[gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/

[Alon Bar-Lev]

commit:     9581cdd6bf9ba6b2e996979bea55e6329cf97fbb
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 15:18:03 2015 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 17:48:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9581cdd6

net-firewall/firehol - cleanup

Package-Manager: portage-2.2.20.1

 net-firewall/firehol/Manifest                |  2 -
 net-firewall/firehol/firehol-1.273-r3.ebuild | 78 ----------------------------
 net-firewall/firehol/firehol-2.0.2.ebuild    | 61 ----------------------
 3 files changed, 141 deletions(-)

diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 4edadeb..8989966 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,3 +1 @@
-DIST firehol-1.273.tar.bz2 128128 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2 SHA512 dbb311fb9d4fa8861480bae1fac449ce85f52612264ec21658946d87be02027c37af13b754acd791ad454964c588897f8187ec8ce80de3b3ed8a888429bfd708 WHIRLPOOL 0fa7f7644d7bf0268bfc6e817eeb95e7c1784cefa6d4a930c2fec6644774347c28e7a4d39c55df7a4e0f7a0c4697ce6b3c4bafdf6e2124bd478c097b9a6cfb27
-DIST firehol-2.0.2.tar.xz 918860 SHA256 8778d0fc891676777b55e68d852a765205a995029f6e9f599c0090a14ca8ee7c SHA512 d125c4ca7d60494afde04f806bb0fc44ebdb12d7bf59e027c441a087082d9c326d009ba568ef640b01409abdecc3c192a9ae6db6c7370ad0221a19cb3a706902 WHIRLPOOL 10b6edee6a4db07a217e7d13eea4dc5ba02d7f3a44ba1955a5b138a09aa41aea6e39acbcdb04e0ee80d22f3f1d9fc1f061d26d7a10a9d1a7f02230ca21efe514
 DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8

diff --git a/net-firewall/firehol/firehol-1.273-r3.ebuild b/net-firewall/firehol/firehol-1.273-r3.ebuild
deleted file mode 100644
index d5f5d8b..0000000
--- a/net-firewall/firehol/firehol-1.273-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}

diff --git a/net-firewall/firehol/firehol-2.0.2.ebuild b/net-firewall/firehol/firehol-2.0.2.ebuild
deleted file mode 100644
index f39413c..0000000
--- a/net-firewall/firehol/firehol-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	app-arch/gzip"
-DEPEND="${RDEPEND}"
-
-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_prepare() {
-	epatch "${FILESDIR}/${P}-autosave.patch"
-}
-
-src_configure() {
-	# removing IP6TABLES_CMD has no effect and enable build
-	# without ipv6 available
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \
-		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
-		$(use_enable doc) \
-		IP6TABLES_CMD=/bin/false \
-		IP6TABLES_SAVE_CMD=/bin/false
-}
-
-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
-}