| 1 |
commit: 6a212ea835e3bc70ab1e9f4f4c52aa8c4d96924a |
| 2 |
Author: Florian Schmaus <flo <AT> geekplace <DOT> eu> |
| 3 |
AuthorDate: Tue Apr 20 07:07:45 2021 +0000 |
| 4 |
Commit: Florian Schmaus <flo <AT> geekplace <DOT> eu> |
| 5 |
CommitDate: Tue Apr 20 07:07:45 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a212ea8 |
| 7 |
|
| 8 |
sys-fs/fscrypt: sync "no Ubuntu specific files" patch |
| 9 |
|
| 10 |
Sync "no Ubuntu specific files" patch with pull request that upstreams |
| 11 |
it, i.e. https://github.com/google/fscrypt/pull/284. |
| 12 |
|
| 13 |
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu> |
| 14 |
|
| 15 |
...tionally-avoid-installation-of-Ubuntu-spe.patch | 22 ++++++++++++---------- |
| 16 |
sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild | 2 +- |
| 17 |
2 files changed, 13 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index ba2402209..f1732df62 100644 |
| 21 |
--- a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch |
| 22 |
+++ b/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-From 4aeb699562b0c50ac0061dcbbed7248f5f5be4f9 Mon Sep 17 00:00:00 2001 |
| 25 |
+From 3e08e9d634ae6fe259ba35139ef0a7bb4b7e60d8 Mon Sep 17 00:00:00 2001 |
| 26 |
From: Florian Schmaus <flo@×××××××××.eu> |
| 27 |
Date: Sat, 17 Apr 2021 18:19:59 +0200 |
| 28 |
Subject: [PATCH] Makefile: Optionally avoid installation of Ubuntu-specific |
| 29 |
@@ -11,20 +11,22 @@ of Ubuntu-specific PAM files. |
| 30 |
1 file changed, 3 insertions(+) |
| 31 |
|
| 32 |
diff --git a/Makefile b/Makefile |
| 33 |
-index 6e79421356de..447ccf193745 100644 |
| 34 |
+index 6e79421356de..307eeedc5153 100644 |
| 35 |
--- a/Makefile |
| 36 |
+++ b/Makefile |
| 37 |
-@@ -173,14 +173,17 @@ PAM_MODULE_DIR := $(PREFIX)/lib/security |
| 38 |
- PAM_INSTALL_PATH := $(PAM_MODULE_DIR)/$(PAM_NAME).so |
| 39 |
- PAM_CONFIG := $(BIN)/config |
| 40 |
- PAM_CONFIG_DIR := $(PREFIX)/share/pam-configs |
| 41 |
-+INSTALL_UBUNTU_PAM_CONFIG := true |
| 42 |
- |
| 43 |
- install-pam: $(PAM_MODULE) |
| 44 |
+@@ -28,6 +28,7 @@ PAM_NAME := pam_$(NAME) |
| 45 |
+ # BINDIR: Where to install the fscrypt binary. Default: $(PREFIX)/bin |
| 46 |
+ # PAM_MODULE_DIR: Where to install pam_fscrypt.so. Default: $(PREFIX)/lib/security |
| 47 |
+ # PAM_CONFIG_DIR: Where to install Ubuntu PAM config. Default: $(PREFIX)/share/pam-configs |
| 48 |
++# If the empty string, then the Ubuntu PAM config will not be installed. |
| 49 |
+ # |
| 50 |
+ # MOUNT: The filesystem where our tests are run. Default: /mnt/fscrypt_mount |
| 51 |
+ # Ex: make test-setup MOUNT=/foo/bar |
| 52 |
+@@ -178,9 +179,11 @@ install-pam: $(PAM_MODULE) |
| 53 |
install -d $(DESTDIR)$(PAM_MODULE_DIR) |
| 54 |
install $(PAM_MODULE) $(DESTDIR)$(PAM_MODULE_DIR) |
| 55 |
|
| 56 |
-+ifeq ($(INSTALL_UBUNTU_PAM_CONFIG), true) |
| 57 |
++ifdef $(PAM_CONFIG_DIR) |
| 58 |
m4 --define=PAM_INSTALL_PATH=$(PAM_INSTALL_PATH) < $(PAM_NAME)/config > $(PAM_CONFIG) |
| 59 |
install -d $(DESTDIR)$(PAM_CONFIG_DIR) |
| 60 |
install $(PAM_CONFIG) $(DESTDIR)$(PAM_CONFIG_DIR)/$(NAME) |
| 61 |
|
| 62 |
diff --git a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild |
| 63 |
index f19412826..df4d50515 100644 |
| 64 |
--- a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild |
| 65 |
+++ b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild |
| 66 |
@@ -90,7 +90,7 @@ src_install() { |
| 67 |
DESTDIR="${ED}" \ |
| 68 |
PREFIX="/usr" \ |
| 69 |
PAM_MODULE_DIR="$(getpam_mod_dir)" \ |
| 70 |
- INSTALL_UBUNTU_PAM_CONFIG="false" \ |
| 71 |
+ PAM_CONFIG_DIR= \ |
| 72 |
install |
| 73 |
einstalldocs |
Archives