Update l7-filter support #150124.

Package-Manager: portage-2.1.2_pre2-r5

4 files changed, 212 insertions, 8 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 3cae0ba43ff1..ce759df32d12 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.116 2006/10/03 21:12:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.117 2006/10/07 03:18:03 vapier Exp $
+
+*iptables-1.3.6-r1 (07 Oct 2006)
+
+  07 Oct 2006; Mike Frysinger <vapier@gentoo.org> +iptables-1.3.6-r1.ebuild:
+  Update l7-filter support #150124.
 
   03 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   iptables-1.3.5-r4.ebuild:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index a0932c501382..ce37fbf3dba3 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -88,6 +88,7 @@ DIST iptables-1.3.6.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8
 DIST netfilter-layer7-v2.1.tar.gz 89247 RMD160 cd2d455a16761b4fe2318d6d8a5671a535176d62 SHA1 5dc0c9bd1e3df3110cf724f3437a4b68d62b4dd3 SHA256 5022e8a349135f67045f4add47405af0d626c90a5e8b86ee01745755946e1390
 DIST netfilter-layer7-v2.2.tar.gz 88944 RMD160 cf421e6ef4acf5b9107feacaee6566d55ad21683 SHA1 55eaad3b4e46feff09910cd5e3c76c57ac12dc58 SHA256 e82cc356ece2bea3da2bb4b467063a96337ced4bde6127a44f0296245e74d57d
 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
 EBUILD iptables-1.2.11-r3.ebuild 5052 RMD160 f5d9a32239ba315c55422d3cd4dd7b0eb1bb6515 SHA1 3e8f9cf44a34682ada0b18e55a5ca8ba99621bc9 SHA256 fcc858795417b80b1f2f113e57b161703832a8416e8de7b098de26aedd4376ca
 MD5 33a251bfd2d6b0e3a7a786fdf78554e7 iptables-1.2.11-r3.ebuild 5052
 RMD160 f5d9a32239ba315c55422d3cd4dd7b0eb1bb6515 iptables-1.2.11-r3.ebuild 5052
@@ -108,14 +109,18 @@ EBUILD iptables-1.3.5-r4.ebuild 5775 RMD160 69ebc792630f4b3b9b639fe7e64b18e5fdb5
 MD5 2752be7d5c6482bf4bcc7af0639cff55 iptables-1.3.5-r4.ebuild 5775
 RMD160 69ebc792630f4b3b9b639fe7e64b18e5fdb5621d iptables-1.3.5-r4.ebuild 5775
 SHA256 9a28f9f88a999fb1ddbc142fae9b5295e64f4a65f018b6847dd405a398e302e7 iptables-1.3.5-r4.ebuild 5775
+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
+SHA256 f726ba01a366ea9e60d907408b0e0fab98f4c75ce639e854a24c3a8969a5fc83 iptables-1.3.6-r1.ebuild 5730
 EBUILD iptables-1.3.6.ebuild 5727 RMD160 3942518924aa00b35b57572814cc691b64586d5a SHA1 b1b6ec204ef0b6ad13c4b7c37fcbeb40ad91dcaf SHA256 c5719408d68a0b487239b5b171f6e19f0e1b00857c0c1185ecf65e051dcbdd47
 MD5 bda128f763227c8cb2c899f8f5bf014b iptables-1.3.6.ebuild 5727
 RMD160 3942518924aa00b35b57572814cc691b64586d5a iptables-1.3.6.ebuild 5727
 SHA256 c5719408d68a0b487239b5b171f6e19f0e1b00857c0c1185ecf65e051dcbdd47 iptables-1.3.6.ebuild 5727
-MISC ChangeLog 24190 RMD160 28c14828829eeb99b70c2b1d0c2112d075268959 SHA1 17882c6d1200c863e8f69f6a0150d547929415ff SHA256 987d2a1f5e93278f2e91b4de35dfc9a7d44691dec94f949cf0569258f062085d
-MD5 7fe9bcf3c6ceab0d1c32c92337c66b79 ChangeLog 24190
-RMD160 28c14828829eeb99b70c2b1d0c2112d075268959 ChangeLog 24190
-SHA256 987d2a1f5e93278f2e91b4de35dfc9a7d44691dec94f949cf0569258f062085d ChangeLog 24190
+MISC ChangeLog 24336 RMD160 6c929f828bd82cd041744d9d9536ce801608cc92 SHA1 cdea1ac2edeb70ec2f3c41a24bb45988ca0b99f5 SHA256 d1d7d892f8d69ad828832a9dce5397f7d38b8e63788eac2b1cf37490b2cae7e3
+MD5 a8631020c314aa2eeee4095951f687f1 ChangeLog 24336
+RMD160 6c929f828bd82cd041744d9d9536ce801608cc92 ChangeLog 24336
+SHA256 d1d7d892f8d69ad828832a9dce5397f7d38b8e63788eac2b1cf37490b2cae7e3 ChangeLog 24336
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -138,10 +143,13 @@ SHA256 77bb5fb7a5d08a68d83c29526ac411e6e40c1a8ae103bf446895f7b355bc5e7c files/di
 MD5 c1f56ee14ffde62b283a77aa02e4b8f6 files/digest-iptables-1.3.6 759
 RMD160 806070e58ebebae90c0e5e5ec38d56d77f551474 files/digest-iptables-1.3.6 759
 SHA256 65f1e644901e9411fbb3f8a2787a839d3fbd941134d8b25314976a495a9a0938 files/digest-iptables-1.3.6 759
+MD5 0f737b6bda361096558683003e58e97d files/digest-iptables-1.3.6-r1 759
+RMD160 9ac216fda9f8372cfc4a7feb3ced6586eaacf2d6 files/digest-iptables-1.3.6-r1 759
+SHA256 b6cdf0da6f3681548aea7cd05500b00660b64d95f4d6d6196267c2535dc190d0 files/digest-iptables-1.3.6-r1 759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFI8ICamhnQswr0vIRAuy6AJsHqhfH8L+mfsk7qGHP+ei16ZFVBgCfV/Fq
-8agZ+pOD1HhysilPWc4XF/g=
-=BP9W
+iD8DBQFFJxx/amhnQswr0vIRAglgAJwOjThwLgQTLU0AudIO/59kWx+LZACgjKLi
+vjBKltWC6ers27dlTQYV+OU=
+=jUdG
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/digest-iptables-1.3.6-r1 b/net-firewall/iptables/files/digest-iptables-1.3.6-r1
new file mode 100644
index 000000000000..874edc2d59db
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.3.6-r1
@@ -0,0 +1,9 @@
+MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369
+RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 iptables-1.3.0-imq1.diff 5369
+SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b iptables-1.3.0-imq1.diff 5369
+MD5 077e886a9c90a11bb47f3d7a4fc4a689 iptables-1.3.6.tar.bz2 185438
+RMD160 54d9777f2116ad57253446c42619c726f68ae8f0 iptables-1.3.6.tar.bz2 185438
+SHA256 4394c3de8c55776e54a36a6fcd4f9eeed381f451883049f8268c34c3482f5f1b iptables-1.3.6.tar.bz2 185438
+MD5 58135cd1aafaf4ae2fa478159206f064 netfilter-layer7-v2.6.tar.gz 122514
+RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d netfilter-layer7-v2.6.tar.gz 122514
+SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa netfilter-layer7-v2.6.tar.gz 122514
diff --git a/net-firewall/iptables/iptables-1.3.6-r1.ebuild b/net-firewall/iptables/iptables-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..c710159a40db
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.3.6-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.6-r1.ebuild,v 1.1 2006/10/07 03:18:03 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+L7_PV="2.6"
+L7_P="netfilter-layer7-v${L7_PV}"
+L7_PATCH="iptables-layer7-${L7_PV}.patch"
+IMQ_PATCH="iptables-1.3.0-imq1.diff"
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
+	imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
+	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="extensions imq ipv6 l7filter static"
+
+DEPEND="virtual/os-headers
+	l7filter? ( virtual/linux-sources )
+	imq? ( virtual/linux-sources )"
+RDEPEND=""
+
+pkg_setup() {
+	if use l7filter || use imq || use extensions ; 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."
+		ewarn
+		if use extensions ; then
+			ewarn "You may have to patch your kernel to allow iptables to build."
+			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
+			ewarn "for your kernel."
+			ewarn
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use l7filter && \
+		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; then
+		die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
+	fi
+	if use imq && \
+		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
+		die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use l7filter && unpack ${L7_P}.tar.gz
+	cd "${S}"
+
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
+	EPATCH_OPTS="-p1" \
+	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
+
+	# this provide's grsec's stealth match
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
+	sed -i \
+		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
+		extensions/Makefile || die "failed to enable stealth extension"
+
+	EPATCH_OPTS="-p1" \
+	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
+
+	epatch "${FILESDIR}"/1.3.5-files/${PN}-1.3.5-log-prefix-no-empty-strings.patch #148169
+
+	if use imq ; then
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
+	fi
+	if use l7filter ; then
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
+		chmod +x extensions/.layer7-test*
+	fi
+
+	# the net directory is moving around so account for new/old locations
+	cd "${S}"/extensions
+	local x
+	for x in .*-test* ; do
+		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
+		if cmp ${x} .new-${x} > /dev/null ; then
+			rm -f .new-${x}
+		else
+			chmod a+rx .new-${x}
+		fi
+	done
+}
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf=""
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/$(get_libdir)"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	# iptables and libraries are now installed to /sbin and /lib, so that
+	# systems with remote network-mounted /usr filesystems can get their
+	# network interfaces up and running correctly without /usr.
+	use ipv6 || myconf="${myconf} DO_IPV6=0"
+	use static && myconf="${myconf} NO_SHARED_LIBS=0"
+	export myconf
+	if ! use l7filter && ! use imq && ! use extensions ; then
+		export KERNEL_DIR="/usr"
+		diemsg="failure"
+	else
+		diemsg="failure - with l7filter or imq patch added"
+	fi
+	export diemsg
+}
+
+src_compile() {
+	src_defs
+
+	# iptables will NOT work correctly unless -O[123] are present!
+	replace-flags -O0 -O2
+	get-flag -O || append-flags -O2
+
+	emake -j1 \
+		COPT_FLAGS="${CFLAGS}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		CC="$(tc-getCC)" \
+		|| die "${diemsg}"
+}
+
+src_install() {
+	src_defs
+	make ${myconf} \
+		DESTDIR="${D}" \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		install install-devel || die "${diemsg}"
+
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
+
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
+	fi
+}
+
+pkg_postinst() {
+	einfo "This package now includes an initscript which loads and saves"
+	einfo "rules stored in /var/lib/iptables/rules-save"
+	use ipv6 && einfo "and /var/lib/ip6tables/rules-save"
+	einfo "This location can be changed in /etc/conf.d/iptables"
+	einfo
+	einfo "If you are using the iptables initsscript you should save your"
+	einfo "rules using the new iptables version before rebooting."
+	einfo
+	einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
+	einfo "iptables."
+	einfo
+	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
+	einfo
+	einfo "To enable ipforwarding at bootup:"
+	einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
+	if use ipv6 ; then
+		einfo "and/or"
+		einfo "  net.ipv6.ip_forward = 1"
+		einfo "for ipv6."
+	fi
+	if has_version '=net-firewall/iptables-1.2*' ; then
+		echo
+		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
+		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
+		ewarn "http://bugs.gentoo.org/92535"
+	fi
+}