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

Package-Manager: portage-2.1.2.9

5 files changed, 149 insertions, 5 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/Manifest b/net-firewall/firehol/Manifest
index 832bd7152e8f..f241a157def2 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -14,6 +14,10 @@ AUX firehol-1.250-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8
 MD5 bfaa62f4b3eb2956611c1085e61ca673 files/firehol-1.250-printf.patch 1496
 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 files/firehol-1.250-printf.patch 1496
 SHA256 35ab81db53612f938ca37f592d85e68260573084c34b598a7c4254b3d3fab071 files/firehol-1.250-printf.patch 1496
+AUX firehol-1.256-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 SHA1 a3450b2b3c94c94be4f64aebdbdbf6a0fc5e3b19 SHA256 35ab81db53612f938ca37f592d85e68260573084c34b598a7c4254b3d3fab071
+MD5 bfaa62f4b3eb2956611c1085e61ca673 files/firehol-1.256-printf.patch 1496
+RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 files/firehol-1.256-printf.patch 1496
+SHA256 35ab81db53612f938ca37f592d85e68260573084c34b598a7c4254b3d3fab071 files/firehol-1.256-printf.patch 1496
 AUX firehol.conf.d 70 RMD160 a87dc5fb7ba67d3f87d9672de62ba5081925ddcb SHA1 5a31d6751f0ea13550218132ff210e3286694152 SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c
 MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
 RMD160 a87dc5fb7ba67d3f87d9672de62ba5081925ddcb files/firehol.conf.d 70
@@ -23,6 +27,7 @@ MD5 9217f80319c21b460ace2c676d2a8430 files/firehol.initrd 1212
 RMD160 2c683cc4064d5cbc357c7f1a3da10eb7306ed94c files/firehol.initrd 1212
 SHA256 dbba1eafc4b3bff40f187eb2f83051529e30a35fd5bc04409278b6d3e8b92015 files/firehol.initrd 1212
 DIST firehol-1.226.tar.bz2 118113 RMD160 bff910e8a3a67ce91f0634177b5ee361edc90e96 SHA1 c54496bc0cadb6d9728738e826464cf35cf7b96e SHA256 b434e8142eb4093516794c6f2213d03efa3c08161758ff836dbd266f0a9438cf
+DIST firehol-1.256.tar.bz2 125333 RMD160 42ef66f441529d0c216545a313f71d37800f8f7b SHA1 1fc4adb067d0d0ad4d79149710b9db003ffbbf31 SHA256 2c6e709073a7cdb9c73863b3f5bdc77d7cf526162cb4ffd1a1e89e56a7b4fb49
 EBUILD firehol-1.250-r1.ebuild 2199 RMD160 fabfff06cc65bf632fa7b79e0e04b37b8e88b708 SHA1 a0f6bd8342a505e24bfdba5680326545db1cf779 SHA256 dab94162554785315840a51a5f90b911a5ab70f547376351f8df2e1c389e7eae
 MD5 6d93b85c01cb318ab7692f410e2fd665 firehol-1.250-r1.ebuild 2199
 RMD160 fabfff06cc65bf632fa7b79e0e04b37b8e88b708 firehol-1.250-r1.ebuild 2199
@@ -35,10 +40,14 @@ EBUILD firehol-1.250.ebuild 2148 RMD160 05b29f5a8908a76aee860a4f28a484c8717ed371
 MD5 c4903b1d8f5bdd1ef3fbc383ace429f6 firehol-1.250.ebuild 2148
 RMD160 05b29f5a8908a76aee860a4f28a484c8717ed371 firehol-1.250.ebuild 2148
 SHA256 49f34fe53a361a7eb7fd14abe5abb69eccb3b86fbc8908609fd547eff99a11c9 firehol-1.250.ebuild 2148
-MISC ChangeLog 5705 RMD160 70ac78f74429df4ba95eb80c0394b72aad532333 SHA1 f535c71e2513de9cbfcdeca46a7c31850d10d7f1 SHA256 1edc0efbb3716f7aa70717d49112f72f2d018a294579b25b65d28eef8eeeb854
-MD5 3f8af4ff2789f0e34ce8fd6829e80e1f ChangeLog 5705
-RMD160 70ac78f74429df4ba95eb80c0394b72aad532333 ChangeLog 5705
-SHA256 1edc0efbb3716f7aa70717d49112f72f2d018a294579b25b65d28eef8eeeb854 ChangeLog 5705
+EBUILD firehol-1.256.ebuild 2035 RMD160 712e130d246d1b63ebf2b5e1fb18b3e4b6c7677c SHA1 ec13d61e151f4fae8b152be58ebcd13a33bcaa8f SHA256 e1fd6655320b0bde1585f9bbafec0706f9c245a2194a22402d47dcc4289c0d4a
+MD5 8b8d3254f96ea8325d5f7ceebb39dc38 firehol-1.256.ebuild 2035
+RMD160 712e130d246d1b63ebf2b5e1fb18b3e4b6c7677c firehol-1.256.ebuild 2035
+SHA256 e1fd6655320b0bde1585f9bbafec0706f9c245a2194a22402d47dcc4289c0d4a firehol-1.256.ebuild 2035
+MISC ChangeLog 5904 RMD160 f57a2e3551476cee395959bd4ee41f21de5fc38c SHA1 9edea8d103a803caa28a2146e81b4354326e0e8f SHA256 51eba9d505f398c0cca6d7fd4002b3df29d0fa2c9f4476bb00147cd0cbc274db
+MD5 01e8b539b390118a0bcde7cbb1f49754 ChangeLog 5904
+RMD160 f57a2e3551476cee395959bd4ee41f21de5fc38c ChangeLog 5904
+SHA256 51eba9d505f398c0cca6d7fd4002b3df29d0fa2c9f4476bb00147cd0cbc274db ChangeLog 5904
 MISC metadata.xml 253 RMD160 0cd01c4343823e36f3c9c789581a852cdcbe681c SHA1 cb73dff13edb196ce55af76f44975f6623420563 SHA256 034ab34443202ebc511ba59b753ec32fb42c04c22ed8094e1ab183d7e8ef09e7
 MD5 b787adc4ee82beeebc624de3babf75a0 metadata.xml 253
 RMD160 0cd01c4343823e36f3c9c789581a852cdcbe681c metadata.xml 253
@@ -52,3 +61,6 @@ SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/di
 MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.250-r2 244
 RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.250-r2 244
 SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.250-r2 244
+MD5 3be2e154048dc67bcb56cab8156aa3f2 files/digest-firehol-1.256 244
+RMD160 9281c973e35a75adfceab9961b078fcc288df8bc files/digest-firehol-1.256 244
+SHA256 5244d39d650ddcbd8faf4dfead8873a080c0d979dc0e3f31a353caeb30481c36 files/digest-firehol-1.256 244
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
+}