Add support to pass sanewall arguments (bug #493860).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 76 insertions, 10 deletions

diff --git a/net-firewall/sanewall/ChangeLog b/net-firewall/sanewall/ChangeLog
index 2c4dcf2f8395..ff761e7ca412 100644
--- a/net-firewall/sanewall/ChangeLog
+++ b/net-firewall/sanewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/sanewall
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/ChangeLog,v 1.4 2013/11/06 06:00:14 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/ChangeLog,v 1.5 2014/11/28 17:04:05 radhermit Exp $
+
+*sanewall-1.1.6-r1 (28 Nov 2014)
+
+  28 Nov 2014; Tim Harder <radhermit@gentoo.org> +sanewall-1.1.6-r1.ebuild,
+  files/sanewall.confd, files/sanewall.initd:
+  Add support to pass sanewall arguments (bug #493860).
 
 *sanewall-1.1.6 (06 Nov 2013)
 
diff --git a/net-firewall/sanewall/files/sanewall.confd b/net-firewall/sanewall/files/sanewall.confd
index fa847f11e292..2193b04d49bf 100644
--- a/net-firewall/sanewall/files/sanewall.confd
+++ b/net-firewall/sanewall/files/sanewall.confd
@@ -1,2 +1,5 @@
 # location of sanewall config
 SANEWALL_CONFIG="/etc/sanewall/sanewall.conf"
+
+# arguments for sanewall
+#SANEWALL_OPTS=""
diff --git a/net-firewall/sanewall/files/sanewall.initd b/net-firewall/sanewall/files/sanewall.initd
index fa333bd4b83a..6e53504d012e 100644
--- a/net-firewall/sanewall/files/sanewall.initd
+++ b/net-firewall/sanewall/files/sanewall.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.initd,v 1.1 2013/06/15 11:07:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.initd,v 1.2 2014/11/28 17:04:05 radhermit Exp $
 
 extra_commands="save panic try"
 extra_started_commands="reload"
@@ -22,36 +22,36 @@ start_pre() {
 
 start() {
 	ebegin "Starting sanewall"
-	/usr/sbin/sanewall ${SANEWALL_CONFIG} start >/dev/null
+	/usr/sbin/sanewall ${SANEWALL_OPTS} ${SANEWALL_CONFIG} start >/dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping sanewall"
-	/usr/sbin/sanewall stop >/dev/null
+	/usr/sbin/sanewall ${SANEWALL_OPTS} stop >/dev/null
 	eend $?
 }
 
 try() {
 	ebegin "Trying sanewall configuration"
-	/usr/sbin/sanewall ${SANEWALL_CONFIG} try
+	/usr/sbin/sanewall ${SANEWALL_OPTS} ${SANEWALL_CONFIG} try
 	eend $?
 }
 
 status() {
 	ebegin "Showing sanewall status"
-	/usr/sbin/sanewall status
+	/usr/sbin/sanewall ${SANEWALL_OPTS} status
 	eend $?
 }
 
 panic() {
 	ebegin "sanewall panic"
-	/usr/sbin/sanewall panic
+	/usr/sbin/sanewall ${SANEWALL_OPTS} panic
 	eend $?
 }
 
 save() {
 	ebegin "Saving sanewall configuration"
-	/usr/sbin/sanewall save
+	/usr/sbin/sanewall ${SANEWALL_OPTS} save
 	eend $?
 }
diff --git a/net-firewall/sanewall/sanewall-1.1.6-r1.ebuild b/net-firewall/sanewall/sanewall-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..b85ec86ad5b9
--- /dev/null
+++ b/net-firewall/sanewall/sanewall-1.1.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/sanewall-1.1.6-r1.ebuild,v 1.1 2014/11/28 17:04:05 radhermit Exp $
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="iptables firewall generator (fork of firehol)"
+HOMEPAGE="http://www.sanewall.org/"
+SRC_URI="http://download.sanewall.org/releases/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="net-firewall/iptables[ipv6]
+	sys-apps/iproute2[-minimal]
+	virtual/modutils
+	|| (
+		net-misc/wget
+		net-misc/curl
+	)"
+
+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="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	# install default configuration if it doesn't exist
+	if [[ ! -e "${ROOT}"/etc/${PN}/${PN}.conf ]] ; then
+		einfo "Installing a sample configuration to ${ROOT}/etc/${PN}/${PN}.conf"
+		cp "${ROOT}"/etc/${PN}/${PN}.conf.example "${ROOT}"/etc/${PN}/${PN}.conf || die
+	fi
+}