back port linux kernel checks #150058

Package-Manager: portage-2.1.2_pre2

2 files changed, 25 insertions, 35 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index fc6247de7979..a0932c501382 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -88,10 +88,10 @@ DIST iptables-1.3.6.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8
 DIST netfilter-layer7-v2.1.tar.gz 89247 RMD160 cd2d455a16761b4fe2318d6d8a5671a535176d62 SHA1 5dc0c9bd1e3df3110cf724f3437a4b68d62b4dd3 SHA256 5022e8a349135f67045f4add47405af0d626c90a5e8b86ee01745755946e1390
 DIST netfilter-layer7-v2.2.tar.gz 88944 RMD160 cf421e6ef4acf5b9107feacaee6566d55ad21683 SHA1 55eaad3b4e46feff09910cd5e3c76c57ac12dc58 SHA256 e82cc356ece2bea3da2bb4b467063a96337ced4bde6127a44f0296245e74d57d
 DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
-EBUILD iptables-1.2.11-r3.ebuild 5335 RMD160 be0e4f868b4f24b39b1a684a6b120d5120ec0763 SHA1 77755490bb3a7fde4779c0ef633bfe65b238601f SHA256 8ffed50f6d6ebbf4159b72279adda848f5932f615901c4066cbbd466f089054f
-MD5 fc6e50abc57966f2b5655301809a6d15 iptables-1.2.11-r3.ebuild 5335
-RMD160 be0e4f868b4f24b39b1a684a6b120d5120ec0763 iptables-1.2.11-r3.ebuild 5335
-SHA256 8ffed50f6d6ebbf4159b72279adda848f5932f615901c4066cbbd466f089054f iptables-1.2.11-r3.ebuild 5335
+EBUILD iptables-1.2.11-r3.ebuild 5052 RMD160 f5d9a32239ba315c55422d3cd4dd7b0eb1bb6515 SHA1 3e8f9cf44a34682ada0b18e55a5ca8ba99621bc9 SHA256 fcc858795417b80b1f2f113e57b161703832a8416e8de7b098de26aedd4376ca
+MD5 33a251bfd2d6b0e3a7a786fdf78554e7 iptables-1.2.11-r3.ebuild 5052
+RMD160 f5d9a32239ba315c55422d3cd4dd7b0eb1bb6515 iptables-1.2.11-r3.ebuild 5052
+SHA256 fcc858795417b80b1f2f113e57b161703832a8416e8de7b098de26aedd4376ca iptables-1.2.11-r3.ebuild 5052
 EBUILD iptables-1.3.5-r1.ebuild 5059 RMD160 45c9b9729cd8f57a87541b04655953c5b24b4998 SHA1 a1b36b92660ed9169c630749a8af60891fd22093 SHA256 8829221162e3efc705bbf792695d45f2003e3691f9703a49cfed06722c10690c
 MD5 a13225ca53456b22ba77129c78370765 iptables-1.3.5-r1.ebuild 5059
 RMD160 45c9b9729cd8f57a87541b04655953c5b24b4998 iptables-1.3.5-r1.ebuild 5059
@@ -141,7 +141,7 @@ SHA256 65f1e644901e9411fbb3f8a2787a839d3fbd941134d8b25314976a495a9a0938 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFItIvkT4lNIS36YERAu2gAJ9ds14laqsT6as616N3XKK8mxa4dwCghYwN
-Ellmv49YEpDd2XJ9obvsFh0=
-=hKyi
+iD8DBQFFI8ICamhnQswr0vIRAuy6AJsHqhfH8L+mfsk7qGHP+ei16ZFVBgCfV/Fq
+8agZ+pOD1HhysilPWc4XF/g=
+=BP9W
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.2.11-r3.ebuild b/net-firewall/iptables/iptables-1.2.11-r3.ebuild
index 06b9dcd3cae1..0f2ad4370d6b 100644
--- a/net-firewall/iptables/iptables-1.2.11-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.11-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.16 2006/02/02 01:40:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.17 2006/10/04 14:14:35 vapier Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs linux-info
 
 #extensions versions
 
@@ -20,7 +20,7 @@ DEPEND="virtual/os-headers
 RDEPEND=""
 
 pkg_setup() {
-	if use extensions; then
+	if use extensions ; then
 		einfo "WARNING: 3rd party extensions has been enabled."
 		einfo "This means that iptables will use your currently installed"
 		einfo "kernel in /usr/src/linux as headers for iptables."
@@ -28,23 +28,25 @@ pkg_setup() {
 		einfo "You may have to patch your kernel to allow iptables to build."
 		einfo "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ for patches"
 		einfo "for your kernel."
+		linux-info_pkg_setup
 	fi
 }
 
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch
-	epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch
-	epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch
-	epatch ${FILESDIR}/${PV}-files/round-robin.patch
-	epatch ${FILESDIR}/${PV}-files/CAN-2004-0986.patch ; # security bug 70240
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-files/grsecurity-1.2.8-iptables.patch
+	epatch "${FILESDIR}"/${PV}-files/install_ipv6_apps.patch
+	epatch "${FILESDIR}"/${PV}-files/install_all_dev_files.patch
+	epatch "${FILESDIR}"/${PV}-files/round-robin.patch
+	epatch "${FILESDIR}"/${PV}-files/CAN-2004-0986.patch ; # security bug 70240
 	sed -i "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" extensions/Makefile
 
 	if use extensions; then
-		epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff
-		epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch
+		epatch "${FILESDIR}"/${PV}-files/iptables-1.2.9-imq1.diff
+		epatch "${FILESDIR}"/${PV}-files/iptables-layer7-0.9.0.patch
 
 		chmod +x extensions/.IMQ-test*
 		chmod +x extensions/.childlevel-test*
@@ -72,14 +74,6 @@ src_compile() {
 	use static && myconf="${myconf} NO_SHARED_LIBS=0"
 
 	if use extensions; then
-		# Only check_KV if /usr/src/linux exists
-		if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then
-			check_KV
-		else
-			ewarn "You don't have kernel sources available at /usr/src/linux."
-			ewarn "Iptables will be built against linux-headers."
-		fi
-
 		make COPT_FLAGS="${CFLAGS}" ${myconf} \
 			PREFIX= \
 			LIBDIR=/lib \
@@ -141,17 +135,13 @@ src_install() {
 
 	dodoc COPYING
 	dodir /var/lib/iptables ; keepdir /var/lib/iptables
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PN}-1.2.9-r1.init iptables
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${PN}-1.2.9-r1.confd iptables
+	newinitd "${FILESDIR}"/${PN}-1.2.9-r1.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.2.9-r1.confd iptables
 
 	if use ipv6; then
 		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/${PN/iptables/ip6tables}-1.2.9-r1.init ip6tables
-		insinto /etc/conf.d
-		newins ${FILESDIR}/${PN/iptables/ip6tables}-1.2.9-r1.confd ip6tables
+		newinitd "${FILESDIR}"/${PN/iptables/ip6tables}-1.2.9-r1.init ip6tables
+		newconfd "${FILESDIR}"/${PN/iptables/ip6tables}-1.2.9-r1.confd ip6tables
 	fi
 }