diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-12-31 01:26:59 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-12-31 01:28:01 +0100 |
| commit | fee0ed60a3e76c9d0ce7e3d8a21e495cd2444ef8 (patch) | |
| tree | 513ae5492316677042071e6767635ad9cdf784f5 /net-firewall/shorewall | |
| parent | dev-util/catalyst: setup.py || die (diff) | |
| download | gentoo-fee0ed60a3e76c9d0ce7e3d8a21e495cd2444ef8.tar.gz gentoo-fee0ed60a3e76c9d0ce7e3d8a21e495cd2444ef8.tar.bz2 gentoo-fee0ed60a3e76c9d0ce7e3d8a21e495cd2444ef8.zip | |
net-firewall/shorewall: Rev bump to limit find search depth
Link: https://sourceforge.net/p/shorewall/mailman/message/36172339/
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'net-firewall/shorewall')
| -rw-r--r-- | net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch | 21 | ||||
| -rw-r--r-- | net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild (renamed from net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild) | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch new file mode 100644 index 000000000000..2850d12297f0 --- /dev/null +++ b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch @@ -0,0 +1,21 @@ +commit 4e5b98d3d928579bc3530893ceaf166337ea8e22 +Author: Tom Eastep <teastep@shorewall.net> +Date: Fri Dec 29 15:32:05 2017 -0800 + + Only search files in each CONFIG_PATH directory - no recursion + + Signed-off-by: Tom Eastep <teastep@shorewall.net> + +diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std +index 6f220aa3d..95eafdf65 100644 +--- a/shorewall-5.1.10.1/lib.cli-std ++++ b/shorewall-5.1.10.1/lib.cli-std +@@ -386,7 +386,7 @@ uptodate() { + IFS=':' + + for dir in $g_shorewalldir $CONFIG_PATH; do +- if [ -n "$(find ${dir} -newer $1)" ]; then ++ if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then + IFS="$ifs" + return 1; + fi diff --git a/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild index 3b7545ca47d4..ffef283075da 100644 --- a/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild +++ b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild @@ -164,6 +164,7 @@ src_prepare() { ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..." ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" eend 0 + eapply "${FILESDIR}"/${PN}-5.1.10.1-fix-find.patch # shorewall if use ipv4; then |