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

Package-Manager: portage-2.1.3.15

8 files changed, 162 insertions, 48 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/Manifest b/net-firewall/firehol/Manifest
index 3cb4db831581..49c703fd4cf9 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX firehol-1.226-to-228.patch 2311 RMD160 9adefc751d465dd193134b3243e6d34300216f7c SHA1 5f900b6e2a6f475596aa1bff4eafad37109fb5c9 SHA256 8a682147e82665124b256d9fadf16d989bf310f2480168e888d4b048e60b910c
 MD5 0d4eceaa49f1a12171145a685e42c015 files/firehol-1.226-to-228.patch 2311
 RMD160 9adefc751d465dd193134b3243e6d34300216f7c files/firehol-1.226-to-228.patch 2311
@@ -28,26 +31,30 @@ 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 2201 RMD160 df2da6ba263610820bd9032d2a29d96b7e916f09 SHA1 e1044e07ea66d5c1a8fc9c9c1168e7e5f9004d72 SHA256 a2e6b8eeecab139bd466096045d51b18b4e14af496e38868b30d2cc04db50a74
-MD5 0ebd7b49f7491f6ac43ec551775938ac firehol-1.250-r1.ebuild 2201
-RMD160 df2da6ba263610820bd9032d2a29d96b7e916f09 firehol-1.250-r1.ebuild 2201
-SHA256 a2e6b8eeecab139bd466096045d51b18b4e14af496e38868b30d2cc04db50a74 firehol-1.250-r1.ebuild 2201
-EBUILD firehol-1.250-r2.ebuild 2227 RMD160 7741129774fd3c64dfcc3ecadd7b9db8aff0ef10 SHA1 87878442c1ad683d33da0456709549479fa1f1f9 SHA256 0c542e9b5bad09544c5b9f0e8f22466516fe1d83f2ffce39929da652acd43601
-MD5 99e0b15686385634101384e40d976bdb firehol-1.250-r2.ebuild 2227
-RMD160 7741129774fd3c64dfcc3ecadd7b9db8aff0ef10 firehol-1.250-r2.ebuild 2227
-SHA256 0c542e9b5bad09544c5b9f0e8f22466516fe1d83f2ffce39929da652acd43601 firehol-1.250-r2.ebuild 2227
-EBUILD firehol-1.250.ebuild 2150 RMD160 7919962ffe5bd8225f61e3cc25a90cc1ab25a07d SHA1 5da7a80e87c7c0828b2e0fd7dbbd0156616a5a64 SHA256 07c0e42ffbf70a8c980a5dd4c1c015332e598089b27fd8d9fb0a340f8dde0660
-MD5 95a1883bfd149962e47dc3f42d84dd5c firehol-1.250.ebuild 2150
-RMD160 7919962ffe5bd8225f61e3cc25a90cc1ab25a07d firehol-1.250.ebuild 2150
-SHA256 07c0e42ffbf70a8c980a5dd4c1c015332e598089b27fd8d9fb0a340f8dde0660 firehol-1.250.ebuild 2150
-EBUILD firehol-1.256.ebuild 2037 RMD160 cec7b5eec5bfebb90e5913cda57f2c56c137ddb4 SHA1 6f00272ffb412e92e83c9f2c40a14796b625563a SHA256 629cbb97ceaa56b29a082e9da4f1709a319033e912d9f210fd5113a2a97b784c
-MD5 93430a6d9a663e4c5d55ebb760042102 firehol-1.256.ebuild 2037
-RMD160 cec7b5eec5bfebb90e5913cda57f2c56c137ddb4 firehol-1.256.ebuild 2037
-SHA256 629cbb97ceaa56b29a082e9da4f1709a319033e912d9f210fd5113a2a97b784c firehol-1.256.ebuild 2037
-MISC ChangeLog 5904 RMD160 f57a2e3551476cee395959bd4ee41f21de5fc38c SHA1 9edea8d103a803caa28a2146e81b4354326e0e8f SHA256 51eba9d505f398c0cca6d7fd4002b3df29d0fa2c9f4476bb00147cd0cbc274db
-MD5 01e8b539b390118a0bcde7cbb1f49754 ChangeLog 5904
-RMD160 f57a2e3551476cee395959bd4ee41f21de5fc38c ChangeLog 5904
-SHA256 51eba9d505f398c0cca6d7fd4002b3df29d0fa2c9f4476bb00147cd0cbc274db ChangeLog 5904
+EBUILD firehol-1.250-r1.ebuild 2212 RMD160 734801fa392e0c68b95b01bcd236d7a634170b15 SHA1 63ee44e712252425570bf6f4de115a3f74a5ef4d SHA256 c7ba28d61198bfb5bb577992a8d0c0a1a0c6c2fd7fec0881d67f9824249738e9
+MD5 24a7a3dfdac8ec5543b520e339035ef6 firehol-1.250-r1.ebuild 2212
+RMD160 734801fa392e0c68b95b01bcd236d7a634170b15 firehol-1.250-r1.ebuild 2212
+SHA256 c7ba28d61198bfb5bb577992a8d0c0a1a0c6c2fd7fec0881d67f9824249738e9 firehol-1.250-r1.ebuild 2212
+EBUILD firehol-1.250-r2.ebuild 2236 RMD160 aabb5d8acaeb6ecc8301f4ee26296b46286a26d8 SHA1 cc6aa41a914c8caafd59fe4a4f72a7a1cc1c2667 SHA256 1b57e5002dc4310855901a99173e54f2fc8c7c82b46c77f7825cd9724c1901de
+MD5 901ed7747a5dadfb2519fc27db5b5ef2 firehol-1.250-r2.ebuild 2236
+RMD160 aabb5d8acaeb6ecc8301f4ee26296b46286a26d8 firehol-1.250-r2.ebuild 2236
+SHA256 1b57e5002dc4310855901a99173e54f2fc8c7c82b46c77f7825cd9724c1901de firehol-1.250-r2.ebuild 2236
+EBUILD firehol-1.250.ebuild 2159 RMD160 607a741e34d181d21dbd9b61b7b22c2f1e7219ce SHA1 4a4c5ba0b8b5b27f6501d9365eae399b8b0c9b3c SHA256 5f72c2862a0ee58a59486958f950c6751825c228d7538de3b550960ef0572b3a
+MD5 cf3c049727f42f5eef4984d0b0c7b22d firehol-1.250.ebuild 2159
+RMD160 607a741e34d181d21dbd9b61b7b22c2f1e7219ce firehol-1.250.ebuild 2159
+SHA256 5f72c2862a0ee58a59486958f950c6751825c228d7538de3b550960ef0572b3a firehol-1.250.ebuild 2159
+EBUILD firehol-1.256-r1.ebuild 2724 RMD160 40bd95fa2d2324cd0520280f542b9497c6de37a9 SHA1 cec5057b0318a0845f52ac5edebe8db4dce680d5 SHA256 2032a61120a0f413927edb8c6fd8ee2273b97d7b4f223835fb250775255cf80d
+MD5 8759d2df1834ccf68a8d8fa2be83db4f firehol-1.256-r1.ebuild 2724
+RMD160 40bd95fa2d2324cd0520280f542b9497c6de37a9 firehol-1.256-r1.ebuild 2724
+SHA256 2032a61120a0f413927edb8c6fd8ee2273b97d7b4f223835fb250775255cf80d firehol-1.256-r1.ebuild 2724
+EBUILD firehol-1.256.ebuild 2042 RMD160 40de6a7b87ada3ca15ed7bffadd78d6ef6da7bb3 SHA1 6d54a2bccaf39aa20252d1fa598b104e6ce8a4e6 SHA256 c853a3ac841026aa8639123b4a7218d17f29fcd0889a150a532769c2d5ec3ffe
+MD5 77a7260c244fc60955f4479caf5496f4 firehol-1.256.ebuild 2042
+RMD160 40de6a7b87ada3ca15ed7bffadd78d6ef6da7bb3 firehol-1.256.ebuild 2042
+SHA256 c853a3ac841026aa8639123b4a7218d17f29fcd0889a150a532769c2d5ec3ffe firehol-1.256.ebuild 2042
+MISC ChangeLog 6244 RMD160 e52042bd4281f79f4ff3b7ad94765687ec87074f SHA1 8b750175fd6b25ea564ac3fa218f66e4511e0fd0 SHA256 df74086e21b751bc3e1215b95d0e311115181d880d07339d1d155d7457d413cf
+MD5 fea751d9bec3750c01346e8c6db5a2e9 ChangeLog 6244
+RMD160 e52042bd4281f79f4ff3b7ad94765687ec87074f ChangeLog 6244
+SHA256 df74086e21b751bc3e1215b95d0e311115181d880d07339d1d155d7457d413cf ChangeLog 6244
 MISC metadata.xml 253 RMD160 0cd01c4343823e36f3c9c789581a852cdcbe681c SHA1 cb73dff13edb196ce55af76f44975f6623420563 SHA256 034ab34443202ebc511ba59b753ec32fb42c04c22ed8094e1ab183d7e8ef09e7
 MD5 b787adc4ee82beeebc624de3babf75a0 metadata.xml 253
 RMD160 0cd01c4343823e36f3c9c789581a852cdcbe681c metadata.xml 253
@@ -64,3 +71,13 @@ SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/di
 MD5 3be2e154048dc67bcb56cab8156aa3f2 files/digest-firehol-1.256 244
 RMD160 9281c973e35a75adfceab9961b078fcc288df8bc files/digest-firehol-1.256 244
 SHA256 5244d39d650ddcbd8faf4dfead8873a080c0d979dc0e3f31a353caeb30481c36 files/digest-firehol-1.256 244
+MD5 3be2e154048dc67bcb56cab8156aa3f2 files/digest-firehol-1.256-r1 244
+RMD160 9281c973e35a75adfceab9961b078fcc288df8bc files/digest-firehol-1.256-r1 244
+SHA256 5244d39d650ddcbd8faf4dfead8873a080c0d979dc0e3f31a353caeb30481c36 files/digest-firehol-1.256-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHK656cCwrIuQnILcRAvSrAJ9VP/VrfojW6IGrbhvfRzPqd4K5BwCfc8WN
+H6FZq4Aoau9YgvQ7h8E4zC4=
+=GWc5
+-----END PGP SIGNATURE-----
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() {