From b641bf3eeb87f462d2a69e989a682764fef30c23 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Wed, 21 Oct 2015 23:04:20 +0300
Subject: net-firewall/firehol: fix autosave location issue

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force
---
 net-firewall/firehol/firehol-2.0.3-r1.ebuild | 62 ++++++++++++++++++++++++++++
 net-firewall/firehol/firehol-2.0.3.ebuild    | 58 --------------------------
 2 files changed, 62 insertions(+), 58 deletions(-)
 create mode 100644 net-firewall/firehol/firehol-2.0.3-r1.ebuild
 delete mode 100644 net-firewall/firehol/firehol-2.0.3.ebuild

(limited to 'net-firewall')

diff --git a/net-firewall/firehol/firehol-2.0.3-r1.ebuild b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..5fae33165853
--- /dev/null
+++ b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
@@ -0,0 +1,62 @@
+# 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}/${PN}-2.0.2-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 \
+		IP6TABLES_RESTORE_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
+}
diff --git a/net-firewall/firehol/firehol-2.0.3.ebuild b/net-firewall/firehol/firehol-2.0.3.ebuild
deleted file mode 100644
index eda56e51a749..000000000000
--- a/net-firewall/firehol/firehol-2.0.3.ebuild
+++ /dev/null
@@ -1,58 +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_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 \
-		IP6TABLES_RESTORE_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
-}
-- 
cgit v1.2.3-65-gdbad