Fix bashisms in init script #451460 by Alexander Tsoy.

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

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index d59b72cc8637fcf2dbcb6206962f12932b433a82..415a5fb662d0f0fbd2e18180adf240d995565cbe 100644 (file)
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.198 2015/04/12 18:13:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.199 2015/04/12 20:03:54 vapier Exp $
+
+  12 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/1.5.1-dmcrypt.rc:
+  Fix bashisms in init script #451460 by Alexander Tsoy.
 
   12 Apr 2015; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.6.5.ebuild,
   cryptsetup-1.6.6.ebuild, metadata.xml:

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index a1f6bab7d10843c0b5cfaa50c04c0659ce5f35e8..1ff79e42442556a506b417daf2e51e5bcd8eddd0 100644 (file)
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX 1.0.6-dmcrypt.confd 3310 SHA256 9696d70a49296113a9ae3dff1b023b859df984bfb3572426ba199a630b628ce8 SHA512 dd89dbbe16b0f65f5c892535c18ee0b00c2ca48571c71ce2b2177dc9848d0cf9ad776e1b44740415510cfd54687b39bf0626a8ce698a327e315560507eeee7e4 WHIRLPOOL 79b3e819ebf8ac28728240c47de9684780482b7988b6f507a74108002d0c5e7e9c17c4aea38b2ab5387b5d8fd75c18140585052d3b4e79ca325d37390d8dd0a1
-AUX 1.5.1-dmcrypt.rc 9438 SHA256 1010666cfb3cd2c662032c3e8f3c2aec35316fc376d0ce30f2c821b581ae2c6d SHA512 8f4171cbd0165cc0cebf11d184c9b0299a7c775d2d173c26d9db22316cc8bc5147e1119fb982d1366e57d24bd105df5151004806bce97e537da12db9b713b135 WHIRLPOOL 18d6dcac3c7c8f6400219812435b978b27d00b901743439692dcb240c5063ff1c54dedd5c077529045079e39b5f875dbe5cacf0d7105964ce95f595f9ab07e67
+AUX 1.5.1-dmcrypt.rc 9439 SHA256 ce23fdf61252c67c9c345ca0e5b75b1d0d3d65d43999b37a45753ff5f56460fb SHA512 0bda051249bf89c29f0ff54fedc11eef269f4daedcab03f43ef7bad96f40098525dffa26deaa7e13cbbb7735ac3246fa2a481d5341fcde71f88fe2eeccda3356 WHIRLPOOL 55979a54bc64ba68107567fda8ae7933474481826752c6d5b04b493eea9d30676ec33e319d6e9d830bdc373ccecaf9aa45ad5e1bb331b930e058e0a1a8a988dc
 AUX cryptsetup-1.6.1-openssl-static.patch 472 SHA256 7029ba7870ff183b7dac3c658140c8c01286efd29e9427d1195b5b4e85fe2f4f SHA512 4292ee661b3e1a26b3c9b6fe8f360ed1df1cb416a13162ffa40d6610d5d0431c3dbdb17280fb1aa3aa6eeacb735ead3da4e6cc126d8be74121565b4c9bf6c6a2 WHIRLPOOL f0186cf9317560a480dab53c8c538f35ba5273401f2d37b4be9e3aae06203c43fcd22c4ce17c41cf80a01db5cd22877105ff2be0a8f3effd50cde8c9f42b68df
 DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
@@ -10,22 +10,22 @@ DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14
 EBUILD cryptsetup-1.6.2.ebuild 4322 SHA256 13c975deec6ae9b7801da12e379548c7569c88cdab3bd893144cfe5cac1073fd SHA512 4cf354a17f640899bc63745c7af9ff9572cbc4adf791c00b6bc51469c1c9750731eb504be35df7db50c2646a665442c47c6101f4e2486f64e162121c5645c88c WHIRLPOOL ef3d10184827e39d4662f55137c93fd2f466f29f9dbdbcdd1eac5da2c12ac5328f0ffea833ff18d6f3cbc01b78e9f5d9d4d17006a44a75902837c4a8f90cdf32
 EBUILD cryptsetup-1.6.5.ebuild 4485 SHA256 6f646bbf6096079726e477872a80b07bd96604cb224251dd4497c7eaace15161 SHA512 8101c36d38503d5b333fa3efa7d4dae8bf9edd2241f679eb1b17a0b2bb70e4d83373a24de2c6d4b16a73ee7da6882c2e5ae6eb8b29560666e753347ebeda1906 WHIRLPOOL 790f6bce1f49c83c0cbc9f486eb4331a3897bfaaa80e11dc5ea8604f5fac121defc5eb35b9cf5111d7753fa81c61290d37fde14111c950d4a19e96c9ab760b50
 EBUILD cryptsetup-1.6.6.ebuild 4817 SHA256 2f4a66ec18e6d5fc5033d7fef2c126403ed395a49023263b8f8fea361d8039a9 SHA512 7c505f30ad17ca003d88ddf0aa7d2c395476a9d1521214ce858a48a9b48f52b81d6ea8647ab75f8336d2da811b1bd3a36dbe0764e397466bda8f4eb67606e574 WHIRLPOOL 029900d0fea6cde671e433bd4237c379e1be549fc1236d4ff847926419e47bbd582d86a96dca1701f1a5cc0b7a16b34172f137f7c716204cce7919f98f11e6a4
-MISC ChangeLog 30520 SHA256 48d639f32ef7c3ac8d82f528923b2b196db1d105988651fead5a143c806322b7 SHA512 5efd0b567760bc606ced5b7a98963d5cbf2f10f86ad224d668a91acca22dc2450b1ce9a2eb08634060ecb8f9eb938fae5b95c35b6fe91d08343eee24f41daa46 WHIRLPOOL f8af85fc5599c708b1e5981baeaf548bc111172bfe90e3ce781d29dfa5459b18d533218148c601b8f47ac4de7de7bbd9b1cad030897cb7bd9c15d0199a2722e3
+MISC ChangeLog 30652 SHA256 01d59f02523f7292808bbeef21863bc35eb74681cce4e6f4c8f0ff58a8f7b093 SHA512 41d0014b61bd5ff934ab6215861032fbc2b0a9d3ad8ff2c33b8ae0f0c4e86579a1e5c10718aa6125145ea089a572a043d0161cc72487ee1db93bb511e6eacc6b WHIRLPOOL 10f3d99a8837f233a735795559ce4e0d5c0bfe5e79ff43ca2856d4af55ffa09793376884b6d01abf75581360668be317e780a2bf2686aaa3bf8e60ce4e2e98c0
 MISC metadata.xml 803 SHA256 ce0f5ae709246410b10cad5d04e7ebeb228009bbb3259f0e79aa693e35ff96d3 SHA512 332aa6594bfa3f07a321dd37d9c0787d7d93c77e6a380afe4793a125a58f20bde092410bb91be68e39616dc4933d9fb375ac5576c8d85c802d0227c995ae24e7 WHIRLPOOL 4811a0bc88bcf22d45de33352c85f7f6dc221d19c6cd6fe47072110dcf6e2cd0522abec94fbed99aff5be06e7ae1e4d6dcca33e20ec0b859735da2ef65e0b7a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKrXZAAoJEPGu1DbS6WIAx2sP/0e2IMuKeL3ReoVNTw7Ld4B9
-zJdkf33d5f7uvjyErtfh2XXoZ0b5h4dC5TTkCDMhgLcQLt43yxjDaT7+9OwGlmPI
-KX3+S7pTrYJnHchDefq2X0qqb/2eOflvwwguxMC08fTpyVWra7yGLBwYLYtRr/xS
-2LdmVCJGeGFsnvepU96X84N/YOi/lDock/bJzn7+9xWJ70PIjiOg/JRpH9MG0F9U
-w2yM1b0fo+re3koE25Xt40NR/SXk6u2IrIu9hipgJkMkicBlbpPmcoCXxQfBxV4z
-G4BWc+KqSRy/mzMUyYjfWfzG4gO7Rt4zjA0Ic5Vk4fqUdOj6a+5y7QX0HdAb0Pt+
-vzaHNuphiqg0Z6iGlOkdXBcFQXLbHZV+jxyE44HrAQmnUmlYj181lKkv63ZSGo8d
-XaxpWI4qRhLrKF3GLbpLKJEB9NN8WW03CsZhb6jH+GMx9hEO9XTRLe94pKSpZrUJ
-Wb5T/0rJkyoqzHVcsB9Ljudg7l8xn1ZbwczYl9O2o/fUQDSbAJyGWn3gQqj4FC2Y
-VJskMbB44DQ2K5+BdK7wTx5kNUnlw9a64Cud8ykdgQzKTLD1+DFKcVWyvChQF6uE
-kNV5s8NTAdVtf1auvjSbFiZMSwL6UYvVLqp1IzGGPvrsk2bW4V3nq+KtnJlNgMjO
-TGVPZs8GE7PJI/v4ILTz
-=6078
+iQIcBAEBCAAGBQJVKs+rAAoJEPGu1DbS6WIA1/YP/A8nGzzl2VBpO2hj5vMZgfoD
+vk96uf15Pk0DOiCM3QZM/MIiPq+WxsDdGWVr2pKGBKtxz0S7nzZrq5rY29fH1VzN
+uEoyfhIEhv3kSnFJKGG+YBIZYzymZP1Ztz/1ln8tadaVAqrNGvvcbqQEcK7Z+3Nt
+Oto6lROal1qTILy5WCIbrJ2hFT20Szude11lSWtQp4SRWYUDmpW5X/f+VWythqjp
+XpOl80Vuh7qVx6kK11V6ift2rzNoVXAaCi8TyoMANF4757fJBd+k0U/sOhPRcePQ
+frAAbHKbB6hDZEsqBi6t8oZEMlQ7+JqQ75b9960iI7h489e/eWrv7uHVVRCfyy+4
+tYGIApNR7XG2kFeiWbac5YHehBq0qJsMrPKeipXil78KbaJn3EYWgHrnE8ynAt36
+I66z/ebNX6WBEjDX1a8OEAmOz3n8Nv6Ay+Os3IIiRnXNRmwMahQjuOEslectdt2I
+ue/1iERY/uPSXN/ljRzkvqDNLsQmGLXnOADcM44Dhnh7uj+czdaEtmIVgagLCZ27
+axyVhkN1p8wPhTOaPkqWIgUch55RsxJPCrGf94ZEYZ87Zaa+PgAIqy3tG4OD2WRJ
+SWVvyYCfhO7zyknk60TkXNIRpukBef5pXcL0v8yre5f6CzCWXwf/uPTKHonUsBWV
+CqNQp/HcURsfqg2QtAmv
+=gVps
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
index 9415a0bcef563d93c8fe1fa8cbb9f82efb9086a2..359ded4f89428401a4c766939eeb34772e0e0a23 100755 (executable)
--- a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.2 2014/10/19 04:37:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.3 2015/04/12 20:03:54 vapier Exp $
 
 depend() {
        before checkfs fsck
@@ -103,8 +103,8 @@ dm_crypt_execute_dmcrypt() {
                }
 
                # Notes: sed not used to avoid case where /usr partition is encrypted.
-               mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-               key=${key/:*/}
+               mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
+               key=${key%:*}
                case "${mode}" in
                gpg|reg)
                        # handle key on removable device
@@ -162,7 +162,7 @@ dm_crypt_execute_dmcrypt() {
        if [ "${mode}" = "gpg" ] ; then
                : ${gpg_options:='-q -d'}
                # gpg available ?
-               if type -p gpg >/dev/null ; then
+               if command -v gpg >/dev/null ; then
                        for i in 0 1 2 ; do
                                # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
                                # save stdin stdout stderr "values"
@@ -262,7 +262,7 @@ start() {
                esac
        done
 
-       while read -u 3 targetline ; do
+       while read targetline <&3 ; do
                case ${targetline} in
                # skip comments and blank lines
                ""|"#"*) continue ;;