Control: tag 764451 + patch

So I set up a new host, and noticed that libpam-mount is no longer
available in jessie...

On Sat, 08 Nov 2014 16:23:44 +0100 intrigeri <intrig...@debian.org> wrote:
> additional info for anyone who wants this package to be part of Jessie
> and dig this further: cryptoloop (losetup) support was dropped from
> util-linux 2.24.2-1. This change propagated into unstable via
> 2.25.1-3, that was uploaded on 2014-10-05. So indeed, the mount -p
> option isn't available anymore.

I believe the easiest solution would be to just simply drop the -p.
pam_mount.conf(5) explicitly says:

  | cryptoloop volumes
  |   cryptoloop is not explicitly supported by pam_mount. Citing
  |   the Linux kernel config help text: "WARNING: This device
  |   [cryptoloop] is not safe for journal[l]ed filesystems[...].
  |   Please use the Device Mapper[dm-crypt] module instead."

So whoever was actually using cryptoloop was operating in unsupported
territory anyway.

I attached a debdiff for an NMU which drops the -p option. I'd
appreciate it an affected user could test this. For convenience, you can
find an amd64 version of the package here:

http://www.kvr.at/debian/pool/main/libp/libpam-mount/libpam-mount_2.14-1.1_amd64.deb

I was wondering whether this might something that should be mentioned in
NEWS, but ultimately decided against it since I don't believe dropping
unsupported behavior is newsworthy.

Regards,
Christian
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-04 21:32:59.000000000 +0100
@@ -1,3 +1,13 @@
+libpam-mount (2.14-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch 013-drop-obsolete-mount-option-p.
+    cryptoloop support is no longer available in mount(8) from newer
+    util-linux, so we need to stop passing the -p option to avoid mount
+    errors. Closes: #764451
+
+ -- Christian Kastner <deb...@kvr.at>  Thu, 04 Dec 2014 21:28:49 +0100
+
 libpam-mount (2.14-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru 
libpam-mount-2.14/debian/patches/012-drop-obsolete-mount-option-p.patch 
libpam-mount-2.14/debian/patches/012-drop-obsolete-mount-option-p.patch
--- libpam-mount-2.14/debian/patches/012-drop-obsolete-mount-option-p.patch     
1970-01-01 01:00:00.000000000 +0100
+++ libpam-mount-2.14/debian/patches/012-drop-obsolete-mount-option-p.patch     
2014-12-04 21:28:36.000000000 +0100
@@ -0,0 +1,23 @@
+From: Christian Kastner <c...@kvr.at>
+Date: Thu, 04 Dec 2014 21:23:29 +0100
+Subject: Drop obsolete mount option -p
+
+cryptoloop support has been dropped from util-linux 2.24+, therefore mount(8)
+no longer recognizes the -p option. Passing it to mount causes a mount failure,
+so we need to drop it.
+
+Bug-Debian: https://bugs.debian.org/764451
+Last-Update: 2014-12-04
+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-04 21:23:53.000000000 
+0100
@@ -9,3 +9,4 @@
 009-manpage-typos
 010-mount-crypt-libs
 011-pmvarrun-no-l0g
+012-drop-obsolete-mount-option-p.patch

Reply via email to