aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/admin.scm11
-rw-r--r--gnu/packages/patches/pam-mount-luks2-support.patch51
3 files changed, 3 insertions, 60 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index a390f97693..e9dafc0292 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1432,7 +1432,6 @@ dist_patch_DATA = \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
- %D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d04312c9a1..b855bd15dc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3934,19 +3934,14 @@ tcpdump and snoop.")
(define-public pam-mount
(package
(name "pam-mount")
- (version "2.16")
+ (version "2.17")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pam-mount/pam_mount/"
- version "/pam_mount-" version ".tar.xz"))
+ "pam_mount-" version ".tar.xz"))
(sha256
- (base32
- "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"))
- (patches
- ;; Patch adding support for encrypted volumes in LUKS2 format.
- ;; It comes from the Gentoo package definition for sys-auth/pam_mount.
- (search-patches "pam-mount-luks2-support.patch"))))
+ (base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)
diff --git a/gnu/packages/patches/pam-mount-luks2-support.patch b/gnu/packages/patches/pam-mount-luks2-support.patch
deleted file mode 100644
index b59daf5ce1..0000000000
--- a/gnu/packages/patches/pam-mount-luks2-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001
-From: Ingo Franzki <ifranzki@linux.ibm.com>
-Date: Mon, 29 Oct 2018 16:47:40 +0100
-Subject: [PATCH] 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>
----
- src/crypto-dmc.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-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);
---
-2.21.0