Version bump, bug#542148

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

7 files changed, 128 insertions, 75 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 090c8125d5e1..c2a983454ec9 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2012/12/14 10:03:29 alonbl Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.54 2015/03/05 09:18:08 alonbl Exp $
+
+*firehol-2.0.1 (05 Mar 2015)
+
+  05 Mar 2015; Alon Bar-Lev <alonbl@gentoo.org> +files/fireqos.conf.d,
+  +files/fireqos.initrd, +firehol-2.0.1.ebuild, -files/firehol.initrd,
+  files/firehol.initrd.1:
+  Version bump, bug#542148
 
   14 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
   Assign as a maintainer
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index b37d9c3cfc13..64d9e6e25161 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX RESERVED_IPS 225 SHA256 81d4b0645943ed17215f830c024b11e0d3f74d65d6ee17eea551083c728f607d SHA512 148e523600c4d998da4d6ae7f83e802da47af38afed895d2069d24bcfa6547a0705e7bd280c28e280094a01a3a23a08f632586c36d1c7b144f63fc171dd722aa WHIRLPOOL cb940cd5ed1f63e4a242feecec62b6a30df004ee6e40faf125ba0a0a3d8b265700bb61ec39f064fde20f4e679b674e535a4e85a8c970fc05f6d44e22252669ad
 AUX firehol-1.273-CVE-2008-4953.patch 1734 SHA256 9f14a2bcf92f3a68b63a2506cd75f4cbdacd600e72133b37b439b6e179a2fd9d SHA512 cc5032626577bf853c6688a1cdb30c76eb8f0eb7e8fa241eb54afdb68ea34037271d3a1d1df3b952c6512a8485328bef19f417e2d9b94f3b32ee3ed664f8e13d WHIRLPOOL e92714115c966dc8c18f4dc85cc74f2d0e7fe313df0fad26226536f8adafaf07824022832c7acfaaf6d800b2281edd07d814660e01a33783dd0e7994b611e6f8
 AUX firehol-1.273-log-output.patch 280 SHA256 8685431621fc42d8d6f0a6dee0119743026ead5754ad0f4315ec6c29e8c94da0 SHA512 11122a6df07912a0defd3bdef3c263fde9ce248f059ecde358c2e79a99eaddb9ed986dcea0058cc2e3b94f4a788f56f6ce3e245d744f6f8db5d46077081d97fa WHIRLPOOL 1abd6cbe92aed3c0a744baf0c0ccfd5dbdaad62be2650851ea87b8e23e561a903ab2bffe4c72adeb562ce9dbbd485b7884e5a9f0b4fc6a0df87dd3048a588fb2
 AUX firehol.conf.d 70 SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c SHA512 e6b21b493526770bf5619d09b63f8e6cf7f94fb8059fc8ff2d1f19776cab1320218e103d73219534817464314430faca4e437644befa5330610d948c2ade1a35 WHIRLPOOL f5a4db182e7f04200686a4ab2c2fd76929fed12ba2c7cf36461a5e01ece9d2eaac3caaf98def21dd0a7be4902220f51a82f0281ef0eef3724efc88af4cea4643
-AUX firehol.initrd 1245 SHA256 8e5d71c35ccb9e03ff8b2a984d7082d69a51cd1384a6cc709931f3f7a5531d4c SHA512 2e245dc8ccad3f0540e64b42255d3501186db72006f5a2b7902c6d768789133e3de1509814a123632f0128d59aee22de1837eba59d9f08749e9cc170aa6445d6 WHIRLPOOL 79de5ffcf3a0b87d9f27f894c47112a47bee1cf90554a8dc98ea2cc7709881e82e1c988a8caab917a56d97039e140ee7f8897ee792d1ef53e9f69a2e3108a3a9
-AUX firehol.initrd.1 1258 SHA256 b48964a99db2304f7ed4ee2706555e2dc768d1853eaa92fd06ffbf67e2dde194 SHA512 f22cfd09788d6c57bc43b426f267ad017146b66958a8f894e2e7b6bd6fb751b35cea7332153a0840ea6281add149047dbc157f1c81d3544d1e9950dedaa954e2 WHIRLPOOL b3a202f07541a2881302c509d951e59f58491de57ea621a50daed84aa05f199df9527a49020891c7c3f03838f4b536268d224b642febdb6da30237d32c1bafaf
+AUX firehol.initrd.1 1261 SHA256 4704db0d00d1326a09a04e867ed3575938d2e41141b245cf543c9265c3ba4ddd SHA512 58aace281b1461c2d8b1cbb9e265a642cbd32d238996322323d931961d2635b3fb111dee8484889e77c95fb0f34a008e1c7320b8065b0bae05009d466d13bc03 WHIRLPOOL bfe42058afd359e4a8fdf9ab9e6d9bbedddd36eba76fab62cd02c08e18a72438a9dffee54faccdb5f5a2e74e11281802e264a0d6ee7cc9a3834cf5d3279dc3c6
+AUX fireqos.conf.d 65 SHA256 c18e2f224ac8e33971c632d7492ed3142059e8fce370713cf72df35cbd0a3b6a SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c WHIRLPOOL 05cded3032f1db543e1b35eb84963ebadb59a72d3b4cffcf00c31b18346a85795f21bc836eb461688152c8abcd0a221ec46d47dac5302c692c9bb3d67e835d14
+AUX fireqos.initrd 947 SHA256 f5653511645992ae90a592a150b95bef17d3fcff219a7407fcd1bdbd1e58df31 SHA512 821c20a38e26ca908cc0d8a49e77c101117c12de40128c461f86f7142d7206b22a5ef1475df6d6b4c58ef5e0803bd08bfa23bfcc0969bb45b1569b127ff8eff9 WHIRLPOOL 5f5bccee8a40c9e084d295c7bc46ad69cd83ef4772fd7fd2f83cb5ddf5ddb43b8af8875eb1db4e3729838d5ca8bd38f7c1eff57d2adc36807335326f6e7fc704
 DIST firehol-1.273.tar.bz2 128128 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2 SHA512 dbb311fb9d4fa8861480bae1fac449ce85f52612264ec21658946d87be02027c37af13b754acd791ad454964c588897f8187ec8ce80de3b3ed8a888429bfd708 WHIRLPOOL 0fa7f7644d7bf0268bfc6e817eeb95e7c1784cefa6d4a930c2fec6644774347c28e7a4d39c55df7a4e0f7a0c4697ce6b3c4bafdf6e2124bd478c097b9a6cfb27
+DIST firehol-2.0.1.tar.xz 918040 SHA256 21aa3b200987fdc784c16e6c50b7fb587237cf60278859ea59d5359edcd43796 SHA512 61ecd7881c03e17986a51cb4214159197ce5e0cdf2c1c7e8759903d064e77cd43a49e57e4817e17e059e3bf63a0f6d8774d1f811fc6fc1a5e4b90ddb796cd994 WHIRLPOOL 82423ac7b51777a059cf7232edab6ad07abc8d6fcf8d7485abb0deb72076d9702897e75875eea6d020f3bf20e062290b181301a34e09f3fbfc1cd5f3688b30c1
 EBUILD firehol-1.273-r3.ebuild 2235 SHA256 25b1f90baa1b258390029d57aa46b38f19905eae3ecb957aa4ab794c450c3d6a SHA512 0307ab47ed84c847ba9cf5cd3e0e53f8ac3e14f603fc0fa3a1b25e1c81862a4333e45f5bffa8e0b7e8c03b3198fa24d51878613f623a560796922d826a7a23d2 WHIRLPOOL 380df5a7d9b2139cf005c64385d283d3db1c3597e57bfc9ca7aae465c9c191f4052b2cdee706388a46be334206f469a80480eabeff4f08a3f9d58e69bf4671ec
-MISC ChangeLog 9723 SHA256 0b2ec9bba9b84edd4ac9cc425f7143a5bf06fcc24547f4956d103506994b0694 SHA512 39a431b3bc3a5500ea1b2db8c8b96dd7af5d378de25704c7ae805fa6d89fda9ad0c530331fc7af0f1d679116c91cffcb95d9255426a47294a6bada9aa9b3067b WHIRLPOOL bc74946417c7777cdc79500cd8fccb56f37373410bc9869dc7637e95445068589c1db7a7f82123171762005e877668b802ecd1630b852a74fa5435bbd486295b
+EBUILD firehol-2.0.1.ebuild 1627 SHA256 65bf2b9fba2250f66336a85f5c37a0b8822baa03762522f3aa86641c38bdf591 SHA512 96d008b22f55dc6913da752b68b50982703eb6bf388baed7a3da20dc0a5acbd7cdecb34205f3001f40abd410be5633690c58d69609dee4d97c05ed94d46a24e8 WHIRLPOOL 0891fe27fd396b1bef1b55ab5e99b3f3e7a3b8b80ad4a8e649d036f2c2392a99508b3de3e9030f02e3d22b034f52a501e0021a9aee434d0e58176742af3cc8cb
+MISC ChangeLog 9949 SHA256 9b2a6e7d090d1597f4fd6d648c0a275ece659870ae86dbe6e59d57a86d118b38 SHA512 504ebe270a9f6519beace26acbe45c50e30338249dd77ac672cc7e4e7d3a48166ed2436a0e9d6d801dfa526160355be94cf86e39968b9f429389c97a06292cec WHIRLPOOL 4d1a93f5c60beac4ab8342f7c718a0c2c6b8f7d71272c6e2b2102dff46159c4b218e03b0d39ec77c1959f4ea31bcc65bb2720409eaa00f543ed4e188a4e2456d
 MISC metadata.xml 203 SHA256 6457ca6309badbd279e3ab106f60275f4b83ed47897af823830ecfde8dd40c96 SHA512 023202f99e1bf2ae94b35f80fa43d998b583f0eaf52ae2a090e6894e141008065f996c03e004cd6d0cfc124171a1a7f93c9a5ab03043bf04b88e52b0b04a3a74 WHIRLPOOL 21ec04c789baef31a21ac62e83901befa770e65252c1e27151df5b5253184371a948cce4bcf9f9375f87a5c2c88565ff36cdd5cc7f10d848d25024b75b59a162
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlT4H1QACgkQXYk9GL8g3FG6BQD9HFGf2ialrIbB/mOsPH1MXJhz
+IMDEQz9gy9w1dFxadvUA/RVGHuxRHQRRb2fgI7Ltd6E1BOkJK3wp3KVD8gxONoeg
+=8LXR
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd
deleted file mode 100644
index feb30d0a0b70..000000000000
--- a/net-firewall/firehol/files/firehol.initrd
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd,v 1.7 2008/04/26 10:00:56 alonbl Exp $
-
-
-opts="start stop restart try status panic save"
-
-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/files/firehol.initrd.1 b/net-firewall/firehol/files/firehol.initrd.1
index ab697f281c51..790b2a9d88c2 100644
--- a/net-firewall/firehol/files/firehol.initrd.1
+++ b/net-firewall/firehol/files/firehol.initrd.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd.1,v 1.2 2015/03/05 09:18:08 alonbl Exp $
 
 extra_commands="save panic try"
 extra_started_commands="reload"
diff --git a/net-firewall/firehol/files/fireqos.conf.d b/net-firewall/firehol/files/fireqos.conf.d
new file mode 100644
index 000000000000..55fa2e037e01
--- /dev/null
+++ b/net-firewall/firehol/files/fireqos.conf.d
@@ -0,0 +1,2 @@
+#Locate of FireQOS conf file
+FIREQOS="/etc/firehol/fireqos.conf"
diff --git a/net-firewall/firehol/files/fireqos.initrd b/net-firewall/firehol/files/fireqos.initrd
new file mode 100644
index 000000000000..b183ed8c3bbd
--- /dev/null
+++ b/net-firewall/firehol/files/fireqos.initrd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/fireqos.initrd,v 1.1 2015/03/05 09:18:08 alonbl Exp $
+
+depend() {
+	need localmount
+	after bootmisc
+	before net
+}
+
+checkrules() {
+	if [ ! -f ${FIREQOS_CONF} ]; then
+		eerror "Not starting FireQOS. Create ${FIREQOS_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man fireqos.conf for more info."
+		return 1
+	fi
+}
+
+start() {
+	checkrules || return 1
+	ebegin "Starting FireQOS"
+		/usr/sbin/fireqos start ${FIREQOS_CONF} -- ${FIREQOS_EXTRA_ARGS} > /dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping FireQOS"
+		/usr/sbin/fireqos stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting FireQOS"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+status() {
+	ebegin "Showing FireQOS status"
+	/usr/sbin/fireqos status
+	eend $?
+}
diff --git a/net-firewall/firehol/firehol-2.0.1.ebuild b/net-firewall/firehol/firehol-2.0.1.ebuild
new file mode 100644
index 000000000000..1f8c56dfab46
--- /dev/null
+++ b/net-firewall/firehol/firehol-2.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-2.0.1.ebuild,v 1.1 2015/03/05 09:18:08 alonbl Exp $
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-apps/iproute2"
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal]
+	virtual/modutils"
+
+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_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-autosave="${EPREFIX}/etc/conf.d/iptables" \
+		--with-autosave="${EPREFIX}/etc/conf.d/ip6tables"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/firehol.conf.d firehol
+	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
+	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
+	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+
+	# no --disable-doc yet
+	use doc || rm -fr "${D}/usr/share/doc/${PF}"/*.pdf "${D}/usr/share/doc/${PF}/html"
+}