pam_mount: 2.16 -> 2.17
This commit is contained in:
parent
3054fdf8d6
commit
7244e1c23d
|
@ -2,16 +2,15 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pam_mount";
|
pname = "pam_mount";
|
||||||
version = "2.16";
|
version = "2.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz";
|
url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
|
sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./insert_utillinux_path_hooks.patch
|
./insert_utillinux_path_hooks.patch
|
||||||
./support_luks2.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||||
"--sbindir=${placeholder "out"}/bin"
|
"--sbindir=${placeholder "out"}/bin"
|
||||||
"--sysconfdir=${placeholder "out"}/etc"
|
"--sysconfdir=${placeholder "out"}/etc"
|
||||||
"--with-slibdir=${placeholder "out"}/lib"
|
"--with-slibdir=${placeholder "out"}/lib"
|
||||||
"--with-ssbindir=${placeholder "out"}/bin"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
commit d4434c05e7c0cf05d87089404cfa2deedc60811a
|
|
||||||
Author: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
Date: Mon Oct 29 16:47:40 2018 +0100
|
|
||||||
|
|
||||||
crypto: Add support for LUKS2
|
|
||||||
|
|
||||||
Cryptsetup version 2.0 added support for LUKS2.
|
|
||||||
This patch adds support for mounting LUKS2 volumes with
|
|
||||||
pam_mount.
|
|
||||||
|
|
||||||
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
|
|
||||||
diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c
|
|
||||||
index d0ab6ca..abd0358 100644
|
|
||||||
--- a/src/crypto-dmc.c
|
|
||||||
+++ b/src/crypto-dmc.c
|
|
||||||
@@ -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 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev)
|
|
||||||
|
|
||||||
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 @@ static bool dmc_run(const struct ehd_mount_request *req,
|
|
||||||
#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);
|
|
Loading…
Reference in a new issue