- rediffed

[packages/shorewall.git] / shorewall-config.patch

diff --git a/shorewall-config.patch b/shorewall-config.patch
index e2f5d7906ae8503cc336e6fd105471dd1587e162..785f754d9a8456710b2209811b065d4b3ebae5ab 100644 (file)
--- a/shorewall-config.patch
+++ b/shorewall-config.patch
@@ -1,21 +1,24 @@
-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-06-14 21:47:03.135155987 +0000
-@@ -49,7 +49,7 @@
+diff -ur shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf shorewall-5.2.1/shorewall/configfiles/shorewall.conf
+--- shorewall-5.2.1.orig/shorewall/configfiles/shorewall.conf  2018-10-02 15:15:20.000000000 +0000
++++ shorewall-5.2.1/shorewall/configfiles/shorewall.conf       2018-10-11 21:39:19.903033000 +0000
+@@ -101,7 +101,7 @@
  
- LOGALLNEW=
+ RESTOREFILE=restore
  
--LOGFILE=/var/log/messages
-+LOGFILE=/var/log/kernel
+-SHOREWALL_SHELL=/bin/sh
++SHOREWALL_SHELL=/bin/bash
  
- LOGFORMAT="%s %s "
+ SUBSYSLOCK=/var/lock/subsys/shorewall
  
-@@ -101,7 +101,7 @@
+diff -ur shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf
+--- shorewall-5.2.1.orig/shorewall6/configfiles/shorewall6.conf        2018-10-02 15:15:20.000000000 +0000
++++ shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf     2018-10-11 21:39:19.903033000 +0000
+@@ -98,7 +98,7 @@
  
  RESTOREFILE=restore
  
 -SHOREWALL_SHELL=/bin/sh
 +SHOREWALL_SHELL=/bin/bash
  
- SUBSYSLOCK=/var/lock/subsys/shorewall
+ SUBSYSLOCK=/var/lock/subsys/shorewall6