gentoo resync : 25.08.2018

6 files changed, 87 insertions, 2 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 86cfd27ff3fe..6573b44fb7a7 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/google-authenticator-wrappers/Manifest b/sys-auth/google-authenticator-wrappers/Manifest
index 71d1076ca7dd..0b58c33fbd49 100644
--- a/sys-auth/google-authenticator-wrappers/Manifest
+++ b/sys-auth/google-authenticator-wrappers/Manifest
@@ -1,5 +1,7 @@
 DIST google-authenticator-wrappers-1.tar.gz 1379 BLAKE2B b8566281ade004a6b8996b18138754bab0f8ad2c4c23f4481b8a4f511a779a661fa7f1d68d22f43d0a077b9cef6dc5979d6ec522736d66e969db25c38a89062c SHA512 28d85206486c7aef9c1aee6e97e99950dd152c2114ae72c96c0af53debb1108e3d021766349d175cc6e402948f0ecd51a289575ebaa86680010ac50316e0146b
 DIST google-authenticator-wrappers-2.tar.gz 1615 BLAKE2B 313283bf2672e36883aa21d1520595afab90120ea106ef79e1dd7f2561d4a13f9ccb767ff3496f54eb2943b4a8fb55edce21e9b7f4ba9acb2845a97afbbbabde SHA512 5edcd57a1494fb6750a45396c9c5746dc952a9c7935c15bbae5e9ffce9175c9e1db92ee136ffe9cf513828425ab3dca0d976d1cc82737375b139f646717519cb
+DIST google-authenticator-wrappers-3.tar.gz 6128 BLAKE2B a2c2b35a0c780213a6ba2940c05a205a8ccb043b6ff0808eb47a45c7d52da215293ca785c968f26ec99b7a97e770b127b391fb104b85db6c09efd6af31531786 SHA512 471beb9fdc0225d59efef5c24cbfe1beec5fc4916521c4205c8aec5c4b3dfb473e53fbc5ada337cf0118a715aee9f5e045411b6d43c301d94fc08cccdbc889da
 EBUILD google-authenticator-wrappers-1.ebuild 478 BLAKE2B 50335934f2b7b20cfd10e74f6d7028b18ff67f36735d7a4955a1b834c3a96936c798800c769a4f84cc8d8f18e808fdd4ee67b137d297a714c90e050db95c052f SHA512 db098d6d9015ba3d0691d7bf63c7ab93099f5cd6bf2a4e5b71595c38446f1d468435bca47882207ff721c3914af1c39bbb9efdf54c1599503e18ea7acfe56d38
 EBUILD google-authenticator-wrappers-2.ebuild 478 BLAKE2B 50335934f2b7b20cfd10e74f6d7028b18ff67f36735d7a4955a1b834c3a96936c798800c769a4f84cc8d8f18e808fdd4ee67b137d297a714c90e050db95c052f SHA512 db098d6d9015ba3d0691d7bf63c7ab93099f5cd6bf2a4e5b71595c38446f1d468435bca47882207ff721c3914af1c39bbb9efdf54c1599503e18ea7acfe56d38
+EBUILD google-authenticator-wrappers-3.ebuild 1411 BLAKE2B acbf7d766ce7abf674e64b08d2abb5e3d2edd695ad941696141ba0bd73d49e31d9677d9c1153bd6b815da744f9fab5ea2ece8b4921283d4e75f686e8782f1e99 SHA512 21e6135e4c856046e813a9c96b04420c6a0e642e8114add040cfc7e7ea65cd9301ec9eabdb9538121bcf25cbe19d1c7cd6aadc84bfbf3e25c03024072051518d
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild
new file mode 100644
index 000000000000..f1d2f1cb4b31
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver user
+
+DESCRIPTION="Set of scripts to manage google-auth setup on Gentoo Infra"
+HOMEPAGE="https://github.com/mgorny/google-authenticator-wrappers"
+SRC_URI="https://github.com/mgorny/google-authenticator-wrappers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-auth/google-authenticator"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 3; then
+				ewarn "google-authenticator-wrappers v3 switches the secret store mechanism"
+				ewarn "from user-owned files to /var/lib/gauth.  To migrate secrets, move"
+				ewarn "and chown, e.g.:"
+				ewarn
+				ewarn "  mv /home/myuser/.google_authenticator /var/lib/gauth/myuser"
+				ewarn "  chown gauth /var/lib/gauth/myuser"
+				ewarn
+				ewarn "If you do not migrate or reset secrets, second step authentication"
+				ewarn "will be disabled after the upgrade."
+				break
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAUTH_USERNAME=gauth
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	enewgroup gauth
+	enewuser gauth -1 -1 -1 gauth
+	fowners gauth:gauth /var/lib/gauth /usr/bin/gauthctl /usr/bin/gauth-test
+	fperms ug+s /usr/bin/gauthctl /usr/bin/gauth-test
+}
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 3a090f7738f3..399c1c998d12 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,5 +1,6 @@
+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 648 BLAKE2B f82dd2218c056e11602e44aa2c1e9b209d96a0c1a29eb00b62313fc2d5d23d63b2e17659bea9abc7e979f8133b44cc5106ebe38cce8f5bef12505ee59dbf44c8 SHA512 d21ff01082da69296959e4ad24cb9c4b8a4c6dd6068a7811eca62c09e1bb814133e88de8c655947fc3842da6fe380d4cd5c18a04bb1b1f10a19a8055f72ffac6
+EBUILD pam_p11-0.2.0.ebuild 689 BLAKE2B 538769464d300e72daa8e7cc674d5377e7fe3209d8e3d70a1c85ea1d14576386b085cd0335bf11c2a786f2f632902e6601ed2726a7498e0a68286389062dc4b6 SHA512 b4f9b8a48a5f5d7d5caf2c618ac1ba860cb8e7e08080d4225467a656d17bdad6a8020ac3d2ad3b1fd2917b46afda362a9ffd06b05ffe2c1fb3c307f202180250
 MISC metadata.xml 528 BLAKE2B c2ab3c41473490f8c7c3926491d06ddf35554b92cd41ac7abe05f830a2b7c78c97a4ad9d4bcf39e6d1250cb2544ef9bd280e11a96f579ee1552b4748f012f1b8 SHA512 7d3ab0a89f1be52b1937fe300710c23ca4c24c548448b5c7edd5b6817c45a0a184fef8e07d60c0c4f6f9e1ee2fdb843dc6ceb95e5731ce9e9d76f98ae5b7e652
diff --git a/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch b/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
new file mode 100644
index 000000000000..813499acd3a7
--- /dev/null
+++ b/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
@@ -0,0 +1,26 @@
+From 659a6eb5434039c27b41a9d06edc64923e5042b9 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 15 Aug 2018 18:30:51 +0300
+Subject: [PATCH] build: pam_p11: unsigned comparison
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/pam_p11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pam_p11.c b/src/pam_p11.c
+index 960c164..1cf6cb2 100644
+--- a/src/pam_p11.c
++++ b/src/pam_p11.c
+@@ -553,7 +553,7 @@ static int randomize(pam_handle_t *pamh, unsigned char *r, unsigned int r_len)
+ {
+ 	int ok = 0;
+ 	int fd = open("/dev/urandom", O_RDONLY);
+-	if (0 <= fd && read(fd, r, r_len) == r_len) {
++	if (0 <= fd && read(fd, r, r_len) == (ssize_t)r_len) {
+ 		ok = 1;
+ 	} else {
+ 		pam_syslog(pamh, LOG_CRIT, "Error reading from /dev/urandom: %s",
+-- 
+2.16.4
+
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 5719fc04d4c4..b1872dfaa3eb 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
@@ -20,6 +20,10 @@ RDEPEND="virtual/pam
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	econf --with-pamdir="$(getpam_mod_dir)"
 }