Fix dm-crypt-start.sh file for passphrase at startup issue, bug 243216

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 9 insertions, 15 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 38dea5e69dcb..e2137753e797 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.64 2009/04/19 18:41:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.65 2009/06/16 20:44:22 darkside Exp $
+
+  16 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
+  files/1.0.6-r2-dm-crypt-start.sh:
+  Fix dm-crypt-start.sh file for passphrase at startup issue, bug 243216
 
   19 Apr 2009; Doug Goldstein <cardoe@gentoo.org>
   -files/1.0.6-dm-crypt-start.sh, -cryptsetup-1.0.5.ebuild,
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index b3f509fbce38..7c2cbcdfc0e9 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.5-dm-crypt-start.sh 8298 RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 SHA1 00c7380894d30842c01ef18ed3e14114cf1da36b SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201
 AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
 AUX 1.0.5-dmcrypt.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA1 b006d7f31773842e7247b2df0fe1735aac87ec59 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280
 AUX 1.0.5-dmcrypt.rc 660 RMD160 f1af3b07db2eaf938fd21b8ef4b23068f2fac78a SHA1 c297587c68d84611a8fec444d3a98443105efee7 SHA256 11518d0d26572b07f43e7ad69f638e93546656b9f14b647d9825ab8b4619906d
 AUX 1.0.6-dmcrypt.confd 3141 RMD160 64d4d4d7df03d301632851bee5969d11a61d57b1 SHA1 e44c783fd42076c7976cdb9bbf2c5280382ffa31 SHA256 9a962e482ead52e7636c0b99145a420f817c73efb6d506cb8322e555e5515325
-AUX 1.0.6-r2-dm-crypt-start.sh 8086 RMD160 fd7efee56a67b66f80e39a154365959f9068930e SHA1 d11d188022cc6909c914efb22449d2a8a39a0899 SHA256 e338c017d0b645eb2e1d6d88d0d01610f8bf1ddf3901203be5047845eb13d782
+AUX 1.0.6-r2-dm-crypt-start.sh 8092 RMD160 d61f1cf13e75c105065f8ca6c6a9afe12eedbcaa SHA1 fc4b6580063cd3758ada2d1ddfced3e005c8fabf SHA256 56004bef91b8fad57fe67fec19427dd7c48e01c8e1ba7ff60f8c370295775fdc
 AUX cryptfs.confd 1337 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 SHA1 5e7b239e549b6def07af968d02b300ec36d8aac1 SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c
 AUX cryptsetup-1.0.6-udevsettle.patch 1138 RMD160 16cedcb2393fa699e2d43f86c3d8bdcf792771a6 SHA1 80ca7458b747bef795ce27eafb2cf9028fde9f68 SHA256 4a957a4ca6f86ec4a1384c508e2ce57c95976ea1ef0c46fe12fb7d8bf5d0cf8d
 AUX cryptsetup-libmapper.patch 297 RMD160 1f5a19f125147797db69f4fb75d6abe36743d52b SHA1 e198368263d1635d30d27c87ed45deb23fac2f06 SHA256 c66c178fe949ceccd82d64f5acc8288e0486014dcfbc4fc6f4a0bf6c62bf4cc8
@@ -18,12 +15,5 @@ DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea9
 EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
 EBUILD cryptsetup-1.0.5-r1.ebuild 2967 RMD160 e3d53062c60387d7ed59c864a842de457f031d3f SHA1 4a603cb45fe4cf249cc6a75413d3e14481098b6e SHA256 4f305ccb9c8432becb2e4a42859305aa642d3df8c8ed04b78c5dca4f839bead7
 EBUILD cryptsetup-1.0.6-r2.ebuild 3112 RMD160 f833a6f36e18935eab111a8d87429fa14e36f79f SHA1 a9b2cfea40a03760eb984b8f4689c878b1523789 SHA256 413d9a58c739b55c7916959278f9378d7d612bfb8429e7c666ea1f5b5f320956
-MISC ChangeLog 9194 RMD160 792829471a069f6d49d3be9ddd3219e43837c7b3 SHA1 ab31d2cc707d420bf4f6d0528b405d9a69e81393 SHA256 628ad511d9d95655083b4f255d7346d08e08d23f262f56344834f84fae40b17d
+MISC ChangeLog 9356 RMD160 573a24556529db1ac96b825ea2b8d071e4b47ef1 SHA1 f2182c4c977cc4634c7608f776ab65dfae46a0c3 SHA256 a3285cc509c076985853dc0d7cf1f8f02ebf4a8966c422990408011bddd0856e
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEUEARECAAYFAknrcJcACgkQoeSe8B0zEfzoFwCY+qiveyYKeG3h0Fy6EoO2G1Fh
-sgCeLg+Kt/SnFFbuiTMJsJKCzEe5Du4=
-=0FLk
------END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
index 6fbf7a1e81b1..44d2c4563b18 100644
--- a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
+++ b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
@@ -255,7 +255,7 @@ if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
 	# Fix for baselayout-1.12.10 (bug 174256)
 	[ -z ${SVCNAME} ] && SVCNAME="${myservice}"
 
-	while read targetline ; do
+	while read -u 3 targetline ; do
 		# skip comments and blank lines
 		[[ ${targetline}\# == \#* ]] && continue
 
@@ -283,7 +283,7 @@ if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
 
 		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
 		eval "${targetline}"
-	done < /etc/conf.d/dmcrypt
+	done 3< /etc/conf.d/dmcrypt
 
 	# If we have a target queued up, then execute it
 	dm_crypt_execute_${SVCNAME}