Add some patches from Fedora and a gcc-3.4 fix by Felix Braun #95149.

(Portage version: 2.0.51.22-r1)

5 files changed, 67 insertions, 17 deletions

diff --git a/net-firewall/ipchains/ChangeLog b/net-firewall/ipchains/ChangeLog
index a00d3ae61b02..d12ef1754cb4 100644
--- a/net-firewall/ipchains/ChangeLog
+++ b/net-firewall/ipchains/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipchains
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ChangeLog,v 1.5 2004/07/01 22:14:32 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ChangeLog,v 1.6 2005/06/06 04:22:34 vapier Exp $
+
+  06 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ipchains-1.3.10-fixman.patch, +files/ipchains-1.3.10-gcc34.patch,
+  +files/ipchains-1.3.10-nonroot.patch, ipchains-1.3.10-r1.ebuild:
+  Add some patches from Fedora and a gcc-3.4 fix by Felix Braun #95149.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   ipchains-1.3.10-r1.ebuild:
diff --git a/net-firewall/ipchains/files/ipchains-1.3.10-fixman.patch b/net-firewall/ipchains/files/ipchains-1.3.10-fixman.patch
new file mode 100644
index 000000000000..59f52529bf24
--- /dev/null
+++ b/net-firewall/ipchains/files/ipchains-1.3.10-fixman.patch
@@ -0,0 +1,13 @@
+From Fedora
+--- ipchains-1.3.10/ipchains.8
++++ ipchains-1.3.10/ipchains.8
+@@ -70,7 +70,8 @@
+ .I DENY 
+ and 
+ .I REJECT 
+-are the same for ICMP packets.)  
++are the same for ICMP packets). [Note: this is incorrect; setting ICMP to
++REJECT will cause ICMP port unreachables to be sent!] 
+ .sp 0.5
+ .I MASQ
+ is only legal for the forward and user defined chains, and can only be
diff --git a/net-firewall/ipchains/files/ipchains-1.3.10-gcc34.patch b/net-firewall/ipchains/files/ipchains-1.3.10-gcc34.patch
new file mode 100644
index 000000000000..af554dacb71a
--- /dev/null
+++ b/net-firewall/ipchains/files/ipchains-1.3.10-gcc34.patch
@@ -0,0 +1,11 @@
+Fix building with gcc-3.4 #95149
+--- libipfwc/libipfwc.c
++++ libipfwc/libipfwc.c
+@@ -501,6 +501,7 @@
+ 					       " transparent proxying?)");
+ 					break;
+ 				default:
++					break;
+ 				}
+ 			return message;
+ 		}
diff --git a/net-firewall/ipchains/files/ipchains-1.3.10-nonroot.patch b/net-firewall/ipchains/files/ipchains-1.3.10-nonroot.patch
new file mode 100644
index 000000000000..ba8d24340daf
--- /dev/null
+++ b/net-firewall/ipchains/files/ipchains-1.3.10-nonroot.patch
@@ -0,0 +1,16 @@
+From Fedora
+--- ipchains-1.3.10/Makefile
++++ ipchains-1.3.10/Makefile
+@@ -41,9 +41,9 @@
+ 	[ -d $(PREFIX)/$(MANDIR)/man4 ] || mkdir -p $(PREFIX)/$(MANDIR)/man4
+ 	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
+ 	@-mv $(PREFIX)/$(SBIN)/ipchains $(PREFIX)/$(SBIN)/ipchains.old
+-	$(INSTALL) -m 0755 -o root -g root ipchains $(PREFIX)/$(SBIN)/
+-	$(INSTALL) -m 0644 -o root -g root ipfw.4 $(PREFIX)/$(MANDIR)/man4/
+-	$(INSTALL) -m 0644 -o root -g root ipchains.8 $(PREFIX)/$(MANDIR)/man8/
++	$(INSTALL) -m 0755 ipchains $(PREFIX)/$(SBIN)/
++	$(INSTALL) -m 0644 ipfw.4 $(PREFIX)/$(MANDIR)/man4/
++	$(INSTALL) -m 0644 ipchains.8 $(PREFIX)/$(MANDIR)/man8/
+ 
+ uninstall:
+ 	-rm -f $(PREFIX)/$(SBIN)/ipchains $(PREFIX)/$(MANDIR)/man4/ipfw.4 $(PREFIX)/$(MANDIR)/man8/ipchains.8
diff --git a/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild b/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
index 2042c492b17b..3dd43936f571 100644
--- a/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
+++ b/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
@@ -1,25 +1,30 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild,v 1.5 2004/07/14 23:46:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild,v 1.6 2005/06/06 04:22:34 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="legacy Linux firewall/packet mangling tools"
-SRC_URI="http://netfilter.kernelnotes.org/ipchains/${P}.tar.gz"
 HOMEPAGE="http://netfilter.filewatcher.org/ipchains/"
-KEYWORDS="x86 ppc sparc "
-IUSE=""
-SLOT="0"
+SRC_URI="http://netfilter.kernelnotes.org/ipchains/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
-	cd ${S}/libipfwc
-	mv Makefile Makefile.orig
-	sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/ipchains-1.3.10-gcc34.patch
+	epatch "${FILESDIR}"/ipchains-1.3.10-fixman.patch
+	epatch "${FILESDIR}"/ipchains-1.3.10-nonroot.patch
+	sed -i \
+		-e "s/= -g -O/= ${CFLAGS}/" \
+		Makefile libipfwc/Makefile \
+		|| die "sed CFLAGS"
 }
 
 src_compile() {
@@ -29,9 +34,9 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin ipchains
+	dosbin ipchains || die
 	doman ipfw.4 ipchains.8
-	dodoc COPYING README
+	dodoc README
 	docinto ps
 	dodoc ipchains-quickref.ps
 }