add patch to fix 2.6 kernel problem

9 files changed, 77 insertions, 67 deletions

diff --git a/net-firewall/firestarter/ChangeLog b/net-firewall/firestarter/ChangeLog
index 0635c615c9f3..700ccc33b41b 100644
--- a/net-firewall/firestarter/ChangeLog
+++ b/net-firewall/firestarter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/firestarter
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/ChangeLog,v 1.9 2003/07/09 17:33:22 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/ChangeLog,v 1.10 2003/12/07 18:59:03 foser Exp $
+
+  06 Dec 2003; foser <foser@gentoo.org> firestarter-0.9.2-r1.ebuild :
+  Added patch to fix kernel 2.6 detection, patch taken from 
+  reported by James Lademann <jwlademann@myrealbox.com> in #32903
 
   09 Jul 2003; Alastair Tse <liquidx@gentoo.org> firestarter-0.9.1.ebuild,
   firestarter-0.9.2.ebuild:
diff --git a/net-firewall/firestarter/Manifest b/net-firewall/firestarter/Manifest
index 34a7a0cc9a27..a777c644d3b5 100644
--- a/net-firewall/firestarter/Manifest
+++ b/net-firewall/firestarter/Manifest
@@ -1,12 +1,10 @@
-MD5 aaa111df279025dc271b73080620cc99 firestarter-0.8.3.ebuild 1027
-MD5 2211bf63aa17f8031f4e899713427847 firestarter-0.9.1.ebuild 1177
-MD5 89bcd77dee35966ce9654074246ba1cd firestarter-0.8.2.ebuild 1041
-MD5 e0c2d2bd8e97b7e3c058583361c164b3 firestarter-0.9.2-r1.ebuild 1130
-MD5 8b74236242a65df40c43e35f1d24bf6b ChangeLog 2532
+MD5 c6dcfc6954a61a7d70587671f21f5a1c firestarter-0.8.3.ebuild 1025
+MD5 ed4ad0674a658f7fb351cc7dbe3fca9f firestarter-0.9.2.ebuild 979
+MD5 ba195ad9398eb290a07c37b711c4a4e3 firestarter-0.9.2-r1.ebuild 1208
+MD5 e99fe4f0d902ac73fc3cd9dbe3125748 ChangeLog 2729
 MD5 4f0a940bc2890d6db486101ddcc920c0 metadata.xml 221
 MD5 3101a926225f487680916daeba635d0e files/digest-firestarter-0.9.2-r1 69
-MD5 fa0cdcb7ca3e62e4421b6af34617bed0 files/digest-firestarter-0.8.2 69
+MD5 f6dc39a662681022807624031063fcae files/firestarter-0.9.2-kernel_2.6_fix.patch 1211
 MD5 739762551719ca1b046cfb870db435c4 files/digest-firestarter-0.8.3 69
-MD5 e1ece6269a376e45ec1feaf625f8794e files/digest-firestarter-0.9.1 69
 MD5 3101a926225f487680916daeba635d0e files/digest-firestarter-0.9.2 69
 MD5 12c7246e102282b0c2d565ca9ae3bc12 files/firestarter-0.9.1-gcc2_fixes.patch 1514
diff --git a/net-firewall/firestarter/files/digest-firestarter-0.8.2 b/net-firewall/firestarter/files/digest-firestarter-0.8.2
deleted file mode 100644
index 07b72c08bece..000000000000
--- a/net-firewall/firestarter/files/digest-firestarter-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80e101dc3b5d8ba0f539e26d08ef829d firestarter-0.8.2.tar.gz 678372
diff --git a/net-firewall/firestarter/files/digest-firestarter-0.9.1 b/net-firewall/firestarter/files/digest-firestarter-0.9.1
deleted file mode 100644
index 56ab7de1427f..000000000000
--- a/net-firewall/firestarter/files/digest-firestarter-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2b2b22182a340e2bd06a94d4800d26c firestarter-0.9.1.tar.gz 628274
diff --git a/net-firewall/firestarter/files/digest-firestarter-0.9.2-r1 b/net-firewall/firestarter/files/digest-firestarter-0.9.2-r1
new file mode 100644
index 000000000000..7e1feae6d3b7
--- /dev/null
+++ b/net-firewall/firestarter/files/digest-firestarter-0.9.2-r1
@@ -0,0 +1 @@
+MD5 68b7b18663581fd20bb434cee4bbcc1a firestarter-0.9.2.tar.gz 690885
diff --git a/net-firewall/firestarter/files/firestarter-0.9.2-kernel_2.6_fix.patch b/net-firewall/firestarter/files/firestarter-0.9.2-kernel_2.6_fix.patch
new file mode 100644
index 000000000000..276e259799be
--- /dev/null
+++ b/net-firewall/firestarter/files/firestarter-0.9.2-kernel_2.6_fix.patch
@@ -0,0 +1,44 @@
+--- firestarter/src/util.c	2003-06-12 20:50:21.000000000 +0300
++++ firestarter/src/util.c	2003-08-12 20:18:57.000000000 +0300
+@@ -85,13 +85,14 @@
+ }
+ 
+ /* [ detect_netfilter ]
+- * Return true if Linux 2.4 or 2.5 kernel found
++ * Return true if kernel supports netfilter (Linux 2.4 and newer)
+  */
+ gboolean
+ detect_netfilter (void)
+ {
+ 	FILE *f;
+ 	gchar buf[512];
++	char *ver;
+ 
+ 	/* The detection is only done once */
+ 	static gint detected = 0;
+@@ -112,15 +113,17 @@
+ 		result = TRUE;
+ 	} else {
+ 		while (fgets (buf, 512, f) != NULL) {
+-			if ((strstr (buf, " 2.4.") != NULL) || (strstr (buf, " 2.5.") != NULL)) {
+-				g_print ("NETFILTER detected\n");
+-
+-				if (access("/sbin/modprobe", R_OK) == 0)
+-					system ("/sbin/modprobe --autoclean ip_tables");
+-				else
+-					system ("`which modprobe` --autoclean ip_tables");
++			if (strstr (buf, "2.") != NULL){
++				ver = strstr (buf, "2.");
++				if(ver[2] >= '4') {
++					g_print ("NETFILTER detected\n");
++					if (access("/sbin/modprobe", R_OK) == 0)
++						system ("/sbin/modprobe --autoclean ip_tables");
++					else
++						system ("`which modprobe` --autoclean ip_tables");
+ 				
+-				result = TRUE;
++					result = TRUE;
++				}
+ 			}
+ 		}
+ 		fclose (f);
diff --git a/net-firewall/firestarter/firestarter-0.8.2.ebuild b/net-firewall/firestarter/firestarter-0.8.2.ebuild
deleted file mode 100644
index e888a98fb4bd..000000000000
--- a/net-firewall/firestarter/firestarter-0.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-0.8.2.ebuild,v 1.6 2003/09/10 04:58:24 msterret Exp $
-
-IUSE="nls"
-
-#MY_P=firestarter-${PV}
-S=${WORKDIR}/${P}
-DESCRIPTION="Gui for firewalls (iptables & ipchains), and a firewall monitor."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://firestarter.sf.net"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.4
-	<gnome-base/gnome-panel-2
-	net-firewall/iptables"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-SLOT="0"
-
-src_compile() {
-
-	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	einstall destdir=${D} graphicsdir=${D}/usr/share/pixmaps || die "einstall failed"
-	dodoc AUTHORS Changelog README TODO
-
-}
-
-pkg_postinstall() {
-	./postinstall
-}
diff --git a/net-firewall/firestarter/firestarter-0.8.3.ebuild b/net-firewall/firestarter/firestarter-0.8.3.ebuild
index aec9557d617a..b2d4a5f5f2fd 100644
--- a/net-firewall/firestarter/firestarter-0.8.3.ebuild
+++ b/net-firewall/firestarter/firestarter-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-0.8.3.ebuild,v 1.6 2003/09/07 00:10:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-0.8.3.ebuild,v 1.7 2003/12/07 18:59:03 foser Exp $
 
 IUSE="nls"
 
@@ -12,9 +12,9 @@ HOMEPAGE="http://firestarter.sf.net"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc"
+#	>=gnome-base/gnome-libs-1.4.1.4
 
 RDEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.4
 	<gnome-base/gnome-panel-2
 	net-firewall/iptables"
 DEPEND="${RDEPEND}
diff --git a/net-firewall/firestarter/firestarter-0.9.1.ebuild b/net-firewall/firestarter/firestarter-0.9.2-r1.ebuild
index f793836cbdc9..226619a3dc92 100644
--- a/net-firewall/firestarter/firestarter-0.9.1.ebuild
+++ b/net-firewall/firestarter/firestarter-0.9.2-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-0.9.1.ebuild,v 1.8 2003/09/07 00:10:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-0.9.2-r1.ebuild,v 1.1 2003/12/07 18:59:03 foser Exp $
 
 inherit gnome2 eutils
 
 IUSE="nls"
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Gui for iptables firewall setup and monitor."
+DESCRIPTION="GUI for iptables firewall setup and monitor."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://firestarter.sf.net"
 LICENSE="GPL-2"
@@ -23,28 +22,37 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 src_unpack() {
+
 	unpack ${A}
 
-	cd ${S}/src ; epatch ${FILESDIR}/${P}-gcc2_fixes.patch
+	cd ${S}
+	# make firestarter not choke on 2.6 kernels (#32903)
+	# patch from http://firestarter.sf.net/beta/firestarter-kernel-2.6.patch
+	epatch ${FILESDIR}/${P}-kernel_2.6_fix.patch
+
 }
 
 src_compile() {
-	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-	econf ${myconf} || die "econf failed"
+
+	econf "`use_enable nls`" || die "econf failed"
 	emake || die "emake failed"
+
 }
 
 src_install() {
-	einstall destdir=${D} graphicsdir=${D}/usr/share/pixmaps || die "einstall failed"
-	dodoc AUTHORS Changelog COPYING CREDITS INSTALL README TODO
+
+	einstall destdir=${D} graphicsdir=${D}/usr/share/pixmaps || \
+		die "einstall failed"
+
+	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL README TODO
+
 }
 
 pkg_postinstall() {
+
 	./postinstall
+
 }