--- cryptsetup-1.0.5/debian/rules
+++ cryptsetup-1.0.5/debian/rules
@@ -85,7 +85,7 @@
 
 	rm -f debian/crypttab.5 debian/crypttab.5.xml debian/luksformat.8
 	rm -f config.mess
-	rm -f autom4te.cache 
+	rm -rf autom4te.cache 
 	rm -f src/cryptsetup.static
 
 	dh_clean 
--- cryptsetup-1.0.5/debian/changelog
+++ cryptsetup-1.0.5/debian/changelog
@@ -1,3 +1,13 @@
+cryptsetup (2:1.0.5-2ubuntu3) hardy; urgency=low
+
+  * RELIABILY FIX: lib/libdevmapper.c: Ensure that pending device creation
+    events are being processed by calling /sbin/udevsettle. Patch based on
+    OpenSUSE bug #285478, LP: #132373.
+  * Fix debian/rules to not fail to build if autom4te.cache is left behind
+    from a previous incomplete build.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Fri, 02 Nov 2007 20:53:31 +0100
+
 cryptsetup (2:1.0.5-2ubuntu2) gutsy; urgency=low
 
   * debian/initramfs/cryptroot-script:
--- cryptsetup-1.0.5.orig/lib/libdevmapper.c
+++ cryptsetup-1.0.5/lib/libdevmapper.c
@@ -184,6 +184,21 @@
 	if (dmi.read_only)
 		options->flags |= CRYPT_FLAG_READONLY;
 
+	/*
+	 * patch inspired from
+	 * https://bugzilla.novell.com/show_bug.cgi?id=285478
+	 *
+	 * At this point, it is quite likely that there are currently
+	 * devmapper events being processed. In order to avoid
+	 * workarounds (which involve calling udevsettle at the
+	 * 'right' places in scripts integrating cryptsetup), we are
+	 * checking here if udevsettle is available and call it if it
+	 * is.
+	 */
+	if (0 == access("/sbin/udevsettle", X_OK)) {
+		system("/sbin/udevsettle");
+	}
+	
 	r = 0;
 	
 out: