Control: unmerge 734813
Control: severity 731574 wishlist
Control: tags 734813 + patch
On Sat, Dec 07, 2013 at 12:06:06AM +0100, Michael Stapelberg wrote:
> Can you please package the new upstream version so that this bugfix will
> be available and the docker package can start depending on mount >= 2.24
> instead of adding ugly workarounds please? Thanks!
While packaging a new upstream release is sufficient, there also is a
1-line fix available against the old code base. I am attaching a patch,
which also happens to fix the FTBFS (cause without that fix you couldn't
evaluate this fix anyway, right?).
I intend to NMU util-linux. Please raise any objections soonish.
Helmut
diff -u util-linux-2.20.1/configure.ac util-linux-2.20.1/configure.ac
--- util-linux-2.20.1/configure.ac
+++ util-linux-2.20.1/configure.ac
@@ -733,7 +733,7 @@
[m4_ifval([$1],
[#(
$1) syscall="$2" ;;dnl
- _UTIL_CHECK_SYSCALL_FALLBACK(m4_shiftn(2, $@))])dnl
+ _UTIL_CHECK_SYSCALL_FALLBACK(m4_shift2($@))])dnl
])
diff -u util-linux-2.20.1/mount/mount.c util-linux-2.20.1/mount/mount.c
--- util-linux-2.20.1/mount/mount.c
+++ util-linux-2.20.1/mount/mount.c
@@ -596,7 +596,7 @@
/* The propagation flags should not be used together with any other
flags */
if (*flags & MS_PROPAGATION)
- *flags &= MS_PROPAGATION;
+ *flags &= MS_PROPAGATION|MS_REC;
}
/* Try to build a canonical options string. */
diff -u util-linux-2.20.1/debian/changelog util-linux-2.20.1/debian/changelog
--- util-linux-2.20.1/debian/changelog
+++ util-linux-2.20.1/debian/changelog
@@ -1,3 +1,12 @@
+util-linux (2.20.1-5.6) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix m4 looping in configure.ac's _UTIL_CHECK_SYSCALL.
+ m4_shiftn(2, sequence of two elements) infloops. (Closes: #724255)
+ * mount should not strip MS_REC for --make-r* options. (Closes: #731574)
+
+ -- Helmut Grohne <[email protected]> Sat, 25 Jan 2014 13:38:36 +0100
+
util-linux (2.20.1-5.5) unstable; urgency=medium
* Non-maintainer upload by the Security Team.
