Add missing kernel checks (#310797 by Phil Koenig, Tom Knight, Tyler Montbriand), use static and fixed RESERVED_IPS file (#332135 by Richard Gray), handle errors better (#332507 by Tyler Montbriand).

Package-Manager: portage-2.1.10.54/cvs/Linux x86_64

4 files changed, 111 insertions, 2 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 2b0a3a3a665d..6627366a297e 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.46 2012/02/25 06:34:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.47 2012/04/02 20:28:46 pacho Exp $
+
+*firehol-1.273-r2 (02 Apr 2012)
+
+  02 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/firehol-1.273-log-output.patch, +firehol-1.273-r2.ebuild:
+  Add missing kernel checks (#310797 by Phil Koenig, Tom Knight, Tyler
+  Montbriand), use static and fixed RESERVED_IPS file (#332135 by Richard Gray),
+  handle errors better (#332507 by Tyler Montbriand).
 
   25 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> firehol-1.273-r1.ebuild:
   Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools.
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 6e5d3e4bd802..ea804b358ed6 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX firehol-1.273-CVE-2008-4953.patch 1734 RMD160 d0cceb51c5c0acb568700b38650ed02242db2211 SHA1 5087929bc70de03bf61f1a3ad70c3160d337042a SHA256 9f14a2bcf92f3a68b63a2506cd75f4cbdacd600e72133b37b439b6e179a2fd9d
+AUX firehol-1.273-log-output.patch 280 RMD160 388b75bee045b946e3d7cd3c1f0422c12e6f3880 SHA1 a692a842ce4446d2b550676c3476dc3461b86a98 SHA256 8685431621fc42d8d6f0a6dee0119743026ead5754ad0f4315ec6c29e8c94da0
 AUX firehol.conf.d 70 RMD160 a87dc5fb7ba67d3f87d9672de62ba5081925ddcb SHA1 5a31d6751f0ea13550218132ff210e3286694152 SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c
 AUX firehol.initrd 1245 RMD160 65730686994af4ae61a8ecc3d5b747850ea01aa4 SHA1 a5892f1c762b0c061f6957583dd58bf7b5bc4ab9 SHA256 8e5d71c35ccb9e03ff8b2a984d7082d69a51cd1384a6cc709931f3f7a5531d4c
 DIST firehol-1.273.tar.bz2 128128 RMD160 858fda3300e2de10fc82be6582d7042de6cbfc23 SHA1 09433f7fbb3cbb7e33e9c601008191bfe3b388a8 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2
 EBUILD firehol-1.273-r1.ebuild 2165 RMD160 5e213e12d10642fce7de4ace19ce38c47e74aca5 SHA1 15d1cdc9e1705e5a645cd2cecc8b3a39d243a396 SHA256 c490196323a8938b6e7bfdd0fc91ac44f175f4a58f63e2663027c18f72740e92
-MISC ChangeLog 8660 RMD160 e243389680520624e979e640b3f52101edbdc339 SHA1 c2f322de7409ec723de34e8a408ec3bccaedc879 SHA256 92befc20c9140a83f437acfe6a088d00bf09c26652ab0d0f0760f4b596122444
+EBUILD firehol-1.273-r2.ebuild 2236 RMD160 b9f6c9310aaad738bf42a4f1da179cc15998741c SHA1 04f2c642f1c23805a67ad0af6cd83ccd1319f36d SHA256 a007607e458310070a480ed394540581ae73647ed135a4a1dedef8e9d2de2b62
+MISC ChangeLog 9011 RMD160 a87f71f61ae56fcec183adb1adfe260c1ad02af3 SHA1 8b68eecef8d5977b082d6da78b0c61e7b4fa63f0 SHA256 343aecc91ab7bf065c864d7478d6b940bcfd7566f156d7a76eefcb8ca10a751e
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk96DAQACgkQCaWpQKGI+9QaKQCeNan2KZax9VoRlDvxL8j8EQWx
+JjMAn14OeyvIZAl37vp0TxcYwj1Y6GIg
+=KDrb
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/firehol/files/firehol-1.273-log-output.patch b/net-firewall/firehol/files/firehol-1.273-log-output.patch
new file mode 100644
index 000000000000..66f0fd4c9b2e
--- /dev/null
+++ b/net-firewall/firehol/files/firehol-1.273-log-output.patch
@@ -0,0 +1,11 @@
+--- firehol.sh-old	2010-08-11 09:01:29.000000000 -0600
++++ firehol.sh	2010-08-12 09:22:07.000000000 -0600
+@@ -5212,7 +5212,7 @@
+ 	printf >&2 "\n"
+ 	echo >&2 "OUTPUT  : "
+ 	echo >&2
+-	${CAT_CMD} ${FIREHOL_OUTPUT}.log
++	${CAT_CMD} ${FIREHOL_OUTPUT}.log >&2
+ 	echo >&2
+ 	
+ 	return 0
diff --git a/net-firewall/firehol/firehol-1.273-r2.ebuild b/net-firewall/firehol/firehol-1.273-r2.ebuild
new file mode 100644
index 000000000000..72fe929f7b18
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.273-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.273-r2.ebuild,v 1.1 2012/04/02 20:28:46 pacho Exp $
+
+EAPI=4
+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[-minimal]
+	virtual/modutils
+	|| (
+		net-misc/wget
+		net-misc/curl
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2008-4953.patch
+	epatch "${FILESDIR}"/${P}-log-output.patch #332507
+}
+
+pkg_setup() {
+	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
+		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
+		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
+		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
+
+	get_version
+	if [ ${KV_PATCH} -ge 25 ]; then
+		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
+	else
+		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
+	fi
+	linux-info_pkg_setup
+}
+
+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
+	newinitd "${FILESDIR}/firehol.initrd" firehol
+
+	dodoc ChangeLog README TODO WhatIsNew
+	dohtml doc/*.html doc/*.css
+
+	docinto scripts
+	dodoc get-iana.sh adblock.sh
+
+	doman man/*.1 man/*.5
+
+	# Install this RESERVED_IPS as discussed in bug #332135
+	insinto /etc/firehol
+	doins "${FILESDIR}"/RESERVED_IPS
+}
+
+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
+}