diff options
| -rw-r--r-- | net-firewall/shorewall/ChangeLog | 10 | ||||
| -rw-r--r-- | net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch | 28 | ||||
| -rw-r--r-- | net-firewall/shorewall/shorewall-4.6.10.1.ebuild (renamed from net-firewall/shorewall/shorewall-4.6.9.ebuild) | 4 |
3 files changed, 39 insertions, 3 deletions
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog index 77bcac9a6139..6b68a0fcb897 100644 --- a/net-firewall/shorewall/ChangeLog +++ b/net-firewall/shorewall/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-firewall/shorewall # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.286 2015/05/25 02:52:22 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.287 2015/06/15 11:47:22 mgorny Exp $ + +*shorewall-4.6.10.1 (15 Jun 2015) + + 15 Jun 2015; Michał Górny <mgorny@gentoo.org> + +files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch, + +shorewall-4.6.10.1.ebuild, -shorewall-4.6.9.ebuild: + Version bump. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/151 + by Whissi. *shorewall-4.6.9 (25 May 2015) diff --git a/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch b/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch new file mode 100644 index 000000000000..8b60eb245fc0 --- /dev/null +++ b/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch @@ -0,0 +1,28 @@ +diff -rupN old/shorewall-init-4.6.10.1/shorewall-init new/shorewall-init-4.6.10.1/shorewall-init +--- old/shorewall-init-4.6.10.1/shorewall-init 2015-06-09 20:02:00.000000000 +0200 ++++ new/shorewall-init-4.6.10.1/shorewall-init 2015-06-14 17:16:17.396424059 +0200 +@@ -78,10 +78,6 @@ shorewall_start () { + fi + done + +- if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then +- ipset -R < "$SAVE_IPSETS" +- fi +- + return 0 + } + +@@ -99,13 +95,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" +- fi +- fi +- + return 0 + } + diff --git a/net-firewall/shorewall/shorewall-4.6.9.ebuild b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild index 15c3a3bc2ac4..d327c694c4d4 100644 --- a/net-firewall/shorewall/shorewall-4.6.9.ebuild +++ b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.9.ebuild,v 1.1 2015/05/25 02:52:22 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.10.1.ebuild,v 1.1 2015/06/15 11:47:22 mgorny Exp $ EAPI="5" @@ -224,7 +224,7 @@ src_prepare() { eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh cd "${S}"/${MY_PN_INIT} - epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality.patch + epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality-r1.patch cd "${S}" fi |