[gentoo-commits] gentoo-x86 commit in net-firewall/shorewall/files/4.5.19: shorewall.systemd shorewall.conf-SUBSYSLOCK.patch shorewall.confd shorewallrc shorewall.initd

[Constanze Hausner (constanze)]

constanze    13/08/28 16:45:58

  Added:                shorewall.systemd shorewall.conf-SUBSYSLOCK.patch
                        shorewall.confd shorewallrc shorewall.initd
  Log:
  Version bump; Add new files/ structure
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)

Revision  Changes    Path
1.1                  net-firewall/shorewall/files/4.5.19/shorewall.systemd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.systemd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.systemd?rev=1.1&content-type=text/plain

Index: shorewall.systemd
===================================================================
#
#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
#
[Unit]
Description=Shorewall IPv4 firewall
Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
After=network.target

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/conf.d/shorewall
ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS

[Install]
WantedBy=multi-user.target



1.1                  net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch?rev=1.1&content-type=text/plain

Index: shorewall.conf-SUBSYSLOCK.patch
===================================================================
--- configfiles/shorewall.conf	2013-06-24 22:07:38.000000000 +0200
+++ configfiles/shorewall.conf.new	2013-07-01 15:50:54.747711444 +0200
@@ -85,7 +85,7 @@
 
 SHOREWALL_SHELL=/bin/sh
 
-SUBSYSLOCK=/var/lock/subsys/shorewall
+SUBSYSLOCK=/run/lock/shorewall
 
 TC=
 
--- configfiles/shorewall.conf.annotated	2013-06-27 20:32:22.000000000 +0200
+++ configfiles/shorewall.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
@@ -444,7 +444,7 @@
 #     or specified as a null value, /bin/sh is assumed. Using a light-weight
 #     shell such as ash or dash can significantly improve performance.
 # 
-SUBSYSLOCK=/var/lock/subsys/shorewall
+SUBSYSLOCK=/run/lock/shorewall
 #
 # SUBSYSLOCK=[pathname]
 # 



1.1                  net-firewall/shorewall/files/4.5.19/shorewall.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.confd?rev=1.1&content-type=text/plain

Index: shorewall.confd
===================================================================
# Global start/restart/stop options
# 
OPTIONS=""

# Start options
# 
STARTOPTIONS=""

# Stop options
# 
STOPOPTIONS=""

# Restart options
# 
RESTARTOPTIONS=""



1.1                  net-firewall/shorewall/files/4.5.19/shorewallrc

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewallrc?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewallrc?rev=1.1&content-type=text/plain

Index: shorewallrc
===================================================================
#
# Gentoo Shorewall 4.5 rc file
#
BUILD=                                  #Default is to detect the build system
HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
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.



1.1                  net-firewall/shorewall/files/4.5.19/shorewall.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.initd?rev=1.1&content-type=text/plain

Index: shorewall.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.initd,v 1.1 2013/08/28 16:45:57 constanze Exp $

description='The Shoreline Firewall, more commonly known as "Shorewall", is'
description="${description} a high-level tool for configuring Netfilter."

extra_commands="check clear"
extra_started_commands="refresh 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} Shorewall. 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_reset="All the packet and byte counters in the firewall are reset."

depend() {
	need net
	provide firewall
	after ulogd
}

status() {
	local _retval
	/sbin/shorewall 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 shorewall"
	/sbin/shorewall ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
	eend $? 
}

stop() {
	ebegin "Stopping shorewall"
	/sbin/shorewall ${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 shorewall"
	/sbin/shorewall status 1>/dev/null
	if [ $? != 0 ] ; then
		svc_start
	else
		/sbin/shorewall ${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"
	/sbin/shorewall ${OPTIONS} clear 1>/dev/null
	eend $?
}

reset() {
	# reset the packet and byte counters in the firewall

	ebegin "Resetting the packet and byte counters in shorewall"
	/sbin/shorewall ${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 shorewall rules"
	/sbin/shorewall ${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 shorewall configuration"
	/sbin/shorewall ${OPTIONS} check 1>/dev/null
	eend $?
}