fixes bug #22223

4 files changed, 114 insertions, 11 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 955e7b905933..692e63d923da 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.15 2003/09/22 02:06:45 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.16 2003/10/15 16:02:34 johnm Exp $
+
+*iptables-1.2.8-r2 (15 Oct 2003)
+
+  15 Oct 2003; John Mylchreest <johnm@gentoo.org>; iptables-1.2.8-r2.ebuild:
+  fixes bug #22223
 
   21 Sep 2003; Matthew Rickard <frogger@gentoo.org> iptables-1.2.8-r1.ebuild:
   "-fstack-protector" breaks "iptables -p icmp".  We will
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 7f37ab7682cb..4436ee787283 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,23 +1,25 @@
-MD5 1c9aac9ec4d76d0c1f9b888788667a53 ChangeLog 8339
+MD5 3870252e9f2f0568119041ef86366324 iptables-1.2.8-r1.ebuild 2603
 MD5 611eccaed05cd06e19488b1a14d78747 iptables-1.2.7a-r3.ebuild 1993
-MD5 ceb03819b44784147104358fa559ba1d iptables-1.2.7a-r4.ebuild 2105
 MD5 59eb30b46fae4911251ff539850a4d0b iptables-1.2.8.ebuild 2105
-MD5 3870252e9f2f0568119041ef86366324 iptables-1.2.8-r1.ebuild 2603
+MD5 b76799632db21bda76bfaa16ce8bd9ac iptables-1.2.8-r2.ebuild 2731
+MD5 ceb03819b44784147104358fa559ba1d iptables-1.2.7a-r4.ebuild 2105
+MD5 d0f3ca986f26682c8efe3c5a35b43c47 ChangeLog 8468
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r4 68
-MD5 69d604b3e3317fddf6778f9e1baaa2f0 files/digest-iptables-1.2.8 67
-MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
 MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
+MD5 1416ab080ec8704b26a5426976f17990 files/ip6tables.init 1864
 MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
+MD5 69d604b3e3317fddf6778f9e1baaa2f0 files/digest-iptables-1.2.8 67
+MD5 a0cf33b15c278425a59e1e9e99665000 files/iptables.init 1832
 MD5 69d604b3e3317fddf6778f9e1baaa2f0 files/digest-iptables-1.2.8-r1 67
+MD5 69d604b3e3317fddf6778f9e1baaa2f0 files/digest-iptables-1.2.8-r2 67
 MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 1416ab080ec8704b26a5426976f17990 files/ip6tables.init 1864
-MD5 a0cf33b15c278425a59e1e9e99665000 files/iptables.init 1832
+MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r4 68
+MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.7a-files/02_all_imq.patch.bz2 2936
 MD5 0b7b54af1ab69e8e10ddcaab93fd62ff files/1.2.7a-files/03_all_mac_fix.patch.bz2 305
 MD5 76d3e579f6be5bc9d4f22f7cdbfd8c71 files/1.2.7a-files/04_all_no_optimize_fix.patch.bz2 549
 MD5 d0e0fa48b2181f3cf1fe8d145d202dc6 files/1.2.8-files/01_all_grsecurity.patch.bz2 1180
-MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.8-files/02_all_imq.patch.bz2 2936
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.8-files/03_hppa_gentoo.patch.bz2 278
+MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.8-files/02_all_imq.patch.bz2 2936
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.8-r2 b/net-firewall/iptables/files/digest-iptables-1.2.8-r2
new file mode 100644
index 000000000000..3f611d49e423
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.2.8-r2
@@ -0,0 +1 @@
+MD5 cf62ebdabf05ccc5479334cc04fa993c iptables-1.2.8.tar.bz2 125446
diff --git a/net-firewall/iptables/iptables-1.2.8-r2.ebuild b/net-firewall/iptables/iptables-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..bb4ae489a623
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.2.8-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8-r2.ebuild,v 1.1 2003/10/15 16:02:34 johnm Exp $
+
+inherit eutils flag-o-matic
+
+# prevent it from causing ICMP errors.
+# http://bugs.gentoo.org/show_bug.cgi?id=23645
+filter-flags "-fstack-protector"
+
+IUSE="ipv6"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
+HOMEPAGE="http://www.iptables.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~arm ~mips ~ia64"
+LICENSE="GPL-2"
+
+# iptables is dependent on kernel sources.  Strange but true.
+DEPEND="virtual/os-headers"
+
+src_unpack() {
+	if [ -z $( get-flag O ) ]; then
+		append-flags -O2
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-files
+
+	# The folowing hack is needed because ${ARCH} is "sparc" and not "sparc64"
+	# and epatch uses ??_${ARCH}_foo.${EPATCH_SUFFIX} when reading from directories
+	[ "${PROFILE_ARCH}" = "sparc64" ] && epatch ${FILESDIR}/sparc64_limit_fix.patch.bz2
+
+	chmod +x extensions/.IMQ-test*
+
+	cp Makefile Makefile.new
+	sed -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile.new > Makefile
+}
+
+src_compile() {
+	# 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.
+
+#	local myconf
+	use ipv6 && myconf="${myconf} DO_IPV6=1" || myconf="${myconf} DO_IPV6=0"
+
+	make \
+		LIBDIR=/lib \
+		BINDIR=/sbin \
+		MANDIR=/usr/share/man \
+		INCDIR=/usr/include \
+		KERNEL_DIR=/usr/src/linux \
+		|| die
+}
+
+src_install() {
+#	local myconf
+#	use ipv6 && myconf="${myconf} DO_IPV6=1" || myconf="${myconf} DO_IPV6=0"
+
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install-experimental
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} ${myconf} \
+		LIBDIR=/usr/lib \
+		MANDIR=/usr/share/man \
+		INCDIR=/usr/include \
+		install-devel
+
+	dodoc COPYING KNOWN_BUGS
+	dodir /var/lib/iptables ; keepdir /var/lib/iptables
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/iptables.init iptables
+	insinto /etc/conf.d
+	newins ${FILESDIR}/iptables.confd iptables
+
+	if [ `use ipv6` ]; then
+		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/ip6tables.init ip6tables
+		insinto /etc/conf.d
+		newins ${FILESDIR}/ip6tables.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"
+	einfo "This location can be changed in /etc/conf.d/iptables"
+}
+