Hello community, here is the log from the commit of package pam_mount for openSUSE:Factory checked in at 2018-11-26 10:23:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_mount (Old) and /work/SRC/openSUSE:Factory/.pam_mount.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_mount" Mon Nov 26 10:23:20 2018 rev:65 rq:649952 version:2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/pam_mount/pam_mount.changes 2016-10-02 00:08:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam_mount.new.19453/pam_mount.changes 2018-11-26 10:25:00.225401414 +0100 @@ -1,0 +2,6 @@ +Sat Nov 17 09:18:54 UTC 2018 - Matthias Fehring <[email protected]> + +- Add pam_mount-2.16-fix-luks2-mount.patch: + fix mounting of LUKS2 volumes + +------------------------------------------------------------------- New: ---- pam_mount-2.16-fix-luks2-mount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.ygPLRM/_old 2018-11-26 10:25:03.909397085 +0100 +++ /var/tmp/diff_new_pack.ygPLRM/_new 2018-11-26 10:25:03.913397081 +0100 @@ -1,7 +1,7 @@ # # spec file for package pam_mount # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: pam_mount %define lname libcryptmount0 Summary: A PAM Module that can Mount Volumes for a User Session -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Libraries Version: 2.16 Release: 0 @@ -33,7 +33,7 @@ Source5: baselibs.conf Source6: %{name}.keyring Patch1: pam_mount-0.47-enable-logout-kill.dif - +Patch2: pam_mount-2.16-fix-luks2-mount.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: libtool @@ -100,6 +100,7 @@ %prep %setup -q %patch -P 1 -p1 +%patch -P 2 -p1 %build %configure --disable-static --with-slibdir="/%_lib" \ ++++++ pam_mount-2.16-fix-luks2-mount.patch ++++++ From: Matthias Fehring <[email protected]> Date: 2018-11-17 09:20:00 +0100 Subject: fix mounting of LUKS2 volumes Upstream: submitted (https://sourceforge.net/p/pam-mount/pam-mount/merge-requests/2/) Cryptsetup version 2.0 added support for LUKS2. This patch adds support for mounting LUKS2 volumes with pam_mount. --- crypto-dmc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/src/crypto-dmc.c 2016-09-23 09:52:47.000000000 +0200 +++ b/src/crypto-dmc.c 2018-11-17 09:17:11.357766056 +0100 @@ -21,6 +21,12 @@ #include "libcryptmount.h" #include "pam_mount.h" +#ifndef CRYPT_LUKS +#define CRYPT_LUKS NULL /* Passing NULL to crypt_load will + default to LUKS(1) on older + libcryptsetup versions. */ +#endif + /** * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) * @path: path to the crypto container @@ -48,7 +54,7 @@ ret = crypt_init(&cd, device); if (ret == 0) { - ret = crypt_load(cd, CRYPT_LUKS1, NULL); + ret = crypt_load(cd, CRYPT_LUKS, NULL); if (ret == -EINVAL) ret = false; else if (ret == 0) @@ -106,7 +112,7 @@ #endif } - ret = crypt_load(cd, CRYPT_LUKS1, NULL); + ret = crypt_load(cd, CRYPT_LUKS, NULL); if (ret == 0) { ret = crypt_activate_by_passphrase(cd, mt->crypto_name, CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);
