Bug#726321: pu: package multipath-tools/0.4.9+git0.4dfdaf2b-7~deb7u2

[Salvatore Bonaccorso <carnil@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hi Stable Release Managers

Cc'ed also Ritesh Raj Sarraf and Gordon Gurbert.

multipath-tools introduced at least in Wheezy (not know for unstable) a
regression, it's reported as #726296 and #726311.

Attached is a proposed debdiff based on the udev rule from upstream
(as per #618700) but restoring the workaround needed in Debian to
gather the information via /lib/udev/dmsetup_env.

I have uploaded also binary packages to [1] to ease some testing of
affected users reading the given bugreports and this one. Gordon could
you test these also in your environment?

 [1] http://people.debian.org/~carnil/multipath-tools/
 
I was able to test the result however only in our case of multipath
devices, not the one of dmraid.

Does this look sane to be uploaded and accepted for stable?

Regards,
Salvatore

diff -Nru multipath-tools-0.4.9+git0.4dfdaf2b/debian/changelog multipath-tools-0.4.9+git0.4dfdaf2b/debian/changelog
--- multipath-tools-0.4.9+git0.4dfdaf2b/debian/changelog	2013-07-01 08:40:56.000000000 +0200
+++ multipath-tools-0.4.9+git0.4dfdaf2b/debian/changelog	2013-10-14 16:08:51.000000000 +0200
@@ -1,3 +1,15 @@
+multipath-tools (0.4.9+git0.4dfdaf2b-7~deb7u2) stable-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Restore "dmsetup export" workaround for Debian.
+    The hunk using /lib/udev/dmsetup_env to gather device-mapper information
+    needed was lost in the -7 Debian revision upload. Restore the udev rule
+    based on the upstream one.
+    Revert copying of kpartx/kpartx.rules from upstream sources.
+    (Closes: #726296, #726311)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 14 Oct 2013 16:06:08 +0200
+
 multipath-tools (0.4.9+git0.4dfdaf2b-7~deb7u1) stable-proposed-updates; urgency=low
 
   * 0.4.9+git0.4dfdaf2b-7~deb7u1 for Wheezy multipath updates 
diff -Nru multipath-tools-0.4.9+git0.4dfdaf2b/debian/kpartx.udev multipath-tools-0.4.9+git0.4dfdaf2b/debian/kpartx.udev
--- multipath-tools-0.4.9+git0.4dfdaf2b/debian/kpartx.udev	1970-01-01 01:00:00.000000000 +0100
+++ multipath-tools-0.4.9+git0.4dfdaf2b/debian/kpartx.udev	2013-10-14 16:08:51.000000000 +0200
@@ -0,0 +1,34 @@
+#
+# persistent links for device-mapper devices
+# only hardware-backed device-mapper devices (ie multipath, dmraid,
+# and kpartx) have meaningful persistent device names
+#
+
+KERNEL!="dm-*", GOTO="kpartx_end"
+ACTION=="remove", GOTO="kpartx_end"
+
+# This is a temporary hack until Debian's dmsetup properly supports "dmsetup
+# export". For more information see: #434241, #487881, #493078
+IMPORT{program}="dmsetup_env %M %m"
+
+ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end"
+
+ENV{DM_UUID}=="?*", IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
+
+OPTIONS="link_priority=50"
+
+# Create persistent links for multipath tables
+ENV{DM_UUID}=="mpath-*", \
+	SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
+
+# Create persistent links for partitions
+ENV{DM_PART}=="?*", \
+        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}-part$env{DM_PART}"
+
+# Create dm tables for partitions
+ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
+        RUN+="/sbin/kpartx -u -p -part /dev/$name"
+
+LABEL="kpartx_end"
+
+
diff -Nru multipath-tools-0.4.9+git0.4dfdaf2b/debian/rules multipath-tools-0.4.9+git0.4dfdaf2b/debian/rules
--- multipath-tools-0.4.9+git0.4dfdaf2b/debian/rules	2013-07-01 08:40:56.000000000 +0200
+++ multipath-tools-0.4.9+git0.4dfdaf2b/debian/rules	2013-10-14 16:08:51.000000000 +0200
@@ -26,8 +26,6 @@
 build-stamp:
 	dh_testdir
 	
-	[ ! -f kpartx/kpartx.rules ] || cp kpartx/kpartx.rules debian/kpartx.udev
-
 	$(MAKE) $(OPTFLAGS) LIB=lib
 
 	touch $@