Install iptables headers again and fix by Arfrever Frehtes Taifersar Arahesis for building with --as-needed #244431.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

4 files changed, 136 insertions, 5 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 4b7d05f8ccac..2f2ed1c1ed20 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.179 2008/10/26 07:49:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.180 2008/10/26 21:39:37 vapier Exp $
+
+*iptables-1.4.2-r1 (26 Oct 2008)
+
+  26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/iptables-1.4.2-as-needed.patch, +iptables-1.4.2-r1.ebuild:
+  Install iptables headers again and fix by Arfrever Frehtes Taifersar
+  Arahesis for building with --as-needed #244431.
 
 *iptables-1.4.2 (26 Oct 2008)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 6756fec65a49..0e653ce41a36 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -11,6 +11,7 @@ AUX iptables-1.3.7-kernel-dir.patch 552 RMD160 4d4b4444c5eb91b7bd24829b1d564263a
 AUX iptables-1.3.7-sparc64.patch 629 RMD160 15655e9ef5047055f9930de11d313e7e9377f083 SHA1 7ca7c7d54840c94a3bd4054f0e0ef38067937b49 SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647
 AUX iptables-1.4.0-dev-files.patch 1523 RMD160 ad3dd979f20f87d78bc19f6cf906bc2fc6206389 SHA1 c0f8e615c65dd43e9b25bcf3c7f44e9f32b7b6fd SHA256 bce920b13a4b94411f23177fb03ca19084508c6121de634d7de1df19bb468afa
 AUX iptables-1.4.0-in6-glibc-2.8.patch 707 RMD160 fe02ae798356522734237fee1bd4b6c9efa47437 SHA1 5c929e66e1176dd3aba6bb4bae8964d2c0bc9891 SHA256 d6bd6fb4fc9002a9aad2bd41830d50610486c200ea5ff104bb691f5da8ff62a8
+AUX iptables-1.4.2-as-needed.patch 2364 RMD160 26ab1dd036518775baceac095d9ee2f7fbb807bd SHA1 d36002df9665449acce6d5211de90b8c0bf3be64 SHA256 8a913a2215880c02d47d4e45e1fba9ea51b94d67b9fdadbf330587a3f3aab934
 AUX iptables-1.4.2-glibc.patch 296 RMD160 96de1cf6c04bfbad7ff0db0079fc95ae0488cd6e SHA1 2ed61ae536cd448d8502dbc74e825096d6c4d7e6 SHA256 6c86b113b67c81d9a8686a363d426d847a8f48909b5a68b7b7c2f10b2ad487b1
 DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7
 DIST iptables-1.3.8.tar.bz2 172584 RMD160 851b223eef0ca008ad1f375aa0ebdab46ff6f886 SHA1 948f361b194e989b39de4cfa3e95dbe634269ed0 SHA256 c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
@@ -22,13 +23,14 @@ DIST netfilter-layer7-v2.17.tar.gz 160408 RMD160 9823d7b411e18160dc8501a6a5d2129
 EBUILD iptables-1.3.8-r3.ebuild 7128 RMD160 64d5bb2f5e8eb5421c930b6d8df0e19dfb83a67a SHA1 c1166af8498cba39492296559245a7bf57bc80d3 SHA256 8085bd074ab9b190e0274d73df311335300644b6a731718667efdba0454a66bc
 EBUILD iptables-1.4.0-r1.ebuild 6235 RMD160 9ca2520dc41d9d2b71aa6d9262ba5f3b00537042 SHA1 f4ab4ca463933e0a4370a5d553eea7ed8be5e00c SHA256 f73139637c70ab27f06a53496335915acf39f4fc564a3ec7d98e4134cb076557
 EBUILD iptables-1.4.1.1.ebuild 1646 RMD160 3e0c302b1e766445b91c8bf9798089e4efa91381 SHA1 a0d2be782633920f1816a96685e43f13863ae03c SHA256 044362f3b320f1bcea7bc0ed2932bef9b47a294eb784c3f21852b895a9c57614
+EBUILD iptables-1.4.2-r1.ebuild 1955 RMD160 f9e0e2747a1dc92019179b007cc13ef15c4edd7b SHA1 e2b20f2a149c41b66bb356b6159abcacce52e714 SHA256 ab9218ffd8528f3f53dbeea39f1717b55ca31c86cbf109b3d4ae3cec4fa98629
 EBUILD iptables-1.4.2.ebuild 1826 RMD160 0929b6dc312ad004e87d0403aa57a41aa5995d76 SHA1 2905f88badc9bf96dc52ad7f9b1e88fc0fb3eab2 SHA256 88497a971a618a2c8ae743397e78a9c927ffdc6e4b2dfed61f05608d7338ae88
-MISC ChangeLog 33724 RMD160 c013b7c8ab7f89c163b198b57de2c7790ecd0b53 SHA1 6686dac2a533fc5cfa7acbef6dfc9cb702c77f29 SHA256 eef999abbaf307f60dae17d598864109a688cb081ad8d48dfbff1b93028da796
+MISC ChangeLog 33998 RMD160 2c12e00393b972caed01ccd9a0832c53ee9661b2 SHA1 076c351817502455a7daefc84a4acb49a20ce32c SHA256 69195d441aea957c7941286116f87bddca62210bfab4a4f396149a5422377a9c
 MISC metadata.xml 1322 RMD160 a960bf567867311d3513c9171b148a9639578f9e SHA1 bdb94c29e97f5b105efcbcd2547809b47425dc97 SHA256 39df18ef3c5485b92e03c93d673bfd959c34f9ab2b4dd97bc7efc53a5e8b15d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkEIR4ACgkQ67wieSYcaxd4HACfWgcLQlW69HUFFNPzte436Lci
-iIMAnAnmMtFx5maVdqWkWgYhpReVEgto
-=Av/9
+iEYEARECAAYFAkkE458ACgkQ67wieSYcaxeijwCfVHKTBvPcSbejIlFfzQVCwMSr
+jM8AnjG9caCVNwN7ED9eWLeV+yPOvk1q
+=WkYX
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch b/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch
new file mode 100644
index 000000000000..df194c65b70d
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch
@@ -0,0 +1,54 @@
+http://bugs.gentoo.org/244431
+
+patch by Arfrever Frehtes Taifersar Arahesis
+
+--- Makefile.in
++++ Makefile.in
+@@ -87,7 +87,7 @@
+ 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libxtables_la_LIBADD =
++libxtables_la_DEPENDENCIES =
+ am_libxtables_la_OBJECTS = xtables.lo
+ libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@@ -353,11 +353,12 @@
+ lib_LTLIBRARIES = libxtables.la
+ libxtables_la_SOURCES = xtables.c
+ libxtables_la_LDFLAGS = -version 0:0:0
++libxtables_la_LIBADD = -ldl
+ 
+ # iptables, dynamic
+ iptables_SOURCES = iptables-standalone.c iptables.c
+ iptables_LDFLAGS = -rdynamic
+-iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
++iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
+ iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
+                             iptables-restore.c iptables-xml.c \
+                             iptables-standalone.c iptables.c
+@@ -375,13 +376,13 @@
+ # iptables-multi, semi-static
+ iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
+ iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
+-iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
++iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
+ iptables_xml_SOURCES = iptables-xml.c
+ 
+ # ip6tables, dynamic
+ ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
+ ip6tables_LDFLAGS = -rdynamic
+-ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
++ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
+ ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
+                             ip6tables-restore.c ip6tables-standalone.c \
+                             ip6tables.c
+@@ -399,7 +400,7 @@
+ # iptables-multi, semi-static
+ ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
+ ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
+-ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
++ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
+ noinst_LIBRARIES := libiptc/libiptc.a
+ man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
+                     iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
diff --git a/net-firewall/iptables/iptables-1.4.2-r1.ebuild b/net-firewall/iptables/iptables-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..c769e08268d5
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r1.ebuild,v 1.1 2008/10/26 21:39:37 vapier Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch #244431
+
+	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+		EPATCH_SOURCE=${base}/${CTARGET}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
+		if [[ -d ${EPATCH_SOURCE} ]] ; then
+			EPATCH_SUFFIX="patch"
+			EPATCH_FORCE="yes" \
+			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
+			epatch
+			break
+		fi
+	done
+}
+
+src_compile() {
+	econf \
+		--sbindir=/sbin \
+		--libexecdir=/$(get_libdir) \
+		--without-kernel \
+		--enable-devel \
+		--enable-libipq \
+		--enable-shared \
+		--enable-static \
+		|| die
+	emake V=1 || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /usr/include
+	doins include/iptables.h include/ip6tables.h || die
+	dolib.a libiptc/libiptc.a || die
+	insinto /usr/include/libiptc
+	doins include/libiptc/*.h || die
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
+	keepdir /var/lib/ip6tables
+	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
+	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
+}