Do not complain if udevadm did not exec for systems that use mdev and such #276369 by Florian Streibelt.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

3 files changed, 20 insertions, 19 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 8ea0f5c861c1..6db54a676331 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2009/07/15 18:41:14 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.73 2009/08/16 18:42:04 vapier Exp $
+
+  16 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+  files/cryptsetup-1.0.6-udevsettle.patch:
+  Do not complain if udevadm did not exec for systems that use mdev and such
+  #276369 by Florian Streibelt.
 
   15 Jul 2009; nixnut <nixnut@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
   ppc stable #259253
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 007bdb5a1fc5..bf66af8ce5f4 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -5,7 +8,7 @@ AUX 1.0.5-dmcrypt.rc 660 RMD160 f1af3b07db2eaf938fd21b8ef4b23068f2fac78a SHA1 c2
 AUX 1.0.6-dmcrypt.confd 3141 RMD160 64d4d4d7df03d301632851bee5969d11a61d57b1 SHA1 e44c783fd42076c7976cdb9bbf2c5280382ffa31 SHA256 9a962e482ead52e7636c0b99145a420f817c73efb6d506cb8322e555e5515325
 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-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
 AUX cryptsetup-libmapper.patch 297 RMD160 1f5a19f125147797db69f4fb75d6abe36743d52b SHA1 e198368263d1635d30d27c87ed45deb23fac2f06 SHA256 c66c178fe949ceccd82d64f5acc8288e0486014dcfbc4fc6f4a0bf6c62bf4cc8
 AUX dm-crypt-start.sh 3939 RMD160 b8e77d42b9f5df01cb04f320d7b983855626b39b SHA1 1af1421b687626dae63781f4d78736522d641984 SHA256 2a6114349008ce7d438dae7adcdcd35fdfafa7d54f73d811812c29938865f651
 AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0f9c13e12b4310a190d5db48d4fd32267b795094 SHA256 944e2227b1125902acfa322373dda67d13998ac2d0af075810986471fcbca5a9
@@ -15,5 +18,12 @@ 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 3107 RMD160 afb2c8fb4e5897ca1d40aa3c663da8322fe69831 SHA1 ded964e6b4ebf1c09eb10d887714a06ef16b6523 SHA256 02260e473e19cc0a18f7f17e0ee4ab9cebad1c589ea11c0d5b295acd9e9f4ab9
-MISC ChangeLog 10096 RMD160 358f1c6640b6756fd57a568b58f49196e4364efb SHA1 822956aa0b26b6868f43184acb4369a1f64c996d SHA256 50a6e51d35fc736a399f3874a3853bd2f7f4742e1c810877353e25eb988e816f
+MISC ChangeLog 10299 RMD160 1073a355659d68219ef285656030b522d0ed2ff2 SHA1 103c56b4a59959c6a0ed2cccfbc710c9d257a418 SHA256 98f08dfeef97b8582f65dd1c73289c005787c30b0912b81a671666c51618902c
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqIUwIACgkQlPl3HsVfCDrZlgCeJOAP6aUyzdFmdOgen+ohRrll
+ZKwAn1xJEBZ80clt0bayI5L50b4ZlbS6
+=L9th
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
index 0d28732471e2..6860a7c4c34c 100644
--- a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
+++ b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
@@ -1,12 +1,9 @@
 2008-09-13  Doug Goldstein  <cardoe@gentoo.org>
 	* switch to udevadm settle since udevsettle has been deprecated
 	  and finally removed with udev 126.
-	* add message if udevadm settle fails to execute properly what the
-	  consequence is
 
-diff -Nur cryptsetup-1.0.6/lib/libdevmapper.c cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c
---- cryptsetup-1.0.6/lib/libdevmapper.c	2007-10-25 03:11:19.000000000 -0400
-+++ cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c	2008-09-13 21:22:56.000000000 -0400
+--- cryptsetup-1.0.6/lib/libdevmapper.c
++++ cryptsetup-1.0.6/lib/libdevmapper.c
 @@ -18,11 +18,11 @@
  
  #define	CRYPT_TARGET	"crypt"
@@ -22,14 +19,3 @@ diff -Nur cryptsetup-1.0.6/lib/libdevmapper.c cryptsetup-1.0.6-udevsettle/lib/li
  }
  
  static void set_dm_error(int level, const char *file, int line,
-@@ -192,7 +192,9 @@
- 		options->flags |= CRYPT_FLAG_READONLY;
- 
- 	/* run udevsettle to avoid a race in libdevmapper causing busy dm devices */
--	run_udevsettle();
-+	if (run_udevsettle() != 0)
-+		fprintf(stderr, "%s unable to avoid potential race with busy "
-+				"device-mapper devices", UDEVSETTLE);
- 
- 	r = 0;
-