gentoo resync : 15.06.2021

3 files changed, 75 insertions, 0 deletions

diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 109ef8775ea3..ee9dfb9b0623 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,5 +1,8 @@
 AUX pam_u2f-1.0.2-fix-Makefile.patch 324 BLAKE2B bc32459e011106e0f8516afe8e1afaa288e1bb53190b350467a12b9c6bbfaee9beb885bd78f1f1c3665b5f6907c1d7d99fb70d8d476b2dc3fe1fad2cba52f940 SHA512 eddf3c607e953b952ba91acb7d7bb1b8a43d6b70da86faece994011eb3eac43476c6ad9721be0a76805688dc9f9bab02ee5e13f58ce556bb68b8d574135ca44d
 AUX pam_u2f-1.1.0-include-limits_h.patch 929 BLAKE2B 8dae033c55d8299f72396cec45e3d1fdb121b5f36326ecdc55f7d84793c9409c3d96fa4beecfacbbac0fdd59f27893981fe99e9d46cab808a8f3e26056c037a6 SHA512 75d992031989a36ea558269f4d187a432adbb71d1a32d22b25e3020f1f6a0d56295b9344a1b6ba97f8dde6bf1918c7e3e530946b9fce9a98e315c798d4f07d87
+AUX pam_u2f-1.1.1-fix-Makefile.patch 1174 BLAKE2B 274826e8af955fa2515c5b9a6e4de3357b5c8631324376ecfd2be8d8129c59d9a07764f4ad9594b7dfe4364f73a4b8035e5cbf04b97e5f966f087a555eb1551a SHA512 3d76994be0f17158e23c7e4b45c5994d720e01dd510313bdd3831a7d68cf91325f1c615466dc07452a98efdd21e5f368ad1d76d108c8ac1558b5ba7c387320ef
 DIST pam_u2f-1.1.0.tar.gz 415677 BLAKE2B dba5cd195d390ba4537752549fa5e0f4487930637fedd64b2750424d21d968bf8be54b75dccba92ac13a18b4e2d44825ec18089e9c4f5dc8e11ac12c36b8d28c SHA512 0ffcc32f0bbee279ad02f9c1cd928e2cf1df2fdebe718d869c16b7fece8edafd73cf08c5dfd6a2bc08434ed1970e16e4f89b6dae3b027a961ab43b26818b634f
+DIST pam_u2f-1.1.1.tar.gz 429822 BLAKE2B 8ed44f82295ea24fe30c5830971afd29a23b48e173c3cb69d3dcaf73b142de36f86087eaee69b1793a8846fdb2efc5530d52fa9f40e4357e6cd2ea9960b9bb39 SHA512 ca81c78e67c17c369117e9d38e50033eaa96e0b15673521db2c382de1aa2566f7406fb43801a5938758480966c5e7316943769db5be826983d3865710e0274c1
 EBUILD pam_u2f-1.1.0.ebuild 756 BLAKE2B 0eb66a1cb03a85d3ac99b86a8704e3535d96400b16c668372ddc31afc8994b7c4ce9a86cd8c6b14e59dc317bce4f6527e643694d7108b98c5a06913a8055df35 SHA512 c59cd3f29b302c65b9f7936dd9cc17c237fed0cee04252f0de9079a723cc49df5c8ad3963e9fc40515e349b19eb4cb150db224e29f23a303f59c620e35dda203
+EBUILD pam_u2f-1.1.1.ebuild 705 BLAKE2B 873f4cf3d5a1c8b5a2742c4e18c11c8442d7f2cc6ff4deed08b75a99a015bd6a49e1f886471ddccfd43a7afe3a9e4afc2de318e0a2eddc52d8c5e58e5604c574 SHA512 20e678f1683e828c8fee5ebdb41713ac2eb05310e399e0204a0d3de5d252e7a67eb529f00f488c34e220dc17d8aab2166073111de0cdf315f23114aeb5b45082
 MISC metadata.xml 714 BLAKE2B 8694b13d8ec22eb56c2bf5637f0ef83c5adf369025aeec8f4512a79914cc00e43620d6db1d95361199c7861a41afd2f1c215758e84584af7d6fdeb7d00619101 SHA512 a59a8b6a51c50c63495eecf712d3a5c9f60b0a94d78a6d2a12d789eb334d77bc80b00de3c2368cbc3cc684c359085af71153f09d0ce5f9cf4f74be77fdc09277
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
new file mode 100644
index 000000000000..68a9ae741004
--- /dev/null
+++ b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
@@ -0,0 +1,38 @@
+From 1475ea762deee61f4be8c33a0915039ff1fc9b5c Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Fri, 4 Jun 2021 12:09:30 +0200
+Subject: [PATCH] respect `DESTDIR`
+
+* Without `DESTDIR`, `make install` will try to delete files from the live filesystem.
+* Also, do not change `libdir`, create a separate prefix for the pam plugin instead.
+---
+ Makefile.am | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 896c3ff..560145a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,9 +11,8 @@ ACLOCAL_AMFLAGS = -I m4
+ AM_CFLAGS = $(CWFLAGS) $(CSFLAGS)
+ AM_CPPFLAGS = $(LIBFIDO2_CFLAGS) $(LIBCRYPTO_CFLAGS)
+ 
+-libdir = $(PAMDIR)
+-
+-lib_LTLIBRARIES = pam_u2f.la
++pampluginexecdir = $(PAMDIR)
++pampluginexec_LTLIBRARIES = pam_u2f.la
+ 
+ pam_u2f_la_SOURCES = pam-u2f.c
+ pam_u2f_la_SOURCES += util.c util.h
+@@ -43,8 +42,8 @@ endif
+ # Release
+ 
+ install-exec-hook:
+-	rm -f $(PAMDIR)/pam_u2f.la
+-	chmod -f 644 $(PAMDIR)/pam_u2f.so || true
++	rm -f $(DESTDIR)$(pampluginexecdir)/pam_u2f.la
++	chmod -f 644 $(DESTDIR)$(pampluginexecdir)/pam_u2f.so || true
+ 
+ indent:
+ 	clang-format -i *.c *.h pamu2fcfg/*.c pamu2fcfg/*.h
diff --git a/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild
new file mode 100644
index 000000000000..a8dd23c88d43
--- /dev/null
+++ b/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="PAM module for FIDO2 and U2F keys"
+HOMEPAGE="https://github.com/Yubico/pam-u2f"
+SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/libfido2:=
+	dev-libs/openssl:=
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.1-fix-Makefile.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+	econf --with-pam-dir=$(getpam_mod_dir)
+}