From 1cccfd3f59d402425aa096b0debf1c4df10046ad Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 10 Aug 2018 13:52:32 +0000 Subject: [PATCH] - updated to 5.2.0.5 --- init.patch | 6 +-- man.patch | 12 ++--- shell-fix.patch | 6 +-- shorewall-config.patch | 12 ++--- shorewall-logging.patch | 108 ++++++++++++++++++++-------------------- shorewall.spec | 16 +++--- tld.patch | 36 +++++++------- 7 files changed, 98 insertions(+), 98 deletions(-) diff --git a/init.patch b/init.patch index f6dc9ee..fa31eb2 100644 --- a/init.patch +++ b/init.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh 2018-06-14 22:28:59.725127653 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh 2018-06-14 22:31:22.419126046 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh 2018-06-14 22:28:59.725127653 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh 2018-06-14 22:31:22.419126046 +0000 @@ -318,12 +318,13 @@ install_file $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service 0644 [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service diff --git a/man.patch b/man.patch index 0ba48c3..96224f1 100644 --- a/man.patch +++ b/man.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh 2018-06-14 22:07:06.867142434 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh 2018-06-14 22:13:13.101138311 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh 2018-06-14 22:07:06.867142434 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh 2018-06-14 22:13:13.101138311 +0000 @@ -1191,10 +1191,10 @@ shorewall-accounting.5 shorewall-ipsets.5 shorewall-providers.5 shorewall-tcclasses.5 \ shorewall-actions.5 shorewall-maclist.5 shorewall-tcdevices.5 \ @@ -16,9 +16,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/s shorewall-exclusion.5 shorewall-netmap.5 shorewall-secmarks.5 shorewall-tunnels.5 \ shorewall-hosts.5 shorewall-params.5 shorewall-snat.5 shorewall-vardir.5 \ shorewall-interfaces.5 shorewall-policy.5 shorewall-stoppedrules.5 shorewall-zones.5 -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh 2018-06-14 22:07:06.867142434 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh 2018-06-14 22:13:13.101138311 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh 2018-06-14 22:07:06.867142434 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh 2018-06-14 22:13:13.101138311 +0000 @@ -1191,10 +1191,10 @@ shorewall-accounting.5 shorewall-ipsets.5 shorewall-providers.5 shorewall-tcclasses.5 \ shorewall-actions.5 shorewall-maclist.5 shorewall-tcdevices.5 \ diff --git a/shell-fix.patch b/shell-fix.patch index 5645c8e..524e490 100644 --- a/shell-fix.patch +++ b/shell-fix.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/Perl/Shorewall/Config.pm shorewall-5.2.0.4/shorewall-5.2.0.4/Perl/Shorewall/Config.pm ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/Perl/Shorewall/Config.pm 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/Perl/Shorewall/Config.pm 2018-06-20 12:32:04.348554961 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-06-20 12:32:04.348554961 +0000 @@ -6250,10 +6250,10 @@ $have_capabilities = 1; } diff --git a/shorewall-config.patch b/shorewall-config.patch index 1202f68..6642b1f 100644 --- a/shorewall-config.patch +++ b/shorewall-config.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf shorewall-5.2.0.4/shorewall-5.2.0.4/configfiles/shorewall.conf ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/configfiles/shorewall.conf 2018-07-11 17:41:38.155301202 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-07-11 17:41:38.155301202 +0000 @@ -101,7 +101,7 @@ RESTOREFILE=restore @@ -10,9 +10,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf sho SUBSYSLOCK=/var/lock/subsys/shorewall -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/configfiles/shorewall6.conf shorewall-5.2.0.4/shorewall6-5.2.0.4/configfiles/shorewall6.conf ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/configfiles/shorewall6.conf 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/configfiles/shorewall6.conf 2018-07-11 17:42:08.487299394 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-07-11 17:42:08.487299394 +0000 @@ -98,7 +98,7 @@ RESTOREFILE=restore diff --git a/shorewall-logging.patch b/shorewall-logging.patch index 73ba3be..d8e8602 100644 --- a/shorewall-logging.patch +++ b/shorewall-logging.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf shorewall-5.2.0.4/shorewall-5.2.0.4/configfiles/shorewall.conf ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf 2018-07-11 17:42:26.621298313 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/configfiles/shorewall.conf 2018-07-11 17:44:09.647292172 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-07-11 17:42:26.621298313 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/configfiles/shorewall.conf 2018-07-11 17:44:09.647292172 +0000 @@ -49,9 +49,9 @@ LOGALLNEW= @@ -22,9 +22,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/configfiles/shorewall.conf sho TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh 2018-07-11 17:47:50.239279024 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh 2018-07-11 17:47:50.239279024 +0000 @@ -1215,8 +1215,8 @@ fi @@ -63,18 +63,18 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/s perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/logrotate shorewall-5.2.0.4/shorewall-5.2.0.4/logrotate ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/logrotate 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/logrotate 2018-07-11 17:43:00.277296307 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-5.2.0.5/logrotate +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/logrotate 2018-07-11 17:43:00.277296307 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-init.log { +/var/log/shorewall-init { missingok notifempty create 0600 root root -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/uninstall.sh shorewall-5.2.0.4/shorewall-5.2.0.4/uninstall.sh ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/uninstall.sh 2018-07-11 17:47:41.736279531 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-5.2.0.5/uninstall.sh +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/uninstall.sh 2018-07-11 17:47:41.736279531 +0000 @@ -216,7 +216,7 @@ esac done @@ -84,9 +84,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/uninstall.sh shorewall-5.2.0.4 [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/configfiles/shorewall6.conf shorewall-5.2.0.4/shorewall6-5.2.0.4/configfiles/shorewall6.conf ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/configfiles/shorewall6.conf 2018-07-11 17:42:26.621298313 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/configfiles/shorewall6.conf 2018-07-11 17:43:46.477293554 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-07-11 17:42:26.621298313 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/configfiles/shorewall6.conf 2018-07-11 17:43:46.477293554 +0000 @@ -48,9 +48,9 @@ LOGALLNEW= @@ -108,9 +108,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/configfiles/shorewall6.conf s TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh 2018-07-11 17:47:07.879281549 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh 2018-07-11 17:47:07.879281549 +0000 @@ -1215,8 +1215,8 @@ fi @@ -149,18 +149,18 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh shorewall-5.2.0.4/ perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf to enable" -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/logrotate shorewall-5.2.0.4/shorewall6-5.2.0.4/logrotate ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/logrotate 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/logrotate 2018-07-11 17:43:27.447294688 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall6-5.2.0.5/logrotate +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/logrotate 2018-07-11 17:43:27.447294688 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall6-init.log { +/var/log/shorewall6-init { missingok notifempty create 0600 root root -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/uninstall.sh shorewall-5.2.0.4/shorewall6-5.2.0.4/uninstall.sh ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/uninstall.sh 2018-07-11 17:47:15.348281104 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/uninstall.sh +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/uninstall.sh 2018-07-11 17:47:15.348281104 +0000 @@ -216,7 +216,7 @@ esac done @@ -170,9 +170,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/uninstall.sh shorewall-5.2.0. [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service -diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/install.sh 2018-07-11 17:47:32.928280056 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh 2018-07-11 17:47:32.928280056 +0000 @@ -459,8 +459,8 @@ fi @@ -211,18 +211,18 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh shorewall-5.2 perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" -diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/logrotate shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/logrotate ---- shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/logrotate 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/logrotate 2018-07-11 17:43:19.397295168 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/logrotate +--- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/logrotate 2018-07-11 17:43:19.397295168 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall6-lite-init.log { +/var/log/shorewall6-lite-init { missingok notifempty create 0600 root root -diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/uninstall.sh shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/uninstall.sh ---- shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/uninstall.sh 2018-07-11 17:47:20.438280800 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/uninstall.sh +--- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/uninstall.sh 2018-07-11 17:47:20.438280800 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT @@ -232,9 +232,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/uninstall.sh shorewall-5 if [ -n "$SYSCONFDIR" ]; then [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT} -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh 2018-07-11 17:50:51.169268240 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh 2018-07-11 17:50:51.169268240 +0000 @@ -328,8 +328,8 @@ # Install logrotate file # @@ -246,18 +246,18 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh shorewall-5.2. fi # -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/logrotate shorewall-5.2.0.4/shorewall-init-5.2.0.4/logrotate ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/logrotate 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/logrotate 2018-07-11 17:51:06.968267298 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-init-5.2.0.5/logrotate +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/logrotate 2018-07-11 17:51:06.968267298 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-ifupdown.log { +/var/log/shorewall-ifupdown { missingok notifempty create 0600 root root -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/sysconfig shorewall-5.2.0.4/shorewall-init-5.2.0.4/sysconfig ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/sysconfig 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/sysconfig 2018-07-11 17:51:19.147266572 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/sysconfig shorewall-5.2.0.5/shorewall-init-5.2.0.5/sysconfig +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/sysconfig 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/sysconfig 2018-07-11 17:51:19.147266572 +0000 @@ -19,7 +19,7 @@ # # Where Up/Down events get logged @@ -267,9 +267,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/sysconfig shorewall-5.2.0 # Startup options - set verbosity to 0 (minimal reporting) OPTIONS="-V0" -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/uninstall.sh shorewall-5.2.0.4/shorewall-init-5.2.0.4/uninstall.sh ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/uninstall.sh 2018-07-11 17:50:39.479268937 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/uninstall.sh +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/uninstall.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/uninstall.sh 2018-07-11 17:50:39.479268937 +0000 @@ -202,7 +202,7 @@ remove_directory ${SHAREDIR}/$PRODUCT @@ -279,9 +279,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/uninstall.sh shorewall-5. # # Report Success -diff -ur shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-lite-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/install.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-lite-5.2.0.4/install.sh 2018-07-11 17:48:09.765277860 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh 2018-07-11 17:48:09.765277860 +0000 @@ -459,8 +459,8 @@ fi @@ -320,18 +320,18 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/install.sh shorewall-5.2. perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf else echo "Set STARTUP_ENABLED=Yes in ${CONFDIR}/$PRODUCT/$PRODUCT.conf to enable" -diff -ur shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/logrotate shorewall-5.2.0.4/shorewall-lite-5.2.0.4/logrotate ---- shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/logrotate 2018-05-18 17:18:09.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-lite-5.2.0.4/logrotate 2018-07-11 17:43:04.257296070 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/logrotate shorewall-5.2.0.5/shorewall-lite-5.2.0.5/logrotate +--- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/logrotate 2018-05-18 17:18:09.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/logrotate 2018-07-11 17:43:04.257296070 +0000 @@ -1,4 +1,4 @@ -/var/log/shorewall-lite-init.log { +/var/log/shorewall-lite-init { missingok notifempty create 0600 root root -diff -ur shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/uninstall.sh shorewall-5.2.0.4/shorewall-lite-5.2.0.4/uninstall.sh ---- shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-lite-5.2.0.4/uninstall.sh 2018-07-11 17:47:56.086278676 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/uninstall.sh shorewall-5.2.0.5/shorewall-lite-5.2.0.5/uninstall.sh +--- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/uninstall.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/uninstall.sh 2018-07-11 17:47:56.086278676 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT diff --git a/shorewall.spec b/shorewall.spec index 99c0620..0f383e9 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -6,22 +6,22 @@ Summary: Shoreline Firewall - an iptables-based firewall for Linux systems Summary(pl.UTF-8): Shoreline Firewall - zapora sieciowa oparta na iptables Name: shorewall -Version: 5.2.0.4 -Release: 4 +Version: 5.2.0.5 +Release: 1 License: GPL Group: Networking/Utilities Source0: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-%{version}.tar.bz2 -# Source0-md5: b8702d14846f890d263f5ea2447b5bed +# Source0-md5: 3fb5f8c1f0012c0221681bc6d62b84a3 Source1: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-lite-%{version}.tar.bz2 -# Source1-md5: 0dd43f44f7555418ae2f153fbf7ce1ef +# Source1-md5: 821f5b69ba22fb9950195647ff3ad223 Source2: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}6-%{version}.tar.bz2 -# Source2-md5: 14c87b9880bc69c82792854af45335e6 +# Source2-md5: 7f8a9fcc0227e50b21da553acb99f764 Source3: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}6-lite-%{version}.tar.bz2 -# Source3-md5: 9f03407f5f7dac39f286bdaf3ec051e8 +# Source3-md5: 57fbbf639a3351212c02026ba0e7b89d Source4: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-init-%{version}.tar.bz2 -# Source4-md5: cf6b2a6c1a8827a99c1b3e717d42ccff +# Source4-md5: 87cc6453104a65fac36996a86469157e Source5: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-core-%{version}.tar.bz2 -# Source5-md5: be73e2f76b2438e7813f62873a50c203 +# Source5-md5: 16e6505831f5c1bc19c08d8982a4becc Source10: %{name}.init Source11: %{name}.logrotate Patch0: %{name}-config.patch diff --git a/tld.patch b/tld.patch index 2f78cb3..c8b84e8 100644 --- a/tld.patch +++ b/tld.patch @@ -1,6 +1,6 @@ -diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-5.2.0.4/install.sh 2018-06-14 21:55:53.138150020 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-5.2.0.5/install.sh 2018-06-14 21:55:53.138150020 +0000 @@ -215,6 +215,8 @@ BUILD=archlinux elif [ -f ${CONFDIR}/openwrt_release ] ; then @@ -20,9 +20,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-5.2.0.4/install.sh shorewall-5.2.0.4/s linux) ;; *) -diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-5.2.0.4/install.sh 2018-06-14 21:56:25.519149655 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-5.2.0.5/install.sh 2018-06-14 21:56:25.519149655 +0000 @@ -215,6 +215,8 @@ BUILD=archlinux elif [ -f ${CONFDIR}/openwrt_release ] ; then @@ -42,9 +42,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-5.2.0.4/install.sh shorewall-5.2.0.4/ linux) ;; *) -diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall6-lite-5.2.0.4/install.sh 2018-06-14 21:53:33.408151593 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall6-lite-5.2.0.5/install.sh 2018-06-14 21:53:33.408151593 +0000 @@ -266,6 +266,9 @@ openwrt) echo "Installing OpenWRT-specific configuration..." @@ -55,9 +55,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall6-lite-5.2.0.4/install.sh shorewall-5.2 linux) ;; *) -diff -ur shorewall-5.2.0.4.orig/shorewall-core-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-core-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-core-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-core-5.2.0.4/install.sh 2018-06-14 21:57:08.268149174 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-core-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-core-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-core-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-core-5.2.0.5/install.sh 2018-06-14 21:57:08.268149174 +0000 @@ -190,6 +190,8 @@ BUILD=archlinux elif [ -f ${CONFDIR}/openwrt_release ] ; then @@ -76,9 +76,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-core-5.2.0.4/install.sh shorewall-5.2. ;; *) fatal_error "Unknown HOST \"$HOST\"" -diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-init-5.2.0.4/install.sh 2018-06-14 21:54:45.169150785 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh 2018-05-18 18:46:49.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-init-5.2.0.5/install.sh 2018-06-14 21:54:45.169150785 +0000 @@ -201,6 +201,8 @@ BUILD=archlinux elif [ -f ${CONFDIR}/openwrt_release ]; then @@ -98,9 +98,9 @@ diff -ur shorewall-5.2.0.4.orig/shorewall-init-5.2.0.4/install.sh shorewall-5.2. linux) fatal_error "Shorewall-init is not supported on this system" ;; -diff -ur shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/install.sh shorewall-5.2.0.4/shorewall-lite-5.2.0.4/install.sh ---- shorewall-5.2.0.4.orig/shorewall-lite-5.2.0.4/install.sh 2018-05-18 18:46:50.000000000 +0000 -+++ shorewall-5.2.0.4/shorewall-lite-5.2.0.4/install.sh 2018-06-14 21:52:59.958151970 +0000 +diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh +--- shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh 2018-05-18 18:46:50.000000000 +0000 ++++ shorewall-5.2.0.5/shorewall-lite-5.2.0.5/install.sh 2018-06-14 21:52:59.958151970 +0000 @@ -266,6 +266,9 @@ openwrt) echo "Installing OpenWRT-specific configuration..." -- 2.46.0