Bump to version 1.256, fixes bug 180302, thanks for providing patches

(Portage version: 2.1.2.9)

4 files changed, 133 insertions, 1 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index a153595c2cd1..e81c3fe559b2 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2007/05/15 13:59:32 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.31 2007/06/01 14:03:10 centic Exp $
+
+*firehol-1.256 (01 Jun 2007)
+
+  01 Jun 2007; <dstadler@gentoo.org> +files/firehol-1.256-printf.patch,
+  +firehol-1.256.ebuild:
+  Bump to version 1.256, fixes bug 180302, thanks for providing patches
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-firewall/firehol/files/digest-firehol-1.256 b/net-firewall/firehol/files/digest-firehol-1.256
new file mode 100644
index 000000000000..4e2369d33e36
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.256
@@ -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/files/firehol-1.256-printf.patch b/net-firewall/firehol/files/firehol-1.256-printf.patch
new file mode 100644
index 000000000000..1222e15de65d
--- /dev/null
+++ b/net-firewall/firehol/files/firehol-1.256-printf.patch
@@ -0,0 +1,47 @@
+--- firehol.sh	2006-12-27 14:34:58.000000000 +0100
++++ firehol.new	2006-12-27 14:53:16.000000000 +0100
+@@ -2412,7 +2412,7 @@
+ 		printf "runcmd '${check}' '${FIREHOL_LINEID}' " >>${FIREHOL_OUTPUT}
+ 	fi
+ 	
+-	printf "%q " "$@" >>${FIREHOL_OUTPUT}
++	printf "%b " "$@" >>${FIREHOL_OUTPUT}
+ 	printf "\n" >>${FIREHOL_OUTPUT}
+ 	
+ 	if [ ${FIREHOL_EXPLAIN} -eq 1 ]
+@@ -4885,7 +4885,7 @@
+ 	echo >&2 "WARNING"
+ 	echo >&2 "WHAT   : ${work_function}"
+ 	echo >&2 "WHY    :" "$@"
+-	printf >&2 "COMMAND: "; printf >&2 "%q " "${work_realcmd[@]}"; echo >&2
++	printf >&2 "COMMAND: "; printf >&2 "%b " "${work_realcmd[@]}"; echo >&2
+ 	echo >&2 "SOURCE : line ${FIREHOL_LINEID} of ${FIREHOL_CONFIG}"
+ 	echo >&2
+ 	
+@@ -4906,7 +4906,7 @@
+ 	echo >&2 "ERROR #: ${work_error}"
+ 	echo >&2 "WHAT   : ${work_function}"
+ 	echo >&2 "WHY    :" "$@"
+-	printf >&2 "COMMAND: "; printf >&2 "%q " "${work_realcmd[@]}"; echo >&2
++	printf >&2 "COMMAND: "; printf >&2 "%b " "${work_realcmd[@]}"; echo >&2
+ 	echo >&2 "SOURCE : line ${FIREHOL_LINEID} of ${FIREHOL_CONFIG}"
+ 	echo >&2
+ 	
+@@ -4960,7 +4960,7 @@
+ 	echo >&2 "WHAT    : A runtime command failed to execute (returned error ${ret})."
+ 	echo >&2 "SOURCE  : line ${line} of ${FIREHOL_CONFIG}"
+ 	printf >&2 "COMMAND : "
+-	printf >&2 "%q " "$@"
++	printf >&2 "%b " "$@"
+ 	printf >&2 "\n"
+ 	echo >&2 "OUTPUT  : "
+ 	echo >&2
+@@ -5157,7 +5157,7 @@
+ 			*)	;;
+ 		esac
+ 		
+-		printf "%q " "${work_realcmd[@]}"
++		printf "%b " "${work_realcmd[@]}"
+ 		printf "\n\n"
+ 	) >>${FIREHOL_OUTPUT}
+ }
diff --git a/net-firewall/firehol/firehol-1.256.ebuild b/net-firewall/firehol/firehol-1.256.ebuild
new file mode 100644
index 000000000000..434627a57c2a
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.256.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2007/06/01 14:03:10 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="~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
+}
+
+# patch for embedded Gentoo - GNAP
+# backport from firehol-CVS.
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+	epatch ${FILESDIR}/${P}-printf.patch || 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
+}