Fix bashisms in test scripts #531020 by Paolo Pedroni.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 91 insertions, 19 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 8f06fa38594e..1e8a01b8220f 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/findutils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.225 2014/09/08 23:14:34 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.226 2015/04/04 22:38:19 vapier Exp $
+
+  04 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/findutils-4.5.14-test-bashisms.patch, findutils-4.5.14-r1.ebuild:
+  Fix bashisms in test scripts #531020 by Paolo Pedroni.
 
 *findutils-4.4.2-r2 (08 Sep 2014)
 *findutils-4.5.14-r1 (08 Sep 2014)
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 62295e32e3a1..5cf2237bfc16 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,30 +3,31 @@ Hash: SHA256
 
 AUX findutils-4.4.2-gnulib-date-x32.patch 1210 SHA256 004a9d3a28ac727fddf3e54fcf2846aab90b30f29f40f8ff32b19742539e85eb SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60 WHIRLPOOL 7c866ac607fd7c9311160e398ccd98e593f69833ca643606d0462f2b125fce616249a8a0063f2514cd573542e5563539164a1527f3b02c1f20234880d287f258
 AUX findutils-4.4.2-selinux.diff 15603 SHA256 67de61c659f8d524b70ebabafe25093c02374b1fc83770dd5633480745e2ee9d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9 WHIRLPOOL 612394c54d4095c6cd9d0dc326be2b5b6ce41e43cd3dc8e3cd2a4e99a0844aec769373243c62398df79d6f7561f865754b627917b5f1733d6b065b7e3ce7be35
+AUX findutils-4.5.14-test-bashisms.patch 2002 SHA256 402ab15b499e8cbc5afb80bbd479ac9cfdff7451a77b997956aec81377d67b80 SHA512 1012d539c87b879af5390e2bcdb266cb4d80493c8eb645b7c2fe73a5f44796db2e8965091c1e01e0835d5a4bbd2d441b90ce219f086444013004a7e0e23d1bcf WHIRLPOOL 99210c02eaa5fb70fcaf78c3a929f4cf8e53e6dd8ef48f39a03175d8b7011b726a947e163fab97805b8a7403c0b03c0c58c5d576524cf1b65f357f2c4788b06a
 DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 WHIRLPOOL 2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393
 DIST findutils-4.5.12.tar.gz 3236073 SHA256 df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de SHA512 d909ca2d3629f871e6f79e99cf547f76ea73dad773972923c177267c272a7c82e308cca22e5c8746e6aca33dee8110f1af390fbe2abf93544e5917e6475ab2f8 WHIRLPOOL 046ef3394c0834800139c1c5a6c9caddbbf36190d27bb28bd2afa212c00bbbef6c959441f2afc36c058d3cee279d3b6c971192ff442e796ee7e72edfb76b2730
 DIST findutils-4.5.14.tar.gz 3536727 SHA256 0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2 SHA512 e26f0d58c316202d99d7dcc1c4d4d40591150dcf198dff2dab0f8ef5e4dc039a5ff42ef536bfc08d860f39ee4bd8215591b4cb460ff45f73007040fc5f99e66b WHIRLPOOL 116b725ffb76562a3f1e9bbfa475a791b873746a7ae362eea1a97f3b701c6e32508eafb10fe47a3ad8f56ef0e67fb04a5d98a7baf5371646945718e7aff5ad60
 EBUILD findutils-4.4.2-r1.ebuild 1442 SHA256 bf1e431d16e2594c29540bcce1f59083f7cac50ec7900eacb9ed276ab773c41b SHA512 3e24b9fc896f16bc8f46ea4872909f660361ff628612280389f00e5fbf2d37f44a620b1401ee27f30f3cbdfd22082a3b79c6a2bd0782fa0f22729e16bada2183 WHIRLPOOL 1f0cc25434e3912587774ec3e99b54985fe6db1c51ff7ec75a6160a44a4b89dbb627380af8e2f58ae3ed5f425ff84df3d790d35a6ca48c2f1ac7c570a99f66a9
 EBUILD findutils-4.4.2-r2.ebuild 1452 SHA256 71a7d1f22586cd151964dabed2934fae2603dba9292a244eb88a72b68b1236cd SHA512 309a2366a401aa9829609dab9b6aa2bc2edee7c4e3e98ce2b966ee15a735d7298b4bcdb649d47000bcedbca072415b85aab75721672fbdee07d75305612dadf4 WHIRLPOOL 7a70eb0ca6872cbb5baec0a3ed52afa0f9866754c3e4c767328a2647374a0d1d71e2877fec4d6a4e81c6f40c426083ba0038479e928eb5f977172f3548a303c5
 EBUILD findutils-4.5.12.ebuild 1706 SHA256 930e034ec56e68f014b8d54e2c64453fb57093accb53d33c2fabc63f9d58c976 SHA512 a5b07873290184e159866c5ef9d9c4e9296b2510a4f3910138f4cd80140ffda9b8214c03f864a6b380677d925e58fc58748940ce0bc939d93684ec770f118018 WHIRLPOOL a260df1ad3afee1baa8ddf29c054a61ef4f54bb9455537ccbd93b39a9c719ef1434958ce540549b316b07f2d52403e03c5db1d28c25855d626bf5df25d77aea9
-EBUILD findutils-4.5.14-r1.ebuild 1675 SHA256 abe0ebdb3a4d6eccaef50ba5946de45e57e8e8d5a59a20885ef4e6a300a642b9 SHA512 b65afddb9a0371511b8a042f9cdc7627c9cbb7b633b3ed1be0f1cbefc147fb29eca9dedfa5ac031beada02c18360dff213836a231527940a24816d1ff2c88c6c WHIRLPOOL dca12ce9947292bbf73f5df2708d46fa430408a8f6f5159e209b977c7803a75105320354da2a98281ccb617ee75ee2c2acb7e21506e134e7665b8fd0c3124fde
+EBUILD findutils-4.5.14-r1.ebuild 1730 SHA256 99f568280cbd4566374db767da087a93ed83b7508da7d8ee79f555ceadfc42df SHA512 ac924a11565fbf9be10c86a308aaaeb22dea6b1151ecd89d9d9973ed3736898bde61cb48a8cadea2f3971da4372c42a0b40972b93342bc19f548abd5b1aff031 WHIRLPOOL 794e0a993f6e11e0e9a23bfba247cc8530114e6a7a49f479aadeda028e700477d820a902426ec51d38c84d533bbaeff9889976a996773ad871008698603b952b
 EBUILD findutils-4.5.14.ebuild 1712 SHA256 bc9a01dc2ee640e694bd1180af40c4bc316ae4d33adad0583ab25dd03a5de1af SHA512 1e765da105e69502b34bfb20e8466c762df541ce8234736bcca55e775823cfcd2c2edbee55071f1edb1566925c3c95f3b7dbb8971e67c2807a1cda36fb5275ae WHIRLPOOL fc0853e6a3137c8f8e98805140a17185cec4c02fad3069510196619e624f24ee8afa7a56b14846cf0852306712a656ec8c2478ca8445f2f8de26653ccfd602dd
-MISC ChangeLog 31833 SHA256 df6d6b922e444114d4ae7e30c86c19559dd8fd67169037a22522125fc79cb771 SHA512 072d598c471f3e8bc0c72bc386321d6483bf8211086ff147674479db694846c7b293d2546ac168325a8311946c6e70c0090fe8137a3662427f77f172845840d4 WHIRLPOOL 6c890a521de1bd09f7df53ca27acda70da3d8c0394345931dc83b22e95c3ef4fcd08f33f82d4ba66e50fac81e74539e1c0738d7007f6f3509dedd43eb7d47cb2
+MISC ChangeLog 32016 SHA256 de3dcedbb7352207e59ec59b2fca237705d42f7a742e3e4017667003fa294eef SHA512 45e6f117e44b7d5e9706b4728b7d63ad3a8c0de1ae9dcd7c9f3e4afd370fad74fc17321aef6c0f8409288ecd285bdb225397f49372885458ba3d43f83765927d WHIRLPOOL df4668698bfeedf25b2d179967824da3337d1d5d9f026ffdefadcdc0cb8adaa19ff88093ec6b3f7c99ed83198c6e5bf2337653cef641a7940c4bd8a4530a714f
 MISC metadata.xml 247 SHA256 c1aace970507b192985f753f5b6d6b4f909284fa2e8c9a6492c9d29651476bab SHA512 e42648aa29d9aaa1125770a5f89c68ede330e90c64562942f8cb64d85471cc8176f2ae10c1dad00230b4fcad3a65eae92676c6fd8a43c1bf8985e9ee8ac8fd29 WHIRLPOOL f8eb5d248383ef10b836b0a9ffa9154bb8f38d001813ca727ffb0d07ffa9234eee323894831b01144017cb8b43400dd910b685babf75ebe10a2615dc94999e08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUDjhgAAoJEPGu1DbS6WIAbzoP/jzAy8mFDqV5gbhnFuIYXbpl
-n1n0dX6+hn0IER20sBsc5mt6QhcYEeEs7rcqzOO7f5MAJuYy2jAIizXBnJQuxbcq
-szpLwo02xisNz28lApa1Gopmnhpdn4d7gqWk7nvArACGpqJONYhL42N3l36OuFkJ
-+NTlbB1+ivfSmhPTxomF/vYojfAhQmJsQ8FIuk6DpUSslEsM526dUbQ/uXmg+GFR
-FdP+AdqTWGoqxL86m8GLQVkUGxGw/8bKb7of/J8/qWKBCtVaXZNTl025fktYyfo6
-cw7KoGorDBd133EEaifpRn3kJ1wDHFaZr6aC+fAMzTPMrZs1oZt5CIeURTYAIrzw
-U3sFGXVqgB/qQJlpVX4qMZzYS8I7kUx5LwHYMV1CeGw+OziRm/qTnddOOaeZ26tv
-2HxwSKGfb3NSFeUaTBO7vGf/5QS+m7yk1nvSYdzVOCIMzRMP90LFnn8Oya2WrtSQ
-G5SAwLU4Sj0A6RN4GcBa5vjnrit8AiEPQ5SMz8W7uGNhIRw6af/bGjowKDmD7oDX
-gHAY0L5jZNuGoaDnppU7pfvdjAjacFfcFzqtepuak/huKdYymT1E53ckXOjhHlJJ
-X905dK9ZXYzNn1Qh/iBvHeo6BEvdYBiWyCrA1va/lvIaKKxyK4EwPcli1l4TLHvP
-nwhXF66aZIKurYsF5QEU
-=fg05
+iQIcBAEBCAAGBQJVIGfcAAoJEPGu1DbS6WIAemkP/REpwn1LkYofX+hZPsYkHeCN
+io6JOL+PXPgiZb/Mjdl7jOw7E4Qs7ov4BWcMI+IijWCXrLmYllxsLWSAq8nRuyEy
+cHGU+XWCVb1Y81vpX9taX0ByYZM6jDQSDAn2VbT//My/rftBcqMYGxf6YgfXCoEq
+zNln82a0PwFMHgMx6BXM3bb1J60GyxAT/9ZYx/Z15sNFZORXgi0vowK2HdISCQzh
+RASj+XFzR4zJ4M9juxwVn1ZhVo52tGGvly1wF7/4Q3g5ydFWa6b89zK1k4+iSdnZ
+ERsV8KKwmpH6Dj0FTY8PfMFUj7ZPXwF+yZiZc4LKgYrNgGOHA8iJs+U9AeRnKl0H
+MP0+JzVGqWbFCp1cn5Mjz5r/2DO0RDjSBlIFSu0eeHXyz5R5aye2sBBuLD9rpcdK
+WIMndhs94mylv9DFXRzj4ZeUlz9oMRzl000bbSfMBHKfqs+mB2AjDhtaqKHAqMib
+XbomBzlS6TNMYS/W4KA3lwln3cFztDvpC3UZC/BIHI0Tbx5Yn15/y5bvu/U3qF08
+r05iHmXhOt9j/FxnU9Qn4YqjDWi/sszSv/1PlAarZKeghRAOb5Lyze4sVLmO3m7k
+bDCZb8j1Xf/g02aeHH0QGgJeGARvJX9Ad3dMhfEbCz/XWnvPdBVofKw+cCWBjarE
+R3WpxLClCIOFKzHMpat4
+=/l2h
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
new file mode 100644
index 000000000000..0bfe7017b8b4
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
@@ -0,0 +1,66 @@
+From 284afcb4a01996bb1a56f87da1e7c541fd0a903c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 4 Apr 2015 18:34:51 -0400
+Subject: [PATCH] test: fix bashisms
+
+These test scripts use #!/bin/sh, but then try to use bash-specific
+[[...]] tests.  Change them to [...] instead.
+
+Reported-by: Paolo Pedroni <paolo.pedroni@iol.it>
+URL: https://bugs.gentoo.org/531020
+
+* find/testsuite/binary_locations.sh: Change [[...]] to [...].
+* find/testsuite/sv-34079.sh: Likewise.
+---
+ find/testsuite/binary_locations.sh | 6 +++---
+ find/testsuite/sv-34079.sh         | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/find/testsuite/binary_locations.sh b/find/testsuite/binary_locations.sh
+index 96943a0..238d57f 100644
+--- a/find/testsuite/binary_locations.sh
++++ b/find/testsuite/binary_locations.sh
+@@ -1,15 +1,15 @@
+ # Source this file, don't execute it.
+ 
+-if [[ -z "${testname}" ]]; then
++if [ -z "${testname}" ]; then
+     echo 'Please set $testname before sourcing binary_locations.sh.' >&2
+     exit 1
+ fi
+ 
+ parent="$(cd .. && pwd)"
+-if [[ -f "${parent}/ftsfind" ]]; then
++if [ -f "${parent}/ftsfind" ]; then
+     ftsfind="${parent}/ftsfind"
+     oldfind="${parent}/find"
+-elif [[ -f "${parent}/oldfind" ]]; then
++elif [ -f "${parent}/oldfind" ]; then
+     ftsfind="${parent}/find"
+     oldfind="${parent}/oldfind"
+ else
+diff --git a/find/testsuite/sv-34079.sh b/find/testsuite/sv-34079.sh
+index 5773a3f..928a9af 100755
+--- a/find/testsuite/sv-34079.sh
++++ b/find/testsuite/sv-34079.sh
+@@ -41,7 +41,7 @@ make_test_data() {
+ }
+ 
+ 
+-if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
++if [ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]; then
+     if outdir=$(mktemp -d); then
+ 	# Create some test files.
+ 	bad=""
+@@ -64,7 +64,7 @@ if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
+ 	    bad="failed to set up the test in ${outdir}"
+ 	fi
+ 	rm -rf "${outdir}" || exit 1
+-	if [[ -n "${bad}" ]]; then
++	if [ -n "${bad}" ]; then
+ 	    echo "${bad}" >&2
+ 	    exit 1
+ 	fi
+-- 
+2.3.5
+
diff --git a/sys-apps/findutils/findutils-4.5.14-r1.ebuild b/sys-apps/findutils/findutils-4.5.14-r1.ebuild
index 90d69e7e3ef3..30245c98a7ea 100644
--- a/sys-apps/findutils/findutils-4.5.14-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.5.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.14-r1.ebuild,v 1.1 2014/09/08 23:14:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.14-r1.ebuild,v 1.2 2015/04/04 22:38:19 vapier Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-test-bashisms.patch #531020
 	# Don't build or install locate because it conflicts with slocate,
 	# which is a secure version of locate.  See bug 18729
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in