X-Git-Url: https://git.tld-linux.org/?p=packages%2Fshorewall.git;a=blobdiff_plain;f=tld.patch;h=3c810ae81a9891d0bedc82c4f5f1a7184f312195;hp=c8b84e8523e6eecef23e51526cd78637a60c2460;hb=388965a44c6c000cd6675b98bcdb22df5f84bce3;hpb=407461decbc440dbc1fe57c339a28e94bd698d97

diff --git a/tld.patch b/tld.patch
index c8b84e8..3c810ae 100644
--- a/tld.patch
+++ b/tld.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur shorewall-5.2.1.orig/shorewall/install.sh shorewall-5.2.1/shorewall/install.sh
+--- shorewall-5.2.1.orig/shorewall/install.sh	2018-10-11 21:40:46.293033000 +0000
++++ shorewall-5.2.1/shorewall/install.sh	2018-10-11 21:41:47.396033000 +0000
+@@ -220,6 +220,8 @@
  		BUILD=archlinux
  	    elif [ -f ${CONFDIR}/openwrt_release ] ; then
  		BUILD=openwrt
@@ -10,9 +10,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/s
  	    else
  		BUILD=linux
  	    fi
-@@ -269,6 +271,9 @@
-     openwrt)
- 	echo "Installing OpenWRT-specific configuration..."
+@@ -277,6 +279,9 @@
+     alt)
+ 	echo "Installing ALT-specific configuration...";
  	;;
 +    tld)
 +	echo "Installing TLD-specific configuration..."
@@ -20,10 +20,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/s
      linux)
  	;;
      *)
-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 @@
+diff -ur shorewall-5.2.1.orig/shorewall6/install.sh shorewall-5.2.1/shorewall6/install.sh
+--- shorewall-5.2.1.orig/shorewall6/install.sh	2018-10-11 21:40:46.293033000 +0000
++++ shorewall-5.2.1/shorewall6/install.sh	2018-10-11 21:41:47.397033000 +0000
+@@ -220,6 +220,8 @@
  		BUILD=archlinux
  	    elif [ -f ${CONFDIR}/openwrt_release ] ; then
  		BUILD=openwrt
@@ -32,9 +32,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/
  	    else
  		BUILD=linux
  	    fi
-@@ -269,6 +271,9 @@
-     openwrt)
- 	echo "Installing OpenWRT-specific configuration..."
+@@ -277,6 +279,9 @@
+     alt)
+ 	echo "Installing ALT-specific configuration...";
  	;;
 +    tld)
 +	echo "Installing TLD-specific configuration..."
@@ -42,12 +42,12 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/
      linux)
  	;;
      *)
-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..."
+diff -ur shorewall-5.2.1.orig/shorewall6-lite/install.sh shorewall-5.2.1/shorewall6-lite/install.sh
+--- shorewall-5.2.1.orig/shorewall6-lite/install.sh	2018-10-11 21:40:46.294033000 +0000
++++ shorewall-5.2.1/shorewall6-lite/install.sh	2018-10-11 21:41:47.397033000 +0000
+@@ -274,6 +274,9 @@
+     alt)
+ 	echo "Installing ALT-specific configuration...";
  	;;
 +    tld)
 +	echo "Installing TLD-specific configuration..."
@@ -55,10 +55,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh shorewall-5.2
      linux)
  	;;
      *)
-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 @@
+diff -ur shorewall-5.2.1.orig/shorewall-core/install.sh shorewall-5.2.1/shorewall-core/install.sh
+--- shorewall-5.2.1.orig/shorewall-core/install.sh	2018-10-02 15:21:54.000000000 +0000
++++ shorewall-5.2.1/shorewall-core/install.sh	2018-10-11 21:42:16.164033000 +0000
+@@ -195,6 +195,8 @@
  		BUILD=archlinux
  	    elif [ -f ${CONFDIR}/openwrt_release ] ; then
  		BUILD=openwrt
@@ -67,19 +67,19 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-core-5.2.0.5/install.sh shorewall-5.2.
  	    else
  		BUILD=linux
  	    fi
-@@ -238,7 +240,7 @@
+@@ -243,7 +245,7 @@
      apple)
  	echo "Installing Mac-specific configuration...";
  	;;
--    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt)
-+    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt|tld)
+-    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt|alt)
++    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt|alt|tld)
  	;;
      *)
  	fatal_error "Unknown HOST \"$HOST\""
-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 @@
+diff -ur shorewall-5.2.1.orig/shorewall-init/install.sh shorewall-5.2.1/shorewall-init/install.sh
+--- shorewall-5.2.1.orig/shorewall-init/install.sh	2018-10-11 21:40:46.294033000 +0000
++++ shorewall-5.2.1/shorewall-init/install.sh	2018-10-11 21:41:47.397033000 +0000
+@@ -206,6 +206,8 @@
  		BUILD=archlinux
  	    elif [ -f ${CONFDIR}/openwrt_release ]; then
  		BUILD=openwrt
@@ -88,9 +88,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.
  	    else
  		BUILD=linux
  	    fi
-@@ -253,6 +255,9 @@
-     openwrt)
- 	echo "Installing Openwrt-specific configuration..."
+@@ -261,6 +263,9 @@
+     alt)
+ 	echo "Installing ALT-specific configuration...";
  	;;
 +    tld)
 +	echo "Installing TLD-specific configuration..."
@@ -98,12 +98,12 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2.
      linux)
  	fatal_error "Shorewall-init is not supported on this system"
  	;;
-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..."
+diff -ur shorewall-5.2.1.orig/shorewall-lite/install.sh shorewall-5.2.1/shorewall-lite/install.sh
+--- shorewall-5.2.1.orig/shorewall-lite/install.sh	2018-10-11 21:40:46.295033000 +0000
++++ shorewall-5.2.1/shorewall-lite/install.sh	2018-10-11 21:41:47.398033000 +0000
+@@ -274,6 +274,9 @@
+     alt)
+ 	echo "Installing ALT-specific configuration...";
  	;;
 +    tld)
 +	echo "Installing TLD-specific configuration..."