Cleanup; Version bump; Systemd support wrt bug 465950

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)

5 files changed, 83 insertions, 33 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index d0a3b61828ca..84d62916c193 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.227 2013/05/29 15:25:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.228 2013/06/02 10:47:00 constanze Exp $
+
+*shorewall-4.5.17 (02 Jun 2013)
+
+  02 Jun 2013; Constanze Hausner <constanze@gentoo.org>
+  +shorewall-4.5.17.ebuild, +files/shorewall.systemd, -files/all_zone.patch,
+  -files/shorewallrc:
+  Cleanup; Version bump; Systemd support wrt bug #465950
 
   29 May 2013; Jeroen Roovers <jer@gentoo.org> shorewall-4.5.15.ebuild:
   Stable for HPPA (bug #470544).
diff --git a/net-firewall/shorewall/files/all_zone.patch b/net-firewall/shorewall/files/all_zone.patch
deleted file mode 100644
index 09384e19c831..000000000000
--- a/net-firewall/shorewall/files/all_zone.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Perl/Shorewall/Rules_orig.pm	2011-08-06 17:12:13.000000000 +0200
-+++ Perl/Shorewall/Rules.pm	2011-08-06 17:12:39.000000000 +0200
-@@ -1554,7 +1554,7 @@
-     #
-     # Handle Wildcards
-     #
--    if ( $input =~ /^(all[-+]*)(![^:]+)?(:.*)?/ ) {
-+    if ( $input =~ /^(all[-+]*)(![^:]+)?(:.*)?$/ ) {
- 	$input   = $1;
- 	$exclude = $2;
- 	$rest    = $3;
diff --git a/net-firewall/shorewall/files/shorewall.systemd b/net-firewall/shorewall/files/shorewall.systemd
new file mode 100644
index 000000000000..bd4638d5dfaf
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.systemd
@@ -0,0 +1,20 @@
+#
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall
+StandardOutput=syslog
+ExecStart=/sbin/shorewall $OPTIONS start
+ExecStop=/sbin/shorewall $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/shorewallrc b/net-firewall/shorewall/files/shorewallrc
deleted file mode 100644
index 4f13769114a4..000000000000
--- a/net-firewall/shorewall/files/shorewallrc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARDIR=/var/lib                         #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/shorewall-4.5.17.ebuild b/net-firewall/shorewall/shorewall-4.5.17.ebuild
new file mode 100644
index 000000000000..e54542841cea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.17.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.17.ebuild,v 1.1 2013/06/02 10:47:00 constanze Exp $
+
+EAPI="4"
+
+inherit eutils systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_P="${PN}-${MY_PV_BASE}"
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2[-minimal]
+	dev-lang/perl
+	=net-firewall/shorewall-core-${PV}"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/shorewall
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall.initd shorewall
+	systemd_newunit "${FILESDIR}"/shorewall.systemd 'shorewall.service' || die
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r Samples
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+	dodir /var/lock/subsys
+}