New -r2 with enhanced init-script and updated metadata.xml.

8 files changed, 131 insertions, 13 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 4618109bc4f2..baaf1c614f0a 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.8 2004/08/01 21:30:32 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.9 2004/10/02 18:44:02 centic Exp $
+
+*firehol-1.191-r2 (02 Oct 2004)
+
+  02 Oct 2004; Dominik Stadler <centic@gentoo.org> metadata.xml,
+  files/firehol.initrd, firehol-1.191-r1.ebuild, +firehol-1.191-r2.ebuild:
+  Add 1.191-r2 with enhanced init-script, fixes Bug 65718, thanks to Eric R.
+  Stoeckel, Jr. for the script. Update metadata.xml
 
 *firehol-1.191-r1 (01 Aug 2004)
 
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 6acb5cbc1764..477c003a057c 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,12 +1,13 @@
-MD5 be21fd501618da7d7fd89f5e50f6ed1a ChangeLog 1575
+MD5 99af02dbb8f5600357eaa684859a1d5c ChangeLog 1878
 MD5 4ee85082d33557f1f172e9220b14433e firehol-1.120.ebuild 1113
 MD5 6362cf4f0a41bd85afbafbf65b052020 firehol-1.159.ebuild 1066
 MD5 013ad6c2ea965b219ac9dd986f763749 firehol-1.91.ebuild 979
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
 MD5 3520a2bedc2847655f09b165eb5e167f firehol-1.159-r1.ebuild 1104
 MD5 b9e974b4c6d63f8cdddacd84458e1215 firehol-1.191.ebuild 1270
-MD5 d9c4081d5ca923b4d5d1ab41fd91df24 firehol-1.191-r1.ebuild 1489
-MD5 d35ae3140fdbb1dda3259023101e982c files/firehol.initrd 476
+MD5 2ed6c1ceb94a3aa65879f8edd9ec084f firehol-1.191-r1.ebuild 1507
+MD5 c3228f3a09a2a15b5cba192b04bea609 firehol-1.191-r2.ebuild 1626
+MD5 6315c4d8f849c18acb2a9aa84a28b1e9 files/firehol.initrd 1196
 MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
 MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159 65
 MD5 1afffcb0a10f9c0028dc5062244934fc files/digest-firehol-1.91 64
@@ -14,3 +15,5 @@ MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
 MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191 66
 MD5 32a409eeb7b55602f5a83b77a8f1662b files/firehol-1.191-bash-3.0.patch 5663
 MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r1 66
+MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r2 66
+MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
diff --git a/net-firewall/firehol/files/digest-firehol-1.191-r2 b/net-firewall/firehol/files/digest-firehol-1.191-r2
new file mode 100644
index 000000000000..a3a8578a11c7
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.191-r2
@@ -0,0 +1 @@
+MD5 29ce4e88059c9bd408711803a569a492 firehol-1.191.tar.bz2 105623
diff --git a/net-firewall/firehol/files/firehol.conf.d b/net-firewall/firehol/files/firehol.conf.d
new file mode 100644
index 000000000000..c8b06e0eaf09
--- /dev/null
+++ b/net-firewall/firehol/files/firehol.conf.d
@@ -0,0 +1,2 @@
+#Locate of FireHOL conf file
+FIREHOL_CONF="/etc/firehol/firehol.conf"
diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd
index 858441a92bb0..8ea6b4d99efa 100644
--- a/net-firewall/firehol/files/firehol.initrd
+++ b/net-firewall/firehol/files/firehol.initrd
@@ -1,24 +1,66 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd,v 1.2 2004/07/14 23:28:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd,v 1.3 2004/10/02 18:44:02 centic Exp $
 
-opts="start stop"
+
+opts="start stop restart try status panic save"
 
 depend() {
-	need net
+	before net
 	provide firewall
 }
 
+checkrules() {
+	if [ ! -f ${FIREHOL_CONF} ]; then
+		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man firehol.conf for more info."
+		return 1
+	fi
+}
+
 start() {
+	checkrules || return 1
 	ebegin "Starting FireHOL"
-	/usr/sbin/firehol start 1>/dev/null
+		/usr/sbin/firehol start ${FIREHOL_CONF} > /dev/null
 	eend $? 
 }
 
 stop() {
 	ebegin "Stopping FireHOL"
-	/usr/sbin/firehol stop 1>/dev/null
+		/usr/sbin/firehol stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting Firewall"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+
+try() {
+	ebegin "Trying FireHOL configuration"
+	/usr/sbin/firehol try
 	eend $?
 }
 
+status() {
+	ebegin "Showing FireHOL status"
+	/usr/sbin/firehol status
+	eend $?
+}
+
+panic() {
+	ebegin "FireHOL PANIC"
+	/usr/sbin/firehol panic
+	eend $?
+}
+
+save() {
+	ebegin "Saving FireHOL configuration"
+	/usr/sbin/firehol save
+	eend $?
+}
diff --git a/net-firewall/firehol/firehol-1.191-r1.ebuild b/net-firewall/firehol/firehol-1.191-r1.ebuild
index 9d8dd1014166..bdfd332481d9 100644
--- a/net-firewall/firehol/firehol-1.191-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.191-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r1.ebuild,v 1.1 2004/08/01 21:30:32 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r1.ebuild,v 1.2 2004/10/02 18:44:02 centic Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ IUSE=""
 KEYWORDS="~x86"
 
 RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	virtual/modutils"
 
 # patch for problems with bash-3.0, can be removed in next version of firehol as
 # this is a backport from firehol-CVS.
diff --git a/net-firewall/firehol/firehol-1.191-r2.ebuild b/net-firewall/firehol/firehol-1.191-r2.ebuild
new file mode 100644
index 000000000000..91be4572e5fc
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.191-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r2.ebuild,v 1.1 2004/10/02 18:44:02 centic Exp $
+
+inherit eutils
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2
+	virtual/modutils"
+
+# patch for problems with bash-3.0, can be removed in next version of firehol as
+# this is a backport from firehol-CVS.
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-bash-3.0.patch
+}
+
+src_install() {
+	newsbin firehol.sh firehol
+
+	dodir /etc/firehol /etc/firehol/examples
+	insinto /etc/firehol/examples
+	doins examples/* || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/firehol.conf.d firehol || die
+
+	dodoc ChangeLog COPYING README TODO WhatIsNew || die
+	dohtml doc/*.html doc/*.css  || die
+
+	docinto scripts
+	dodoc get-iana.sh adblock.sh || die
+
+	doman man/*.1 man/*.5 || die
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/firehol.initrd firehol || die
+}
+
+pkg_postinst() {
+	einfo "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
+	einfo "See /etc/firehol/examples for configuration examples."
+	#
+	# Install a default configuration if none is available yet
+	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
+		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
+		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
+	fi
+}
+
diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
index 20ce219711a2..3db6319a8af1 100644
--- a/net-firewall/firehol/metadata.xml
+++ b/net-firewall/firehol/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<maintainer>
+  <email>centic@gentoo.org</email>
+  <name>Dominik Stadler</name>
+</maintainer>
 </pkgmetadata>