jlec 15/01/04 09:49:46
Modified: shorewall-init.systemd shorewall-lite.systemd
shorewall6.initd shorewall.initd shorewall.systemd
shorewall-init.initd shorewall6-lite.systemd
shorewall6-lite.initd shorewall-lite.initd
shorewallrc shorewall6.systemd
Removed: shorewallrc-r1
Log:
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!)
Revision Changes Path
1.2 net-firewall/shorewall/files/4.6/shorewall-init.systemd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.systemd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.systemd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.systemd?r1=1.1&r2=1.2
Index: shorewall-init.systemd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.systemd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-init.systemd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall-init.systemd 4 Jan 2015 09:49:46 -0000 1.2
@@ -12,8 +12,8 @@
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
1.2 net-firewall/shorewall/files/4.6/shorewall-lite.systemd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.systemd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.systemd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.systemd?r1=1.1&r2=1.2
Index: shorewall-lite.systemd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.systemd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-lite.systemd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall-lite.systemd 4 Jan 2015 09:49:46 -0000 1.2
@@ -12,8 +12,8 @@
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
1.2 net-firewall/shorewall/files/4.6/shorewall6.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd?r1=1.1&r2=1.2
Index: shorewall6.initd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall6.initd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall6.initd 4 Jan 2015 09:49:46 -0000 1.2
@@ -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."
1.2 net-firewall/shorewall/files/4.6/shorewall.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd?r1=1.1&r2=1.2
Index: shorewall.initd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall.initd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall.initd 4 Jan 2015 09:49:46 -0000 1.2
@@ -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."
1.2 net-firewall/shorewall/files/4.6/shorewall.systemd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.systemd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.systemd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.systemd?r1=1.1&r2=1.2
Index: shorewall.systemd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.systemd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall.systemd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall.systemd 4 Jan 2015 09:49:46 -0000 1.2
@@ -12,8 +12,8 @@
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
1.2 net-firewall/shorewall/files/4.6/shorewall-init.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd?r1=1.1&r2=1.2
Index: shorewall-init.initd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-init.initd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall-init.initd 4 Jan 2015 09:49:46 -0000 1.2
@@ -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}"
1.2 net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd?r1=1.1&r2=1.2
Index: shorewall6-lite.systemd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall6-lite.systemd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall6-lite.systemd 4 Jan 2015 09:49:46 -0000 1.2
@@ -12,8 +12,8 @@
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
1.2 net-firewall/shorewall/files/4.6/shorewall6-lite.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd?r1=1.1&r2=1.2
Index: shorewall6-lite.initd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall6-lite.initd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall6-lite.initd 4 Jan 2015 09:49:46 -0000 1.2
@@ -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."
1.2 net-firewall/shorewall/files/4.6/shorewall-lite.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd?r1=1.1&r2=1.2
Index: shorewall-lite.initd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-lite.initd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall-lite.initd 4 Jan 2015 09:49:46 -0000 1.2
@@ -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."
1.2 net-firewall/shorewall/files/4.6/shorewallrc
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewallrc?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewallrc?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewallrc?r1=1.1&r2=1.2
Index: shorewallrc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewallrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewallrc 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewallrc 4 Jan 2015 09:49:46 -0000 1.2
@@ -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 @@
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
1.2 net-firewall/shorewall/files/4.6/shorewall6.systemd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.systemd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.systemd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.systemd?r1=1.1&r2=1.2
Index: shorewall6.systemd
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.systemd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall6.systemd 18 Nov 2014 12:54:56 -0000 1.1
+++ shorewall6.systemd 4 Jan 2015 09:49:46 -0000 1.2
@@ -12,8 +12,8 @@
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
