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

2021-06-22 Thread Florian Schmaus 
commit: 6d22cee6cc0b872d282b0b375faa79bb2ca9edb9
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Jun 21 19:20:01 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Jun 22 06:16:22 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d22cee6

sys-fs/fscrypt: treeclean (moved to ::gentoo)

Signed-off-by: Florian Schmaus  gentoo.org>

 sys-fs/fscrypt/Manifest| 45 --
 ...tionally-avoid-installation-of-Ubuntu-spe.patch | 39 -
 .../files/0001-Remove-TestLoadSourceDevice.patch   | 44 --
 sys-fs/fscrypt/files/fscrypt.pam-config|  3 -
 sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild | 98 --
 sys-fs/fscrypt/metadata.xml|  8 --
 6 files changed, 237 deletions(-)

diff --git a/sys-fs/fscrypt/Manifest b/sys-fs/fscrypt/Manifest
deleted file mode 100644
index 4804e7d85..0
--- a/sys-fs/fscrypt/Manifest
+++ /dev/null
@@ -1,45 +0,0 @@
-DIST fscrypt-0.3.0.tar.gz 148000 BLAKE2B 
c62446bfec0f73cb89be092cadb04d9842ec10d79fff4bd5a3b358b29012c03bba766738f6a0ad61502f3d14781bd36ba1bb0a1fa610570014e5c60bda017c59
 SHA512 
e0b16359a8883d99b2de4aabc0c810d152ce2d70975a785f7a711ac5d7c1abc1e796ad0f58cb8964e9197415062d216ffb7e19d011859d8f98154150349a2cca
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B 
ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d
 SHA512 
320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 
5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb
 SHA512 
43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
-DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 
45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459
 SHA512 
ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
-DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip 246908 BLAKE2B 
94b71d3c77553dca4889c6f066f6741fa9d17a0ea86b564e3e8ff05b015b87c18fd3fcbe2b3d942a8569c99ef4bdf42c686bd58485e9373447d25724ceb934ca
 SHA512 
47991999bacf78ddfd33a4af3c0d5b8a418cb7664e05bc59d886150025a1d5aad831deacbd6da76d5a21a97ed115d4210c374459e7af8ed7b93c4c1c0e7a42fa
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B 
a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75
 SHA512 
e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 
47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6
 SHA512 
d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
-DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 
1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74
 SHA512 
a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
-DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 
2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9
 SHA512 
86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 
2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85
 SHA512 
4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 
63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596
 SHA512 
967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 
475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c
 SHA512 
11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST

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

2021-04-20 Thread Florian Schmaus 
commit: 6a212ea835e3bc70ab1e9f4f4c52aa8c4d96924a
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Apr 20 07:07:45 2021 +
Commit: Florian Schmaus  geekplace  eu>
CommitDate: Tue Apr 20 07:07:45 2021 +
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  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 
 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