| 1 |
commit: fee0ed60a3e76c9d0ce7e3d8a21e495cd2444ef8 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 31 00:26:59 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 31 00:28:01 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee0ed60 |
| 7 |
|
| 8 |
net-firewall/shorewall: Rev bump to limit find search depth |
| 9 |
|
| 10 |
Link: https://sourceforge.net/p/shorewall/mailman/message/36172339/ |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../files/shorewall-5.1.10.1-fix-find.patch | 21 +++++++++++++++++++++ |
| 14 |
....10.1-r1.ebuild => shorewall-5.1.10.1-r2.ebuild} | 1 + |
| 15 |
2 files changed, 22 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..2850d12297f |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch |
| 22 |
@@ -0,0 +1,21 @@ |
| 23 |
+commit 4e5b98d3d928579bc3530893ceaf166337ea8e22 |
| 24 |
+Author: Tom Eastep <teastep@×××××××××.net> |
| 25 |
+Date: Fri Dec 29 15:32:05 2017 -0800 |
| 26 |
+ |
| 27 |
+ Only search files in each CONFIG_PATH directory - no recursion |
| 28 |
+ |
| 29 |
+ Signed-off-by: Tom Eastep <teastep@×××××××××.net> |
| 30 |
+ |
| 31 |
+diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std |
| 32 |
+index 6f220aa3d..95eafdf65 100644 |
| 33 |
+--- a/shorewall-5.1.10.1/lib.cli-std |
| 34 |
++++ b/shorewall-5.1.10.1/lib.cli-std |
| 35 |
+@@ -386,7 +386,7 @@ uptodate() { |
| 36 |
+ IFS=':' |
| 37 |
+ |
| 38 |
+ for dir in $g_shorewalldir $CONFIG_PATH; do |
| 39 |
+- if [ -n "$(find ${dir} -newer $1)" ]; then |
| 40 |
++ if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then |
| 41 |
+ IFS="$ifs" |
| 42 |
+ return 1; |
| 43 |
+ fi |
| 44 |
|
| 45 |
diff --git a/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild |
| 46 |
similarity index 99% |
| 47 |
rename from net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild |
| 48 |
rename to net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild |
| 49 |
index 3b7545ca47d..ffef283075d 100644 |
| 50 |
--- a/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild |
| 51 |
+++ b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild |
| 52 |
@@ -164,6 +164,7 @@ src_prepare() { |
| 53 |
ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..." |
| 54 |
ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" |
| 55 |
eend 0 |
| 56 |
+ eapply "${FILESDIR}"/${PN}-5.1.10.1-fix-find.patch |
| 57 |
|
| 58 |
# shorewall |
| 59 |
if use ipv4; then |
Archives