diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/changelog.txt shorewall-5.0.11/changelog.txt
--- shorewall-5.0.10/changelog.txt 2016-06-30 17:54:28.416050830 -0700
+++ shorewall-5.0.11/changelog.txt 2016-08-06 07:57:47.021242844 -0700
@@ -1,3 +1,29 @@
+Changes in 5.0.11 Beta 2
+
+1) Update release documents
+
+2) Default DSCP rules to the POSTROUTING chain.
+
+3) Correct 'trace' handing of in-rule comments.
+
+4) Correct handling of a provider interface that matches a wildcard.
+
+5) Re-add a handle to flow classifiers.
+
+Changes in 5.0.11 Beta 1
+
+1) Update release documents
+
+2) Allow 'comment' in alternate input.
+
+Changes in 5.0.10.1
+
+1) Update release documents
+
+2) Update Debian SysV init scripts (Roberto Sánchez).
+
+3) Implement LOGFILE=systemd (Scott Shumate).
+
Changes in 5.0.10
1) Update release documents
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/configfiles/mangle.annotated shorewall-5.0.11/configfiles/mangle.annotated
--- shorewall-5.0.10/configfiles/mangle.annotated 2016-06-30 17:54:56.428034830 -0700
+++ shorewall-5.0.11/configfiles/mangle.annotated 2016-08-06 07:58:20.753016407 -0700
@@ -221,7 +221,8 @@
# EF => 0x2e
#
# To indicate more than one class, add their hex values together and
-# specify the result.
+# specify the result. By default, DSCP rules are placed in the
+# POSTROUTING chain.
#
# ECN
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/configfiles/shorewall.conf.annotated shorewall-5.0.11/configfiles/shorewall.conf.annotated
--- shorewall-5.0.10/configfiles/shorewall.conf.annotated 2016-06-30 17:54:59.791394830 -0700
+++ shorewall-5.0.11/configfiles/shorewall.conf.annotated 2016-08-06 07:58:24.768989449 -0700
@@ -200,13 +200,14 @@
#
LOGFILE=/var/log/messages
#
-# LOGFILE=[pathname]
+# LOGFILE=[pathname|systemd]
#
# This parameter tells the /sbin/shorewall program where to look for
# Shorewall messages when processing the dump, logwatch, show log, and hits
# commands. If not assigned or if assigned an empty value, /var/log/messages
# is assumed. For further information, see http://www.shorewall.net/
-# shorewall_logging.html.
+# shorewall_logging.html. Beginning with Shorewall 5.0.10.1, you may specify
+# systemd to use journelctl -r to read the log.
#
LOGFORMAT="Shorewall:%s:%s:"
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/configure shorewall-5.0.11/configure
--- shorewall-5.0.10/configure 2016-06-30 17:54:28.416050830 -0700
+++ shorewall-5.0.11/configure 2016-08-06 07:57:47.021242844 -0700
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=5.0.10
+VERSION=5.0.11
case "$BASH_VERSION" in
[4-9].*)
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/configure.pl shorewall-5.0.11/configure.pl
--- shorewall-5.0.10/configure.pl 2016-06-30 17:54:28.416050830 -0700
+++ shorewall-5.0.11/configure.pl 2016-08-06 07:57:47.021242844 -0700
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '5.0.10'
+ VERSION => '5.0.11'
};
my %params;
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/init.debian.sh shorewall-5.0.11/init.debian.sh
--- shorewall-5.0.10/init.debian.sh 2016-06-30 17:49:43.000000000 -0700
+++ shorewall-5.0.11/init.debian.sh 2016-08-04 11:03:36.000000000 -0700
@@ -4,7 +4,7 @@
# Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs
# Default-Start: S
-# Default-Stop: 0 6
+# Default-Stop: 0 1 6
# Short-Description: Configure the firewall at boot time
# Description: Configure the firewall according to the rules specified in
# /etc/shorewall
@@ -97,10 +97,11 @@
# stop the firewall
shorewall_stop () {
- echo -n "Stopping \"Shorewall firewall\": "
if [ "$SAFESTOP" = 1 ]; then
+ echo -n "Stopping \"Shorewall firewall\": "
$SRWL $SRWL_OPTS stop >> $INITLOG 2>&1 && echo "done." || echo_notdone
else
+ echo -n "Clearing all \"Shorewall firewall\" rules: "
$SRWL $SRWL_OPTS clear >> $INITLOG 2>&1 && echo "done." || echo_notdone
fi
return 0
@@ -145,7 +146,7 @@
restart)
shorewall_restart
;;
- force0reload|reload)
+ force-reload|reload)
shorewall_reload
;;
status)
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/install.sh shorewall-5.0.11/install.sh
--- shorewall-5.0.10/install.sh 2016-06-30 17:54:28.343978829 -0700
+++ shorewall-5.0.11/install.sh 2016-08-06 07:57:46.997243004 -0700
@@ -22,7 +22,7 @@
# along with this program; if not, see .
#
-VERSION=5.0.10
+VERSION=5.0.11
#
# Change to the directory containing this script
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall.8 shorewall-5.0.11/manpages/shorewall.8
--- shorewall-5.0.10/manpages/shorewall.8 2016-06-30 17:54:52.676286830 -0700
+++ shorewall-5.0.11/manpages/shorewall.8 2016-08-06 07:58:16.085047743 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL" "8" "06/30/2016" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL" "8" "08/06/2016" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-accounting.5 shorewall-5.0.11/manpages/shorewall-accounting.5
--- shorewall-5.0.10/manpages/shorewall-accounting.5 2016-06-30 17:54:30.386018829 -0700
+++ shorewall-5.0.11/manpages/shorewall-accounting.5 2016-08-06 07:57:49.225228048 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-accounting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ACCOUNTIN" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ACCOUNTIN" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-actions.5 shorewall-5.0.11/manpages/shorewall-actions.5
--- shorewall-5.0.10/manpages/shorewall-actions.5 2016-06-30 17:54:30.890522829 -0700
+++ shorewall-5.0.11/manpages/shorewall-actions.5 2016-08-06 07:57:49.877223672 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-actions
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ACTIONS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ACTIONS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-arprules.5 shorewall-5.0.11/manpages/shorewall-arprules.5
--- shorewall-5.0.10/manpages/shorewall-arprules.5 2016-06-30 17:54:31.379010829 -0700
+++ shorewall-5.0.11/manpages/shorewall-arprules.5 2016-08-06 07:57:50.565219053 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-arprules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ARPRULES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ARPRULES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-blrules.5 shorewall-5.0.11/manpages/shorewall-blrules.5
--- shorewall-5.0.10/manpages/shorewall-blrules.5 2016-06-30 17:54:31.983614829 -0700
+++ shorewall-5.0.11/manpages/shorewall-blrules.5 2016-08-06 07:57:51.229214596 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-blrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-BLRULES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-BLRULES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall.conf.5 shorewall-5.0.11/manpages/shorewall.conf.5
--- shorewall-5.0.10/manpages/shorewall.conf.5 2016-06-30 17:54:34.450078830 -0700
+++ shorewall-5.0.11/manpages/shorewall.conf.5 2016-08-06 07:57:54.037195746 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\&.CONF" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\&.CONF" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -1152,7 +1152,7 @@
.RE
.RE
.PP
-\fBLOGFILE=\fR[\fIpathname\fR]
+\fBLOGFILE=\fR[\fIpathname\fR|\fBsystemd\fR]
.RS 4
This parameter tells the /sbin/shorewall program where to look for Shorewall messages when processing the
\fBdump\fR,
@@ -1160,7 +1160,11 @@
\fBshow log\fR, and
\fBhits\fR
commands\&. If not assigned or if assigned an empty value, /var/log/messages is assumed\&. For further information, see
-\m[blue]\fBhttp://www\&.shorewall\&.net/shorewall_logging\&.html\fR\m[]\&\s-2\u[22]\d\s+2\&.
+\m[blue]\fBhttp://www\&.shorewall\&.net/shorewall_logging\&.html\fR\m[]\&\s-2\u[22]\d\s+2\&. Beginning with Shorewall 5\&.0\&.10\&.1, you may specify
+\fBsystemd\fR
+to use
+\fBjournelctl \-r\fR
+to read the log\&.
.RE
.PP
\fBLOGFORMAT=\fR[\fB"\fR\fIformattemplate\fR\fB"\fR]
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-conntrack.5 shorewall-5.0.11/manpages/shorewall-conntrack.5
--- shorewall-5.0.10/manpages/shorewall-conntrack.5 2016-06-30 17:54:35.058686830 -0700
+++ shorewall-5.0.11/manpages/shorewall-conntrack.5 2016-08-06 07:57:54.777190779 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall6-conntrack
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL6\-CONNTRAC" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL6\-CONNTRAC" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-ecn.5 shorewall-5.0.11/manpages/shorewall-ecn.5
--- shorewall-5.0.10/manpages/shorewall-ecn.5 2016-06-30 17:54:35.559186829 -0700
+++ shorewall-5.0.11/manpages/shorewall-ecn.5 2016-08-06 07:57:55.393186643 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-ecn
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ECN" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ECN" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-exclusion.5 shorewall-5.0.11/manpages/shorewall-exclusion.5
--- shorewall-5.0.10/manpages/shorewall-exclusion.5 2016-06-30 17:54:36.055682830 -0700
+++ shorewall-5.0.11/manpages/shorewall-exclusion.5 2016-08-06 07:57:56.013182482 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-exclusion
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-EXCLUSION" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-EXCLUSION" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-hosts.5 shorewall-5.0.11/manpages/shorewall-hosts.5
--- shorewall-5.0.10/manpages/shorewall-hosts.5 2016-06-30 17:54:36.564190829 -0700
+++ shorewall-5.0.11/manpages/shorewall-hosts.5 2016-08-06 07:57:56.713177783 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-hosts
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-HOSTS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-HOSTS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-init.8 shorewall-5.0.11/manpages/shorewall-init.8
--- shorewall-5.0.10/manpages/shorewall-init.8 2016-06-30 17:54:37.012638830 -0700
+++ shorewall-5.0.11/manpages/shorewall-init.8 2016-08-06 07:57:57.269174050 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-init
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL\-INIT" "8" "06/30/2016" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL\-INIT" "8" "08/06/2016" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-interfaces.5 shorewall-5.0.11/manpages/shorewall-interfaces.5
--- shorewall-5.0.10/manpages/shorewall-interfaces.5 2016-06-30 17:54:37.765390830 -0700
+++ shorewall-5.0.11/manpages/shorewall-interfaces.5 2016-08-06 07:57:58.169168009 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-interfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-INTERFACE" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-INTERFACE" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-ipsets.5 shorewall-5.0.11/manpages/shorewall-ipsets.5
--- shorewall-5.0.10/manpages/shorewall-ipsets.5 2016-06-30 17:54:38.261886830 -0700
+++ shorewall-5.0.11/manpages/shorewall-ipsets.5 2016-08-06 07:57:58.873163283 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-ipsets
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-IPSETS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-IPSETS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-maclist.5 shorewall-5.0.11/manpages/shorewall-maclist.5
--- shorewall-5.0.10/manpages/shorewall-maclist.5 2016-06-30 17:54:38.742366830 -0700
+++ shorewall-5.0.11/manpages/shorewall-maclist.5 2016-08-06 07:57:59.469159282 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-maclist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MACLIST" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MACLIST" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-mangle.5 shorewall-5.0.11/manpages/shorewall-mangle.5
--- shorewall-5.0.10/manpages/shorewall-mangle.5 2016-06-30 17:54:39.523146829 -0700
+++ shorewall-5.0.11/manpages/shorewall-mangle.5 2016-08-06 07:58:00.441152757 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-mangle
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MANGLE" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MANGLE" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -316,7 +316,7 @@
.RE
.\}
.sp
-To indicate more than one class, add their hex values together and specify the result\&.
+To indicate more than one class, add their hex values together and specify the result\&. By default, DSCP rules are placed in the POSTROUTING chain\&.
.RE
.PP
\fBECN\fR
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-masq.5 shorewall-5.0.11/manpages/shorewall-masq.5
--- shorewall-5.0.10/manpages/shorewall-masq.5 2016-06-30 17:54:40.103726830 -0700
+++ shorewall-5.0.11/manpages/shorewall-masq.5 2016-08-06 07:58:01.233147440 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-masq
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MASQ" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MASQ" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-modules.5 shorewall-5.0.11/manpages/shorewall-modules.5
--- shorewall-5.0.10/manpages/shorewall-modules.5 2016-06-30 17:54:40.596218830 -0700
+++ shorewall-5.0.11/manpages/shorewall-modules.5 2016-08-06 07:58:01.917142850 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-modules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MODULES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MODULES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-nat.5 shorewall-5.0.11/manpages/shorewall-nat.5
--- shorewall-5.0.10/manpages/shorewall-nat.5 2016-06-30 17:54:41.108730829 -0700
+++ shorewall-5.0.11/manpages/shorewall-nat.5 2016-08-06 07:58:02.589138338 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-nat
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NAT" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NAT" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-nesting.5 shorewall-5.0.11/manpages/shorewall-nesting.5
--- shorewall-5.0.10/manpages/shorewall-nesting.5 2016-06-30 17:54:41.625246830 -0700
+++ shorewall-5.0.11/manpages/shorewall-nesting.5 2016-08-06 07:58:03.181134364 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-nesting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NESTING" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NESTING" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-netmap.5 shorewall-5.0.11/manpages/shorewall-netmap.5
--- shorewall-5.0.10/manpages/shorewall-netmap.5 2016-06-30 17:54:42.121742829 -0700
+++ shorewall-5.0.11/manpages/shorewall-netmap.5 2016-08-06 07:58:03.765130443 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-netmap
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NETMAP" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NETMAP" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-params.5 shorewall-5.0.11/manpages/shorewall-params.5
--- shorewall-5.0.10/manpages/shorewall-params.5 2016-06-30 17:54:42.598218830 -0700
+++ shorewall-5.0.11/manpages/shorewall-params.5 2016-08-06 07:58:04.333126632 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-params
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PARAMS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PARAMS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-policy.5 shorewall-5.0.11/manpages/shorewall-policy.5
--- shorewall-5.0.10/manpages/shorewall-policy.5 2016-06-30 17:54:43.126746829 -0700
+++ shorewall-5.0.11/manpages/shorewall-policy.5 2016-08-06 07:58:04.965122388 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-policy
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-POLICY" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-POLICY" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-providers.5 shorewall-5.0.11/manpages/shorewall-providers.5
--- shorewall-5.0.10/manpages/shorewall-providers.5 2016-06-30 17:54:43.663282829 -0700
+++ shorewall-5.0.11/manpages/shorewall-providers.5 2016-08-06 07:58:05.617118012 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-providers
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PROVIDERS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PROVIDERS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-proxyarp.5 shorewall-5.0.11/manpages/shorewall-proxyarp.5
--- shorewall-5.0.10/manpages/shorewall-proxyarp.5 2016-06-30 17:54:44.151770830 -0700
+++ shorewall-5.0.11/manpages/shorewall-proxyarp.5 2016-08-06 07:58:06.229113903 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-proxyarp
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PROXYARP" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PROXYARP" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-routes.5 shorewall-5.0.11/manpages/shorewall-routes.5
--- shorewall-5.0.10/manpages/shorewall-routes.5 2016-06-30 17:54:44.636254829 -0700
+++ shorewall-5.0.11/manpages/shorewall-routes.5 2016-08-06 07:58:06.789110144 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-routes
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ROUTES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ROUTES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-rtrules.5 shorewall-5.0.11/manpages/shorewall-rtrules.5
--- shorewall-5.0.10/manpages/shorewall-rtrules.5 2016-06-30 17:54:45.132750830 -0700
+++ shorewall-5.0.11/manpages/shorewall-rtrules.5 2016-08-06 07:58:07.369106251 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-rtrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-RTRULES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-RTRULES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-rules.5 shorewall-5.0.11/manpages/shorewall-rules.5
--- shorewall-5.0.10/manpages/shorewall-rules.5 2016-06-30 17:54:46.470086829 -0700
+++ shorewall-5.0.11/manpages/shorewall-rules.5 2016-08-06 07:58:08.881096101 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-rules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-RULES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-RULES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-secmarks.5 shorewall-5.0.11/manpages/shorewall-secmarks.5
--- shorewall-5.0.10/manpages/shorewall-secmarks.5 2016-06-30 17:54:47.006622829 -0700
+++ shorewall-5.0.11/manpages/shorewall-secmarks.5 2016-08-06 07:58:09.473092127 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-secmarks
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-SECMARKS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-SECMARKS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-stoppedrules.5 shorewall-5.0.11/manpages/shorewall-stoppedrules.5
--- shorewall-5.0.10/manpages/shorewall-stoppedrules.5 2016-06-30 17:54:47.503118829 -0700
+++ shorewall-5.0.11/manpages/shorewall-stoppedrules.5 2016-08-06 07:58:10.101087911 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-stoppedrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-STOPPEDRU" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-STOPPEDRU" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tcclasses.5 shorewall-5.0.11/manpages/shorewall-tcclasses.5
--- shorewall-5.0.10/manpages/shorewall-tcclasses.5 2016-06-30 17:54:48.067682829 -0700
+++ shorewall-5.0.11/manpages/shorewall-tcclasses.5 2016-08-06 07:58:10.749083561 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcclasses
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCCLASSES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCCLASSES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tcdevices.5 shorewall-5.0.11/manpages/shorewall-tcdevices.5
--- shorewall-5.0.10/manpages/shorewall-tcdevices.5 2016-06-30 17:54:48.584198829 -0700
+++ shorewall-5.0.11/manpages/shorewall-tcdevices.5 2016-08-06 07:58:11.341079588 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcdevices
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCDEVICES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCDEVICES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tcfilters.5 shorewall-5.0.11/manpages/shorewall-tcfilters.5
--- shorewall-5.0.10/manpages/shorewall-tcfilters.5 2016-06-30 17:54:49.112726829 -0700
+++ shorewall-5.0.11/manpages/shorewall-tcfilters.5 2016-08-06 07:58:11.965075399 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcfilters
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCFILTERS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCFILTERS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tcinterfaces.5 shorewall-5.0.11/manpages/shorewall-tcinterfaces.5
--- shorewall-5.0.10/manpages/shorewall-tcinterfaces.5 2016-06-30 17:54:49.609222830 -0700
+++ shorewall-5.0.11/manpages/shorewall-tcinterfaces.5 2016-08-06 07:58:12.537071559 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcinterfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCINTERFA" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCINTERFA" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tcpri.5 shorewall-5.0.11/manpages/shorewall-tcpri.5
--- shorewall-5.0.10/manpages/shorewall-tcpri.5 2016-06-30 17:54:50.133746830 -0700
+++ shorewall-5.0.11/manpages/shorewall-tcpri.5 2016-08-06 07:58:13.145067478 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcpri
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCPRI" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCPRI" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-tunnels.5 shorewall-5.0.11/manpages/shorewall-tunnels.5
--- shorewall-5.0.10/manpages/shorewall-tunnels.5 2016-06-30 17:54:50.646258829 -0700
+++ shorewall-5.0.11/manpages/shorewall-tunnels.5 2016-08-06 07:58:13.733063530 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-tunnels
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TUNNELS" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TUNNELS" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-vardir.5 shorewall-5.0.11/manpages/shorewall-vardir.5
--- shorewall-5.0.10/manpages/shorewall-vardir.5 2016-06-30 17:54:51.126738830 -0700
+++ shorewall-5.0.11/manpages/shorewall-vardir.5 2016-08-06 07:58:14.293059771 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-vardir
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-VARDIR" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-VARDIR" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/manpages/shorewall-zones.5 shorewall-5.0.11/manpages/shorewall-zones.5
--- shorewall-5.0.10/manpages/shorewall-zones.5 2016-06-30 17:54:53.260870829 -0700
+++ shorewall-5.0.11/manpages/shorewall-zones.5 2016-08-06 07:58:16.761043205 -0700
@@ -2,12 +2,12 @@
.\" Title: shorewall-zones
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 06/30/2016
+.\" Date: 08/06/2016
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ZONES" "5" "06/30/2016" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ZONES" "5" "08/06/2016" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Chains.pm shorewall-5.0.11/Perl/Shorewall/Chains.pm
--- shorewall-5.0.10/Perl/Shorewall/Chains.pm 2016-06-30 17:54:28.472106830 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Chains.pm 2016-08-06 07:57:47.073242494 -0700
@@ -296,7 +296,7 @@
Exporter::export_ok_tags('internal');
-our $VERSION = '5.0_10';
+our $VERSION = '5.0_11';
#
# Chain Table
@@ -1337,7 +1337,14 @@
push @{$chainref->{rules}}, $ruleref;
$chainref->{referenced} = 1;
$chainref->{optflags} |= RETURNS_DONT_MOVE if ( $ruleref->{target} || '' ) eq 'RETURN';
- trace( $chainref, 'A', @{$chainref->{rules}}, "-A $chainref->{name} $_[1] $ruleref->{comment}" ) if $debug;
+
+ if ( $debug ) {
+ if ( $ruleref->{comment} ) {
+ trace( $chainref, 'A', @{$chainref->{rules}}, "-A $chainref->{name} $_[1] -m comment --comment \"$ruleref->{comment}\"" );
+ } else {
+ trace( $chainref, 'A', @{$chainref->{rules}}, "-A $chainref->{name} $_[1]" );
+ }
+ }
$chainref->{complete} = 1 if $complete;
@@ -4012,7 +4019,7 @@
my $docheck;
my $duplicate = 0;
- if ( $baseref->{mode} == CAT_MODE ) {
+ if ( $baseref->{mode} == CAT_MODE && $baseref->{target} ) {
my $ports1;
my @keys1 = sort( grep ! $skip{$_}, keys( %$baseref ) );
my $rulenum = @_;
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Config.pm shorewall-5.0.11/Perl/Shorewall/Config.pm
--- shorewall-5.0.10/Perl/Shorewall/Config.pm 2016-06-30 17:54:28.512146830 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Config.pm 2016-08-06 07:57:47.089242387 -0700
@@ -241,7 +241,7 @@
Exporter::export_ok_tags('internal');
-our $VERSION = '5.0_10';
+our $VERSION = '5.0_11';
#
# describe the current command, it's present progressive, and it's completion.
@@ -577,6 +577,7 @@
our $comment; # Current COMMENT
our $comments_allowed; # True if [?]COMMENT is allowed in the current file
our $nocomment; # When true, ignore [?]COMMENT in the current file
+our $sr_comment; # When true, $comment should only be applied to the current rule
our $warningcount; # Used to suppress duplicate warnings about missing COMMENT support
our $checkinline; # The -i option to check/compile/etc.
our $directive_callback; # Function to call in compiler_directive
@@ -731,6 +732,7 @@
# Contents of last COMMENT line.
#
$comment = '';
+ $sr_comment = '';
$warningcount = 0;
#
# Misc Globals
@@ -742,7 +744,7 @@
TC_SCRIPT => '',
EXPORT => 0,
KLUDGEFREE => '',
- VERSION => "5.0.10",
+ VERSION => "5.0.11",
CAPVERSION => 50004 ,
BLACKLIST_LOG_TAG => '',
RELATED_LOG_TAG => '',
@@ -2157,6 +2159,47 @@
}
#
+# This version spits a list on white-space with optional leading comma. It prevents double-quoted
+# strings from being split.
+#
+sub split_list4( $ ) {
+ my ($list ) = @_;
+ my @list1 = split( /,?\s+/, $list );
+ my @list2;
+ my $element = '';
+ my $opencount = 0;
+
+ return @list1 unless $list =~ /"/;
+
+ @list1 = split( /(,?\s+)/, $list );
+
+ for ( my $i = 0; $i < @list1; $i += 2 ) {
+ my $e = $list1[$i];
+
+ if ( $e =~ /[^\\]"/ ) {
+ if ( $e =~ /[^\\]".*[^\\]"/ ) {
+ fatal_error 'Unescaped embedded quote (' . join( $list1[$i - 1], $element, $e ) . ')' if $element ne '';
+ push @list2, $e;
+ } elsif ( $element ne '' ) {
+ fatal_error 'Quoting Error (' . join( $list1[$i - 1], $element, $e ) . ')' unless $e =~ /"$/;
+ push @list2, join( $list1[$i - 1], $element, $e );
+ $element = '';
+ } else {
+ $element = $e;
+ }
+ } elsif ( $element ne '' ) {
+ $element = join( $list1[$i - 1], $element, $e );
+ } else {
+ push @list2, $e;
+ }
+ }
+
+ fatal_error "Mismatched_quotes ($list)" if $element ne '';
+
+ @list2;
+}
+
+#
# Splits the columns of a config file record
#
sub split_columns( $ ) {
@@ -2225,6 +2268,8 @@
defined $val && $val ne '' && $val ne '-';
}
+sub clear_comment();
+
#
# Pre-process a line from a configuration file.
@@ -2248,6 +2293,8 @@
}
$inline_matches = '';
+
+ clear_comment if $sr_comment;
#
# First, see if there are double semicolons on the line; what follows will be raw iptables input
#
@@ -2354,20 +2401,39 @@
$pairs =~ s/^\s*//;
$pairs =~ s/\s*$//;
- my @pairs = split( /,?\s+/, $pairs );
+ my @pairs = split_list4( $pairs );
for ( @pairs ) {
fatal_error "Invalid column/value pair ($_)" unless /^(\w+)(?:=>?|:)(.+)$/;
my ( $column, $value ) = ( lc( $1 ), $2 );
+
+ if ( $value =~ /"$/ ) {
+ fatal_error "Invalid value ( $value )" unless $value =~ /^"(.*)"$/;
+ $value = $1;
+ }
+
+ if ( $column eq 'comment' ) {
+ if ( $comments_allowed ) {
+ if ( have_capability( 'COMMENTS' ) ) {
+ $comment = $value;
+ $sr_comment = 1;
+ } else {
+ warning_message '"comment" ignored -- requires comment support in iptables/Netfilter' unless $warningcount++;
+ }
+ } else {
+ fatal_error '"comment" is not allowed in this file';
+ }
+ } else {
fatal_error "Unknown column ($1)" unless exists $columnsref->{$column};
$column = $columnsref->{$column};
fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;
$value = $1 if $value =~ /^"([^"]+)"$/;
- fatal_error "Column values may not contain embedded double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
+ $value =~ s/\\"/"/g;
fatal_error "Non-ASCII gunk in the value of the $column column" if $columns =~ /[^\s[:print:]]/;
$line[$column] = $value;
}
}
+ }
@line;
}
@@ -2395,6 +2461,7 @@
sub clear_comment() {
$comment = '';
$nocomment = 0;
+ $sr_comment = '';
}
#
@@ -2490,7 +2557,8 @@
$max_format,
$comment,
$nocomment,
- $section_function ];
+ $section_function,
+ $sr_comment ];
}
#
@@ -2514,7 +2582,8 @@
$max_format,
$comment,
$nocomment,
- $section_function ) = @$arrayref;
+ $section_function,
+ $sr_comment ) = @$arrayref;
} else {
$currentfile = undef;
$currentlinenumber = 'EOF';
@@ -2883,6 +2952,7 @@
if ( have_capability( 'COMMENTS' ) ) {
( $comment = $line ) =~ s/^\s*\?COMMENT\s*//;
$comment =~ s/\s*$//;
+ $sr_comment = '';
} else {
directive_warning( 'Yes', "COMMENTs ignored -- require comment support in iptables/Netfilter" , $filename, $linenumber ) unless $warningcount++;
}
@@ -3236,6 +3306,7 @@
push @openstack, \@a;
@includestack = ();
$currentfile = undef;
+ $sr_comment = '';
open_file( $file , $max, $comments_allowed || $ca, $nc , $cf );
}
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Providers.pm shorewall-5.0.11/Perl/Shorewall/Providers.pm
--- shorewall-5.0.10/Perl/Shorewall/Providers.pm 2016-06-30 17:54:28.528162829 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Providers.pm 2016-08-06 07:57:47.109242252 -0700
@@ -686,6 +686,7 @@
interface => $interface ,
physical => $physical ,
optional => $optional ,
+ wildcard => $interfaceref->{wildcard} || 0,
gateway => $gateway ,
gatewaycase => $gatewaycase ,
shared => $shared ,
@@ -2113,9 +2114,31 @@
#
sub handle_optional_interfaces( $ ) {
- my ( $interfaces, $wildcards ) = find_interfaces_by_option1 'optional';
+ my @interfaces;
+ my $wildcards;
- if ( @$interfaces ) {
+ #
+ # First do the provider interfacess. Those that are real providers will never have wildcard physical
+ # names but they might derive from wildcard interface entries. Optional interfaces which do not have
+ # wildcard physical names are also included in the providers table.
+ #
+ for my $providerref ( grep $_->{optional} , sort { $a->{number} <=> $b->{number} } values %providers ) {
+ push @interfaces, $providerref->{interface};
+ $wildcards ||= $providerref->{wildcard};
+ }
+
+ #
+ # Now do the optional wild interfaces
+ #
+ for my $interface ( grep interface_is_optional($_) && ! $provider_interfaces{$_}, all_real_interfaces ) {
+ push@interfaces, $interface;
+ unless ( $wildcards ) {
+ my $interfaceref = find_interface($interface);
+ $wildcards = 1 if $interfaceref->{wildcard};
+ }
+ }
+
+ if ( @interfaces ) {
my $require = $config{REQUIRE_INTERFACE};
my $gencase = shift;
@@ -2126,7 +2149,7 @@
#
# Clear the '_IS_USABLE' variables
#
- emit( join( '_', 'SW', uc var_base( get_physical( $_ ) ) , 'IS_USABLE=' ) ) for @$interfaces;
+ emit( join( '_', 'SW', uc var_base( get_physical( $_ ) ) , 'IS_USABLE=' ) ) for @interfaces;
if ( $wildcards ) {
#
@@ -2143,11 +2166,13 @@
emit '';
}
- for my $interface ( grep $provider_interfaces{$_}, @$interfaces ) {
- my $provider = $provider_interfaces{$interface};
+ for my $interface ( @interfaces ) {
+ if ( my $provider = $provider_interfaces{ $interface } ) {
my $physical = get_physical $interface;
my $base = uc var_base( $physical );
my $providerref = $providers{$provider};
+ my $interfaceref = known_interface( $interface );
+ my $wildbase = uc $interfaceref->{base};
emit( "$physical)" ), push_indent if $wildcards;
@@ -2172,17 +2197,16 @@
emit( ' HAVE_INTERFACE=Yes' ) if $require;
- emit( " SW_${base}_IS_USABLE=Yes" ,
- 'fi' );
+ emit( " SW_${base}_IS_USABLE=Yes" );
+ emit( " SW_${wildbase}_IS_USABLE=Yes" ) if $interfaceref->{wildcard};
+ emit( 'fi' );
pop_indent;
emit( "fi\n" );
emit( ';;' ), pop_indent if $wildcards;
- }
-
- for my $interface ( grep ! $provider_interfaces{$_}, @$interfaces ) {
+ } else {
my $physical = get_physical $interface;
my $base = uc var_base( $physical );
my $case = $physical;
@@ -2213,6 +2237,7 @@
pop_indent;
}
}
+ }
if ( $wildcards ) {
emit( '*)' ,
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Rules.pm shorewall-5.0.11/Perl/Shorewall/Rules.pm
--- shorewall-5.0.10/Perl/Shorewall/Rules.pm 2016-06-30 17:54:28.540174830 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Rules.pm 2016-08-06 07:57:47.125242146 -0700
@@ -77,7 +77,7 @@
Exporter::export_ok_tags('Traffic');
-our $VERSION = '5.0_10';
+our $VERSION = '5.0_11';
#
# Globals are documented in the initialize() function
#
@@ -4299,7 +4299,7 @@
},
DSCP => {
- defaultchain => 0,
+ defaultchain => POSTROUTING,
allowedchains => PREROUTING | FORWARD | OUTPUT | POSTROUTING,
minparams => 1,
maxparams => 1,
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Tc.pm shorewall-5.0.11/Perl/Shorewall/Tc.pm
--- shorewall-5.0.10/Perl/Shorewall/Tc.pm 2016-06-30 17:54:28.544178829 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Tc.pm 2016-08-06 07:57:47.129242118 -0700
@@ -43,7 +43,7 @@
our @ISA = qw(Exporter);
our @EXPORT = qw( process_tc setup_tc );
our @EXPORT_OK = qw( process_tc_rule initialize );
-our $VERSION = '5.0_10';
+our $VERSION = '5.0_11';
our %flow_keys = ( 'src' => 1,
'dst' => 1,
@@ -350,9 +350,10 @@
for ( my $i = 1; $i <= 3; $i++ ) {
my $prio = 16 | $i;
+ my $j = $i + 3;
emit "run_tc qdisc add dev $physical parent $number:$i handle ${number}${i}: sfq quantum 1875 limit 127 perturb 10";
emit "run_tc filter add dev $physical protocol all prio $prio parent $number: handle $i fw classid $number:$i";
- emit "run_tc filter add dev $physical protocol all prio 1 parent ${number}$i: flow hash keys $type divisor 1024" if $type ne '-' && have_capability 'FLOW_FILTER';
+ emit "run_tc filter add dev $physical protocol all prio 1 parent ${number}$i: handle $j flow hash keys $type divisor 1024" if $type ne '-' && have_capability 'FLOW_FILTER';
emit '';
}
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Perl/Shorewall/Zones.pm shorewall-5.0.11/Perl/Shorewall/Zones.pm
--- shorewall-5.0.10/Perl/Shorewall/Zones.pm 2016-06-30 17:54:28.548182829 -0700
+++ shorewall-5.0.11/Perl/Shorewall/Zones.pm 2016-08-06 07:57:47.137242064 -0700
@@ -1587,7 +1587,7 @@
name => $i ,
number => $interfaceref->{number} ,
physical => $physical ,
- base => var_base( $physical ) ,
+ base => $interfaceref->{base} ,
wildcard => $interfaceref->{wildcard} ,
zones => $interfaceref->{zones} ,
};
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/releasenotes.txt shorewall-5.0.11/releasenotes.txt
--- shorewall-5.0.10/releasenotes.txt 2016-06-30 17:54:28.416050830 -0700
+++ shorewall-5.0.11/releasenotes.txt 2016-08-06 07:57:47.021242844 -0700
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 5 . 0 . 1 0
+ S H O R E W A L L 5 . 0 . 1 1
----------------------------
- J u n e 3 0 , 2 0 1 6
+ A u g u s t 1 2 , 2 0 1 6
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,26 +14,27 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
-1) This release includes defect repair through Shorewall 5.0.9.2.
+1) This release contains defect repair through Shorewall 5.0.10.1.
-2) Previously, the 'update' commmand could result in updated files
- having the user's default permissions rather than the permissions
- of the original file. That has been corrected.
+2) In Shorewall 5.0, the default chain for DSCP rules was
+ inadvertently chained to PREROUTING (FORWARD, if
+ MARK_IN_FORWARD_CHAIN=Yes).
-3) A number of update and update-compatibility issues have been
- corrected:
+ The default is now restored to POSTROUTING, its earlier value.
- a) : (e.g., "fred:") is once again accepted in USER columns.
- b) The USER column in the mangle file can once again be specified
- when :T is the chain designator.
- c) The 'notrack' file is now correctly appended to the 'mangle'
- file during update.
- d) IPMARK entries in 'tcrules' are now correctly converted into
- the 'mangle' file.
+3) When 'trace' was specified, prevously the output of ip[6]tables
+ rules containing a comment were displayed incorrectly. The "-m
+ comment --comment" specification was missing and the comment was
+ not enclosed in double quotes. This has been corrected.
-4) When multiple zones are configured on an interface, the 'tcpflags',
- 'nosmurfs' and 'maclist' options could previously result in silly
- duplicate rules. That problem has been corrected.
+4) Previously, if a provider interface matched only a wildcard entry
+ (one whose physical interface name ended in '+'), then the
+ generated script would always find the interface to be
+ unusable. That has been corrected.
+
+5) A change released in 5.0.9.1 and that allowed simple traffic
+ shaping to support more than 9 interfaces prevented some users'
+ configurations from starting. That has been corrected.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
@@ -50,34 +51,21 @@
I I I. N E W F E A T U R E S I N T H I S R E L E A S E
----------------------------------------------------------------------------
-1) The 'allow' command can now remove entries from the ipset-based
- dynamic blacklists.
-
- allow ...
+1) When using the alternate input form, it is now possible to specify
+ a comment to be attached to the generated ip[6]tables rule. Simply
+ use the 'comment' keyword. If the comment contains embedded white
+ space, then it must be enclosed in double quotes. Any double
+ quotes embedded in the comment must be escaped using a backslash.
-2) A new 'dbl' (Dynamic Blacklist) option is now available in the
- 'interfaces' file. Possible settings are:
+ Example:
- none - equivalent to specifying 'nodbl'.
- src - packets entering the firewall on the interface have their
- source IP address checked against the ipset-based
- blacklist.
- dst - packets entering the firewall on the interface have their
- destination IP address checked against the ipset-based
- blacklist.
- src-dst - packets entering the firewall on the interface have their
- source IP address checked against the ipset-based
- blacklist. Packets originating on the fireawll and
- leaving through the interface have their destination IP
- address checked against the ipset-based blacklist.
+ ACCEPT net $FW { proto=tcp, dport=22, comment="Accept \"SSH\"" }
- The normal setting for an internet-facing interface will be either
- 'src' or 'src-dst'. The normal setting for an internal interface
- will be either 'none' or 'dst'.
+2) OPTIMIZE level 16 no longer deletes duplicate COUNT rules, allowing
+ multiple similar COUNT rules in a chain.
-3) The RPMs from shorewall.net are now created to assume that systemd
- is being used. They are targeted specifically at OpenSuSE and have
- been verified on OpenSuSE 42.1.
+3) Beginning with this release, source RPMs are available on the
+ download sites.
----------------------------------------------------------------------------
I V. M I G R A T I O N I S S U E S
@@ -238,6 +226,91 @@
----------------------------------------------------------------------------
V. N O T E S F R O M O T H E R 5 . 0 R E L E A S E S
----------------------------------------------------------------------------
+ P R O B L E M S C O R R E C T E D I N 5 . 0 . 1 0
+----------------------------------------------------------------------------
+
+5.0.10.1
+
+1) Several issues with the Debian SysV init scripts have been
+ corrected:
+
+ a) The scripts now issue progress messages for the 'stop' command
+ based on the setting of SAFESTOP in /etc/default/shorewall*.
+
+ b) The firewall is now stopped or cleared in runlevel 1 (minimal),
+ based on the setting of SAFESTOP.
+
+ c) A typo in the Shorewall init script prevented the force-stop
+ command from working correctly.
+
+ Roberto Sánchez.
+
+5.0.10
+
+1) This release includes defect repair through Shorewall 5.0.9.2.
+
+2) Previously, the 'update' commmand could result in updated files
+ having the user's default permissions rather than the permissions
+ of the original file. That has been corrected.
+
+3) A number of update and update-compatibility issues have been
+ corrected:
+
+ a) : (e.g., "fred:") is once again accepted in USER columns.
+ b) The USER column in the mangle file can once again be specified
+ when :T is the chain designator.
+ c) The 'notrack' file is now correctly appended to the 'mangle'
+ file during update.
+ d) IPMARK entries in 'tcrules' are now correctly converted into
+ the 'mangle' file.
+
+4) When multiple zones are configured on an interface, the 'tcpflags',
+ 'nosmurfs' and 'maclist' options could previously result in silly
+ duplicate rules. That problem has been corrected.
+
+----------------------------------------------------------------------------
+ N E W F E A T U R E S I N 5 . 0 . 1 0
+----------------------------------------------------------------------------
+
+5.0.10.1
+
+1) You can now specify LOGFILE=systemd to cause 'journelctl -r' to be
+ used to read the system log (journel).
+
+ Scott Sumate.
+
+5.0.10
+
+1) The 'allow' command can now remove entries from the ipset-based
+ dynamic blacklists.
+
+ allow ...
+
+2) A new 'dbl' (Dynamic Blacklist) option is now available in the
+ 'interfaces' file. Possible settings are:
+
+ none - equivalent to specifying 'nodbl'.
+ src - packets entering the firewall on the interface have their
+ source IP address checked against the ipset-based
+ blacklist.
+ dst - packets entering the firewall on the interface have their
+ destination IP address checked against the ipset-based
+ blacklist.
+ src-dst - packets entering the firewall on the interface have their
+ source IP address checked against the ipset-based
+ blacklist. Packets originating on the fireawll and
+ leaving through the interface have their destination IP
+ address checked against the ipset-based blacklist.
+
+ The normal setting for an internet-facing interface will be either
+ 'src' or 'src-dst'. The normal setting for an internal interface
+ will be either 'none' or 'dst'.
+
+3) The RPMs from shorewall.net are now created to assume that systemd
+ is being used. They are targeted specifically at OpenSuSE and have
+ been verified on OpenSuSE 42.1.
+
+----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 5 . 0 . 9
----------------------------------------------------------------------------
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Samples/one-interface/shorewall.conf.annotated shorewall-5.0.11/Samples/one-interface/shorewall.conf.annotated
--- shorewall-5.0.10/Samples/one-interface/shorewall.conf.annotated 2016-06-30 17:55:03.226826830 -0700
+++ shorewall-5.0.11/Samples/one-interface/shorewall.conf.annotated 2016-08-06 07:58:28.916961603 -0700
@@ -211,13 +211,14 @@
#
LOGFILE=/var/log/messages
#
-# LOGFILE=[pathname]
+# LOGFILE=[pathname|systemd]
#
# This parameter tells the /sbin/shorewall program where to look for
# Shorewall messages when processing the dump, logwatch, show log, and hits
# commands. If not assigned or if assigned an empty value, /var/log/messages
# is assumed. For further information, see http://www.shorewall.net/
-# shorewall_logging.html.
+# shorewall_logging.html. Beginning with Shorewall 5.0.10.1, you may specify
+# systemd to use journelctl -r to read the log.
#
LOGFORMAT="Shorewall:%s:%s:"
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Samples/three-interfaces/shorewall.conf.annotated shorewall-5.0.11/Samples/three-interfaces/shorewall.conf.annotated
--- shorewall-5.0.10/Samples/three-interfaces/shorewall.conf.annotated 2016-06-30 17:55:05.036634829 -0700
+++ shorewall-5.0.11/Samples/three-interfaces/shorewall.conf.annotated 2016-08-06 07:58:31.160946539 -0700
@@ -209,13 +209,14 @@
#
LOGFILE=/var/log/messages
#
-# LOGFILE=[pathname]
+# LOGFILE=[pathname|systemd]
#
# This parameter tells the /sbin/shorewall program where to look for
# Shorewall messages when processing the dump, logwatch, show log, and hits
# commands. If not assigned or if assigned an empty value, /var/log/messages
# is assumed. For further information, see http://www.shorewall.net/
-# shorewall_logging.html.
+# shorewall_logging.html. Beginning with Shorewall 5.0.10.1, you may specify
+# systemd to use journelctl -r to read the log.
#
LOGFORMAT="Shorewall:%s:%s:"
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Samples/two-interfaces/shorewall.conf.annotated shorewall-5.0.11/Samples/two-interfaces/shorewall.conf.annotated
--- shorewall-5.0.10/Samples/two-interfaces/shorewall.conf.annotated 2016-06-30 17:55:07.154750829 -0700
+++ shorewall-5.0.11/Samples/two-interfaces/shorewall.conf.annotated 2016-08-06 07:58:33.700929489 -0700
@@ -211,13 +211,14 @@
#
LOGFILE=/var/log/messages
#
-# LOGFILE=[pathname]
+# LOGFILE=[pathname|systemd]
#
# This parameter tells the /sbin/shorewall program where to look for
# Shorewall messages when processing the dump, logwatch, show log, and hits
# commands. If not assigned or if assigned an empty value, /var/log/messages
# is assumed. For further information, see http://www.shorewall.net/
-# shorewall_logging.html.
+# shorewall_logging.html. Beginning with Shorewall 5.0.10.1, you may specify
+# systemd to use journelctl -r to read the log.
#
LOGFORMAT="Shorewall:%s:%s:"
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/Samples/Universal/shorewall.conf.annotated shorewall-5.0.11/Samples/Universal/shorewall.conf.annotated
--- shorewall-5.0.10/Samples/Universal/shorewall.conf.annotated 2016-06-30 17:55:08.952546830 -0700
+++ shorewall-5.0.11/Samples/Universal/shorewall.conf.annotated 2016-08-06 07:58:35.808915339 -0700
@@ -200,13 +200,14 @@
#
LOGFILE=/var/log/messages
#
-# LOGFILE=[pathname]
+# LOGFILE=[pathname|systemd]
#
# This parameter tells the /sbin/shorewall program where to look for
# Shorewall messages when processing the dump, logwatch, show log, and hits
# commands. If not assigned or if assigned an empty value, /var/log/messages
# is assumed. For further information, see http://www.shorewall.net/
-# shorewall_logging.html.
+# shorewall_logging.html. Beginning with Shorewall 5.0.10.1, you may specify
+# systemd to use journelctl -r to read the log.
#
LOGFORMAT="Shorewall:%s:%s:"
#
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/shorewall.spec shorewall-5.0.11/shorewall.spec
--- shorewall-5.0.10/shorewall.spec 2016-06-30 17:54:28.416050830 -0700
+++ shorewall-5.0.11/shorewall.spec 2016-08-06 07:57:47.021242844 -0700
@@ -1,5 +1,5 @@
%define name shorewall
-%define version 5.0.10
+%define version 5.0.11
%define release 0base
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -149,6 +149,16 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt Samples
%changelog
+* Sat Aug 06 2016 Tom Eastep tom@shorewall.net
+- Updated to 5.0.11-0base
+* Sat Jul 30 2016 Tom Eastep tom@shorewall.net
+- Updated to 5.0.11-0RC1
+* Wed Jul 27 2016 Tom Eastep tom@shorewall.net
+- Updated to 5.0.11-0Beta2
+* Tue Jul 19 2016 Tom Eastep tom@shorewall.net
+- Updated to 5.0.11-0Beta1
+* Fri Jul 08 2016 Tom Eastep tom@shorewall.net
+- Updated to 5.0.10-1
* Sat Jun 25 2016 Tom Eastep tom@shorewall.net
- Updated to 5.0.10-0base
* Tue Jun 21 2016 Tom Eastep tom@shorewall.net
diff -Naurdw -X /home/teastep/shorewall/tools/build/exclude.txt shorewall-5.0.10/uninstall.sh shorewall-5.0.11/uninstall.sh
--- shorewall-5.0.10/uninstall.sh 2016-06-30 17:54:28.347982830 -0700
+++ shorewall-5.0.11/uninstall.sh 2016-08-06 07:57:46.997243004 -0700
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=5.0.10
+VERSION=5.0.11
PRODUCT=shorewall
usage() # $1 = exit status