diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-09-23 15:48:48 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-09-23 16:15:39 +0200 |
| commit | 6035b78225d3067e9d053c28a03214f5fcb88d38 (patch) | |
| tree | 70fe99beebcaa54c0ce362c0d2bc44888cfe9751 /net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch | |
| parent | dev-lang/php: x86 stable (bug #629452) (diff) | |
| download | gentoo-6035b78225d3067e9d053c28a03214f5fcb88d38.tar.gz gentoo-6035b78225d3067e9d053c28a03214f5fcb88d38.tar.bz2 gentoo-6035b78225d3067e9d053c28a03214f5fcb88d38.zip | |
net-firewall/shorewall: Bump to v5.1.7
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch')
| -rw-r--r-- | net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch b/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch new file mode 100644 index 000000000000..8b7925d6dceb --- /dev/null +++ b/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch @@ -0,0 +1,30 @@ +diff -rupN old/shorewall-init-5.1.7/shorewall-init new/shorewall-init-5.1.7/shorewall-init +--- old/shorewall-init-5.1.7/shorewall-init 2017-09-18 18:28:43.000000000 +0200 ++++ new/shorewall-init-5.1.7/shorewall-init 2017-09-23 15:46:03.489914459 +0200 +@@ -80,10 +80,6 @@ shorewall_start () { + fi + done + +- if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then +- ipset -R < "$SAVE_IPSETS" +- fi +- + return 0 + } + +@@ -101,15 +97,6 @@ shorewall_stop () { + fi + done + +- if [ -n "$SAVE_IPSETS" ]; then +- mkdir -p $(dirname "$SAVE_IPSETS") +- if ipset -S > "${SAVE_IPSETS}.tmp"; then +- grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" || rm -f "${SAVE_IPSETS}.tmp" +- else +- rm -f "${SAVE_IPSETS}.tmp" +- fi +- fi +- + return 0 + } + |