Fix Makefile for non bash shells.

Package-Manager: portage-2.1.2.7

4 files changed, 34 insertions, 20 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 17e78d4d75cd..2dcf154ea9fc 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.132 2007/05/06 09:54:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.133 2007/05/09 16:10:00 uberlord Exp $
+
+  09 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/iptables-1.3.7-test-dir.patch, iptables-1.3.7.ebuild:
+  Fix Makefile for non bash shells.
 
   06 May 2007; Marius Mauch <genone@gentoo.org> iptables-1.3.5-r4.ebuild,
   iptables-1.3.6.ebuild, iptables-1.3.6-r1.ebuild, iptables-1.3.7.ebuild:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 553bd463ded7..bc5cfefac30a 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315 RMD160 3665aaa6788261f16372c1e34810fe99fd60453c SHA1 b3c88dc5ceebc15aca73fcc02afdf8d0fa6a389f SHA256 f86e32f84af0e68b927b712a60e5d02d1bc27972537f476c71a311711fdcfc12
 MD5 319d0b089a495ce1ab8ca02b3820dfe3 files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315
 RMD160 3665aaa6788261f16372c1e34810fe99fd60453c files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315
@@ -53,6 +50,10 @@ AUX iptables-1.3.7-sparc64.patch 629 RMD160 15655e9ef5047055f9930de11d313e7e9377
 MD5 312292cd14526a498be912d671fd9ae5 files/iptables-1.3.7-sparc64.patch 629
 RMD160 15655e9ef5047055f9930de11d313e7e9377f083 files/iptables-1.3.7-sparc64.patch 629
 SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647 files/iptables-1.3.7-sparc64.patch 629
+AUX iptables-1.3.7-test-dir.patch 890 RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 SHA1 4782ddbc85e832b84020adb477224f713aae5784 SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1
+MD5 c34afae216a1c394006964f0c5a551bb files/iptables-1.3.7-test-dir.patch 890
+RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 files/iptables-1.3.7-test-dir.patch 890
+SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1 files/iptables-1.3.7-test-dir.patch 890
 DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b
 DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c
 DIST iptables-1.3.6.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8f0 SHA1 d0c873b4ce1a928424f38fa8419c96be22fef5d0 SHA256 4394c3de8c55776e54a36a6fcd4f9eeed381f451883049f8268c34c3482f5f1b
@@ -72,14 +73,14 @@ EBUILD iptables-1.3.6.ebuild 5717 RMD160 c20d9fb77ef9c37ccd6a456b068ef518a99ea11
 MD5 0b750421cca1140eac4edd9c42bc1496 iptables-1.3.6.ebuild 5717
 RMD160 c20d9fb77ef9c37ccd6a456b068ef518a99ea11e iptables-1.3.6.ebuild 5717
 SHA256 f46928f266ab96a5e20389264019e2851e151dcfc65a556bc708af5788da81a0 iptables-1.3.6.ebuild 5717
-EBUILD iptables-1.3.7.ebuild 5788 RMD160 4111462ddccb5c6cec7a99aff63eb407cf8c9b7e SHA1 24e7f2879797b5a52555322821fd9cd702a75208 SHA256 50ad7e5c5bbc819bfaa7876889143918e7d1bf89a305458444ed21d7f71014e7
-MD5 2e6ed288723b411af16a2fb1de4d8c5c iptables-1.3.7.ebuild 5788
-RMD160 4111462ddccb5c6cec7a99aff63eb407cf8c9b7e iptables-1.3.7.ebuild 5788
-SHA256 50ad7e5c5bbc819bfaa7876889143918e7d1bf89a305458444ed21d7f71014e7 iptables-1.3.7.ebuild 5788
-MISC ChangeLog 27363 RMD160 7e7f2e42a9ed1d2fb2c25533a80fc03bcc7a3601 SHA1 c53333146181f64119ef1a8ee37d0b352a1e3b43 SHA256 1e79b74383d212f2947725f721d10ba3d4bb17f6be2b95dd1ee12333ea39e44b
-MD5 80cf956239cd919f0995336aa2af4f0f ChangeLog 27363
-RMD160 7e7f2e42a9ed1d2fb2c25533a80fc03bcc7a3601 ChangeLog 27363
-SHA256 1e79b74383d212f2947725f721d10ba3d4bb17f6be2b95dd1ee12333ea39e44b ChangeLog 27363
+EBUILD iptables-1.3.7.ebuild 5864 RMD160 96aa980094cfa138ab27b6018d30bae69fa3b6d2 SHA1 66fec0e89a347558599897160d27328a86a7405f SHA256 669f17a51ba696c1f467bde99a9256674843266e95e8530757bfcd910b39ca29
+MD5 8f3236f8c49e830cdc5a949ddd308846 iptables-1.3.7.ebuild 5864
+RMD160 96aa980094cfa138ab27b6018d30bae69fa3b6d2 iptables-1.3.7.ebuild 5864
+SHA256 669f17a51ba696c1f467bde99a9256674843266e95e8530757bfcd910b39ca29 iptables-1.3.7.ebuild 5864
+MISC ChangeLog 27514 RMD160 c27d0d8e37632e8214b95fbd2f0708de23fec2ac SHA1 68aa2fc41dba3cf7b50429803178e781b3fabb0a SHA256 d7a92a15c76715509b086d50c0e97b06f7a1384bfff33ba1b40298c03c1e466d
+MD5 94e546ff21e2091c683aa171fb2076c5 ChangeLog 27514
+RMD160 c27d0d8e37632e8214b95fbd2f0708de23fec2ac ChangeLog 27514
+SHA256 d7a92a15c76715509b086d50c0e97b06f7a1384bfff33ba1b40298c03c1e466d ChangeLog 27514
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -96,10 +97,3 @@ SHA256 b6cdf0da6f3681548aea7cd05500b00660b64d95f4d6d6196267c2535dc190d0 files/di
 MD5 1f40726055a119edf736bd7c7b5620e7 files/digest-iptables-1.3.7 759
 RMD160 ee6a5537941ce5689ee0ef7e302b990a0222142c files/digest-iptables-1.3.7 759
 SHA256 7d47914b31c063817423c4f38b8f047f2f9094f749991b37e12b3987f644d990 files/digest-iptables-1.3.7 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGPaUv6J2i8a8J4okRAi3lAJ9isFnOWmSM0cDmkOIBfp0DzAL72gCgw/1Q
-MnEwa/vVx4CPDP5CQ7FcfNA=
-=7PhS
------END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch b/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch
new file mode 100644
index 000000000000..f9e4b010796b
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch
@@ -0,0 +1,15 @@
+-a isn't a valid test here, god knows why bash allows it
+
+http://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=569
+
+--- Makefile.orig	2007-05-09 16:44:59.000000000 +0100
++++ Makefile	2007-05-09 16:45:06.000000000 +0100
+@@ -79,7 +79,7 @@
+ # Generic test if arch wasn't found above
+ ifneq ($(POINTERTEST),1)
+ 	# Try to determine if kernel is 64bit and we are compiling for 32bit
+-	ifeq ($(shell [ -a $(KERNEL_DIR)/include/asm ] && echo YES), YES)
++	ifeq ($(shell [ -d $(KERNEL_DIR)/include/asm ] && echo YES), YES)
+ 		64bitkernel := $(shell echo -e "\#include <asm/types.h>\n\#if BITS_PER_LONG == 64\nkernel_is_64bits\n\#endif" | $(CC) $(CFLAGS) -D__KERNEL__ -E - | grep kernel_is_64bits)
+ 		ifdef 64bitkernel
+ 			32bituser := $(shell echo -e "\#include <stdio.h>\n\#if !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit)
diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild
index 4f2718cbf14c..d214f05cdc27 100644
--- a/net-firewall/iptables/iptables-1.3.7.ebuild
+++ b/net-firewall/iptables/iptables-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.8 2007/05/06 09:54:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.9 2007/05/09 16:10:00 uberlord Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -58,6 +58,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-more-exact-check-grep.patch #159162
 	epatch "${FILESDIR}"/${P}-sparc64.patch #166201
 	epatch "${FILESDIR}"/${P}-kernel-dir.patch #172209
+	epatch "${FILESDIR}"/${P}-test-dir.patch # Find include/asm without bash
 
 	EPATCH_OPTS="-p0" \
 	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch