Apply POSIX patch #236858.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

3 files changed, 19 insertions, 16 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 352b80d6f006..1242c296f3a9 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.244 2008/10/26 02:16:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.245 2008/10/26 03:16:47 vapier Exp $
+
+  26 Oct 2008; Mike Frysinger <vapier@gentoo.org> files/crypto-loop.initd:
+  Apply POSIX patch #236858.
 
   26 Oct 2008; Mike Frysinger <vapier@gentoo.org> util-linux-2.14.1.ebuild:
   Update loop-aes support #242874 by Fabio Coatti and Lars (Polynomial-C).
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3e5795e726a8..e3f7d8831491 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
-AUX crypto-loop.initd 1722 RMD160 a4015562eb8ac2946082acd54599dc0ad95ca2f1 SHA1 c33d9f04ba9b3ba778bf91404ef559cbc9a8a24f SHA256 6acbd91fdda145b511f380c6d01d0fb9049500d78a109ee54a305e7986b6de88
+AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
 AUX no-symlink-resolve.patch 316 RMD160 a38941174577c046e982d696b245e8c64d491caa SHA1 8cb06d4ed19ab4330b1e3841d0f824d19ea66a7c SHA256 e02ba35bde41df4fcbf215a4598427711bd8104b883f9bd7aeab76c1c8741db9
 AUX util-linux-2.11z-agetty-domainname-option.patch 1810 RMD160 68e18d4e3797a5765283a1ffe1bff962d2df90b9 SHA1 5fec0e6b34021c1dfc390192af3bbbef32c1124f SHA256 4f559a00e7a88e0aadafe47b3f3466545b79f69fe4caf747bdaf23836977083b
 AUX util-linux-2.11z-parallel-make.patch 369 RMD160 94ea7ab04a74c46f07fc3ca7a806a00b8c434f20 SHA1 98270d2606e0450ba0dc2095b3c557f6dec08f1f SHA256 61096f58f84e442accb8b21ae1ced40e45e6801ff8068d454281458af492837a
@@ -46,12 +46,12 @@ EBUILD util-linux-2.13.1.1.ebuild 2556 RMD160 d978885e3991f0fc3ad8c644dd18729a5e
 EBUILD util-linux-2.14.1.ebuild 2573 RMD160 4f8ebcc8ec52f8cd8deb384920328f3b5a0a4210 SHA1 e22d56151da2cebef26849cd5f58f0296e1ee754 SHA256 053f8a7a18b6f12343863e491eab38cfb3e221563852947bab7a1874e728ff27
 EBUILD util-linux-2.14.ebuild 2567 RMD160 390a489ae34505eeaf0d3739c6e98ad6fc209788 SHA1 8a5ad8ef7710badc35c7d351f7c609d91bfb069b SHA256 26eb7c35a3bf48d7c391d67580dec230f4e120836930be5b8054a8de9bda2916
 EBUILD util-linux-9999.ebuild 2115 RMD160 2e24b69651286dc8c751b39c7b43a9cbd6f579ab SHA1 e6d713b5b4e75bf2ede0b4a817789e75a9ef52f7 SHA256 c96b58766ac5e81ca689d2ae3e84cb9252b3129b4ea7f88b15cc2d290b86515f
-MISC ChangeLog 37727 RMD160 62575e1cb7eda72c08dc425a4f026b4f6c088e1c SHA1 59fed0797fd4044fdb05148d08afd9b46bdc81fa SHA256 a2baea41bdac1210c7dc3b52ba9bf065dab01eadcbd3fffd6c9e7209bec9c174
+MISC ChangeLog 37832 RMD160 68ce4cfcef3ea4a2dc67393b81cb65a4d8e917f5 SHA1 ce31a41dd37aaa96c7b2b65c6db69537b3b143b6 SHA256 eaa28d0a1f909c3e30afc65b285c1ac010837a4c6d62f07d6daeb629233c5d5c
 MISC metadata.xml 353 RMD160 747c4d6bef851325d143fed904bae6b102d6eb09 SHA1 782b133d9f9bc0662dd84aa6a4f17a117a96b69e SHA256 53c1f227fbd4fd73ef99f545de234c3608b2ca15268c6953f191a18653f26dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkD0wUACgkQ67wieSYcaxebuACghykwpZB9tCZKNxDLI73QzGtE
-gTsAnjdEpLjVSwACH4s+tiiMVhAC+VM3
-=oLpK
+iEYEARECAAYFAkkD4SYACgkQ67wieSYcaxcungCePAivsj50oO+fvqwFfda801BK
+YogAoL03P3XWBYYDOndcAFXUkxvioYJJ
+=XAn3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/crypto-loop.initd b/sys-apps/util-linux/files/crypto-loop.initd
index 2886982d3149..853bae2756eb 100755
--- a/sys-apps/util-linux/files/crypto-loop.initd
+++ b/sys-apps/util-linux/files/crypto-loop.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.3 2008/02/01 12:36:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $
 
 depend() {
 	if [ -x /etc/init.d/root ]; then
@@ -18,7 +18,7 @@ start() {
 
 	ebegin "Starting crypto loop devices"
 
-	if [[ -e /etc/conf.d/crypto-loop ]] ; then
+	if [ -e /etc/conf.d/crypto-loop ] ; then
 		egrep "^loop" /etc/conf.d/crypto-loop | \
 		while read loopline ; do
 			eval ${loopline}
@@ -26,17 +26,17 @@ start() {
 			local configured=$(awk -v MOUNT="${device}" \
 				'($2 == MOUNT) { print "yes" }' /proc/mounts)
 
-			if [[ ${configured} != "yes" ]] ; then
+			if [ "${configured}" != "yes" ] ; then
 				einfo "  Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): "
 
-				if [[ -n ${hash} ]] ; then
+				if [ -n "${hash}" ] ; then
 					/usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\
 					/sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
 				else
 					/sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
 				fi
 
-				if [[ $? -ne 0 ]] ; then
+				if [ $? -ne 0 ] ; then
 					ewarn "Failure configuring ${loop}.  Skipping."
 					status=1
 				fi
@@ -53,11 +53,11 @@ start() {
 
 stop() {
 	local status="0"
-	for loop in $(ls /dev/loop[0-9]) ; do
-		losetup ${loop} &> /dev/null
-		if [[ $? == 0 ]] ; then
-			umount ${loop} &>/dev/null || swapoff "${loop}" &>/dev/null
-			if ! /sbin/losetup -d ${loop} &> /dev/null ; then
+	for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
+		losetup ${loop} > /dev/null 2>&1
+		if [ $? -eq 0 ] ; then
+			( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
+			if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
 				ewarn "Failure deconfiguring ${loop}."
 				status=1
 			fi