fix USE=extensions problem with linux-headers - bug #156723. Thanks for the tip Paul Hewlett in bug #165590

Package-Manager: portage-2.1.2-r11

4 files changed, 34 insertions, 13 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 155055fdb62a..3b25fae3a813 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # 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.126 2007/02/06 13:10:41 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.127 2007/02/28 13:41:21 dragonheart Exp $
+
+  28 Feb 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/1.3.5-files/iptables-1.3.5-linux-headers.patch,
+  iptables-1.3.5-r4.ebuild:
+  fix USE=extensions problem with linux-headers - bug #156723. Thanks for the
+  tip Paul Hewlett in bug #165590
 
   06 Feb 2007; Daniel Black <dragonheart@gentoo.org>
   -files/1.2.11-files/iptables-layer7-0.9.0.patch,
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index bb5e1b40b2a7..2f518591f306 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -21,6 +21,10 @@ AUX 1.3.5-files/iptables-1.3.5-errno.patch 689 RMD160 67ce38c86fbef574e8f7d2f4eb
 MD5 b27a0ebcd83384e92ee63d64da85af69 files/1.3.5-files/iptables-1.3.5-errno.patch 689
 RMD160 67ce38c86fbef574e8f7d2f4ebffbecff35bf59f files/1.3.5-files/iptables-1.3.5-errno.patch 689
 SHA256 09eff37038db0fd66cb68f5e84dd93c031445f29e3a50afe18d3d389fe5cded1 files/1.3.5-files/iptables-1.3.5-errno.patch 689
+AUX 1.3.5-files/iptables-1.3.5-linux-headers.patch 326 RMD160 f2b26ab8603ff910bc10a9fe478635ccb2982a0a SHA1 06c78ad9156aa5f0c06c0bb7933eb36258ca4ad3 SHA256 deb8a15c8368fa0d790d684a9dcfb5dc0e7e37b5786f59f66ef0d112c5fd3059
+MD5 69c06205e06c346034f5d186bb45bec6 files/1.3.5-files/iptables-1.3.5-linux-headers.patch 326
+RMD160 f2b26ab8603ff910bc10a9fe478635ccb2982a0a files/1.3.5-files/iptables-1.3.5-linux-headers.patch 326
+SHA256 deb8a15c8368fa0d790d684a9dcfb5dc0e7e37b5786f59f66ef0d112c5fd3059 files/1.3.5-files/iptables-1.3.5-linux-headers.patch 326
 AUX 1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607 RMD160 9624733334644b55136724a665e15afa7156f86a SHA1 5cc4fd5fabb44fe72c8a3695e0bd63d06b28c1bd SHA256 5c7617471f98413f1af9ab2846336cbcdf8b2449402967a03b460683aa225bec
 MD5 638f482b4704faf36ba7c6081b86fb55 files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607
 RMD160 9624733334644b55136724a665e15afa7156f86a files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607
@@ -48,10 +52,10 @@ DIST iptables-1.3.7.tar.bz2 196205 RMD160 8109f2d58eb33905bbbbc0cf871abc8172e7dd
 DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
 DIST netfilter-layer7-v2.6.tar.gz 122514 RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d SHA1 6120eae8bd405d35d079774d191830d137643147 SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa
 DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
-EBUILD iptables-1.3.5-r4.ebuild 5769 RMD160 9e132a87381ff2ad4eba7a8a6addc875c6076997 SHA1 e83c7ae6b950924fb7e3c363219ca593059bb840 SHA256 b66f6d1cfa966447d80362e72bff886ed70f1404a92799117da1c38644f9db78
-MD5 77f8722546ec5b6242214fa50a8b5bae iptables-1.3.5-r4.ebuild 5769
-RMD160 9e132a87381ff2ad4eba7a8a6addc875c6076997 iptables-1.3.5-r4.ebuild 5769
-SHA256 b66f6d1cfa966447d80362e72bff886ed70f1404a92799117da1c38644f9db78 iptables-1.3.5-r4.ebuild 5769
+EBUILD iptables-1.3.5-r4.ebuild 5860 RMD160 0f2300c15c28f700be51c269ff30864ce27f7161 SHA1 65f6d0bdf3852d6cafea5a439375b5554a678460 SHA256 75af8f715419837b07e1ccf6819ab7b360229d12c2dc8edeaaa2f30ad46b93f4
+MD5 acd17cd61f9333593de46b4050f4fcfd iptables-1.3.5-r4.ebuild 5860
+RMD160 0f2300c15c28f700be51c269ff30864ce27f7161 iptables-1.3.5-r4.ebuild 5860
+SHA256 75af8f715419837b07e1ccf6819ab7b360229d12c2dc8edeaaa2f30ad46b93f4 iptables-1.3.5-r4.ebuild 5860
 EBUILD iptables-1.3.6-r1.ebuild 5730 RMD160 44369bcadefed70b772d4fa393bf2022a0738f72 SHA1 ab1000f216dc3779eae33a9d1fb90bf247b65a0b SHA256 f726ba01a366ea9e60d907408b0e0fab98f4c75ce639e854a24c3a8969a5fc83
 MD5 277d2bbab7086233832e432533abd878 iptables-1.3.6-r1.ebuild 5730
 RMD160 44369bcadefed70b772d4fa393bf2022a0738f72 iptables-1.3.6-r1.ebuild 5730
@@ -64,10 +68,10 @@ EBUILD iptables-1.3.7.ebuild 5707 RMD160 e69b2f93c2a19bc67b2013d4f7b80281b563d6a
 MD5 134691d67bd2cb53231c2c7f97e29885 iptables-1.3.7.ebuild 5707
 RMD160 e69b2f93c2a19bc67b2013d4f7b80281b563d6a7 iptables-1.3.7.ebuild 5707
 SHA256 67525baedf0976ff9ffc8b7224a406fdc7006e205e0ca68dc89bd38c833df1fb iptables-1.3.7.ebuild 5707
-MISC ChangeLog 26346 RMD160 93c26b1921ab0da4b04a6b058137e39bbcebff8f SHA1 7bff2f7284f4dec30b0034178223ec51528e8a38 SHA256 f2011f937ced05c6011ec1988d86ec496141147cb7458f278f21bee3f732e0b3
-MD5 350d6d1810fdc324a77986ad5fff3e9a ChangeLog 26346
-RMD160 93c26b1921ab0da4b04a6b058137e39bbcebff8f ChangeLog 26346
-SHA256 f2011f937ced05c6011ec1988d86ec496141147cb7458f278f21bee3f732e0b3 ChangeLog 26346
+MISC ChangeLog 26597 RMD160 5fc47f1723fd3b1b65ccd2ddc337c45a3ddc098d SHA1 c9fc9e51c475d0f7ba2c7959a28f8b56c046129c SHA256 c7984ae579dad463401ee6bf4e619f08a0e31b20f7af878f01bdf8deb6ace901
+MD5 31c3ebb5adc42e03825c1bcf245bf624 ChangeLog 26597
+RMD160 5fc47f1723fd3b1b65ccd2ddc337c45a3ddc098d ChangeLog 26597
+SHA256 c7984ae579dad463401ee6bf4e619f08a0e31b20f7af878f01bdf8deb6ace901 ChangeLog 26597
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -87,7 +91,7 @@ SHA256 7d47914b31c063817423c4f38b8f047f2f9094f749991b37e12b3987f644d990 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF5WtemdTrptrqvGERAjYvAJ9tAXiKW+wKE2wQZee6XBFYf7BK4gCfRTGg
-lts20fuyx8ceFD07zcfgRAs=
-=+rx2
+iD8DBQFF5YafmdTrptrqvGERAjsuAJ9+S5CFSYzW6PJho6a5jsN8w0sb9wCaAss4
+osMCowHyMl1RW+XYtEEQEpw=
+=UVoE
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch
new file mode 100644
index 000000000000..7137d1919307
--- /dev/null
+++ b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch
@@ -0,0 +1,10 @@
+--- extensions/libipt_iprange.c.orig	2007-03-01 00:19:36.000000000 +1100
++++ extensions/libipt_iprange.c	2007-03-01 00:19:58.000000000 +1100
+@@ -6,6 +6,7 @@
+ #include <getopt.h>
+ 
+ #include <iptables.h>
++#include <linux/types.h>
+ #include <linux/netfilter_ipv4/ipt_iprange.h>
+ 
+ /* Function which prints out usage message. */
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
index 6708503d3b44..d3db92eceb70 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-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.5-r4.ebuild,v 1.14 2007/01/20 16:12:33 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.15 2007/02/28 13:41:21 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -72,6 +72,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/1.3.5-files/${P}-errno.patch #139726
 	epatch "${FILESDIR}"/1.3.5-files/${P}-log-prefix-no-empty-strings.patch #148169
+	use extensions && epatch "${FILESDIR}"/1.3.5-files/${P}-linux-headers.patch #165590
 
 	if use imq ; then
 		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}