Dont abort check target when uname contains -g #159162 by Sergey Borodich.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 6d0ee81b93a72c07a68c2d5646a04a1b2a1e3bd2..300bc83c46e1cbb36d1f648ca87fa1e7f37ee530 100644 (file)
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.122 2006/12/22 11:37:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.123 2006/12/30 06:42:51 vapier Exp $
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.3.7-more-exact-check-grep.patch, iptables-1.3.7.ebuild:
+  Dont abort check target when uname contains -g #159162 by Sergey Borodich.
 
   22 Dec 2006; Daniel Black <dragonheart@gentoo.org> iptables-1.3.7.ebuild:
   l7filter - changed to 2.8 patch - exactly the same as 2.6 but this way the

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 9d7537287eebc3c4d37cea2f88630d1a3d1d984b..1b03f6b0edaa10f95a025fccaaa89e3e5e3d0c5a 100644 (file)
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -81,6 +81,10 @@ AUX iptables-1.3.2.init 2548 RMD160 0f45a7dd2f1215d46b6e7d42d27da0d10c932c54 SHA
 MD5 f3deaed443d73190338f759c82ab9fd0 files/iptables-1.3.2.init 2548
 RMD160 0f45a7dd2f1215d46b6e7d42d27da0d10c932c54 files/iptables-1.3.2.init 2548
 SHA256 072857516e98886c151a69e8d384688308b72962aacef2bfdab4e502815c5a55 files/iptables-1.3.2.init 2548
+AUX iptables-1.3.7-more-exact-check-grep.patch 602 RMD160 80c80f9d2a2567b164932adc1e9ddb1392b34791 SHA1 5bb693f7ddc641b793334d072b106ab998f4202e SHA256 aa26f352dc2b870363b7de1586105a4bf19eb9a6c6703a23f64ef9656017021d
+MD5 0b0e12c269db9fd7c8e9835f0a9fd3fa files/iptables-1.3.7-more-exact-check-grep.patch 602
+RMD160 80c80f9d2a2567b164932adc1e9ddb1392b34791 files/iptables-1.3.7-more-exact-check-grep.patch 602
+SHA256 aa26f352dc2b870363b7de1586105a4bf19eb9a6c6703a23f64ef9656017021d files/iptables-1.3.7-more-exact-check-grep.patch 602
 DIST iptables-1.2.11.tar.bz2 156988 RMD160 66e0fa391444a1e169feaf2fc67b5f8622ec1d89 SHA1 1a2236e2705b02834aaa506632c08cf8a647efa2 SHA256 be7bd67232fddbe3ce81f40f5b79123380a2e67cd166ec06e650842f8acb373d
 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
@@ -119,14 +123,14 @@ EBUILD iptables-1.3.6.ebuild 5727 RMD160 3942518924aa00b35b57572814cc691b64586d5
 MD5 bda128f763227c8cb2c899f8f5bf014b iptables-1.3.6.ebuild 5727
 RMD160 3942518924aa00b35b57572814cc691b64586d5a iptables-1.3.6.ebuild 5727
 SHA256 c5719408d68a0b487239b5b171f6e19f0e1b00857c0c1185ecf65e051dcbdd47 iptables-1.3.6.ebuild 5727
-EBUILD iptables-1.3.7.ebuild 5643 RMD160 d9c388339fbb5e9ade3104ba6aa1a78762f5f385 SHA1 f9263893eaaac9814202b6261cc94a16e3679f94 SHA256 3b69186c086946b52bb1297302768653346b3aba1421d92194fba62f4b1f9102
-MD5 f46e9a465f7b8915a8f1afc83a7a95f1 iptables-1.3.7.ebuild 5643
-RMD160 d9c388339fbb5e9ade3104ba6aa1a78762f5f385 iptables-1.3.7.ebuild 5643
-SHA256 3b69186c086946b52bb1297302768653346b3aba1421d92194fba62f4b1f9102 iptables-1.3.7.ebuild 5643
-MISC ChangeLog 25176 RMD160 bf96da14960dc2fe84f98e929cb53aad2cb75686 SHA1 bd8ecdc264b3d584fa19fd7f0b68993031a748cc SHA256 4f57c7a8f3075478f8f40c538c1c808ed503271e802163b0e467882f5ba21277
-MD5 d50fd80a9dc4d26d3e367ed6f6211c25 ChangeLog 25176
-RMD160 bf96da14960dc2fe84f98e929cb53aad2cb75686 ChangeLog 25176
-SHA256 4f57c7a8f3075478f8f40c538c1c808ed503271e802163b0e467882f5ba21277 ChangeLog 25176
+EBUILD iptables-1.3.7.ebuild 5702 RMD160 ea8471fc95681f18767549ff7a6f703b84c83ffd SHA1 72344f853f44d27e5dc64d7fcc9835208138f19b SHA256 a9bfbf20073fad7ee26faf4c569f77ddaa0128574db0f2c16ec0e284d915a0be
+MD5 86c9bbfbd285ea6e16dc371ce489b895 iptables-1.3.7.ebuild 5702
+RMD160 ea8471fc95681f18767549ff7a6f703b84c83ffd iptables-1.3.7.ebuild 5702
+SHA256 a9bfbf20073fad7ee26faf4c569f77ddaa0128574db0f2c16ec0e284d915a0be iptables-1.3.7.ebuild 5702
+MISC ChangeLog 25375 RMD160 739c02a4619501bec52a083f787e87782d996b41 SHA1 1e092fbe5a49de1d363a1931f101a7ac12c2c5d3 SHA256 d6476621541d5fadd6b6063e26f586f0c0ba14517f2e78739045261aa797e0a5
+MD5 13fb8d238b083942bedf170930f7db4a ChangeLog 25375
+RMD160 739c02a4619501bec52a083f787e87782d996b41 ChangeLog 25375
+SHA256 d6476621541d5fadd6b6063e26f586f0c0ba14517f2e78739045261aa797e0a5 ChangeLog 25375
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -156,9 +160,9 @@ MD5 5186fb2885f607a5a5cc5f8f8d9bdb54 files/digest-iptables-1.3.7 759
 RMD160 688e4994e49fad2ca49e446369390179068c0385 files/digest-iptables-1.3.7 759
 SHA256 1148530a04bfc20ade97817864f5790d8bf5a69de1c362c3323f4c120f36e51e files/digest-iptables-1.3.7 759
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFi8N9mdTrptrqvGERAnWQAJ0cYDpY/i2ZnrbHgRsalt2hVzZjVgCgg0lC
-b9AtCU9RqGij7huRnJDi5eg=
-=ZuGw
+iD8DBQFFlgqr8bi6rjpTunYRAq4xAJ9KL1B1yYGloP0xiOyYs9NhaJxOPQCg3hTc
+k0v3l2SLglS4qXOUCsOBVw4=
+=K96j
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch b/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch
new file mode 100644 (file)
index 0000000..2f1b46f
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch
@@ -0,0 +1,16 @@
+if `uname -r` contains a '-g' in it, the check target fails
+
+http://bugs.gentoo.org/159162
+https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=527
+
+--- Makefile
++++ Makefile
+@@ -249,7 +249,7 @@ distrib: check distclean delrelease $(RE
+ # -g -pg -DIPTC_DEBUG
+ .PHONY: check
+ check:
+-      @if echo $(CFLAGS) | egrep -e '-g|-pg|IPTC_DEBUG' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
++      @if echo $(CFLAGS) | egrep -e '(^|[[:space:]])(-g|-pg|-DIPTC_DEBUG)([[:space:]]|$)' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
+ 
+ .PHONY: nowhitespace
+ nowhitespace:

diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild
index e842556c332cec8b8b54e46a2c1c6641100daeb2..e1bc9bd1ffd53c6fc277ab9860b56fde25ee90c1 100644 (file)
--- a/net-firewall/iptables/iptables-1.3.7.ebuild
+++ b/net-firewall/iptables/iptables-1.3.7.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.7.ebuild,v 1.2 2006/12/22 11:37:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.3 2006/12/30 06:42:51 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -55,6 +55,8 @@ src_unpack() {
        use l7filter && unpack ${L7_P}.tar.gz
        cd "${S}"
 
+       epatch "${FILESDIR}"/${P}-more-exact-check-grep.patch #159162
+
        EPATCH_OPTS="-p0" \
        epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
        EPATCH_OPTS="-p1" \