X-Git-Url: https://git.tld-linux.org/?p=packages%2Fshorewall.git;a=blobdiff_plain;f=shorewall-logging.patch;h=d8e8602a85390d95ebb96675adf8e5bbe5936b6d;hp=73ba3be91143cb4aee2e493d4788c458386e7eb6;hb=1cccfd3f59d402425aa096b0debf1c4df10046ad;hpb=bd0577e7ed9f603abe55e3af3d0d83eeccb66767

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