From 388965a44c6c000cd6675b98bcdb22df5f84bce3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 11 Oct 2018 21:48:53 +0000 Subject: [PATCH] - updated to 5.2.1 --- init.patch | 8 +-- man.patch | 16 ++--- perl.patch | 69 ------------------- shell-fix.patch | 6 +- shorewall-config.patch | 12 ++-- shorewall-logging.patch | 142 ++++++++++++++++++++-------------------- shorewall.spec | 52 ++++++++------- tld.patch | 80 +++++++++++----------- 8 files changed, 159 insertions(+), 226 deletions(-) delete mode 100644 perl.patch diff --git a/init.patch b/init.patch index fa31eb2..d87eef8 100644 --- a/init.patch +++ b/init.patch @@ -1,7 +1,7 @@ -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 @@ +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:41:47.397033000 +0000 ++++ shorewall-5.2.1/shorewall-init/install.sh 2018-10-11 21:45:51.621033000 +0000 +@@ -326,12 +326,13 @@ install_file $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service 0644 [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service" diff --git a/man.patch b/man.patch index 96224f1..8c0b5ec 100644 --- a/man.patch +++ b/man.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-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 @@ +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:41:47.396033000 +0000 ++++ shorewall-5.2.1/shorewall/install.sh 2018-10-11 21:45:10.481033000 +0000 +@@ -1199,10 +1199,10 @@ shorewall-accounting.5 shorewall-ipsets.5 shorewall-providers.5 shorewall-tcclasses.5 \ shorewall-actions.5 shorewall-maclist.5 shorewall-tcdevices.5 \ shorewall-mangle.5 shorewall-proxyndp.5 shorewall-tcfilters.5 \ @@ -16,10 +16,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/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.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 @@ +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:41:47.397033000 +0000 ++++ shorewall-5.2.1/shorewall6/install.sh 2018-10-11 21:45:10.482033000 +0000 +@@ -1199,10 +1199,10 @@ shorewall-accounting.5 shorewall-ipsets.5 shorewall-providers.5 shorewall-tcclasses.5 \ shorewall-actions.5 shorewall-maclist.5 shorewall-tcdevices.5 \ shorewall-mangle.5 shorewall-proxyndp.5 shorewall-tcfilters.5 \ diff --git a/perl.patch b/perl.patch deleted file mode 100644 index a285d57..0000000 --- a/perl.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm ---- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm 2018-08-05 17:31:09.000000000 +0000 -+++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm 2018-09-06 15:14:31.187972699 +0000 -@@ -5819,7 +5819,7 @@ - - $chain =~ s/[^\w-]//g; - # $1 $2 - $3 -- while ( $condition =~ m( ^(.*?) @({)?(?:0|chain)(?(2)}) (.*)$ )x ) { -+ while ( $condition =~ m( ^(.*?) @(\{)?(?:0|chain)(?(2)}) (.*)$ )x ) { - $condition = join( '', $1, $chain, $3 ); - } - -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-08-05 17:31:09.000000000 +0000 -+++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-09-06 15:14:25.806972759 +0000 -@@ -2833,7 +2833,7 @@ - } - - # $1 $2 $3 - $4 -- while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { -+ while ( $expression =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { - my ( $first, $var, $rest ) = ( $1, $3, $4); - - if ( $var =~ /^\d+$/ ) { -@@ -2850,7 +2850,7 @@ - - if ( $chain ) { - # $1 $2 $3 - $4 -- while ( $expression =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { -+ while ( $expression =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { - my ( $first, $var, $rest ) = ( $1, $3, $4); - $var = numeric_value( $var ) if $var =~ /^\d/; - $val = $var ? $actparams{$var} : $chain; -@@ -2861,7 +2861,7 @@ - } - - # $1 $2 $3 - $4 -- while ( $expression =~ m( ^(.*?) __({)? (\w+) (?(2)}) (.*)$ )x ) { -+ while ( $expression =~ m( ^(.*?) __(\{)? (\w+) (?(2)}) (.*)$ )x ) { - my ( $first, $cap, $rest ) = ( $1, $3, $4); - - if ( exists $capdesc{$cap} ) { -@@ -3791,7 +3791,7 @@ - my ( $lineref, $count ) = ( $_[0], 0 ); - my $chain = $actparams{chain}; - # $1 $2 $3 - $4 -- while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { -+ while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { - - my ( $first, $var, $rest ) = ( $1, $3, $4); - -@@ -3830,7 +3830,7 @@ - # - $$lineref =~ s/\\@/??/g; - # $1 $2 $3 - $4 -- while ( $$lineref =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { -+ while ( $$lineref =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { - my ( $first, $var, $rest ) = ( $1, $3, $4); - my $val = $var ? $actparams{$var} : $actparams{chain}; - $usedcaller = USEDCALLER if $var eq 'caller'; -@@ -3846,7 +3846,7 @@ - sub expand_shorewallrc_variables( \$ ) { - my ( $lineref, $count ) = ( $_[0], 0 ); - # $1 $2 $3 - $4 -- while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { -+ while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { - - my ( $first, $var, $rest ) = ( $1, $3, $4); - diff --git a/shell-fix.patch b/shell-fix.patch index 524e490..c419dba 100644 --- a/shell-fix.patch +++ b/shell-fix.patch @@ -1,6 +1,6 @@ -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 +diff -ur shorewall-5.2.1.orig/shorewall/Perl/Shorewall/Config.pm shorewall-5.2.1/shorewall/Perl/Shorewall/Config.pm +--- shorewall-5.2.1.orig/shorewall/Perl/Shorewall/Config.pm 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall/Perl/Shorewall/Config.pm 2018-10-11 21:43:10.782033000 +0000 @@ -6250,10 +6250,10 @@ $have_capabilities = 1; } diff --git a/shorewall-config.patch b/shorewall-config.patch index 6642b1f..785f754 100644 --- a/shorewall-config.patch +++ b/shorewall-config.patch @@ -1,6 +1,6 @@ -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 +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 @@ RESTOREFILE=restore @@ -10,9 +10,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf sho SUBSYSLOCK=/var/lock/subsys/shorewall -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 +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 diff --git a/shorewall-logging.patch b/shorewall-logging.patch index d8e8602..c49d78a 100644 --- a/shorewall-logging.patch +++ b/shorewall-logging.patch @@ -1,6 +1,6 @@ -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 +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-11 21:39:19.903033000 +0000 ++++ shorewall-5.2.1/shorewall/configfiles/shorewall.conf 2018-10-11 21:40:46.292033000 +0000 @@ -49,9 +49,9 @@ LOGALLNEW= @@ -22,10 +22,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/configfiles/shorewall.conf sho TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" -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 @@ +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-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall/install.sh 2018-10-11 21:40:46.293033000 +0000 +@@ -1223,8 +1223,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then @@ -36,7 +36,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/s fi # -@@ -1254,7 +1254,7 @@ +@@ -1262,7 +1262,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -45,7 +45,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/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" -@@ -1273,7 +1273,7 @@ +@@ -1281,7 +1281,7 @@ elif mywhich update-rc.d ; then echo "${PRODUCT} will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -54,7 +54,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/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 update-rc.d ${PRODUCT} enable elif mywhich rc-update ; then -@@ -1281,7 +1281,7 @@ +@@ -1289,7 +1289,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -63,18 +63,18 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/install.sh shorewall-5.2.0.5/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.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 +diff -ur shorewall-5.2.1.orig/shorewall/logrotate shorewall-5.2.1/shorewall/logrotate +--- shorewall-5.2.1.orig/shorewall/logrotate 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall/logrotate 2018-10-11 21:40:46.293033000 +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.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 +diff -ur shorewall-5.2.1.orig/shorewall/uninstall.sh shorewall-5.2.1/shorewall/uninstall.sh +--- shorewall-5.2.1.orig/shorewall/uninstall.sh 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall/uninstall.sh 2018-10-11 21:40:46.293033000 +0000 @@ -216,7 +216,7 @@ esac done @@ -84,9 +84,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/uninstall.sh shorewall-5.2.0.5 [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service -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 +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-11 21:39:19.903033000 +0000 ++++ shorewall-5.2.1/shorewall6/configfiles/shorewall6.conf 2018-10-11 21:40:46.293033000 +0000 @@ -48,9 +48,9 @@ LOGALLNEW= @@ -108,10 +108,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/configfiles/shorewall6.conf s TCP_FLAGS_LOG_LEVEL="$LOG_LEVEL" -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 @@ +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-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall6/install.sh 2018-10-11 21:40:46.293033000 +0000 +@@ -1223,8 +1223,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then @@ -122,7 +122,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/ fi # -@@ -1254,7 +1254,7 @@ +@@ -1262,7 +1262,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -131,7 +131,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/ 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" -@@ -1273,7 +1273,7 @@ +@@ -1281,7 +1281,7 @@ elif mywhich update-rc.d ; then echo "${PRODUCT} will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -140,7 +140,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/ 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 update-rc.d ${PRODUCT} enable elif mywhich rc-update ; then -@@ -1281,7 +1281,7 @@ +@@ -1289,7 +1289,7 @@ echo "${PRODUCT} will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/${PRODUCT} to enable" @@ -149,18 +149,18 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/install.sh shorewall-5.2.0.5/ 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.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 +diff -ur shorewall-5.2.1.orig/shorewall6/logrotate shorewall-5.2.1/shorewall6/logrotate +--- shorewall-5.2.1.orig/shorewall6/logrotate 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall6/logrotate 2018-10-11 21:40:46.294033000 +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.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 +diff -ur shorewall-5.2.1.orig/shorewall6/uninstall.sh shorewall-5.2.1/shorewall6/uninstall.sh +--- shorewall-5.2.1.orig/shorewall6/uninstall.sh 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall6/uninstall.sh 2018-10-11 21:40:46.294033000 +0000 @@ -216,7 +216,7 @@ esac done @@ -170,10 +170,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-5.2.0.5/uninstall.sh shorewall-5.2.0. [ -n "$SYSTEMD" ] && remove_file ${SYSTEMD}/${PRODUCT}.service -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 @@ +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-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall6-lite/install.sh 2018-10-11 21:40:46.294033000 +0000 +@@ -467,8 +467,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then @@ -184,7 +184,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/install.sh shorewall-5.2 fi # -@@ -510,7 +510,7 @@ +@@ -518,7 +518,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -193,7 +193,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/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" -@@ -529,7 +529,7 @@ +@@ -537,7 +537,7 @@ elif mywhich update-rc.d ; then echo "$PRODUCT will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -202,7 +202,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/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 update-rc.d $PRODUCT enable elif mywhich rc-update ; then -@@ -537,7 +537,7 @@ +@@ -545,7 +545,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -211,18 +211,18 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/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.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 +diff -ur shorewall-5.2.1.orig/shorewall6-lite/logrotate shorewall-5.2.1/shorewall6-lite/logrotate +--- shorewall-5.2.1.orig/shorewall6-lite/logrotate 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall6-lite/logrotate 2018-10-11 21:40:46.294033000 +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.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 +diff -ur shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh shorewall-5.2.1/shorewall6-lite/uninstall.sh +--- shorewall-5.2.1.orig/shorewall6-lite/uninstall.sh 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall6-lite/uninstall.sh 2018-10-11 21:40:46.294033000 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT @@ -232,10 +232,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall6-lite-5.2.0.5/uninstall.sh shorewall-5 if [ -n "$SYSCONFDIR" ]; then [ -n "$SYSCONFFILE" ] && remove_file ${SYSCONFDIR}/${PRODUCT} -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 @@ +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-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall-init/install.sh 2018-10-11 21:40:46.294033000 +0000 +@@ -336,8 +336,8 @@ # Install logrotate file # if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then @@ -246,18 +246,18 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/install.sh shorewall-5.2. fi # -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 +diff -ur shorewall-5.2.1.orig/shorewall-init/logrotate shorewall-5.2.1/shorewall-init/logrotate +--- shorewall-5.2.1.orig/shorewall-init/logrotate 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall-init/logrotate 2018-10-11 21:40:46.294033000 +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.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 +diff -ur shorewall-5.2.1.orig/shorewall-init/sysconfig shorewall-5.2.1/shorewall-init/sysconfig +--- shorewall-5.2.1.orig/shorewall-init/sysconfig 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall-init/sysconfig 2018-10-11 21:40:46.295033000 +0000 @@ -19,7 +19,7 @@ # # Where Up/Down events get logged @@ -267,9 +267,9 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/sysconfig shorewall-5.2.0 # Startup options - set verbosity to 0 (minimal reporting) OPTIONS="-V0" -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 +diff -ur shorewall-5.2.1.orig/shorewall-init/uninstall.sh shorewall-5.2.1/shorewall-init/uninstall.sh +--- shorewall-5.2.1.orig/shorewall-init/uninstall.sh 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall-init/uninstall.sh 2018-10-11 21:40:46.295033000 +0000 @@ -202,7 +202,7 @@ remove_directory ${SHAREDIR}/$PRODUCT @@ -279,10 +279,10 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-init-5.2.0.5/uninstall.sh shorewall-5. # # Report Success -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 @@ +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-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall-lite/install.sh 2018-10-11 21:40:46.295033000 +0000 +@@ -467,8 +467,8 @@ fi if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then @@ -293,7 +293,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/install.sh shorewall-5.2. fi # -@@ -510,7 +510,7 @@ +@@ -518,7 +518,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -302,7 +302,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/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" -@@ -529,7 +529,7 @@ +@@ -537,7 +537,7 @@ elif mywhich update-rc.d ; then echo "$PRODUCT will start automatically at boot" echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -311,7 +311,7 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/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 update-rc.d $PRODUCT enable elif mywhich rc-update ; then -@@ -537,7 +537,7 @@ +@@ -545,7 +545,7 @@ echo "$PRODUCT will start automatically at boot" if [ $HOST = debian ]; then echo "Set startup=1 in ${CONFDIR}/default/$PRODUCT to enable" @@ -320,18 +320,18 @@ diff -ur shorewall-5.2.0.5.orig/shorewall-lite-5.2.0.5/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.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 +diff -ur shorewall-5.2.1.orig/shorewall-lite/logrotate shorewall-5.2.1/shorewall-lite/logrotate +--- shorewall-5.2.1.orig/shorewall-lite/logrotate 2018-10-02 15:15:20.000000000 +0000 ++++ shorewall-5.2.1/shorewall-lite/logrotate 2018-10-11 21:40:46.295033000 +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.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 +diff -ur shorewall-5.2.1.orig/shorewall-lite/uninstall.sh shorewall-5.2.1/shorewall-lite/uninstall.sh +--- shorewall-5.2.1.orig/shorewall-lite/uninstall.sh 2018-10-02 15:21:54.000000000 +0000 ++++ shorewall-5.2.1/shorewall-lite/uninstall.sh 2018-10-11 21:40:46.295033000 +0000 @@ -190,7 +190,7 @@ remove_directory ${VARDIR} remove_directory ${SHAREDIR}/$PRODUCT diff --git a/shorewall.spec b/shorewall.spec index 9dec2f2..bd9598d 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -2,25 +2,28 @@ # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0" # which is found at http://www.shorewall.net/Anatomy.html # +%define ver 5.2.1 +%define rel %{nil} + 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.5 -Release: 2 +Version: %{ver}%{rel} +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: 3fb5f8c1f0012c0221681bc6d62b84a3 -Source1: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-lite-%{version}.tar.bz2 -# Source1-md5: 821f5b69ba22fb9950195647ff3ad223 -Source2: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}6-%{version}.tar.bz2 -# Source2-md5: 7f8a9fcc0227e50b21da553acb99f764 -Source3: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}6-lite-%{version}.tar.bz2 -# Source3-md5: 57fbbf639a3351212c02026ba0e7b89d -Source4: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-init-%{version}.tar.bz2 -# Source4-md5: 87cc6453104a65fac36996a86469157e -Source5: http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/%{name}-core-%{version}.tar.bz2 -# Source5-md5: 16e6505831f5c1bc19c08d8982a4becc +Source0: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-%{version}.tar.bz2 +# Source0-md5: 904a6b38d97bbdfc97b2713ac7f902e2 +Source1: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-lite-%{version}.tar.bz2 +# Source1-md5: 3ebbacbe1414588c01f068264f97de4b +Source2: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}6-%{version}.tar.bz2 +# Source2-md5: d6597b128ff6affef5d7d1dc8b6cd90c +Source3: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}6-lite-%{version}.tar.bz2 +# Source3-md5: c267e40785d85a2b607234b7388be5b1 +Source4: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-init-%{version}.tar.bz2 +# Source4-md5: 6f0365f0d1401221d319844f027b49b5 +Source5: http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-core-%{version}.tar.bz2 +# Source5-md5: ca867aed49a68c58be90add6be937fb2 Source10: %{name}.init Source11: %{name}.logrotate Patch0: %{name}-config.patch @@ -29,7 +32,6 @@ Patch2: tld.patch Patch3: man.patch Patch4: init.patch Patch5: shell-fix.patch -Patch6: perl.patch URL: http://www.shorewall.net/ BuildRequires: perl BuildRequires: perl(Digest::SHA) @@ -138,8 +140,9 @@ and shutdown. %setup -qcT -a0 -a1 -a2 -a3 -a4 -a5 targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init" for i in $targets; do - cp -p $i-%{version}/shorewallrc.{redhat,tld} - %{__sed} -i -r -e 's!RedHat/Fedora!TLD !; s/^HOST\=redhat/HOST\=tld/; /^(SERVICEDIR|SERVICEFILE)/d;' $i-%{version}/shorewallrc.tld + mv $i-%{version} $i + cp -p $i/shorewallrc.{redhat,tld} + %{__sed} -i -r -e 's!RedHat/Fedora!TLD !; s/^HOST\=redhat/HOST\=tld/; /^(SERVICEDIR|SERVICEFILE)/d;' $i/shorewallrc.tld done %patch0 -p1 %patch1 -p1 @@ -147,7 +150,6 @@ done %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 # Remove hash-bang from files which are not directly executed as shell # scripts. This silences some rpmlint errors. @@ -158,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init" for i in $targets; do - cd $i-%{version} + cd $i ./configure \ VENDOR=tld \ LIBEXECDIR=%{_libexecdir} \ @@ -188,7 +190,7 @@ fi %files %defattr(644,root,root,755) -%doc shorewall-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples} +%doc shorewall/{COPYING,changelog.txt,releasenotes.txt,Samples} %attr(755,root,root) %{_sbindir}/shorewall %dir %{_sysconfdir}/shorewall %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shorewall/* @@ -220,7 +222,7 @@ fi %files lite %defattr(644,root,root,755) -%doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt} +%doc shorewall-lite/{COPYING,changelog.txt,releasenotes.txt} %attr(755,root,root) %{_sbindir}/shorewall-lite %dir %{_sysconfdir}/shorewall-lite %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf @@ -234,7 +236,7 @@ fi %files -n shorewall6 %defattr(644,root,root,755) -%doc shorewall6-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples6} +%doc shorewall6/{COPYING,changelog.txt,releasenotes.txt,Samples6} %attr(755,root,root) %{_sbindir}/shorewall6 %dir %{_sysconfdir}/shorewall6 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shorewall6/* @@ -249,7 +251,7 @@ fi %files -n shorewall6-lite %defattr(644,root,root,755) -%doc shorewall6-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt} +%doc shorewall6-lite/{COPYING,changelog.txt,releasenotes.txt} %attr(755,root,root) %{_sbindir}/shorewall6-lite %dir %{_sysconfdir}/shorewall6-lite %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf @@ -264,7 +266,7 @@ fi %files core %defattr(644,root,root,755) -%doc shorewall-core-%{version}/{COPYING,changelog.txt,releasenotes.txt} +%doc shorewall-core/{COPYING,changelog.txt,releasenotes.txt} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/shorewall %dir %{_datadir}/shorewall/ %{_datadir}/shorewall/coreversion @@ -278,7 +280,7 @@ fi %files init %defattr(644,root,root,755) -%doc shorewall-init-%{version}/{COPYING,changelog.txt,releasenotes.txt} +%doc shorewall-init/{COPYING,changelog.txt,releasenotes.txt} %attr(755,root,root) %{_sbindir}/shorewall-init %attr(755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/shorewall-init 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..." -- 2.46.0