Add 1.214, fix order of parameters in init-script.

5 files changed, 70 insertions, 5 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index baaf1c614f0a..fb37a564af90 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2004/10/02 18:44:02 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.10 2004/11/09 13:59:59 centic Exp $
+
+*firehol-1.214 (09 Nov 2004)
+
+  09 Nov 2004; Dominik Stadler <centic@gentoo.org> files/firehol.initrd,
+  +firehol-1.214.ebuild:
+  Add new Version 1.214, fix order of options in init-script
 
 *firehol-1.191-r2 (02 Oct 2004)
 
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 477c003a057c..693707445580 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,4 +1,4 @@
-MD5 99af02dbb8f5600357eaa684859a1d5c ChangeLog 1878
+MD5 f83d867a57e5e6016c36de43c849a85e ChangeLog 2069
 MD5 4ee85082d33557f1f172e9220b14433e firehol-1.120.ebuild 1113
 MD5 6362cf4f0a41bd85afbafbf65b052020 firehol-1.159.ebuild 1066
 MD5 013ad6c2ea965b219ac9dd986f763749 firehol-1.91.ebuild 979
@@ -7,7 +7,8 @@ MD5 3520a2bedc2847655f09b165eb5e167f firehol-1.159-r1.ebuild 1104
 MD5 b9e974b4c6d63f8cdddacd84458e1215 firehol-1.191.ebuild 1270
 MD5 2ed6c1ceb94a3aa65879f8edd9ec084f firehol-1.191-r1.ebuild 1507
 MD5 c3228f3a09a2a15b5cba192b04bea609 firehol-1.191-r2.ebuild 1626
-MD5 6315c4d8f849c18acb2a9aa84a28b1e9 files/firehol.initrd 1196
+MD5 6bfbf4c1c05626e8cefe93c817cbe16f firehol-1.214.ebuild 1487
+MD5 338cc56b7140f4ccd56377488a6aebf5 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
@@ -15,5 +16,6 @@ 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 d36dc29cf673b91c56f80e1406f981df files/digest-firehol-1.214 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.214 b/net-firewall/firehol/files/digest-firehol-1.214
new file mode 100644
index 000000000000..a7761e4f17c4
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.214
@@ -0,0 +1 @@
+MD5 dbab95e567e44e7fe8cbaceff6829909 firehol-1.214.tar.bz2 116120
diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd
index 8ea6b4d99efa..9080f44a2b4b 100644
--- a/net-firewall/firehol/files/firehol.initrd
+++ b/net-firewall/firehol/files/firehol.initrd
@@ -1,7 +1,7 @@
 #!/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.3 2004/10/02 18:44:02 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd,v 1.4 2004/11/09 13:59:59 centic Exp $
 
 
 opts="start stop restart try status panic save"
@@ -23,7 +23,7 @@ checkrules() {
 start() {
 	checkrules || return 1
 	ebegin "Starting FireHOL"
-		/usr/sbin/firehol start ${FIREHOL_CONF} > /dev/null
+		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
 	eend $? 
 }
 
diff --git a/net-firewall/firehol/firehol-1.214.ebuild b/net-firewall/firehol/firehol-1.214.ebuild
new file mode 100644
index 000000000000..d9597f1beea2
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.214.ebuild
@@ -0,0 +1,56 @@
+# 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.214.ebuild,v 1.1 2004/11/09 13:59:59 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
+	|| (
+		net-misc/wget
+		net-misc/curl
+	)"
+
+src_install() {
+	newsbin firehol.sh firehol
+
+	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
+	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
+}
+