By default, let the toolchain worry about kernel header location #172209 by Karl...

Package-Manager: portage-2.1.2.3

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index ebdb10fa8bf78306b90c2803bc5e36c0ddb34b39..ce69ef9da07c0f18ee377ec3fa7f484e79be6779 100644 (file)
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # 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.130 2007/04/04 12:55:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.131 2007/04/08 17:51:44 vapier Exp $
+
+  08 Apr 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.3.7-kernel-dir.patch, iptables-1.3.7.ebuild:
+  By default, let the toolchain worry about kernel header location #172209 by
+  Karl Hiramoto.
 
   04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> iptables-1.3.7.ebuild:
   Stable on sparc

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 3bef11356f537ca6188bc134c757d7ee39aea349..85affb537e55e44b817b75617cba36bd3ca6f821 100644 (file)
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -41,6 +41,10 @@ AUX iptables-1.3.2.init 2570 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 SHA
 MD5 2202ac150a5dfe32a8363b0ad565ee1d files/iptables-1.3.2.init 2570
 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 files/iptables-1.3.2.init 2570
 SHA256 1137517483c0d312e3d396d953e9ee197b84f64ed17adfd48f25dbb60e114697 files/iptables-1.3.2.init 2570
+AUX iptables-1.3.7-kernel-dir.patch 552 RMD160 4d4b4444c5eb91b7bd24829b1d564263a540d5ef SHA1 8949bcafbc899878023a68b16452557a49a88f63 SHA256 13e7108c871fc4203abea57f711010a125fd1856c68f94a5dfd40613f8f27d6a
+MD5 cac3e1c605a23bfdc68c7dc6808d232e files/iptables-1.3.7-kernel-dir.patch 552
+RMD160 4d4b4444c5eb91b7bd24829b1d564263a540d5ef files/iptables-1.3.7-kernel-dir.patch 552
+SHA256 13e7108c871fc4203abea57f711010a125fd1856c68f94a5dfd40613f8f27d6a files/iptables-1.3.7-kernel-dir.patch 552
 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
@@ -68,14 +72,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 5752 RMD160 dd782bc3fb243806202dba9b314c0aea44c2c3a4 SHA1 37c9e2f6e61ba876b7bc24858e6c3320ccb6fc9b SHA256 972b1b99598c6448296e3eb58fbc340b3be529cff20099779066bbd5cc8740ba
-MD5 93462c5a44d2a774059e6b468973f002 iptables-1.3.7.ebuild 5752
-RMD160 dd782bc3fb243806202dba9b314c0aea44c2c3a4 iptables-1.3.7.ebuild 5752
-SHA256 972b1b99598c6448296e3eb58fbc340b3be529cff20099779066bbd5cc8740ba iptables-1.3.7.ebuild 5752
-MISC ChangeLog 26971 RMD160 62f7353f095b1a5fc5f961653f87b707f783bd50 SHA1 2909ae985b42bedbc6e48bbb2f546560e7fcb2d4 SHA256 0ea015ae4edd29c3d4dcfd963279018509160904dbd2653e65745fa58c6d2f4e
-MD5 591fb2c576a738d57983637d41438aee ChangeLog 26971
-RMD160 62f7353f095b1a5fc5f961653f87b707f783bd50 ChangeLog 26971
-SHA256 0ea015ae4edd29c3d4dcfd963279018509160904dbd2653e65745fa58c6d2f4e ChangeLog 26971
+EBUILD iptables-1.3.7.ebuild 5798 RMD160 7b823d5bcae885748fe6cb6fc35950fac7dd23b2 SHA1 ec3b415999a9bb11af4f122789c092cae15a7a70 SHA256 3fc1a6d4c9d4d6a3f8ae8864ee6bb473764a31042e1f0e0b32354ba8a42e505e
+MD5 5f2e5b196fe79a644228bb3fd7918422 iptables-1.3.7.ebuild 5798
+RMD160 7b823d5bcae885748fe6cb6fc35950fac7dd23b2 iptables-1.3.7.ebuild 5798
+SHA256 3fc1a6d4c9d4d6a3f8ae8864ee6bb473764a31042e1f0e0b32354ba8a42e505e iptables-1.3.7.ebuild 5798
+MISC ChangeLog 27180 RMD160 7f2a41edbd1d95114a5310bdd335a26ecd02dd15 SHA1 4d29a1ab1b4d2e49221f1e8f96ec6f421c08430f SHA256 bf61588e5d5a79e0769b699a0d113702e0b4eec9ed2da53a645b782503c3bda6
+MD5 df33333767495c6bf695e3a63f45da5b ChangeLog 27180
+RMD160 7f2a41edbd1d95114a5310bdd335a26ecd02dd15 ChangeLog 27180
+SHA256 bf61588e5d5a79e0769b699a0d113702e0b4eec9ed2da53a645b782503c3bda6 ChangeLog 27180
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -93,9 +97,9 @@ 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 v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGE6BHKRy60XGEcJIRAo2sAJ9fOGX7SwJgtVMH7cxCrt5huADANgCfRvy/
-SK5xO6f515DMfJnbXCTsOac=
-=TylT
+iD8DBQFGGSvN8bi6rjpTunYRAve7AKC3/d1yWMnBMMR6/DVj+F8GwdF4igCfbhrA
+8RJYDxXQzbRG5m0I9/dnFR0=
+=M1DS
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch b/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch
new file mode 100644 (file)
index 0000000..758bc3a
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch
@@ -0,0 +1,18 @@
+let the toolchain figure out the default header location
+
+http://bugs.gentoo.org/172209
+
+--- Makefile
++++ Makefile
+@@ -37,7 +37,10 @@
+ endif
+ 
+ COPT_FLAGS:=-O2
+-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
++CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
++ifneq ($(KERNEL_DIR),)
++CFLAGS += -I$(KERNEL_DIR)/include
++endif
+ 
+ ifdef NO_SHARED_LIBS
+ CFLAGS += -DNO_SHARED_LIBS=1

diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild
index 0e12f12cbec05d0c94c216e4391f0648800607a6..fc5c315a4d74e11199e7521137db5cf95eb36651 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-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.6 2007/04/04 12:55:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.7 2007/04/08 17:51:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -57,6 +57,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_OPTS="-p0" \
        epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
@@ -110,7 +111,7 @@ src_defs() {
        use static && myconf="${myconf} NO_SHARED_LIBS=0"
        export myconf
        if ! use l7filter && ! use imq && ! use extensions ; then
-               export KERNEL_DIR="/usr"
+               export KERNEL_DIR=""
                diemsg="failure"
        else
                diemsg="failure - with l7filter or imq patch added"