diff options
| author | David Reiss <dnr@dnr.im> | 2020-12-04 11:16:56 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-03-19 14:30:43 -0700 |
| commit | 7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f (patch) | |
| tree | e7255dae16659da70ebea9a996330e1267d14688 | |
| parent | 3054fdf8d67e130797625d6e2f765aaf1d27838f (diff) | |
| download | nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar.gz nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar.bz2 nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar.lz nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar.xz nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.tar.zst nixpkgs-7244e1c23d3b42293b1d0e60ea14ad50e55f7d7f.zip | |
pam_mount: 2.16 -> 2.17
| -rw-r--r-- | pkgs/os-specific/linux/pam_mount/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam_mount/support_luks2.patch | 47 |
2 files changed, 3 insertions, 52 deletions
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 7f26ae80ed6..5e4e15c364b 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -2,16 +2,15 @@ stdenv.mkDerivation rec { pname = "pam_mount"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz"; - sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; + url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz"; + sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"; }; patches = [ ./insert_utillinux_path_hooks.patch - ./support_luks2.patch ]; postPatch = '' @@ -31,7 +30,6 @@ stdenv.mkDerivation rec { "--sbindir=${placeholder "out"}/bin" "--sysconfdir=${placeholder "out"}/etc" "--with-slibdir=${placeholder "out"}/lib" - "--with-ssbindir=${placeholder "out"}/bin" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/pam_mount/support_luks2.patch b/pkgs/os-specific/linux/pam_mount/support_luks2.patch deleted file mode 100644 index 0b8557f1bae..00000000000 --- a/pkgs/os-specific/linux/pam_mount/support_luks2.patch +++ /dev/null @@ -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); |