Bug 195378, fix check for zcat, Bug 172000, add check for kernel configuration, also add missing quotes as reported by repoman

(Portage version: 2.1.3.15)

7 files changed, 125 insertions, 28 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index e81c3fe559b2..3c1a671d6f71 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.31 2007/06/01 14:03:10 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.32 2007/11/05 14:07:54 centic Exp $
+
+*firehol-1.256-r1 (02 Nov 2007)
+
+  02 Nov 2007; Dominik Stadler <centic@gentoo.org> firehol-1.250.ebuild,
+  firehol-1.250-r1.ebuild, firehol-1.250-r2.ebuild, firehol-1.256.ebuild,
+  +firehol-1.256-r1.ebuild:
+  Bug 195378, fix check for zcat, Bug 172000, add check for kernel
+  configuration, also add missing quotes as reported by repoman
 
 *firehol-1.256 (01 Jun 2007)
 
diff --git a/net-firewall/firehol/files/digest-firehol-1.256-r1 b/net-firewall/firehol/files/digest-firehol-1.256-r1
new file mode 100644
index 000000000000..4e2369d33e36
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.256-r1
@@ -0,0 +1,3 @@
+MD5 ebf11d2cd9336316c054cb57d1fa7b4e firehol-1.256.tar.bz2 125333
+RMD160 42ef66f441529d0c216545a313f71d37800f8f7b firehol-1.256.tar.bz2 125333
+SHA256 2c6e709073a7cdb9c73863b3f5bdc77d7cf526162cb4ffd1a1e89e56a7b4fb49 firehol-1.256.tar.bz2 125333
diff --git a/net-firewall/firehol/firehol-1.250-r1.ebuild b/net-firewall/firehol/firehol-1.250-r1.ebuild
index c8f16cceb332..391945069796 100644
--- a/net-firewall/firehol/firehol-1.250-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.250-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v 1.3 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v 1.4 2007/11/05 14:07:54 centic Exp $
 
 inherit eutils
 
@@ -39,11 +39,11 @@ pkg_setup() {
 # backport from firehol-CVS.
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
-	epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
-	epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
-	epatch ${FILESDIR}/${P}-groupwith.patch || die
-	epatch ${FILESDIR}/${P}-printf.patch || die
+	cd "${S}" || die
+	epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
+	epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
+	epatch "${FILESDIR}/${P}-groupwith.patch" || die
+	epatch "${FILESDIR}/${P}-printf.patch" || die
 }
 
 src_install() {
@@ -53,7 +53,7 @@ src_install() {
 	insinto /etc/firehol/examples
 	doins examples/* || die
 
-	newconfd ${FILESDIR}/firehol.conf.d firehol || die
+	newconfd "${FILESDIR}/firehol.conf.d firehol" || die
 
 	dodoc ChangeLog README TODO WhatIsNew || die
 	dohtml doc/*.html doc/*.css  || die
@@ -63,7 +63,7 @@ src_install() {
 
 	doman man/*.1 man/*.5 || die
 
-	newinitd ${FILESDIR}/firehol.initrd firehol || die
+	newinitd "${FILESDIR}/firehol.initrd firehol" || die
 }
 
 pkg_postinst() {
diff --git a/net-firewall/firehol/firehol-1.250-r2.ebuild b/net-firewall/firehol/firehol-1.250-r2.ebuild
index 1c2faa6827a1..104698458124 100644
--- a/net-firewall/firehol/firehol-1.250-r2.ebuild
+++ b/net-firewall/firehol/firehol-1.250-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild,v 1.3 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild,v 1.4 2007/11/05 14:07:54 centic Exp $
 
 inherit eutils
 
@@ -39,11 +39,11 @@ pkg_setup() {
 # backport from firehol-CVS.
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
-	epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
-	epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
+	cd "${S}" || die
+	epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
+	epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
 	# invalid, see Bug 176862 epatch ${FILESDIR}/${P}-groupwith.patch || die
-	epatch ${FILESDIR}/${P}-printf.patch || die
+	epatch "${FILESDIR}/${P}-printf.patch" || die
 }
 
 src_install() {
@@ -53,7 +53,7 @@ src_install() {
 	insinto /etc/firehol/examples
 	doins examples/* || die
 
-	newconfd ${FILESDIR}/firehol.conf.d firehol || die
+	newconfd "${FILESDIR}/firehol.conf.d firehol" || die
 
 	dodoc ChangeLog README TODO WhatIsNew || die
 	dohtml doc/*.html doc/*.css  || die
@@ -63,7 +63,7 @@ src_install() {
 
 	doman man/*.1 man/*.5 || die
 
-	newinitd ${FILESDIR}/firehol.initrd firehol || die
+	newinitd "${FILESDIR}/firehol.initrd firehol" || die
 }
 
 pkg_postinst() {
diff --git a/net-firewall/firehol/firehol-1.250.ebuild b/net-firewall/firehol/firehol-1.250.ebuild
index 4df48f31f696..b56f22ebda6b 100644
--- a/net-firewall/firehol/firehol-1.250.ebuild
+++ b/net-firewall/firehol/firehol-1.250.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild,v 1.5 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild,v 1.6 2007/11/05 14:07:54 centic Exp $
 
 inherit eutils
 
@@ -39,10 +39,10 @@ pkg_setup() {
 # backport from firehol-CVS.
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
-	epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
-	epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
-	epatch ${FILESDIR}/${P}-printf.patch || die
+	cd "${S}" || die
+	epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
+	epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
+	epatch "${FILESDIR}/${P}-printf.patch" || die
 }
 
 src_install() {
@@ -52,7 +52,7 @@ src_install() {
 	insinto /etc/firehol/examples
 	doins examples/* || die
 
-	newconfd ${FILESDIR}/firehol.conf.d firehol || die
+	newconfd "${FILESDIR}/firehol.conf.d firehol" || die
 
 	dodoc ChangeLog README TODO WhatIsNew || die
 	dohtml doc/*.html doc/*.css  || die
@@ -62,7 +62,7 @@ src_install() {
 
 	doman man/*.1 man/*.5 || die
 
-	newinitd ${FILESDIR}/firehol.initrd firehol || die
+	newinitd "${FILESDIR}/firehol.initrd firehol" || die
 }
 
 pkg_postinst() {
diff --git a/net-firewall/firehol/firehol-1.256-r1.ebuild b/net-firewall/firehol/firehol-1.256-r1.ebuild
new file mode 100644
index 000000000000..0c45e707b9eb
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.256-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild,v 1.1 2007/11/05 14:07:54 centic Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-apps/iproute2"
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2
+	virtual/modutils
+	|| (
+		net-misc/wget
+		net-misc/curl
+	)"
+
+#S="${WORKDIR}/${PN}-1.226"
+
+pkg_setup() {
+	# Bug 81600 fail if iproute2 is built with minimal
+	if built_with_use sys-apps/iproute2 minimal; then
+		eerror "Firehol requires iproute2 to be emerged without"
+		eerror "the USE-Flag \"minimal\"."
+		eerror "Re-emerge iproute2 with"
+		eerror "USE=\"-minimal\" emerge sys-apps/iproute2"
+		die "sys-apps/iproute2 without USE=\"minimal\" needed"
+	fi
+
+	# perform checks for kernel config from eclass linux-info
+	# for now we just print warnings as I am not sure if these
+	# are required always...
+	CONFIG_CHECK="~NF_CONNTRACK_ENABLED ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
+	linux-info_pkg_setup
+}
+
+# patch for embedded Gentoo - GNAP
+# backport from firehol-CVS.
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	# not needed any more according to http://bugs.gentoo.org/show_bug.cgi?id=172000#c15
+	#epatch ${FILESDIR}/${P}-printf.patch || die
+
+	# Bug 195378, binary is called zcat instead of gzcat, fixed upstream in later releases
+	sed -i -e 's/gzcat/zcat/g' firehol.sh || die
+	sed -i -e 's/GZCAT/ZCAT/g' firehol.sh || die
+}
+
+src_install() {
+	newsbin firehol.sh firehol
+
+	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
+	insinto /etc/firehol/examples
+	doins examples/* || die
+
+	newconfd "${FILESDIR}/firehol.conf.d firehol" || die
+
+	dodoc ChangeLog 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
+
+	newinitd "${FILESDIR}/firehol.initrd firehol" || die
+}
+
+pkg_postinst() {
+	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
+	elog "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/firehol-1.256.ebuild b/net-firewall/firehol/firehol-1.256.ebuild
index 651be713ea64..41a4ffd4ef31 100644
--- a/net-firewall/firehol/firehol-1.256.ebuild
+++ b/net-firewall/firehol/firehol-1.256.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild,v 1.2 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild,v 1.3 2007/11/05 14:07:54 centic Exp $
 
 inherit eutils
 
@@ -39,8 +39,8 @@ pkg_setup() {
 # backport from firehol-CVS.
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
-	epatch ${FILESDIR}/${P}-printf.patch || die
+	cd "${S}" || die
+	epatch "${FILESDIR}/${P}-printf.patch" || die
 }
 
 src_install() {
@@ -50,7 +50,7 @@ src_install() {
 	insinto /etc/firehol/examples
 	doins examples/* || die
 
-	newconfd ${FILESDIR}/firehol.conf.d firehol || die
+	newconfd "${FILESDIR}/firehol.conf.d firehol" || die
 
 	dodoc ChangeLog README TODO WhatIsNew || die
 	dohtml doc/*.html doc/*.css  || die
@@ -60,7 +60,7 @@ src_install() {
 
 	doman man/*.1 man/*.5 || die
 
-	newinitd ${FILESDIR}/firehol.initrd firehol || die
+	newinitd "${FILESDIR}/firehol.initrd firehol" || die
 }
 
 pkg_postinst() {