Version bump to fix #110758 by Brian Kroth.

Package-Manager: portage-2.0.53_rc7

4 files changed, 175 insertions, 6 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index df3bcd3711d8..f0ec21510e00 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.85 2005/10/15 00:14:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.86 2005/11/05 08:01:35 vapier Exp $
+
+*iptables-1.3.4 (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org> +iptables-1.3.4.ebuild:
+  Version bump to fix #110758 by Brian Kroth.
 
   15 Oct 2005; Daniel Black <dragonheart@gentoo.org>
   -files/1.2.7a-files/01_all_grsecurity.patch.bz2,
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index b0b4cefc8c8d..d5ea73f41f46 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e141934d3587faa54e85c72e8a4ca689 ChangeLog 20344
+MD5 bcd8eab367dff98beb4fb48a56d3c60d ChangeLog 20491
 MD5 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
 MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763
 MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041
@@ -17,6 +17,7 @@ MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r3 68
 MD5 396ad08a192cd926417a200569060278 files/digest-iptables-1.3.2 206
 MD5 6eb9a9d6ef4fb4b8275a482b4671f1a5 files/digest-iptables-1.3.3-r1 206
 MD5 57dd4f2755bb43094f081d87347571b2 files/digest-iptables-1.3.3-r2 211
+MD5 d08593cc4d24d53934c8603dc1b14913 files/digest-iptables-1.3.4 211
 MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
 MD5 f74f2424c062e1b2f4b22e4e11db909b files/ip6tables-1.2.9-r1.init 1792
 MD5 dbef6253ff7e347e7fa35a02652ab684 files/ip6tables-1.3.2.confd 293
@@ -28,11 +29,12 @@ MD5 83b159bf81dca9ddaa1e0b4e9c606a70 iptables-1.2.11-r3.ebuild 5355
 MD5 cdad781be189255fe3fd04bedce629e5 iptables-1.3.2.ebuild 4963
 MD5 b5b107c8cf13e1c278bf83b4daea0c70 iptables-1.3.3-r1.ebuild 5030
 MD5 3e7ee88a2de7f0ffd26b9b1111a09ab8 iptables-1.3.3-r2.ebuild 5030
+MD5 f16b693fcd32232e6a370f58c6c211e6 iptables-1.3.4.ebuild 5036
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUEoCmdTrptrqvGERAiI2AJ9Jjc2J/RVPTDd2O42Fv8hloKwn2ACfewTT
-9lX6vfGcCnvc0XW/DgdHdyY=
-=hHU2
+iD8DBQFDbGchgIKl8Uu19MoRAhUJAJ90vUfZF9MvrVtlm+xSnqKPC0TfAgCdHliK
+1g9E0JuNuV0AU3MB8JhO3aM=
+=4sO9
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/digest-iptables-1.3.4 b/net-firewall/iptables/files/digest-iptables-1.3.4
new file mode 100644
index 000000000000..92fe31ea7ce6
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.3.4
@@ -0,0 +1,3 @@
+MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369
+MD5 fdff8abe890807968226b0c374335305 iptables-1.3.4.tar.bz2 189847
+MD5 c760af92bc31c0fbd86faa3155e3f551 netfilter-layer7-v2.0-beta.tar.gz 88369
diff --git a/net-firewall/iptables/iptables-1.3.4.ebuild b/net-firewall/iptables/iptables-1.3.4.ebuild
new file mode 100644
index 000000000000..6b7664dcd56e
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.3.4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.4.ebuild,v 1.1 2005/11/05 08:01:35 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+L7_PV="2.0-beta"
+L7_P="netfilter-layer7-v${L7_PV}"
+L7_PATCH="iptables-layer7-2.0.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
+	extensions? (
+		http://www.linuximq.net/patchs/${IMQ_PATCH}
+		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="ipv6 static extensions"
+
+DEPEND="virtual/os-headers
+	extensions? ( virtual/linux-sources )"
+RDEPEND=""
+
+pkg_setup() {
+	if 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
+		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
+		ewarn "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use extensions && unpack ${L7_P}.tar.gz
+	cd "${S}"
+
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch.bz2
+	EPATCH_OPTS="-p1" \
+	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2
+
+	# 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.bz2
+	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
+
+	if use extensions ; then
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
+		chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*}
+	fi
+}
+
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	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 extensions ; then
+		export KERNEL_DIR="/usr"
+		diemsg=""
+	else
+		diemsg="Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+	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
+
+	# prevent it from causing ICMP errors.
+	# http://bugs.gentoo.org/show_bug.cgi?id=23645
+	filter-flags -fstack-protector
+
+	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 now 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
+	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/show_bug.cgi?id=92535"
+}