net-firewall/shorewall: Version Bump, #534232, Thanks Thomas D. for the patch; fixes bugs, #530704, #534062

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

15 files changed, 58 insertions, 69 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 198ee0eb09c9..542b6c3158ae 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.268 2014/11/18 13:00:28 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.269 2015/01/04 09:49:46 jlec Exp $
+
+*shorewall-4.6.5.3 (04 Jan 2015)
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> -shorewall-4.6.5.2.ebuild,
+  +shorewall-4.6.5.3.ebuild, files/4.6/shorewall.initd,
+  files/4.6/shorewall.systemd, files/4.6/shorewall-init.initd,
+  files/4.6/shorewall-init.systemd, files/4.6/shorewall-lite.initd,
+  files/4.6/shorewall-lite.systemd, files/4.6/shorewall6-lite.initd,
+  files/4.6/shorewall6-lite.systemd, files/4.6/shorewall6.initd,
+  files/4.6/shorewall6.systemd, files/4.6/shorewallrc,
+  -files/4.6/shorewallrc-r1, metadata.xml:
+  Version Bump, #534232, Thanks Thomas D. for the patch; fixes bugs, #530704,
+  #534062
 
   18 Nov 2014; Michael Weber <xmw@gentoo.org>
   -files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch,
diff --git a/net-firewall/shorewall/files/4.6/shorewall-init.initd b/net-firewall/shorewall/files/4.6/shorewall-init.initd
index 26ea0e09d4b1..c2b143fbc7d5 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-init.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall-init.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/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/shorewall/files/4.6/shorewall-init.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
 CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
diff --git a/net-firewall/shorewall/files/4.6/shorewall-init.systemd b/net-firewall/shorewall/files/4.6/shorewall-init.systemd
index e58c7e2375ce..e98565fce8a1 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-init.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall-init.systemd
@@ -12,8 +12,8 @@ Conflicts=iptables.service firewalld.service
 Type=oneshot
 RemainAfterExit=yes
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall-init start
-ExecStop=/usr/sbin/shorewall-init stop
+ExecStart=/sbin/shorewall-init start
+ExecStop=/sbin/shorewall-init stop
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall-lite.initd b/net-firewall/shorewall/files/4.6/shorewall-lite.initd
index 76411682727c..9b3a22076ade 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-lite.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall-lite.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/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/shorewall/files/4.6/shorewall-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall-lite.systemd b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
index 87f994fef7ca..5898ccb86c14 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall-lite
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall.initd b/net-firewall/shorewall/files/4.6/shorewall.initd
index 68211d98bd5b..c663d761b952 100644
--- a/net-firewall/shorewall/files/4.6/shorewall.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/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/shorewall/files/4.6/shorewall.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall, more commonly known as "Shorewall", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall.systemd b/net-firewall/shorewall/files/4.6/shorewall.systemd
index bdb829e6a12a..986c3510454a 100644
--- a/net-firewall/shorewall/files/4.6/shorewall.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall6-lite.initd b/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
index a6e8eed190b5..96ba94fcb5b3 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/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/shorewall/files/4.6/shorewall6-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
index 7c4d306eac57..768a84f2ded1 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall6-lite
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
+ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall6.initd b/net-firewall/shorewall/files/4.6/shorewall6.initd
index 9ca043cf0adf..48aa3cecc7a3 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall6.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/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/shorewall/files/4.6/shorewall6.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall6.systemd b/net-firewall/shorewall/files/4.6/shorewall6.systemd
index bb29c6e5ce0f..6ae4ea589ee8 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall6.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall6
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewallrc b/net-firewall/shorewall/files/4.6/shorewallrc
index a948027eedfd..0eef4147c008 100644
--- a/net-firewall/shorewall/files/4.6/shorewallrc
+++ b/net-firewall/shorewall/files/4.6/shorewallrc
@@ -1,7 +1,7 @@
 #
 # Gentoo Shorewall 4.6 rc file
 #
-BUILD=                                  #Default is to detect the build system
+BUILD=gentoo                            #Default is to detect the build system
 HOST=gentoo                             #Gentoo GNU Linux
 PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
 SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
@@ -14,7 +14,7 @@ INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are i
 INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
 INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
 ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SERVICEDIR=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system      #Directory where .service files are installed (systems running systemd only)
 SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
 SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
 SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
diff --git a/net-firewall/shorewall/files/4.6/shorewallrc-r1 b/net-firewall/shorewall/files/4.6/shorewallrc-r1
deleted file mode 100644
index b3809bb9c242..000000000000
--- a/net-firewall/shorewall/files/4.6/shorewallrc-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.6 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/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=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=${PREFIX}/sbin                  #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system      #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index 67e8813360e3..b05083f3a6ea 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-	<use>
-		<flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
-		<flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
-		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
-		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
-		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
-	</use>
+  <herd>netmon</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>whissi@whissi.de</email>
+    <name>Thomas D. (Whissi)</name>
+  </maintainer>
+  <use>
+    <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
+    <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
+    <flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
+    <flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
+    <flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/net-firewall/shorewall/shorewall-4.6.5.2.ebuild b/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
index 91af74d4a61a..3de3f33e0f0e 100644
--- a/net-firewall/shorewall/shorewall-4.6.5.2.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 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/shorewall/shorewall-4.6.5.2.ebuild,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.5.3.ebuild,v 1.1 2015/01/04 09:49:46 jlec Exp $
 
 EAPI="5"
 
@@ -117,7 +117,6 @@ RDEPEND="
 	!net-firewall/shorewall-lite
 	!net-firewall/shorewall6-lite
 	!net-firewall/shorewall-init
-	!<sys-apps/openrc-0.13
 	!<sys-apps/systemd-214
 "
 
@@ -151,7 +150,7 @@ src_prepare() {
 	# This allows us to use patches from upstream and keeps epatch_user working
 
 	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc-r1 failed"
+	cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
 	eprefixify "${S}"/shorewallrc.gentoo
 
 	# shorewall-core