[arch-commits] Commit in pam_mount/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, May 29, 2020 @ 22:04:28
  Author: arojas
Revision: 637302

archrelease: copy trunk to community-x86_64

Added:
  pam_mount/repos/community-x86_64/PKGBUILD
    (from rev 637301, pam_mount/trunk/PKGBUILD)
  pam_mount/repos/community-x86_64/pam_mount-luks2.patch
    (from rev 637301, pam_mount/trunk/pam_mount-luks2.patch)
Deleted:
  pam_mount/repos/community-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   86 +++++++++++++++++++++++++-----------------------
 pam_mount-luks2.patch |   52 +++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-29 22:03:59 UTC (rev 637301)
+++ PKGBUILD	2020-05-29 22:04:28 UTC (rev 637302)
@@ -1,40 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sirius Bakke <sirius\at/nonline.org>
-
-pkgname=pam_mount
-pkgver=2.16
-pkgrel=6
-pkgdesc="A PAM module that can mount volumes for a user session"
-arch=(x86_64)
-url="http://pam-mount.sourceforge.net/"
-license=(GPL)
-depends=(pcre util-linux libhx libxml2 cryptsetup)
-backup=('etc/security/pam_mount.conf.xml')
-options=(!emptydirs)
-source=("https://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc})
-sha256sums=('ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7'
-            'SKIP')
-validpgpkeys=(2F8BFE96D14F8B560FBC1F1DA28BDFEEB5A2B2FF) # Jan Engelhardt <jengelh at inai.de>
-
-build() {
-  cd $pkgname-$pkgver
-  aclocal
-  libtoolize
-  automake --add-missing
-  autoreconf
-  ./configure \
-	--prefix=/usr \
-	--with-ssbindir=/usr/bin \
-	--sbindir=/usr/bin \
-	--with-slibdir=/usr/lib \
-	--sysconfdir=/etc \
-	--localstatedir=/var
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix overlinking
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: pam_mount/repos/community-x86_64/PKGBUILD (from rev 637301, pam_mount/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-29 22:04:28 UTC (rev 637302)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sirius Bakke <sirius\at/nonline.org>
+
+pkgname=pam_mount
+pkgver=2.16
+pkgrel=7
+pkgdesc="A PAM module that can mount volumes for a user session"
+arch=(x86_64)
+url="http://pam-mount.sourceforge.net/"
+license=(GPL)
+depends=(pcre util-linux libhx libxml2 cryptsetup)
+backup=('etc/security/pam_mount.conf.xml')
+options=(!emptydirs)
+source=("https://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
+         pam_mount-luks2.patch)
+sha256sums=('ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7'
+            'SKIP'
+            'b11f3ed8d95b25089963b74bead65d8100825c7d6043187008334bea8ebeb091')
+validpgpkeys=(2F8BFE96D14F8B560FBC1F1DA28BDFEEB5A2B2FF) # Jan Engelhardt <jengelh at inai.de>
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../pam_mount-luks2.patch # Add support for LUKS2
+}
+
+build() {
+  cd $pkgname-$pkgver
+  aclocal
+  libtoolize
+  automake --add-missing
+  autoreconf
+  ./configure \
+	--prefix=/usr \
+	--with-ssbindir=/usr/bin \
+	--sbindir=/usr/bin \
+	--with-slibdir=/usr/lib \
+	--sysconfdir=/etc \
+	--localstatedir=/var
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix overlinking
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: pam_mount/repos/community-x86_64/pam_mount-luks2.patch (from rev 637301, pam_mount/trunk/pam_mount-luks2.patch)
===================================================================
--- pam_mount-luks2.patch	                        (rev 0)
+++ pam_mount-luks2.patch	2020-05-29 22:04:28 UTC (rev 637302)
@@ -0,0 +1,52 @@
+From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001
+From: Ingo Franzki <ifranzki at 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 at linux.ibm.com>
+Signed-off-by: Till Maas <opensource at till.name>
+---
+ 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.24.1