[gentoo-commits] repo/proj/guru:dev commit in: sys-fs/fscrypt/, sys-fs/fscrypt/files/

["Florian Schmaus" <flo@geekplace.eu>]

commit:     6a212ea835e3bc70ab1e9f4f4c52aa8c4d96924a
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Tue Apr 20 07:07:45 2021 +0000
Commit:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
CommitDate: Tue Apr 20 07:07:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a212ea8

sys-fs/fscrypt: sync "no Ubuntu specific files" patch

Sync "no Ubuntu specific files" patch with pull request that upstreams
it, i.e. https://github.com/google/fscrypt/pull/284.

Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>

 ...tionally-avoid-installation-of-Ubuntu-spe.patch | 22 ++++++++++++----------
 sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild             |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch b/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
index ba2402209..f1732df62 100644
--- a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
+++ b/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
@@ -1,4 +1,4 @@
-From 4aeb699562b0c50ac0061dcbbed7248f5f5be4f9 Mon Sep 17 00:00:00 2001
+From 3e08e9d634ae6fe259ba35139ef0a7bb4b7e60d8 Mon Sep 17 00:00:00 2001
 From: Florian Schmaus <flo@geekplace.eu>
 Date: Sat, 17 Apr 2021 18:19:59 +0200
 Subject: [PATCH] Makefile: Optionally avoid installation of Ubuntu-specific
@@ -11,20 +11,22 @@ of Ubuntu-specific PAM files.
  1 file changed, 3 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 6e79421356de..447ccf193745 100644
+index 6e79421356de..307eeedc5153 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -173,14 +173,17 @@ PAM_MODULE_DIR := $(PREFIX)/lib/security
- PAM_INSTALL_PATH := $(PAM_MODULE_DIR)/$(PAM_NAME).so
- PAM_CONFIG := $(BIN)/config
- PAM_CONFIG_DIR := $(PREFIX)/share/pam-configs
-+INSTALL_UBUNTU_PAM_CONFIG := true
- 
- install-pam: $(PAM_MODULE)
+@@ -28,6 +28,7 @@ PAM_NAME := pam_$(NAME)
+ # BINDIR: Where to install the fscrypt binary.        Default: $(PREFIX)/bin
+ # PAM_MODULE_DIR: Where to install pam_fscrypt.so.    Default: $(PREFIX)/lib/security
+ # PAM_CONFIG_DIR: Where to install Ubuntu PAM config. Default: $(PREFIX)/share/pam-configs
++#   If the empty string, then the Ubuntu PAM config will not be installed.
+ #
+ # MOUNT: The filesystem where our tests are run.    Default: /mnt/fscrypt_mount
+ #   Ex: make test-setup MOUNT=/foo/bar
+@@ -178,9 +179,11 @@ install-pam: $(PAM_MODULE)
  	install -d $(DESTDIR)$(PAM_MODULE_DIR)
  	install $(PAM_MODULE) $(DESTDIR)$(PAM_MODULE_DIR)
  
-+ifeq ($(INSTALL_UBUNTU_PAM_CONFIG), true)
++ifdef $(PAM_CONFIG_DIR)
  	m4 --define=PAM_INSTALL_PATH=$(PAM_INSTALL_PATH) < $(PAM_NAME)/config > $(PAM_CONFIG)
  	install -d $(DESTDIR)$(PAM_CONFIG_DIR)
  	install $(PAM_CONFIG) $(DESTDIR)$(PAM_CONFIG_DIR)/$(NAME)

diff --git a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
index f19412826..df4d50515 100644
--- a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
+++ b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
@@ -90,7 +90,7 @@ src_install() {
 		DESTDIR="${ED}" \
 		PREFIX="/usr" \
 		PAM_MODULE_DIR="$(getpam_mod_dir)" \
-		INSTALL_UBUNTU_PAM_CONFIG="false" \
+		PAM_CONFIG_DIR= \
 		install
 	einstalldocs