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
johu · Dec 31, 2017 · fee0ed6 · fee0ed6
1 parent adadf31
commit fee0ed6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 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
@@ -0,0 +1,21 @@
+commit 4e5b98d3d928579bc3530893ceaf166337ea8e22
+Author: Tom Eastep <[email protected]>
+Date:   Fri Dec 29 15:32:05 2017 -0800
+
+    Only search files in each CONFIG_PATH directory - no recursion
+
+    Signed-off-by: Tom Eastep <[email protected]>
+
+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/...ll/shorewall/shorewall-5.1.10.1-r1.ebuild → ...ll/shorewall/shorewall-5.1.10.1-r2.ebuild b/...ll/shorewall/shorewall-5.1.10.1-r1.ebuild → ...ll/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