Bug#774077: unblock: libpam-mount/2.14-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
The recent NMU [1] for libpam-mount fixed one RC bug, #764451 [2]. On
2014-11-15, libpam-mount was removed from testing because of this bug.
The freeze policy says that auto-removed packages need action within one
week of removal, however as this was an NMU, I was wondering whether
you'd consider counting from the NMU upload instead.
The attached debdiff is from between the last version in testing, and in
unstable. The only change is an added patch fixing #764451, taken from
upstream, and it is trivial.
I have CCed the maintainer.
Regards,
Christian
[1] https://tracker.debian.org/news/670628
[2] https://bugs.debian.org/764451
[3] https://tracker.debian.org/news/585258
diff -Nru libpam-mount-2.14/debian/changelog libpam-mount-2.14/debian/changelog
--- libpam-mount-2.14/debian/changelog 2013-08-31 17:12:07.000000000 +0200
+++ libpam-mount-2.14/debian/changelog 2014-12-23 12:02:00.000000000 +0100
@@ -1,3 +1,11 @@
+libpam-mount (2.14-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream's patch dropped dropping the -p0 mount option. It is no
+ longer available in util-linux >= 2.23. Closes: #764451
+
+ -- Christian Kastner <debian@kvr.at> Tue, 23 Dec 2014 12:00:32 +0100
+
libpam-mount (2.14-1) unstable; urgency=low
* New upstream release.
diff -Nru libpam-mount-2.14/debian/patches/011-pmvarrun-no-l0g libpam-mount-2.14/debian/patches/011-pmvarrun-no-l0g
--- libpam-mount-2.14/debian/patches/011-pmvarrun-no-l0g 2013-06-27 15:16:22.000000000 +0200
+++ libpam-mount-2.14/debian/patches/011-pmvarrun-no-l0g 2014-12-23 11:57:04.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libpam-mount-2.14~zgit3+966c6bea/src/pmvarrun.c
+Index: libpam-mount-2.14/src/pmvarrun.c
===================================================================
---- libpam-mount-2.14~zgit3+966c6bea.orig/src/pmvarrun.c 2013-06-27 15:15:39.249980587 +0200
-+++ libpam-mount-2.14~zgit3+966c6bea/src/pmvarrun.c 2013-06-27 15:16:12.817382328 +0200
+--- libpam-mount-2.14.orig/src/pmvarrun.c
++++ libpam-mount-2.14/src/pmvarrun.c
@@ -151,12 +151,12 @@ long str_to_long(const char *n)
long val;
char *endptr = NULL;
diff -Nru libpam-mount-2.14/debian/patches/remove-unsupported--p0-mount-option.patch libpam-mount-2.14/debian/patches/remove-unsupported--p0-mount-option.patch
--- libpam-mount-2.14/debian/patches/remove-unsupported--p0-mount-option.patch 1970-01-01 01:00:00.000000000 +0100
+++ libpam-mount-2.14/debian/patches/remove-unsupported--p0-mount-option.patch 2014-12-23 11:59:58.000000000 +0100
@@ -0,0 +1,35 @@
+Author: Till Maas <opensource@till.name>
+Date: Wed Nov 26 20:59:52 2014 +0100
+Subject: pam_mount: remove unsupported -p0 mount option
+
+The -p0 mount options was removed in util-linux 2.23.
+
+Bug-Debian: https://bugs.debian.org/764451
+Origin: http://sourceforge.net/p/pam-mount/pam-mount/ci/ca802908d22771e7fff8ffd8051ec21f7b0231eb/
+Last-Update: 2014-12-23
+Index: libpam-mount-2.14/doc/pam_mount.conf.5.in
+===================================================================
+--- libpam-mount-2.14.orig/doc/pam_mount.conf.5.in
++++ libpam-mount-2.14/doc/pam_mount.conf.5.in
+@@ -240,7 +240,7 @@ specify either absolute paths, or relati
+ searched. Since login programs have differing default PATHs, pam_mount has its
+ own path definition (see above).
+ .TP
+-\fB<lclmount>\fP\fImount \-p0 \-t %(FSTYPE) ...\fP\fB</lclmount>\fP
++\fB<lclmount>\fP\fImount \-t %(FSTYPE) ...\fP\fB</lclmount>\fP
+ The regular mount program.
+ .TP
+ \fB<umount>\fP\fIumount %(MNTPT)\fP\fB</umount>\fP
+Index: libpam-mount-2.14/src/rdconf1.c
+===================================================================
+--- libpam-mount-2.14.orig/src/rdconf1.c
++++ libpam-mount-2.14/src/rdconf1.c
+@@ -1431,7 +1431,7 @@ static const struct pmt_command default_
+ */
+ {CMD_NFSMOUNT, "nfs", {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(COMBOPATH)", "%(MNTPT)", NULL}},
+ {CMD_NFSMOUNT, "nfs4"},
+- {CMD_LCLMOUNT, NULL, {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
++ {CMD_LCLMOUNT, NULL, {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
+ {CMD_CRYPTMOUNT, "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}},
+ {CMD_CRYPTMOUNT, "crypt_LUKS"},
+ {CMD_CRYPTMOUNT, "crypto_LUKS"},
diff -Nru libpam-mount-2.14/debian/patches/series libpam-mount-2.14/debian/patches/series
--- libpam-mount-2.14/debian/patches/series 2013-08-31 17:07:33.000000000 +0200
+++ libpam-mount-2.14/debian/patches/series 2014-12-23 11:57:00.000000000 +0100
@@ -9,3 +9,4 @@
009-manpage-typos
010-mount-crypt-libs
011-pmvarrun-no-l0g
+remove-unsupported--p0-mount-option.patch
Reply to: