* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/
@ 2016-05-23 11:33 Ian Delaney
0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2016-05-23 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 8f09666cc8cb33b6f41d5fa75e1b2edcbaf0757a
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 15:54:28 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon May 23 11:32:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f09666c
net-firewall/shorewall: remove trailing whitespaces
found in conf and init files
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1512
Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>
net-firewall/shorewall/files/shorewall-lite.initd-r1 | 2 +-
net-firewall/shorewall/files/shorewall.initd-r1 | 4 ++--
net-firewall/shorewall/files/shorewall6-lite.initd-r1 | 2 +-
net-firewall/shorewall/files/shorewall6.confd-r1 | 8 ++++----
net-firewall/shorewall/files/shorewall6.initd-r1 | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r1 b/net-firewall/shorewall/files/shorewall-lite.initd-r1
index f6dbccd..8857277 100644
--- a/net-firewall/shorewall/files/shorewall-lite.initd-r1
+++ b/net-firewall/shorewall/files/shorewall-lite.initd-r1
@@ -35,7 +35,7 @@ status() {
mark_service_started "${SVCNAME}"
return 0
else
- einfo 'status: stopped'
+ einfo 'status: stopped'
mark_service_stopped "${SVCNAME}"
return 3
fi
diff --git a/net-firewall/shorewall/files/shorewall.initd-r1 b/net-firewall/shorewall/files/shorewall.initd-r1
index 74cadf2..a1ce9ea 100644
--- a/net-firewall/shorewall/files/shorewall.initd-r1
+++ b/net-firewall/shorewall/files/shorewall.initd-r1
@@ -40,7 +40,7 @@ status() {
mark_service_started "${SVCNAME}"
return 0
else
- einfo 'status: stopped'
+ einfo 'status: stopped'
mark_service_stopped "${SVCNAME}"
return 3
fi
@@ -49,7 +49,7 @@ status() {
start() {
ebegin "Starting shorewall"
${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
- eend $?
+ eend $?
}
stop() {
diff --git a/net-firewall/shorewall/files/shorewall6-lite.initd-r1 b/net-firewall/shorewall/files/shorewall6-lite.initd-r1
index 8bca1e1..c47a0b0 100644
--- a/net-firewall/shorewall/files/shorewall6-lite.initd-r1
+++ b/net-firewall/shorewall/files/shorewall6-lite.initd-r1
@@ -35,7 +35,7 @@ status() {
mark_service_started "${SVCNAME}"
return 0
else
- einfo 'status: stopped'
+ einfo 'status: stopped'
mark_service_stopped "${SVCNAME}"
return 3
fi
diff --git a/net-firewall/shorewall/files/shorewall6.confd-r1 b/net-firewall/shorewall/files/shorewall6.confd-r1
index f372685..daef305 100644
--- a/net-firewall/shorewall/files/shorewall6.confd-r1
+++ b/net-firewall/shorewall/files/shorewall6.confd-r1
@@ -1,13 +1,13 @@
# Global start/restart/stop options
-#
+#
OPTIONS="-tvv"
# Start options
-#
+#
STARTOPTIONS=""
# Stop options
-#
+#
STOPOPTIONS=""
# Reload options
@@ -15,5 +15,5 @@ STOPOPTIONS=""
RELOADOPTIONS=""
# Restart options
-#
+#
RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6.initd-r1 b/net-firewall/shorewall/files/shorewall6.initd-r1
index c725a28..dbecf94 100644
--- a/net-firewall/shorewall/files/shorewall6.initd-r1
+++ b/net-firewall/shorewall/files/shorewall6.initd-r1
@@ -40,7 +40,7 @@ status() {
mark_service_started "${SVCNAME}"
return 0
else
- einfo 'status: stopped'
+ einfo 'status: stopped'
mark_service_stopped "${SVCNAME}"
return 3
fi
@@ -49,7 +49,7 @@ status() {
start() {
ebegin "Starting shorewall6"
${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
- eend $?
+ eend $?
}
stop() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/
@ 2016-12-20 14:19 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2016-12-20 14:19 UTC (permalink / raw
To: gentoo-commits
commit: 0dd7636ffc8d8522454176ddfd4d0c3088d15edd
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 14:12:13 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 14:18:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd7636f
net-firewall/shorewall: fix bashisms in init.d script
Package-Manager: Portage-2.3.2, Repoman-2.3.1
net-firewall/shorewall/files/shorewall-lite.initd-r2 | 6 ++++--
net-firewall/shorewall/files/shorewall.initd-r2 | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r2 b/net-firewall/shorewall/files/shorewall-lite.initd-r2
index 689f94b..7777e3b 100644
--- a/net-firewall/shorewall/files/shorewall-lite.initd-r2
+++ b/net-firewall/shorewall/files/shorewall-lite.initd-r2
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-if [[ "${RC_SVCNAME}" == "shorewall6-lite" ]]; then
+if [ "${RC_SVCNAME}" = "shorewall6-lite" ]; then
PRODUCT_NAME="Shorewall6-Lite"
command="/usr/sbin/shorewall6-lite"
else
@@ -51,9 +51,11 @@ reset() {
}
restart() {
+ local _retval
ebegin "Restarting ${RC_SVCNAME}"
${command} status 1>/dev/null
- if [ $? != 0 ] ; then
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
svc_start
else
${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
diff --git a/net-firewall/shorewall/files/shorewall.initd-r2 b/net-firewall/shorewall/files/shorewall.initd-r2
index c23bfb7..fa02b14 100644
--- a/net-firewall/shorewall/files/shorewall.initd-r2
+++ b/net-firewall/shorewall/files/shorewall.initd-r2
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-if [[ "${RC_SVCNAME}" == "shorewall6" ]]; then
+if [ "${RC_SVCNAME}" = "shorewall6" ]; then
PRODUCT_NAME="Shorewall6"
command="/usr/sbin/shorewall6"
else
@@ -68,9 +68,11 @@ reset() {
}
restart() {
+ local _retval
ebegin "Restarting ${RC_SVCNAME}"
${command} status 1>/dev/null
- if [ $? != 0 ] ; then
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
svc_start
else
${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/
@ 2017-11-27 4:39 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2017-11-27 4:39 UTC (permalink / raw
To: gentoo-commits
commit: a1ae7269862547d1620f703142bf47c2e33ba474
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 04:39:00 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 04:39:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ae7269
net-firewall/shorewall: Cleanup old unused file.
Closes: https://bugs.gentoo.org/638128
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../shorewall/files/shorewall6-lite.confd-r1 | 19 ----
.../shorewall/files/shorewall6-lite.initd-r1 | 92 ----------------
net-firewall/shorewall/files/shorewall6.confd-r1 | 19 ----
net-firewall/shorewall/files/shorewall6.initd-r1 | 117 ---------------------
4 files changed, 247 deletions(-)
diff --git a/net-firewall/shorewall/files/shorewall6-lite.confd-r1 b/net-firewall/shorewall/files/shorewall6-lite.confd-r1
deleted file mode 100644
index daef3054274..00000000000
--- a/net-firewall/shorewall/files/shorewall6-lite.confd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Global start/restart/stop options
-#
-OPTIONS="-tvv"
-
-# Start options
-#
-STARTOPTIONS=""
-
-# Stop options
-#
-STOPOPTIONS=""
-
-# Reload options
-#
-RELOADOPTIONS=""
-
-# Restart options
-#
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6-lite.initd-r1 b/net-firewall/shorewall/files/shorewall6-lite.initd-r1
deleted file mode 100644
index 9db79c33451..00000000000
--- a/net-firewall/shorewall/files/shorewall6-lite.initd-r1
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reload reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-command="/usr/sbin/shorewall6-lite"
-
-depend() {
- provide firewall
- after ulogd
-}
-
-status() {
- local _retval
- ${command} status 1>/dev/null
- _retval=$?
- if [ ${_retval} = '0' ]; then
- einfo 'status: started'
- mark_service_started "${SVCNAME}"
- return 0
- else
- einfo 'status: stopped'
- mark_service_stopped "${SVCNAME}"
- return 3
- fi
-}
-
-start() {
- ebegin "Starting shorewall6-lite"
- ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping shorewall6-lite"
- ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
- eend $?
-}
-
-restart() {
- # shorewall comes with its own control script that includes a
- # restart function, so refrain from calling svc_stop/svc_start
- # here. Note that this comment is required to fix bug 55576;
- # runscript.sh greps this script... (09 Jul 2004 agriffis)
-
- ebegin "Restarting shorewall6-lite"
- ${command} status 1>/dev/null
- if [ $? != 0 ] ; then
- svc_start
- else
- ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
- fi
- eend $?
-}
-
-clear() {
- # clear will remove all the rules and bring the system to an unfirewalled
- # state. (21 Nov 2004 eldad)
-
- ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
- ${command} ${OPTIONS} clear 1>/dev/null
- eend $?
-}
-
-reload() {
- ebegin "Reloading shorewall6-lite"
- ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
- eend $?
-}
-
-reset() {
- # reset the packet and byte counters in the firewall
-
- ebegin "Resetting the packet and byte counters in shorewall6-lite"
- ${command} ${OPTIONS} reset 1>/dev/null
- eend $?
-}
diff --git a/net-firewall/shorewall/files/shorewall6.confd-r1 b/net-firewall/shorewall/files/shorewall6.confd-r1
deleted file mode 100644
index daef3054274..00000000000
--- a/net-firewall/shorewall/files/shorewall6.confd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Global start/restart/stop options
-#
-OPTIONS="-tvv"
-
-# Start options
-#
-STARTOPTIONS=""
-
-# Stop options
-#
-STOPOPTIONS=""
-
-# Reload options
-#
-RELOADOPTIONS=""
-
-# Restart options
-#
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6.initd-r1 b/net-firewall/shorewall/files/shorewall6.initd-r1
deleted file mode 100644
index 43a7d1b1f41..00000000000
--- a/net-firewall/shorewall/files/shorewall6.initd-r1
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reload reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-command="/usr/sbin/shorewall6"
-
-depend() {
- provide firewall
- after ulogd
-}
-
-status() {
- local _retval
- ${command} status 1>/dev/null
- _retval=$?
- if [ ${_retval} = '0' ]; then
- einfo 'status: started'
- mark_service_started "${SVCNAME}"
- return 0
- else
- einfo 'status: stopped'
- mark_service_stopped "${SVCNAME}"
- return 3
- fi
-}
-
-start() {
- ebegin "Starting shorewall6"
- ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping shorewall6"
- ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
- eend $?
-}
-
-restart() {
- # shorewall comes with its own control script that includes a
- # restart function, so refrain from calling svc_stop/svc_start
- # here. Note that this comment is required to fix bug 55576;
- # runscript.sh greps this script... (09 Jul 2004 agriffis)
-
- ebegin "Restarting shorewall6"
- ${command} status 1>/dev/null
- if [ $? != 0 ] ; then
- svc_start
- else
- ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
- fi
- eend $?
-}
-
-clear() {
- # clear will remove all the rules and bring the system to an unfirewalled
- # state. (21 Nov 2004 eldad)
-
- ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
- ${command} ${OPTIONS} clear 1>/dev/null
- eend $?
-}
-
-reload() {
- ebegin "Reloading shorewall6"
- ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
- eend $?
-}
-
-reset() {
- # reset the packet and byte counters in the firewall
-
- ebegin "Resetting the packet and byte counters in shorewall6"
- ${command} ${OPTIONS} reset 1>/dev/null
- eend $?
-}
-
-refresh() {
- # refresh the rules involving the broadcast addresses of firewall
- # interfaces, the black list, traffic control rules and
- # ECN control rules
-
- ebegin "Refreshing shorewall6 rules"
- ${command} ${OPTIONS} refresh 1>/dev/null
- eend $?
-}
-
-check() {
- # perform cursory validation of the zones, interfaces, hosts, rules
- # and policy files. CAUTION: does not parse and validate the generated
- # iptables commands.
-
- ebegin "Checking shorewall6 configuration"
- ${command} ${OPTIONS} check 1>/dev/null
- eend $?
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/
@ 2018-04-15 12:43 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2018-04-15 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 0e73b191629ac1e289d3ed10b2bd60fd60e8cfa3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 14 16:08:22 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 12:42:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e73b191
net-firewall/shorewall: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/7996
net-firewall/shorewall/files/shorewallrc-r1 | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/net-firewall/shorewall/files/shorewallrc-r1 b/net-firewall/shorewall/files/shorewallrc-r1
deleted file mode 100644
index 3fc48c39240..00000000000
--- a/net-firewall/shorewall/files/shorewallrc-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Gentoo Shorewall 5.1 rc file
-#
-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.
-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.
-DEFAULT_PAGER=${PAGER} #Pager to use if none specified in shorewall[6].conf
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-15 12:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-23 11:33 [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2016-12-20 14:19 Thomas Deutschmann
2017-11-27 4:39 Thomas Deutschmann
2018-04-15 12:43 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox