Revert bug 171719, breaks group with, see Bug 176862.

Package-Manager: portage-2.1.2.5

4 files changed, 100 insertions, 15 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 4b4f3003d848..f5464cf37667 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2007/04/28 17:39:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.28 2007/05/05 12:10:04 centic Exp $
+
+*firehol-1.250-r2 (05 May 2007)
+
+  05 May 2007; Dominik Stadler <centic@gentoo.org> +firehol-1.250-r2.ebuild:
+  Revert bug 171719, breaks group with, see Bug 176862.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> firehol-1.250.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 1a78cd109b64..e3bede9a6d8d 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,6 +1,3 @@
------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
@@ -30,14 +27,18 @@ EBUILD firehol-1.250-r1.ebuild 2202 RMD160 d5544cf5d0c78cb8afc0e893b7df6189bf534
 MD5 8387d363f23d950ffbeec5002de3fd6d firehol-1.250-r1.ebuild 2202
 RMD160 d5544cf5d0c78cb8afc0e893b7df6189bf5342f6 firehol-1.250-r1.ebuild 2202
 SHA256 a03ef7f26e6f8fe5bece839478affcb71fe81cbdee32c8af319ea38deb3e0814 firehol-1.250-r1.ebuild 2202
+EBUILD firehol-1.250-r2.ebuild 2228 RMD160 ae740b840bf232565f4e64b58b09ba7551e81e90 SHA1 7d2811e689f50f97c827ab4a87f9560bcfb01b77 SHA256 86473845afe75654573acf5ecabeaa535b111519c56543a53bdedf8d1fe41a8f
+MD5 435920ef3aba6eee9d9e1b87c17e3085 firehol-1.250-r2.ebuild 2228
+RMD160 ae740b840bf232565f4e64b58b09ba7551e81e90 firehol-1.250-r2.ebuild 2228
+SHA256 86473845afe75654573acf5ecabeaa535b111519c56543a53bdedf8d1fe41a8f firehol-1.250-r2.ebuild 2228
 EBUILD firehol-1.250.ebuild 2153 RMD160 c47b0f5a923b26ba1f0dcbc925efbc7f62e966a2 SHA1 1a9af676a7e567380e9c248467ec988b64e6787c SHA256 7891f3dd3ecc1615d3ff367bfa2d964437f2de05447ea1281adf89165a195439
 MD5 7aa4e84b0de911639c40fe945acd8dae firehol-1.250.ebuild 2153
 RMD160 c47b0f5a923b26ba1f0dcbc925efbc7f62e966a2 firehol-1.250.ebuild 2153
 SHA256 7891f3dd3ecc1615d3ff367bfa2d964437f2de05447ea1281adf89165a195439 firehol-1.250.ebuild 2153
-MISC ChangeLog 5296 RMD160 f795b5ce9b389564ceceba0799ced25049fe4f95 SHA1 5c86a8d2e59b988e9b5eddae07d6c6225d117e73 SHA256 806bfa5213a19bc6aed9cb95692b887cd19984abefd19425b3b33e433e91c1bc
-MD5 3a2e30e2bee90d2dc8025621da53c984 ChangeLog 5296
-RMD160 f795b5ce9b389564ceceba0799ced25049fe4f95 ChangeLog 5296
-SHA256 806bfa5213a19bc6aed9cb95692b887cd19984abefd19425b3b33e433e91c1bc ChangeLog 5296
+MISC ChangeLog 5461 RMD160 b7173d1161237af2c37486493b2d34bf537953d0 SHA1 554ef58d1664553a5cfc87014cd35f7e78f6a8e8 SHA256 ba0f970305a78e4f5d8c89833134e92a50a923acf72583deed1266f7d4b5d3bc
+MD5 d5f0d27e6aea4292320a5739161632d0 ChangeLog 5461
+RMD160 b7173d1161237af2c37486493b2d34bf537953d0 ChangeLog 5461
+SHA256 ba0f970305a78e4f5d8c89833134e92a50a923acf72583deed1266f7d4b5d3bc ChangeLog 5461
 MISC metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 SHA1 b417ff2a1791163c7ef78c244c84f4ac0dd28396 SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4
 MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 metadata.xml 232
@@ -48,10 +49,6 @@ SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/di
 MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.250-r1 244
 RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.250-r1 244
 SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.250-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM4b0I1lqEGTUzyQRAkE3AJ9pKzUliAUomu92SZo8/re61Lqt1QCgpPtj
-Z7eF5Z9dntmBNK7yRie9m9Q=
-=r9Ns
------END PGP SIGNATURE-----
+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
diff --git a/net-firewall/firehol/files/digest-firehol-1.250-r2 b/net-firewall/firehol/files/digest-firehol-1.250-r2
new file mode 100644
index 000000000000..d2c0f0cf477c
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.250-r2
@@ -0,0 +1,3 @@
+MD5 958f6e95bad37013e544da587f55c8b7 firehol-1.226.tar.bz2 118113
+RMD160 bff910e8a3a67ce91f0634177b5ee361edc90e96 firehol-1.226.tar.bz2 118113
+SHA256 b434e8142eb4093516794c6f2213d03efa3c08161758ff836dbd266f0a9438cf firehol-1.226.tar.bz2 118113
diff --git a/net-firewall/firehol/firehol-1.250-r2.ebuild b/net-firewall/firehol/firehol-1.250-r2.ebuild
new file mode 100644
index 000000000000..08ee8d481b7e
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.250-r2.ebuild
@@ -0,0 +1,80 @@
+# 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.1 2007/05/05 12:10:04 centic Exp $
+
+inherit eutils
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-1.226.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}/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
+}
+
+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() {
+	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
+}
+