diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
| commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
| tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /net-firewall/shorewall/files | |
| parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) | |
gentoo resync : 08.05.2018
Diffstat (limited to 'net-firewall/shorewall/files')
| -rw-r--r-- | net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch | 47 | ||||
| -rw-r--r-- | net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch | 46 |
2 files changed, 0 insertions, 93 deletions
diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch deleted file mode 100644 index 2927d4c17ab9..000000000000 --- a/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli -index 0e2de1525..60499180d 100644 ---- a/Shorewall-core/lib.cli -+++ b/Shorewall-core/lib.cli -@@ -1201,11 +1201,17 @@ show_saves_command() { - echo - - for f in ${VARDIR}/*-iptables; do -- fn=$(basename $f) -- fn=${fn%-iptables} -- mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' ) -- [ $fn = "$RESTOREFILE" ] && fn="$fn (default)" -- echo " $mtime ${fn%-iptables}" -+ case $f in -+ *\**) -+ ;; -+ *) -+ fn=$(basename $f) -+ fn=${fn%-iptables} -+ mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' ) -+ [ $fn = "$RESTOREFILE" ] && fn="$fn (default)" -+ echo " $mtime ${fn%-iptables}" -+ ;; -+ esac - done - - echo -diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std -index 2d8c7df67..46c932335 100644 ---- a/Shorewall/lib.cli-std -+++ b/Shorewall/lib.cli-std -@@ -412,10 +412,14 @@ uptodate() { - elif [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print)" ]; then - return 1; - fi -- elif [ $AUTOMAKE = recursive ]; then -+ elif [ "$AUTOMAKE" = recursive ]; then - if [ -n "$(${find} ${dir} -newer $1 -print -quit)" ]; then - return 1; - fi -+ elif [ -z "$AUTOMAKE" ]; then -+ if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then -+ return 1; -+ fi - elif [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print -quit)" ]; then - return 1; - fi diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch deleted file mode 100644 index 91791e01c4d4..000000000000 --- a/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std -index 9896e18d4..2d8c7df67 100644 ---- a/Shorewall/lib.cli-std -+++ b/Shorewall/lib.cli-std -@@ -1063,6 +1063,41 @@ restart_command() { - return $rc - } - -+read_yesno_with_timeout() { -+ local timeout -+ timeout=${1:-60} -+ -+ case $timeout in -+ *s) -+ ;; -+ *m) -+ timeout=$((${timeout%m} * 60)) -+ ;; -+ *h) -+ timeout=$((${timeout%h} * 3600)) -+ ;; -+ esac -+ -+ read -t $timeout yn 2> /dev/null -+ if [ $? -eq 2 ] -+ then -+ # read doesn't support timeout -+ test -x /bin/bash || return 2 # bash is not installed so the feature is not available -+ /bin/bash -c "read -t $timeout yn ; if [ \"\$yn\" == \"y\" ] ; then exit 0 ; else exit 1 ; fi" # invoke bash and use its version of read -+ return $? -+ else -+ # read supports timeout -+ case "$yn" in -+ y|Y) -+ return 0 -+ ;; -+ *) -+ return 1 -+ ;; -+ esac -+ fi -+} -+ - # - # Safe-start/safe-reload/safe-restart Command Executor - # |