Version bump (bug 420147 by Khayyam)

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

4 files changed, 159 insertions, 6 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 0f685f608c53..a87471ec1734 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2012/04/03 20:41:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.49 2012/06/12 10:04:11 xmw Exp $
+
+*firehol-1.273-r3 (12 Jun 2012)
+
+  12 Jun 2012; Michael Weber <xmw@gentoo.org> +files/firehol.initrd.1,
+  +firehol-1.273-r3.ebuild:
+  Version bump (bug 420147 by Khayyam)
 
   03 Apr 2012; Pacho Ramos <pacho@gentoo.org> +files/RESERVED_IPS:
   Commit missing files, #410689 by Alon Bar-Lev
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 10a68ce3ac8f..efab2dbead8f 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX RESERVED_IPS 225 RMD160 8cbb17eb2e0e2dfa883729218ef839df5e005cfe SHA1 2d6554654f438a9eb6ba9da9668d6d6d7da712aa SHA256 81d4b0645943ed17215f830c024b11e0d3f74d65d6ee17eea551083c728f607d
 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
+AUX firehol.initrd.1 1258 RMD160 f38730757fa7db4f68f0b72be6c7d1e632832fdf SHA1 67316a1dd3acd48996a9842545c9a43b611308d8 SHA256 b48964a99db2304f7ed4ee2706555e2dc768d1853eaa92fd06ffbf67e2dde194
 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
 EBUILD firehol-1.273-r2.ebuild 2236 RMD160 b9f6c9310aaad738bf42a4f1da179cc15998741c SHA1 04f2c642f1c23805a67ad0af6cd83ccd1319f36d SHA256 a007607e458310070a480ed394540581ae73647ed135a4a1dedef8e9d2de2b62
-MISC ChangeLog 9127 RMD160 4cdd8136f096e11ce539dfaf68ae644ee5e7a984 SHA1 da348657aab4137777f1c8c8e204b32d837e172c SHA256 a97731c18f551464e4441497c1733c7709be6cfc872020b44ec501bfe1bfe38f
+EBUILD firehol-1.273-r3.ebuild 2236 RMD160 35ae0c455639b4405e3b9fbd846ebf3df0a14ce0 SHA1 7b2fdcca3be1534c5b56b64b7ed952fc6e1dd1e9 SHA256 15013aec7623fab434aac0141b7e5dce404ca4802200000f1dbb0be373d40e96
+MISC ChangeLog 9297 RMD160 dbfcf8cabaedac6664ac7ed65fe0e2ba649604fd SHA1 a3eb2d1c90aa42ac4b6e87496c0d425ac48a66c3 SHA256 0d0625af24e4696d24b1c29f49449b2ca3ab5db13992dfa6d39fd64d2cb81d91
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk97YGQACgkQCaWpQKGI+9TgpwCfTARDEILJYiHHW1UPW6KpfUPx
-T4sAn1MhYWbret2tiX2PYlf8A5ZOnrYa
-=dwd+
+iF4EAREIAAYFAk/XE/0ACgkQknrdDGLu8JAXyQD+Im82h3Q41j1F1CoFLIFPmyIT
+5oIYi9o5FMWgQODsZrcA/10ODHjdNWZT6HNOMARZCguXpJ9OquW5qI6yfxr7/nFt
+=Z4/U
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/firehol/files/firehol.initrd.1 b/net-firewall/firehol/files/firehol.initrd.1
new file mode 100644
index 000000000000..ab697f281c51
--- /dev/null
+++ b/net-firewall/firehol/files/firehol.initrd.1
@@ -0,0 +1,67 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd.1,v 1.1 2012/06/12 10:04:12 xmw Exp $
+
+extra_commands="save panic try"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	after bootmisc
+	before net
+	provide firewall
+}
+
+checkrules() {
+	if [ ! -f ${FIREHOL_CONF} ]; then
+		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man firehol.conf for more info."
+		return 1
+	fi
+}
+
+start() {
+	checkrules || return 1
+	ebegin "Starting FireHOL"
+		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping FireHOL"
+		/usr/sbin/firehol stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting Firewall"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+try() {
+	ebegin "Trying FireHOL configuration"
+	/usr/sbin/firehol ${FIREHOL_CONF} try
+	eend $?
+}
+
+status() {
+	ebegin "Showing FireHOL status"
+	/usr/sbin/firehol status
+	eend $?
+}
+
+panic() {
+	ebegin "FireHOL PANIC"
+	/usr/sbin/firehol panic
+	eend $?
+}
+
+save() {
+	ebegin "Saving FireHOL configuration"
+	/usr/sbin/firehol save
+	eend $?
+}
diff --git a/net-firewall/firehol/firehol-1.273-r3.ebuild b/net-firewall/firehol/firehol-1.273-r3.ebuild
new file mode 100644
index 000000000000..4312a60948cd
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.273-r3.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-r3.ebuild,v 1.1 2012/06/12 10:04:11 xmw 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.1 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
+}