Bug#773073: unblock: mdadm/3.3.2-4
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package mdadm to fix an RC bug and bring in other fixes.
I've added an unblock hint, but needs review by the d-i release manager.
Debdiff attached.
unblock-udeb mdadm/3.3.2-4
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'testing-proposed-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mdadm-3.3.2/debian/changelog mdadm-3.3.2/debian/changelog
--- mdadm-3.3.2/debian/changelog 2014-10-04 18:28:54.000000000 +0100
+++ mdadm-3.3.2/debian/changelog 2014-12-05 14:29:22.000000000 +0000
@@ -1,3 +1,31 @@
+mdadm (3.3.2-4) unstable; urgency=medium
+
+ * really remove /var/lib/mdadm in postinst, fixing a brown-paper bag
+ bug in previous upload (I fixed it earlier but forgot to commit it
+ before 3.3.2-3 release). (Closes: #764036 #771852)
+ * mention closing of #588965 #599352 #694513 by 3.3-1
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Fri, 05 Dec 2014 17:29:22 +0300
+
+mdadm (3.3.2-3) unstable; urgency=medium
+
+ * remove /var/lib/mdadm dir in postinst to clean up from old pkg,
+ remove config files on purge (restore extraneous cleanup from
+ last change) (Closes: #764036)
+ * remove set -u (error on unset variables) from maintscripts
+ (Closes: #766308)
+ * rebuildmap-strip-local-host-name-from-device-name.patch - a patch
+ from upstream fixing a bug when mdadm have to re-create device
+ nodes after assembling arrays (eg, when switching from initramfs
+ without preserving /dev and /run), to choose the same device names
+ as when doing inital assembly
+ * readlink-path.patch: readlink is in /bin not /usr/bin on debian
+ (Closes: #766416)
+ * mdmonitor-service-simplify.diff: simplify mdmonitor.service
+ systemd file, do not try to read non-existing files (Closes: #764647)
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Fri, 28 Nov 2014 09:55:14 +0300
+
mdadm (3.3.2-2) unstable; urgency=medium
* remove more leftovers from old versions
@@ -56,7 +84,7 @@
mdadm (3.3-1) unstable; urgency=low
[ Michael Tokarev ]
- * new upstream 3.3 release (Closes: #718896)
+ * new upstream 3.3 release (Closes: #718896 #588965 #599352 #694513)
See ANNOUNCE-3.3 for details.
Patches:
- refreshed debian-conffile-location.diff
diff -Nru mdadm-3.3.2/debian/mdadm.postinst mdadm-3.3.2/debian/mdadm.postinst
--- mdadm-3.3.2/debian/mdadm.postinst 2014-10-04 18:07:22.000000000 +0100
+++ mdadm-3.3.2/debian/mdadm.postinst 2014-12-05 08:09:59.000000000 +0000
@@ -3,10 +3,9 @@
# Copyright © 2005-2008 Martin F. Krafft <madduck@debian.org>
# Distributable under the terms of the GNU GPL version 2.
#
+set -e
. /usr/share/debconf/confmodule
-# See #369953 for ordering
-set -eu
case "${1:-}" in
configure|reconfigure)
@@ -99,9 +98,11 @@
command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
- if dpkg --compare-versions "$2" le 3.3.2-1; then
- rm -f /var/lib/mdadm/CONF-UNCHECKED
- rm -f /var/lib/mdadm/mdadm.conf-generated
+ if dpkg --compare-versions "$2" le 3.3.2-3; then
+ rm -f /var/lib/mdadm/CONF-UNCHECKED /var/lib/mdadm/mdadm.conf-generated
+ if [ -d /var/lib/mdadm ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/mdadm
+ fi
fi
;;
esac
diff -Nru mdadm-3.3.2/debian/mdadm.postrm mdadm-3.3.2/debian/mdadm.postrm
--- mdadm-3.3.2/debian/mdadm.postrm 2014-10-04 18:07:27.000000000 +0100
+++ mdadm-3.3.2/debian/mdadm.postrm 2014-11-14 16:00:29.000000000 +0000
@@ -3,7 +3,7 @@
# Copyright © 2006-2008 Martin F. Krafft <madduck@debian.org>
# Distributable under the terms of the GNU GPL version 2.
#
-set -eu
+set -e
case "${1:-}" in
remove)
@@ -14,6 +14,10 @@
fi
;;
+ purge)
+ rm -f /etc/default/mdadm /etc/mdadm.conf /etc/mdadm/mdadm.conf
+ ;;
+
esac
[ -d /run/systemd/system ] && systemctl --system daemon-reload >/dev/null || :
diff -Nru mdadm-3.3.2/debian/mdadm.preinst mdadm-3.3.2/debian/mdadm.preinst
--- mdadm-3.3.2/debian/mdadm.preinst 2014-10-04 18:07:34.000000000 +0100
+++ mdadm-3.3.2/debian/mdadm.preinst 2014-11-14 16:00:35.000000000 +0000
@@ -2,7 +2,7 @@
# Copyright © martin f. krafft <madduck@debian.org>
# Distributed under the terms of the Artistic Licence 2.0
#
-set -eu
+set -e
# based on idea from http://www.dpkg.org/dpkg/ConffileHandling
rm_conffile() {
diff -Nru mdadm-3.3.2/debian/patches/mdmonitor-service-simplify.diff mdadm-3.3.2/debian/patches/mdmonitor-service-simplify.diff
--- mdadm-3.3.2/debian/patches/mdmonitor-service-simplify.diff 1970-01-01 01:00:00.000000000 +0100
+++ mdadm-3.3.2/debian/patches/mdmonitor-service-simplify.diff 2014-11-14 16:18:14.000000000 +0000
@@ -0,0 +1,20 @@
+Subject: simplify mdmonitor.service
+From: Michael Tokarev <mjt@tls.msk.ru>
+Date: Fri, 14 Nov 2014 19:18:05 +0300
+Bug-Debian: http://bugs.debian.org/764647
+Forwarded: no
+
+There isn't much for customization for mdadm --monitor.
+it'll just do what it's supposed to do, so just run it.
+
+--- a/systemd/mdmonitor.service
++++ b/systemd/mdmonitor.service
+@@ -10,7 +10,4 @@ Description=MD array monitor
+ DefaultDependencies=no
+
+ [Service]
+-Environment= MDADM_MONITOR_ARGS=--scan
+-EnvironmentFile=-/run/sysconfig/mdadm
+-ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh
+-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
++ExecStart=BINDIR/mdadm --monitor --scan
diff -Nru mdadm-3.3.2/debian/patches/readlink-path.patch mdadm-3.3.2/debian/patches/readlink-path.patch
--- mdadm-3.3.2/debian/patches/readlink-path.patch 1970-01-01 01:00:00.000000000 +0100
+++ mdadm-3.3.2/debian/patches/readlink-path.patch 2014-11-14 16:12:47.000000000 +0000
@@ -0,0 +1,15 @@
+From: Michael Tokarev <mjt@tls.msk.ru>
+Subject: readlink is in /bin not /usr/bin on debian
+Date: Fri, 14 Nov 2014 19:11:51 +0300
+Bug-Debian: http://bugs.debian.org/766416
+Forwarded: no
+
+This is a debian-specific change, upstream ships
+the rule to use /usr/bin/readlink while on debian
+it is /bin/readlink
+
+--- a/udev-md-raid-arrays.rules
++++ b/udev-md-raid-arrays.rules
+@@ -38 +38 @@ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
+-ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
++ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
diff -Nru mdadm-3.3.2/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch mdadm-3.3.2/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch
--- mdadm-3.3.2/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch 1970-01-01 01:00:00.000000000 +0100
+++ mdadm-3.3.2/debian/patches/rebuildmap-strip-local-host-name-from-device-name.patch 2014-11-14 16:06:43.000000000 +0000
@@ -0,0 +1,47 @@
+From 628cdf19ea35daad22e409e51c0abc7ffb19d6aa Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Mon, 3 Nov 2014 12:49:05 +1100
+Subject: Rebuildmap: strip local host name from device name.
+
+When /run/mdadm/map is being rebuilt, e.g. by "mdadm -Ir",
+if the device doesn't exist in /dev, we have to choose
+a name.
+Currently we don't strip the hostname which is wrong if
+it is the local host.
+
+Reported-by: Stephen Kent <smkent@smkent.net>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ mapfile.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/mapfile.c b/mapfile.c
+index 4e7f242..41599df 100644
+--- a/mapfile.c
++++ b/mapfile.c
+@@ -455,12 +455,19 @@ void RebuildMap(void)
+ sep = "";
+ }
+ }
+- if (strchr(name, ':'))
+- /* probably a uniquifying
++ if (strchr(name, ':')) {
++ /* Probably a uniquifying
+ * hostname prefix. Allow
+- * without a suffix
++ * without a suffix, and strip
++ * hostname if it is us.
+ */
++ if (homehost && unum == -1 &&
++ strncmp(name, homehost,
++ strlen(homehost)) == 0 &&
++ name[strlen(homehost)] == ':')
++ name += strlen(homehost)+1;
+ unum = -1;
++ }
+
+ while (conflict) {
+ if (unum >= 0)
+--
+1.7.10.4
+
diff -Nru mdadm-3.3.2/debian/patches/series mdadm-3.3.2/debian/patches/series
--- mdadm-3.3.2/debian/patches/series 2014-10-04 18:28:54.000000000 +0100
+++ mdadm-3.3.2/debian/patches/series 2014-11-14 16:16:41.000000000 +0000
@@ -3,3 +3,6 @@
sha1-includes.diff
use-external-blkid.diff
build-sys-no-check_rundir.patch
+rebuildmap-strip-local-host-name-from-device-name.patch
+readlink-path.patch
+mdmonitor-service-simplify.diff
Reply to: