pam-mount: update to 2.20.

This commit is contained in:
Pulux 2024-03-17 09:52:53 +01:00 committed by classabbyamp
parent a026ec7b00
commit bfafb67b03
2 changed files with 5 additions and 39 deletions

View File

@ -1,34 +0,0 @@
From: https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7c0cf05d87089404cfa2deedc60811a/tree/src/crypto-dmc.c?diff=e47b8ee42f14926b013a78cc487b794059edccff
--- 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 @@
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);

View File

@ -1,19 +1,19 @@
# Template file for 'pam-mount' # Template file for 'pam-mount'
pkgname=pam-mount pkgname=pam-mount
version=2.16 version=2.20
revision=6 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-ssbindir=/usr/bin --with-slibdir=/usr/lib" configure_args="--with-ssbindir=/usr/bin --with-slibdir=/usr/lib"
hostmakedepends="perl pkg-config" hostmakedepends="perl pkg-config"
makedepends="cryptsetup-devel libHX-devel libmount-devel libxml2-devel pam-devel makedepends="cryptsetup-devel libHX-devel libmount-devel libxml2-devel pam-devel
pcre-devel" pcre2-devel"
depends="hxtools pam" depends="hxtools pam"
short_desc="PAM module that can mount volumes for a user session" short_desc="PAM module that can mount volumes for a user session"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>" maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
homepage="http://pam-mount.sourceforge.net/" homepage="http://pam-mount.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/pam-mount/pam_mount/${version}/pam_mount-${version}.tar.xz" distfiles="https://inai.de/files/pam_mount/pam_mount-${version}.tar.xz"
checksum=ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7 checksum=5426207a485680f8e1764ba405bb38c39a4e0c8306bc8271910f1b819a336ced
conf_files="/etc/security/pam_mount.conf.xml" conf_files="/etc/security/pam_mount.conf.xml"
libpam-mount_package() { libpam-mount_package() {