Add 1.191-r1 that fixes problems with bash-3.0.

5 files changed, 287 insertions, 6 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 0097143eeecf..4618109bc4f2 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.7 2004/06/24 22:38:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.8 2004/08/01 21:30:32 centic Exp $
+
+*firehol-1.191-r1 (01 Aug 2004)
+
+  01 Aug 2004; Dominik Stadler <centic@gentoo.org>
+  +files/firehol-1.191-bash-3.0.patch, +firehol-1.191-r1.ebuild:
+  Add patch to fix problems with bash-3.0, see Bug 59098
 
 *firehol-1.191 (18 May 2004)
 
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index f3f35255a481..ddd63239877f 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,13 +1,16 @@
-MD5 b9e974b4c6d63f8cdddacd84458e1215 firehol-1.191.ebuild 1270
+MD5 958af59041e643cf2c580c6a61a03681 ChangeLog 1370
 MD5 4ee85082d33557f1f172e9220b14433e firehol-1.120.ebuild 1113
 MD5 6362cf4f0a41bd85afbafbf65b052020 firehol-1.159.ebuild 1066
 MD5 013ad6c2ea965b219ac9dd986f763749 firehol-1.91.ebuild 979
-MD5 958af59041e643cf2c580c6a61a03681 ChangeLog 1370
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 3520a2bedc2847655f09b165eb5e167f firehol-1.159-r1.ebuild 1104
-MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
-MD5 1afffcb0a10f9c0028dc5062244934fc files/digest-firehol-1.91 64
+MD5 b9e974b4c6d63f8cdddacd84458e1215 firehol-1.191.ebuild 1270
+MD5 34f6e13758e3bf0e207e1d063bcd0bf8 firehol-1.191-r1.ebuild 1246
+MD5 d35ae3140fdbb1dda3259023101e982c files/firehol.initrd 476
 MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
 MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159 65
+MD5 1afffcb0a10f9c0028dc5062244934fc files/digest-firehol-1.91 64
+MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
 MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191 66
-MD5 d35ae3140fdbb1dda3259023101e982c files/firehol.initrd 476
+MD5 f1312ea827f6ac596600469b82c5ec2f files/firehol-1.191-bash-3.0.patch 7040
+MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r1 66
diff --git a/net-firewall/firehol/files/digest-firehol-1.191-r1 b/net-firewall/firehol/files/digest-firehol-1.191-r1
new file mode 100644
index 000000000000..a3a8578a11c7
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.191-r1
@@ -0,0 +1 @@
+MD5 29ce4e88059c9bd408711803a569a492 firehol-1.191.tar.bz2 105623
diff --git a/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch b/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch
new file mode 100644
index 000000000000..b810323a2bb8
--- /dev/null
+++ b/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch
@@ -0,0 +1,220 @@
+--- firehol.sh	2004-05-03 00:51:38.000000000 +0200
++++ firehol.sh.new	2004-08-01 23:16:42.390810920 +0200
+@@ -1788,7 +1788,7 @@
+ 	local prface="${work_inface}"
+ 	
+ 	local pre="pr"
+-	unset reverse
++	local reverse=
+ 	if [ "${1}" = "reverse" ]
+ 	then
+ 		local reverse="reverse"	# needed to recursion
+@@ -2691,7 +2691,7 @@
+ 				action="${2}"
+ 				shift 2
+ 				
+-				unset action_param
++				local -a action_param=()
+ 				local action_is_chain=0
+ 				case "${action}" in
+ 					accept|ACCEPT)
+@@ -3287,7 +3287,7 @@
+ 			local pr=
+ 			for pr in ${proto}
+ 			do
+-				unset proto_arg
++				local -a proto_arg=()
+ 				
+ 				case ${pr} in
+ 					any|ANY)
+@@ -3299,7 +3299,7 @@
+ 				esac
+ 				
+ 				rule_action_param "${negative_action}" "${pr}" "${action_param[@]}" -- ${table} -A "${negative_chain}" "${proto_arg[@]}"
+-				unset action_param
++				local -a action_param=()
+ 			done
+ 		fi
+ 	fi
+@@ -3311,8 +3311,8 @@
+ 	local tuid=
+ 	for tuid in ${uid}
+ 	do
+-		unset uid_arg
+-		unset owner_arg
++		local -a uid_arg=()
++		local -a owner_arg=()
+ 		
+ 		case ${tuid} in
+ 			any|ANY)
+@@ -3327,7 +3327,7 @@
+ 		local tgid=
+ 		for tgid in ${gid}
+ 		do
+-			unset gid_arg
++			local -a gid_arg=()
+ 			
+ 			case ${tgid} in
+ 				any|ANY)
+@@ -3342,7 +3342,7 @@
+ 			local tpid=
+ 			for tpid in ${pid}
+ 			do
+-				unset pid_arg
++				local -a pid_arg=()
+ 				
+ 				case ${tpid} in
+ 					any|ANY)
+@@ -3357,7 +3357,7 @@
+ 				local tsid=
+ 				for tsid in ${sid}
+ 				do
+-					unset sid_arg
++					local -a sid_arg=()
+ 					
+ 					case ${tsid} in
+ 						any|ANY)
+@@ -3372,7 +3372,7 @@
+ 					local tcmd=
+ 					for tcmd in ${cmd}
+ 					do
+-						unset cmd_arg
++						local -a cmd_arg=()
+ 						
+ 						case ${tcmd} in
+ 							any|ANY)
+@@ -3387,7 +3387,7 @@
+ 						local pr=
+ 						for pr in ${proto}
+ 						do
+-							unset proto_arg
++							local -a proto_arg=()
+ 							
+ 							case ${pr} in
+ 								any|ANY)
+@@ -3401,7 +3401,7 @@
+ 							local inf=
+ 							for inf in ${inface}
+ 							do
+-								unset inf_arg
++								local -a inf_arg=()
+ 								case ${inf} in
+ 									any|ANY)
+ 										;;
+@@ -3414,7 +3414,7 @@
+ 								local outf=
+ 								for outf in ${outface}
+ 								do
+-									unset outf_arg
++									local -a outf_arg=()
+ 									case ${outf} in
+ 										any|ANY)
+ 											;;
+@@ -3427,7 +3427,7 @@
+ 									local inph=
+ 									for inph in ${physin}
+ 									do
+-										unset inph_arg
++										local -a inph_arg=()
+ 										case ${inph} in
+ 											any|ANY)
+ 												;;
+@@ -3441,7 +3441,7 @@
+ 										local outph=
+ 										for outph in ${physout}
+ 										do
+-											unset outph_arg
++											local -a outph_arg=()
+ 											case ${outph} in
+ 												any|ANY)
+ 													;;
+@@ -3455,7 +3455,7 @@
+ 											local sp=
+ 											for sp in ${sport}
+ 											do
+-												unset sp_arg
++												local -a sp_arg=()
+ 												case ${sp} in
+ 													any|ANY)
+ 													;;
+@@ -3468,7 +3468,7 @@
+ 												local dp=
+ 												for dp in ${dport}
+ 												do
+-													unset dp_arg
++													local -a dp_arg=()
+ 													case ${dp} in
+ 														any|ANY)
+ 															;;
+@@ -3481,7 +3481,7 @@
+ 													local mc=
+ 													for mc in ${mac}
+ 													do
+-														unset mc_arg
++														local -a mc_arg=()
+ 														case ${mc} in
+ 															any|ANY)
+ 																;;
+@@ -3494,7 +3494,7 @@
+ 														local s=
+ 														for s in ${src}
+ 														do
+-															unset s_arg
++															local -a s_arg=()
+ 															case ${s} in
+ 																any|ANY)
+ 																	;;
+@@ -3507,7 +3507,7 @@
+ 															local d=
+ 															for d in ${dst}
+ 															do
+-																unset d_arg
++																local -a d_arg=()
+ 																case ${d} in
+ 																	any|ANY)
+ 																		;;
+@@ -3517,19 +3517,19 @@
+ 																		;;
+ 																esac
+ 																
+-																unset state_arg
++																local -a state_arg=()
+ 																if [ ! -z "${state}" ]
+ 																then
+ 																	local -a state_arg=("-m" "state" "${statenot}" "--state" "${state}")
+ 																fi
+ 																
+-																unset limit_arg
++																local -a limit_arg=()
+ 																if [ ! -z "${limit}" ]
+ 																then
+ 																	local -a limit_arg=("-m" "limit" "--limit" "${limit}" "--limit-burst" "${burst}")
+ 																fi
+ 																
+-																unset iplimit_arg
++																local -a iplimit_arg=()
+ 																if [ ! -z "${iplimit}" ]
+ 																then
+ 																	local -a iplimit_arg=("-m" "iplimit" "--iplimit-above" "${iplimit}" "--iplimit-mask" "${iplimit_mask}")
+@@ -3537,7 +3537,7 @@
+ 																
+ 																declare -a basecmd=("${inf_arg[@]}" "${outf_arg[@]}" "${physdev_arg[@]}" "${inph_arg[@]}" "${outph_arg[@]}" "${limit_arg[@]}" "${iplimit_arg[@]}" "${proto_arg[@]}" "${s_arg[@]}" "${sp_arg[@]}" "${d_arg[@]}" "${dp_arg[@]}" "${owner_arg[@]}" "${uid_arg[@]}" "${gid_arg[@]}" "${pid_arg[@]}" "${sid_arg[@]}" "${cmd_arg[@]}" "${state_arg[@]}" "${mc_arg[@]}")
+ 																
+-																unset logopts_arg
++																local -a logopts_arg=()
+ 																if [ "${FIREHOL_LOG_MODE}" = "ULOG" ]
+ 																then
+ 																	local -a logopts_arg=("--ulog-prefix='${logtxt}:'")
+@@ -4822,10 +4822,8 @@
+ 			# find all the networks this IP can access directly
+ 			# or through its peer
+ 			netcount=0
+-			unset ifnets
+-			unset ofnets
+-			set -a ifnets=
+-			set -a ofnets=
++			ifnets=
++			ofnets=
+ 			for net in ${nets}
+ 			do
+ 				test "${net}" = "default" && continue
diff --git a/net-firewall/firehol/firehol-1.191-r1.ebuild b/net-firewall/firehol/firehol-1.191-r1.ebuild
new file mode 100644
index 000000000000..9d8dd1014166
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.191-r1.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+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"
+
+# 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/*
+	dodoc ChangeLog COPYING README TODO WhatIsNew
+	dohtml doc/*.html doc/*.css
+	docinto scripts
+	dodoc get-iana.sh adblock.sh
+	doman man/*.1 man/*.5
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/firehol.initrd firehol
+}
+
+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
+}
+