diff --git a/mount.crypt b/mount.crypt deleted file mode 100644 index 00ca6dd..0000000 --- a/mount.crypt +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -CMD="${0##*/}" - -if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x /usr/sbin/umount.crypt ]; then - logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found." - exit 1 - fi - /usr/sbin/umount.crypt "$@" -elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x /usr/sbin/mount.crypt ]; then - logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found." - exit 1 - fi - /usr/sbin/mount.crypt "$@" -else - logger -t "mount.crypt" -p user.err -i "Unknown command: $0" - exit 1 -fi - diff --git a/pam_mount-2.16-fix-luks2-mount.patch b/pam_mount-2.16-fix-luks2-mount.patch deleted file mode 100644 index 8bebaeb..0000000 --- a/pam_mount-2.16-fix-luks2-mount.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Matthias Fehring -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); diff --git a/pam_mount-2.16.tar.asc b/pam_mount-2.16.tar.asc deleted file mode 100644 index a05126b..0000000 --- a/pam_mount-2.16.tar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJX7h5zAAoJEGo5M9opfft9aTwQAKWX81qwZ99resDlTmc9WVja -QrZlXw3G2ZC9+dv2CcprcsiINP5aR04hT3Y0BHuOGCHL68xrFHo5yvI8rXuY1Iv0 -IfzNNf2jll0mkLiP4qSMr0DGuVKj82qOZbn+udBjfxcTUIzhgzdTO0xAZPx/Fj6i -MeUyEfGCggyfqJj0rsKQtOU5coGhyFcaozUZ87/Xj71lZxtAECeNBgOY32hQEwx9 -caHls1CvJ0LhO0tzF/2p6mpmN9JKRjcXbW3HFxAKu7GFXTL/n0w3WFVPEHwpbKB+ -Vky3EdZdffKCtvSq/9k/jON3KmVqKucor42/k8K74zq1VCfeH4IWPrlmQQdeKEE4 -ZmMI2hiywg0BeWy9YN0zRVGiByS5EVovaFQroLay3B5ovx6kO2aPZbpZm1qZRORT -cVPkiRVRqmRhd3V+Wg4/mAL3YOTAjgJWm1fudhCMvbnT2T8OyOzMegglTLBPW64l -9vADfTzV4kplSmCujy3F0n45wo6zbpp0I/r2IWFv2Gzhp5uYU1MwNrQdfmBJk81L -iMsYf8jmS14OK6+ifWWYGOocoA7Ttm6CPLwcvzSp11t16hkML0axDyFvGNxJ4BU+ -YSbslaJVdBYhFQjNtPJSCBRKfRou88oPBjGCumFphk5QWw0mAfeolT0QqaDa1vjZ -/uHAs8JfoFwSM8Fs8Kij -=zrZh ------END PGP SIGNATURE----- diff --git a/pam_mount-2.16.tar.xz b/pam_mount-2.16.tar.xz deleted file mode 100644 index 1c7ba71..0000000 --- a/pam_mount-2.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7 -size 312316 diff --git a/pam_mount-2.17.tar.asc b/pam_mount-2.17.tar.asc new file mode 100644 index 0000000..76afffc --- /dev/null +++ b/pam_mount-2.17.tar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEI2hsEKRWkb56QlEJ1jiBgfNaCTgFAl+3nY0ACgkQ1jiBgfNa +CThEJg/+P40vq1X3dHCTViuC5SHzfpXWl2Mq0G+9Y2N9/mWhj2q6doAzfutwAmI7 +M2ErOXwCuB0lRhHBJBKS9NbW+4HPZ4+TEaxjCB846AhLvyXyn9u+DtWImGRlG2x4 +FZ+2NMzpoqnW/s8lfClWUjY5Cfn/84OA5pBCcHQwmUiPdvuQRy4XxFhaVT50edAl +4CSs9OFiRd4Fu2f3ZCfMrDspgiAg9OGGXUGWaiQ/4u4gZU8WboQeAJNjFUZKxM4G +NeunDut77qHolWZzHNt5edShHPI+2k95ZZZvOCFnZrIrB1Fj+CDQjgn6Z+CHDR+p +TQ8GrAOFw+YUui8UHvbnHMvKoINGEs0WU04QmoruKyPlrqIgB5WCCqLbNaXhQ9PA +/Pj79p3KlRoGExq+UrjWPXWwGYa14Q/CSuFv4P+LpQflmy3PUVUBZmlMzKlWuMXP +wo1y1+rn2RRGHP7yNDsfi99EPN4qh4pBOOV1ajDnRVpF2qVlPu4Qr+YTwxlWRKF2 +R7ZYdkC+i1qkUHmxdUorxaYrEVx41VbPDgHmK/4aFgTNPGtwcTUs32LW6f8DSwpQ +NMiYqfj0vy5pNx6tUfKJjm6Wv66NLjd6VsxIuwBEmSgkb1dsZXM1rXFhekHkY5O9 +Qc3wa3xUrSowVP9KSDcplmyk+uq+cx8tidJkqNu5tkhAEO2Wfto= +=ZViF +-----END PGP SIGNATURE----- diff --git a/pam_mount-2.17.tar.xz b/pam_mount-2.17.tar.xz new file mode 100644 index 0000000..800ec9d --- /dev/null +++ b/pam_mount-2.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be45ea3ba646293bfb7b0c916ecbe2d21e2224174d99886c83cf1aa8843256e0 +size 326948 diff --git a/pam_mount.changes b/pam_mount.changes index 63b7539..7c01aa0 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 20 10:42:59 UTC 2020 - Jan Engelhardt + +- Update to release 2.17 + * Abandon /sbin as a location +- Drop pam_mount-2.16-fix-luks2-mount.patch (merged) + ------------------------------------------------------------------- Tue Sep 15 23:39:22 UTC 2020 - Jan Engelhardt diff --git a/pam_mount.keyring b/pam_mount.keyring index ec8f049..301222e 100644 --- a/pam_mount.keyring +++ b/pam_mount.keyring @@ -1,91 +1,52 @@ -pub 4096R/0xA28BDFEEB5A2B2FF 2015-05-07 [expires: 2020-08-08] - Key fingerprint = 2F8B FE96 D14F 8B56 0FBC 1F1D A28B DFEE B5A2 B2FF -uid [ unknown] Jan Engelhardt -sub 4096R/0xB927458717B4ECED 2015-05-07 [expires: 2020-08-08] -sub 4096R/0x6A3933DA297DFB7D 2015-05-07 [expires: 2020-08-08] - -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -cCAy -=ePMx +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 +NGTT6x12 +=QLsa -----END PGP PUBLIC KEY BLOCK----- diff --git a/pam_mount.spec b/pam_mount.spec index ab9959d..f41b69f 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -18,24 +18,21 @@ Name: pam_mount %define lname libcryptmount0 +Version: 2.17 +Release: 0 Summary: A PAM Module that can Mount Volumes for a User Session License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Libraries -Version: 2.16 -Release: 0 URL: http://pam-mount.sf.net/ Source: http://downloads.sf.net/pam-mount/%name-%version.tar.xz Source9: http://downloads.sf.net/pam-mount/%name-%version.tar.asc Source1: convert_pam_mount_conf.pl Source2: convert_keyhash.pl -Source3: mount.crypt Source5: baselibs.conf -Source6: %{name}.keyring +Source6: %name.keyring Patch1: pam_mount-0.47-enable-logout-kill.dif -Patch2: pam_mount-2.16-fix-luks2-mount.patch Patch3: bsc1153630-prevent-systemd-from-calling-pam_mount.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: libtool # LOOP64 support: @@ -116,13 +113,6 @@ mkdir -p %buildroot/%_docdir/%name/examples cp doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt %buildroot/%_docdir/%name/ install -m 755 %SOURCE1 %buildroot/%_docdir/%name/examples/ install -m 755 %SOURCE2 %buildroot/%_docdir/%name/examples/ -# -# move /sbin/mount.crypt to %_sbindir/mount.crypt and put a wrapper script to /sbin/mount.crypt -# -mkdir -p %buildroot%_sbindir/ -mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/ -ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt -install -m755 %SOURCE3 %buildroot/sbin/ %fdupes %buildroot/%_prefix %post @@ -134,7 +124,7 @@ then fi if [ "$1" -gt 1 ] then - for v in `rpm -q --queryformat "%%{VERSION} " %name`; do + for v in `rpm -q --queryformat "%%VERSION " %name`; do if echo "$v" | grep -E "^0\." - ; then %_docdir/%name/examples/convert_keyhash.pl \ -i etc/security/pam_mount.conf.xml @@ -149,10 +139,8 @@ fi %files %_docdir/%name /%_lib/security/pam_mount*.so -/sbin/mount.crypt* -/sbin/umount.crypt* -%_sbindir/mount.crypt -%_sbindir/umount.crypt +%_sbindir/mount.* +%_sbindir/umount.* %_sbindir/pmvarrun %_sbindir/pmt-ehd %config(noreplace) %_sysconfdir/security/pam_mount.conf.xml