Finished iptables cleanup.

12 files changed, 51 insertions, 33 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 3e59ae989ef4..6fe88bc0a45c 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.31 2004/06/28 19:00:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.32 2004/06/28 20:36:52 aliz Exp $
 
-*iptables-1.2.9-r2 (28 Jun 2004)
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11.ebuild,
+  iptables-1.2.9-r3.ebuild:
+  Revision bump these so they propagate correctly.
 
-  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r2.ebuild:
+*iptables-1.2.11-r1 (28 Jun 2004)
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11.ebuild:
+  Version bump and updated IMQ and l7 patches. Closing #54067 and #55308.
+
+*iptables-1.2.9-r3 (28 Jun 2004)
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r3.ebuild:
   New revision with a new local use flag that toggles the applying of
   3rd party patches and building against linux sources. Without the new
   use flag no 3rd party extensions patches will be applied and iptables
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index b2d2c65c700a..cb9679a0ec2b 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,10 +1,10 @@
 MD5 e17c9bfee1f65cb1a80b6ea77ccbed7c iptables-1.2.7a-r3.ebuild 1959
-MD5 1766f125115bb4e14b1b921b20482e0e iptables-1.2.9-r2.ebuild 4722
+MD5 fccee733368de1aed12c5a8083c0c66d iptables-1.2.11-r1.ebuild 4635
 MD5 9cd0905c67f2b36d434811cdd13cf14c iptables-1.2.9.ebuild 2777
 MD5 15b500a507f8a161618d173a656922fa iptables-1.2.9-r1.ebuild 3496
-MD5 a8363be7d747fe0b455126b622628f9d ChangeLog 11322
+MD5 a8fb67fd049c0acd3c08e0cd6d8c5936 ChangeLog 11656
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 4ea8f7993eb0e4ed7409455e221653ad iptables-1.2.11.ebuild 4727
+MD5 5ac97f2c615fc3eb7dc57eac644441f7 iptables-1.2.9-r3.ebuild 4697
 MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
 MD5 11b6d4adeda9db7a96bc9c1238320fb5 files/ip6tables.init 2107
 MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
@@ -12,13 +12,13 @@ MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
 MD5 521c8e99785dfc3c424a6b7bcdbed140 files/iptables-1.2.9-r1.init 1787
 MD5 3b47fcf66505ee6154949e600a501e32 files/iptables.init 2091
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
-MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r2 67
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r3 67
 MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r1 68
 MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
 MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213
 MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11 68
 MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211
 MD5 7e146122ae2bb424410cb64f54ad0a9b files/ip6tables-1.2.9-r1.init 1795
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
@@ -32,4 +32,10 @@ MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936
 MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455
 MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.11-files/hppa.patch.bz2 278
+MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815
+MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041
+MD5 3e4bb17303647ee7a43279f6aa6f0d61 files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 1420
+MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.11-files/03_all_gentoo.patch.bz2 278
diff --git a/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2
new file mode 100644
index 000000000000..2d23cde70c29
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2
diff --git a/net-firewall/iptables/files/1.2.11-files/hppa.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/hppa.patch.bz2
new file mode 100644
index 000000000000..6e1093b07157
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/hppa.patch.bz2
diff --git a/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2
new file mode 100644
index 000000000000..9cae5c993354
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2
diff --git a/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2
new file mode 100644
index 000000000000..d6a865a6eb28
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 b/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2
new file mode 100644
index 000000000000..efdba3e37808
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2
new file mode 100644
index 000000000000..d01057502c59
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.11 b/net-firewall/iptables/files/digest-iptables-1.2.11-r1
index 5f9f67fb7252..5f9f67fb7252 100644
--- a/net-firewall/iptables/files/digest-iptables-1.2.11
+++ b/net-firewall/iptables/files/digest-iptables-1.2.11-r1
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.9-r2 b/net-firewall/iptables/files/digest-iptables-1.2.9-r3
index ef4d9437364b..ef4d9437364b 100644
--- a/net-firewall/iptables/files/digest-iptables-1.2.9-r2
+++ b/net-firewall/iptables/files/digest-iptables-1.2.9-r3
diff --git a/net-firewall/iptables/iptables-1.2.11.ebuild b/net-firewall/iptables/iptables-1.2.11-r1.ebuild
index 147cd449e0d6..1a74cfe8fbcb 100644
--- a/net-firewall/iptables/iptables-1.2.11.ebuild
+++ b/net-firewall/iptables/iptables-1.2.11-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 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.ebuild,v 1.3 2004/06/28 19:07:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r1.ebuild,v 1.1 2004/06/28 20:36:52 aliz Exp $
 
 inherit eutils flag-o-matic
 
+#extensions versions
+
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.iptables.org/"
 SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
@@ -30,26 +32,22 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	epatch ${FILESDIR}/${PV}-files/04_all_install_ipv6_apps.patch.bz2
-	epatch ${FILESDIR}/${PV}-files/05_all_install_all_dev_files.patch.bz2
+	epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch.bz2
+	epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2
+	epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch.bz2
+	use hppa && epatch ${FILESDIR}/${PV}-files/hppa.patch.bz2
 
-	# The folowing hack is needed because ${ARCH} is "sparc" and not "sparc64"
-	# and epatch uses ??_${ARCH}_foo.${EPATCH_SUFFIX} when reading from directories
-	[ "${PROFILE_ARCH}" = "sparc64" ] && epatch ${FILESDIR}/${PV}-files/sparc64_limit_fix.patch.bz2
-	use hppa && epatch ${FILESDIR}/${PV}-files/03_hppa_gentoo.patch.bz2
+	sed -i "s:PF_EXT_SLIB=:PF_EXT_SLIB=stealth :g" extensions/Makefile
 
 	if use extensions; then
-		epatch ${FILESDIR}/${PV}-files/01_all_grsecurity.patch.bz2
-		epatch ${FILESDIR}/${PV}-files/02_all_imq.patch.bz2
-		epatch ${FILESDIR}/${PV}-files/06_all_l7.patch.bz2
+		epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff.bz2
+		epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch.bz2
 
 		chmod +x extensions/.IMQ-test*
 		chmod +x extensions/.childlevel-test*
 		chmod +x extensions/.layer7-test*
-	fi
-
 
-	sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile
+	fi
 }
 
 src_compile() {
@@ -79,7 +77,8 @@ src_compile() {
 			ewarn "Iptables will be built against linux-headers."
 		fi
 
-		make ${myconf} \
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			PREFIX= \
 			LIBDIR=/lib \
 			BINDIR=/sbin \
 			MANDIR=/usr/share/man \
@@ -87,7 +86,8 @@ src_compile() {
 			KERNEL_DIR=/usr/src/linux \
 			|| die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
 	else
-		make ${myconf} \
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			PREFIX= \
 			LIBDIR=/lib \
 			BINDIR=/sbin \
 			MANDIR=/usr/share/man \
@@ -98,8 +98,14 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
-	make DESTDIR=${D} ${myconf} \
+	make COPT_FLAGS="${CFLAGS}" ${myconf} \
+		PREFIX= \
+		DESTDIR=${D} \
+		MANDIR=/usr/share/man \
+		install
+	make COPT_FLAGS="${CFLAGS}" ${myconf} \
+		DESTDIR=${D} \
+		PREFIX= \
 		LIBDIR=/usr/lib \
 		MANDIR=/usr/share/man \
 		INCDIR=/usr/include \
diff --git a/net-firewall/iptables/iptables-1.2.9-r2.ebuild b/net-firewall/iptables/iptables-1.2.9-r3.ebuild
index aa5c40c55bf9..64b4e74eb5ca 100644
--- a/net-firewall/iptables/iptables-1.2.9-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r2.ebuild,v 1.5 2004/06/28 19:07:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r3.ebuild,v 1.1 2004/06/28 20:36:52 aliz Exp $
 
 inherit eutils flag-o-matic
 
@@ -48,13 +48,6 @@ src_unpack() {
 		chmod +x extensions/.layer7-test*
 	fi
 
-
-	sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile
-}
-
-src_compile() {
-	replace-flags -O0 -O2
-
 	if [ -z `get-flag O` ]; then
 		append-flags -O2
 	fi
@@ -63,6 +56,10 @@ src_compile() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=23645
 	filter-flags "-fstack-protector"
 
+	sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile
+}
+
+src_compile() {
 	# iptables and libraries are now installed to /sbin and /lib, so that
 	# systems with remote network-mounted /usr filesystems can get their
 	# network interfaces up and running correctly without /usr.