Version bump.

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 146 insertions, 2 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 3162f04a5731..45d7f6656617 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.193 2009/02/16 16:57:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.194 2009/03/24 08:12:31 pva Exp $
+
+*iptables-1.4.3 (24 Mar 2009)
+
+  24 Mar 2009; Peter Volkov <pva@gentoo.org>
+  +files/iptables-1.4.3-as-needed.patch, +iptables-1.4.3.ebuild:
+  Version bump.
 
   16 Feb 2009; Brent Baude <ranger@gentoo.org> iptables-1.4.2-r2.ebuild:
   stable ppc64, bug 255786
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 8755d04ff89b..8f7a1bd0fff3 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -16,12 +16,14 @@ AUX iptables-1.4.2-libxt_TOS-compilation.patch 1054 RMD160 af7c38971c0359c388794
 AUX iptables-1.4.2-libxt_iprange.c-build.patch 1801 RMD160 a42a7df755d42f202171f04fe0c783b1d61f4498 SHA1 5ea4bc8d67cb08858a8df7814b0ab9bbe7140f01 SHA256 4067d721b109931d929ab77e103a8e060ceef175a57434e48ad496feae24a70e
 AUX iptables-1.4.2-no-ldconfig.patch 525 RMD160 87ee4b6829d525e00fc81934cb50d8cc2fa160a2 SHA1 3de7f0c559a70e9d5383a3e54b0cd247f4e38717 SHA256 afe2b3bd055fac66c9552346ef097e8e2e9afb3e24dbc4ad2657742e6ff44a97
 AUX iptables-1.4.2-owner-restore.patch 1431 RMD160 c634ea3bf65b721bdfe10f6fefaa1e3d5ac8977d SHA1 3339d5f9a70bf8e14b7bd10ccb6c098a3957a906 SHA256 cc6619245376636482b6da1903d1bcf211d648eb0f5ae09784e4889836e438b6
+AUX iptables-1.4.3-as-needed.patch 1856 RMD160 f0a03d07f299b50f74bd399ee0d40773206c3c8d SHA1 509108173db204c2d4d79bc30215f47e9eb831b1 SHA256 235c01fe22ad7295536f522b15cfdc828173deae948074e121a163ffe694b584
 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
 DIST iptables-1.4.0-imq.diff 5345 RMD160 71e012358cb0ed274feb46f862d300cf0d877818 SHA1 8e243b15c20400402d60f627a40b08957ac96c10 SHA256 e23d5bce7845cbe6fecf9e93e4e8e329948adb8282efec932d629b3bb4cb9c82
 DIST iptables-1.4.0.tar.bz2 181610 RMD160 6f6a29cbe0e55261607acc1183e04482c444286e SHA1 b61064885ab20b62d6ac2a590ea429117248d9d7 SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52
 DIST iptables-1.4.1.1.tar.bz2 436366 RMD160 3986c7023b82037acb931c06e792f019b927fbd3 SHA1 61a8680b2aa578d1ff8d242b9ddf6b682c60eba7 SHA256 f9e11ccdf60a9f118bbee8d80dc76cf7c0c649f0e18fa34a8450df271a70b582
 DIST iptables-1.4.2.tar.bz2 435891 RMD160 e20dd33ad3174bdc6a0ef4d6bdfd60a9c6d2c604 SHA1 64f6ed902514b5328f09c22e4dbf9ba0018389ca SHA256 7b21e1e8b12a08d7ee54f83a9070950961a0a3c7d8cbeabe496a2bc4fb806c65
+DIST iptables-1.4.3.tar.bz2 442868 RMD160 1537537fdbf6881cb72ab3d97fd601323accbdc7 SHA1 c7ae0541bf91501da5c459670f4f2b9ba526185c SHA256 81e18949033091e2aa40c8b7faa6951c606d04d529ba994919824e23715a4887
 DIST netfilter-layer7-v2.21.tar.gz 174702 RMD160 95b6c86bc73e346c516509c5d769d0ef2b34c8b9 SHA1 1a21b7273478ccd0ac57cfc3f1b6d1893a1c2dfd SHA256 4c3ce80dd6ddc9f7c04ea2b6d9a3f678f33a6a3457de3175949d9c5b0e77021b
 EBUILD iptables-1.3.8-r3.ebuild 7132 RMD160 9da9caa232f1fc421828715a74d18db0d10f0004 SHA1 c9a3b9ec4645cefaec3f1efc41cc9c4d5806c094 SHA256 7ed4cd8ed62a8f571032922276c57bc7e3115f108cd993604baf7465458a7779
 EBUILD iptables-1.4.0-r1.ebuild 6295 RMD160 60d28cb1ba3e54acdee3a7afeebeb82fe4956eb4 SHA1 29f2cf21aeeea06733811f7757af8fd5412d0ddf SHA256 171847cdcc42344ff5d7ea38c230b7ce0a1bd43ec93a0d00434486592ab7f5e6
@@ -29,5 +31,6 @@ EBUILD iptables-1.4.1.1.ebuild 1646 RMD160 3e0c302b1e766445b91c8bf9798089e4efa91
 EBUILD iptables-1.4.2-r1.ebuild 1989 RMD160 007f0955a21c967da4560e0e61b715b5309ea0fa SHA1 b0623fdf97fdb345e3defe6652f7852cecbceed2 SHA256 a2ce9f62b4747130a0ea9e36d75100e0856e50c91c4236e6c3751433587c1690
 EBUILD iptables-1.4.2-r2.ebuild 3262 RMD160 f28cd3243ae6c6028a6537f0d07f00c40d8b5ae7 SHA1 87dada8cc221dd9faec7df0b77cdb38b2be5b62f SHA256 7249be2d9c37d0a5c705603cf8b079cd8d2205baff380445d36f6b5264184b69
 EBUILD iptables-1.4.2.ebuild 1826 RMD160 0929b6dc312ad004e87d0403aa57a41aa5995d76 SHA1 2905f88badc9bf96dc52ad7f9b1e88fc0fb3eab2 SHA256 88497a971a618a2c8ae743397e78a9c927ffdc6e4b2dfed61f05608d7338ae88
-MISC ChangeLog 35997 RMD160 07893c30a36d2b08fe210e139a2525878f12e660 SHA1 f9b0350c877b6281016abc26a860aba3cc07b092 SHA256 25606ba11b40c1f40ef77ccb51882ab64a2f168c3295acefeddecf6d5df7add2
+EBUILD iptables-1.4.3.ebuild 3060 RMD160 f7a7bd8258d8d37460804b4e95cdc61901142d22 SHA1 67c1761028c823ce0511269631e2fb0ef4557fa4 SHA256 dd34dcf07a000135f588a7a88b8dec138271941e29c0f2c90e98508d20669f8b
+MISC ChangeLog 36152 RMD160 ef6efc171821aabf6d2ea0cf268c80849c1f2ec9 SHA1 9eac7ce2c9c37e02bdcf9258f47495002629357d SHA256 5c22808445bc5b28f06df29a46148c1cc2269adea4b2ff7af4d3c6ef3a7ff9be
 MISC metadata.xml 1278 RMD160 5453b196b5ae00ad8fc8dd0d27731cb5425339d4 SHA1 3e0dabdca50df87aa78c5c9236e04ed747f3bc82 SHA256 d6d81511d3e81d6bb2097be63ea6bc9a8871519f1727e6d0b89bf231bd6ba92b
diff --git a/net-firewall/iptables/files/iptables-1.4.3-as-needed.patch b/net-firewall/iptables/files/iptables-1.4.3-as-needed.patch
new file mode 100644
index 000000000000..e44d6577038a
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.4.3-as-needed.patch
@@ -0,0 +1,38 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2009-03-23 20:36:12 +0000
++++ Makefile.in	2009-03-23 20:38:14 +0000
+@@ -354,7 +354,7 @@
+ # iptables, dynamic
+ iptables_SOURCES = iptables-standalone.c iptables.c
+ iptables_LDFLAGS = -rdynamic
+-iptables_LDADD = -lm libiptc/libiptc.la extensions/libext4.a libxtables.la
++iptables_LDADD = libiptc/libiptc.la extensions/libext4.a libxtables.la -lm
+ iptables_xml_LDADD = libxtables.la
+ iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
+                             iptables-restore.c iptables-xml.c \
+@@ -373,13 +373,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.la extensions/libext4.a
++iptables_static_LDADD = libiptc/libiptc.la extensions/libext4.a -lm
+ iptables_xml_SOURCES = iptables-xml.c
+ 
+ # ip6tables, dynamic
+ ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
+ ip6tables_LDFLAGS = -rdynamic
+-ip6tables_LDADD = -lm libiptc/libiptc.la extensions/libext6.a libxtables.la
++ip6tables_LDADD = libiptc/libiptc.la extensions/libext6.a libxtables.la -lm
+ ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
+                             ip6tables-restore.c ip6tables-standalone.c \
+                             ip6tables.c
+@@ -397,7 +397,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.la extensions/libext6.a
++ip6tables_static_LDADD = libiptc/libiptc.la extensions/libext6.a -lm
+ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
+                    iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
+                    ip6tables-save.8
+
diff --git a/net-firewall/iptables/iptables-1.4.3.ebuild b/net-firewall/iptables/iptables-1.4.3.ebuild
new file mode 100644
index 000000000000..10dc2ea3422f
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.ebuild,v 1.1 2009/03/24 08:12:31 pva Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+L7_PV=2.21
+L7_P=netfilter-layer7-v${L7_PV}
+
+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
+	l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="l7filter"
+
+DEPEND="virtual/os-headers"
+RDEPEND=""
+
+pkg_setup() {
+	if use l7filter ; then
+		ewarn "WARNING: 3rd party extensions has been enabled."
+		ewarn "This means that iptables will use your currently installed"
+		ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
+		linux-info_pkg_setup
+
+		if kernel_is lt 2 6 20 ; then
+			eerror "Currently there is no l7-filter patch available for iptables-1.4.x"
+			eerror "and kernel version before 2.6.20."
+			eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
+			eerror "or earlier, with l7-filter patch, please, report upstream."
+			die "No patch available."
+		fi
+
+		[[ ! -f ${KERNEL_DIR}/include/linux/netfilter/xt_layer7.h ]] && \
+			die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this."
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use l7filter && unpack ${L7_P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.4.2-no-ldconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.4.2-hashlimit.patch #254496
+	sed -e 's:\<\(LOAD_MUST_SUCCEED\)\>:XTF_\1:' -i xtables.c
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	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
+
+	if use l7filter ; then
+		cp "${WORKDIR}/${L7_P}/iptables-1.4.1.1-for-kernel-2.6.20forward"/* extensions \
+			|| die "Failed to copy l7filter sources"
+	fi
+}
+
+src_compile() {
+	econf \
+		--sbindir=/sbin \
+		--libexecdir=/$(get_libdir) \
+		--enable-devel \
+		--enable-libipq \
+		--enable-shared \
+		--enable-static \
+		$(use_with l7filter kernel ${KERNEL_DIR})
+	emake V=1 || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /usr/include
+	doins include/iptables.h include/ip6tables.h || die
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
+	keepdir /var/lib/ip6tables
+	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
+	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
+}