handle locations of newer extensions #142763 by Matt Whitlock

Package-Manager: portage-2.1.1_pre4

2 files changed, 24 insertions, 17 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index d93400053cd2..b6412f74461e 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -105,10 +105,10 @@ EBUILD iptables-1.3.5-r3.ebuild 5241 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd
 MD5 394593497a454f0f24dcf449aacd07a7 iptables-1.3.5-r3.ebuild 5241
 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd2326 iptables-1.3.5-r3.ebuild 5241
 SHA256 d5102e65285357386d6635c1ac816320bfc8770ad0f6e1bad9c9dde38089faac iptables-1.3.5-r3.ebuild 5241
-EBUILD iptables-1.3.5-r4.ebuild 5521 RMD160 9332b152f6191b048ecf347dcd92958a325245c7 SHA1 a26c4d4db8a606608defe90c4c96a1d53d3d75eb SHA256 eeddb72164dbc17642a5973ec8890d369724984e5f9213facedd623e91d2da77
-MD5 47d7da465bd63efc9c08f30482132d6b iptables-1.3.5-r4.ebuild 5521
-RMD160 9332b152f6191b048ecf347dcd92958a325245c7 iptables-1.3.5-r4.ebuild 5521
-SHA256 eeddb72164dbc17642a5973ec8890d369724984e5f9213facedd623e91d2da77 iptables-1.3.5-r4.ebuild 5521
+EBUILD iptables-1.3.5-r4.ebuild 5708 RMD160 d1d3c14f5ae508612fd81713c948b1a7afff28a6 SHA1 bc61f9948f6fdf40c404c75eeb27634440501abc SHA256 717ab14a1fb412de74572371d0d8748318cdf5431c234b4f19124208e96610e8
+MD5 d39fa1eb0fae67ef6bce24e779cca80f iptables-1.3.5-r4.ebuild 5708
+RMD160 d1d3c14f5ae508612fd81713c948b1a7afff28a6 iptables-1.3.5-r4.ebuild 5708
+SHA256 717ab14a1fb412de74572371d0d8748318cdf5431c234b4f19124208e96610e8 iptables-1.3.5-r4.ebuild 5708
 EBUILD iptables-1.3.5.ebuild 5064 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 SHA1 d1b64266e3cadc4932729d10219ba37962abbc54 SHA256 1a37910c39e95ed8efbf2aaf132fc8c6878b61e0cbeb635ca072d9a68193f94e
 MD5 925412ddd3ef1cda9a5c0016c2268c06 iptables-1.3.5.ebuild 5064
 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 iptables-1.3.5.ebuild 5064
@@ -145,7 +145,7 @@ SHA256 77bb5fb7a5d08a68d83c29526ac411e6e40c1a8ae103bf446895f7b355bc5e7c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyn0u1ZcsMnZjRyIRArzbAJ9T1mFjpY7vaTh97nlFItyxC2oEIgCgwIfj
-nID7tsVKpzBvCG1O+JAIJE0=
-=hZ3I
+iD8DBQFE1S/VamhnQswr0vIRAr/mAJ94ovCmgewQRnTa4wc5/X7CsWZAbQCdFN7h
+cSYhvT44VZHxlw7afC0C1d0=
+=HFZs
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
index daedaa2d2454..281bb166eab9 100644
--- a/net-firewall/iptables/iptables-1.3.5-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.3.5-r4.ebuild,v 1.2 2006/07/28 21:06:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.3 2006/08/05 23:54:42 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -12,13 +12,13 @@ IMQ_PATCH="iptables-1.3.0-imq1.diff"
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
 SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
-	imq? (	http://www.linuximq.net/patchs/${IMQ_PATCH} )
-	l7filter? (	mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
+	imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
+	l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static imq l7filter extensions"
+IUSE="extensions imq ipv6 l7filter static"
 
 DEPEND="virtual/os-headers
 	l7filter? ( virtual/linux-sources )
@@ -81,11 +81,23 @@ src_unpack() {
 		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
 		chmod +x extensions/.layer7-test*
 	fi
-}
 
+	# the net directory is moving around so account for new/old locations
+	cd "${S}"/extensions
+	local x
+	for x in .*-test* ; do
+		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
+		if cmp ${x} .new-${x} > /dev/null ; then
+			rm -f .new-${x}
+		else
+			chmod a+rx .new-${x}
+		fi
+	done
+}
 
 src_defs() {
 	# these are used in both of src_compile and src_install
+	myconf=""
 	myconf="${myconf} PREFIX="
 	myconf="${myconf} LIBDIR=/$(get_libdir)"
 	myconf="${myconf} BINDIR=/sbin"
@@ -106,7 +118,6 @@ src_defs() {
 	export diemsg
 }
 
-
 src_compile() {
 	src_defs
 
@@ -114,10 +125,6 @@ src_compile() {
 	replace-flags -O0 -O2
 	get-flag -O || append-flags -O2
 
-	# prevent it from causing ICMP errors.
-	# http://bugs.gentoo.org/show_bug.cgi?id=23645
-	filter-flags -fstack-protector
-
 	emake -j1 \
 		COPT_FLAGS="${CFLAGS}" ${myconf} \
 		KERNEL_DIR="${KERNEL_DIR}" \