summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstanze Hausner <constanze@gentoo.org>2013-06-02 10:47:00 +0000
committerConstanze Hausner <constanze@gentoo.org>2013-06-02 10:47:00 +0000
commit0a7559e84a81be35e8585c7e9caee235c3f15c3c (patch)
tree81bb0a37b94d3ba7ab10f776c3559baf8ec29973 /net-firewall/shorewall/files
parentCleanup; Version bump (diff)
downloadgentoo-2-0a7559e84a81be35e8585c7e9caee235c3f15c3c.tar.gz
gentoo-2-0a7559e84a81be35e8585c7e9caee235c3f15c3c.tar.bz2
gentoo-2-0a7559e84a81be35e8585c7e9caee235c3f15c3c.zip
Cleanup; Version bump; Systemd support wrt bug 465950
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)
Diffstat (limited to 'net-firewall/shorewall/files')
-rw-r--r--net-firewall/shorewall/files/all_zone.patch11
-rw-r--r--net-firewall/shorewall/files/shorewall.systemd20
-rw-r--r--net-firewall/shorewall/files/shorewallrc21
3 files changed, 20 insertions, 32 deletions
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.