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

(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)

3 files changed, 130 insertions, 1 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/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
+}