Version bump. l7-filter is broken and thus dropped again.

(Portage version: 2.2_rc26/cvs/Linux i686)

3 files changed, 13 insertions, 78 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 45d7f6656617..07c0cdf1c06b 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,13 @@
 # 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.194 2009/03/24 08:12:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.195 2009/03/24 13:46:55 pva Exp $
+
+*iptables-1.4.3.1 (24 Mar 2009)
+
+  24 Mar 2009; Peter Volkov <pva@gentoo.org>
+  -files/iptables-1.4.3-as-needed.patch, -iptables-1.4.3.ebuild,
+  +iptables-1.4.3.1.ebuild:
+  Version bump. l7-filter is broken and thus dropped again.
 
 *iptables-1.4.3 (24 Mar 2009)
 
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
deleted file mode 100644
index e44d6577038a..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.3-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-=== 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.1.ebuild
index 10dc2ea3422f..07aa16a06035 100644
--- a/net-firewall/iptables/iptables-1.4.3.ebuild
+++ b/net-firewall/iptables/iptables-1.4.3.1.ebuild
@@ -1,54 +1,26 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.1.ebuild,v 1.1 2009/03/24 13:46:55 pva Exp $
 
-inherit eutils toolchain-funcs linux-info
-
-L7_PV=2.21
-L7_P=netfilter-layer7-v${L7_PV}
+inherit eutils toolchain-funcs
 
 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 )"
+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="l7filter"
+IUSE=""
 
 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
@@ -63,11 +35,6 @@ src_unpack() {
 			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() {
@@ -77,8 +44,7 @@ src_compile() {
 		--enable-devel \
 		--enable-libipq \
 		--enable-shared \
-		--enable-static \
-		$(use_with l7filter kernel ${KERNEL_DIR})
+		--enable-static
 	emake V=1 || die
 }