gentoo resync : 15.09.2018

7 files changed, 60 insertions, 30 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 05d1202fedde..0def2517cb58 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/google-authenticator-libpam-hardened/Manifest b/sys-auth/google-authenticator-libpam-hardened/Manifest
new file mode 100644
index 000000000000..0350dae345cd
--- /dev/null
+++ b/sys-auth/google-authenticator-libpam-hardened/Manifest
@@ -0,0 +1,2 @@
+EBUILD google-authenticator-libpam-hardened-9999.ebuild 838 BLAKE2B 9c1937c8b616c6dbefe89e7c14c5ffc587e5a825369fa9a3d90d0ea2a3f03c7554a167ac3ab75d7f93f418fa1c59e84fcb3afacf729657fa88c4c75c803fef82 SHA512 7f503c6cf54738dfb29a5c02a2fee8d9dcd18ea1b04a67670d6c7e6ea711350c28fc80f5046b0667d16e023a37de8d516b51562b40285a5a79483144662fae5a
+MISC metadata.xml 479 BLAKE2B 39b28a2bf2db3539427278e8711a97c3b034621fbaf1517a9413ad414f535ddd19dd769970952103ea9562913b3103bdcd4fe7465fcf807d0fdaf7a9bf46953d SHA512 5e28d65550f0f28e4f603238dcfbe8ae28cddc89bb186528a983bafb7dddb9326a54eff72df685a58f99bec6b81719697d6a6f69d8f13e7ffadca514ef619536
diff --git a/sys-auth/google-authenticator-libpam-hardened/google-authenticator-libpam-hardened-9999.ebuild b/sys-auth/google-authenticator-libpam-hardened/google-authenticator-libpam-hardened-9999.ebuild
new file mode 100644
index 000000000000..9ce8f782e776
--- /dev/null
+++ b/sys-auth/google-authenticator-libpam-hardened/google-authenticator-libpam-hardened-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/mgorny/google-authenticator-libpam-hardened.git"
+inherit autotools git-r3
+
+DESCRIPTION="PAM Module for two step verification via mobile platform"
+HOMEPAGE="https://github.com/mgorny/google-authenticator-libpam-hardened"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+qrcode"
+
+DEPEND="sys-auth/oath-toolkit:=
+	virtual/pam
+	qrcode? ( media-gfx/qrencode:= )"
+RDEPEND="${DEPEND}
+	!sys-auth/google-authenticator"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# TODO: use getpam_mod_dir after fixing build system
+		--libdir="/$(get_libdir)"
+
+		$(use_enable qrcode qrencode)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/google-authenticator-libpam-hardened/metadata.xml b/sys-auth/google-authenticator-libpam-hardened/metadata.xml
new file mode 100644
index 000000000000..40610c9eb281
--- /dev/null
+++ b/sys-auth/google-authenticator-libpam-hardened/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name='qrcode'>Display QRcode after setup to accomodate
+			automatic setup of OTP client apps.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mgorny/google-authenticator-libpam-hardened</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index a2ce0b5b09ac..8ec3598e6824 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,6 +1,4 @@
 AUX pam_p11-0.2.0-build.patch 812 BLAKE2B efd9b8f46bff6bfd04d0be9a82998ddb3ef4b53d17130be349b0ed85fd5845e4c4aeff24417e740a3f8534d76bc7598666a9f07836aeeb264bb9d71a05c8ab77 SHA512 ebb3802d4ed4e6e6b2bb863edceb04e02246f5d36a0b7d78ba17295f151c2864a13fd9b161568da614b03c38f81c2157793a4160a90bbb61a9e666c4075807ef
-DIST pam_p11-0.1.6.tar.gz 351244 BLAKE2B a07f747a7abccc49e3c7bb7ceea5d4fce5c0491c2dcadfa0c5f5ce2215af724d187f00f6f1f7e43525e76f88afcf18ad74c3d38a793329e6c3175bfe696bbf3a SHA512 92ea894dfe605400dd3684b67bfb3fa4a4b6b67f0818791b492dd002063ebcf85eeb93c07d2f60ece98e579f298061c2e0c225554b6dc618bb1e335ac69f36b0
 DIST pam_p11-0.2.0.tar.gz 417550 BLAKE2B e3c5bb32d6c7c84776341796ebdb9850a9561778aee820acb2a6c61112a2a5df5ee7c539cb5974439e565046e944f4710b87c3b51dea61fdb2cd9171daac3a0c SHA512 2cadf6fe880c953554757099741f3cfe992067f251b7e7e977a6dda5f65cbe1f55b1de6d180638997eada0d3b760887091014b99f8ae4b6d31b25af8e555343c
-EBUILD pam_p11-0.1.6.ebuild 611 BLAKE2B 0e9f20e7b37a485d605eff45e82b4c36668b1fc965d260e6927ba391f216c55cd0f99f36ff8a99b3a2b7c6eedc3b152b6ef5b4319c885113557a44192a645560 SHA512 d500cae47e3bea469f7597e818a630ff95a07d1722ef0841fe6062916caa62216f730380efadd7e474652d36deec6fa5ca9812497041bcb361a1aaada1b2133b
-EBUILD pam_p11-0.2.0.ebuild 688 BLAKE2B e0214addcc97001d5730b3dda2a55c2d4a06d6a351fbf543366be551e0aaf337dfe2c2baf05b2d8a486840bb2f989e02bd3754fe069c3496966e127bfbf0362c SHA512 5fda546992598fe2426fc99218b2d21bb6559791aea991a9c81b07864c0c322b7d812da15eab260358577f51d46ce1a279dc15da2b00a15948e429d72d875c2f
+EBUILD pam_p11-0.2.0.ebuild 687 BLAKE2B f4e4bccf289055750d553f8a6a5a774335f8480c509431d03c6d84f52d22b34120bee259fc4991ea7a0311a60e4aa11f6edee036398f1cf8aed42f558a1044b8 SHA512 b932dbbf8ded7f143a1d25fff1128dfa3c61d3590561b79f4c2f0b5fc18becc55d272cb08b15b9f6246ff6a630bed68b1e6e116857a36b6a88d0b508e59269ed
 MISC metadata.xml 528 BLAKE2B c2ab3c41473490f8c7c3926491d06ddf35554b92cd41ac7abe05f830a2b7c78c97a4ad9d4bcf39e6d1250cb2544ef9bd280e11a96f579ee1552b4748f012f1b8 SHA512 7d3ab0a89f1be52b1937fe300710c23ca4c24c548448b5c7edd5b6817c45a0a184fef8e07d60c0c4f6f9e1ee2fdb843dc6ceb95e5731ce9e9d76f98ae5b7e652
diff --git a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild b/sys-auth/pam_p11/pam_p11-0.1.6.ebuild
deleted file mode 100644
index b3747044554b..000000000000
--- a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam
-
-DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
-HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/pam
-		dev-libs/libp11
-		dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	dopammod src/.libs/pam_p11_opensc.so
-	dopammod src/.libs/pam_p11_openssh.so
-}
diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
index 4ac3eb2f38cd..012b53a32b65 100644
--- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/pam