gentoo resync : 22.01.2019

6 files changed, 142 insertions, 65 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 9816acc9e29a..e789e59da48e 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 687ca765bfe1..73a8af8f7ac5 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,7 +1,5 @@
 DIST fprintd-0.5.0.tar.bz2 66981 BLAKE2B 02ae16bbeaab55559a44ef43999941fd2076ef610adc92184601963ab3edc4bae41abfce0540d4ac0e0717b8542f0b0684af2616684856b0e71f3e58b1834d6a SHA512 d77adb92e6913c8822e2c866ed632f5d1429c93e8e7c4c7d51d23385f6afb0c6048ff72c9cb885d7581e8d1e461f708af06ca6e6f98e177c98834289a76341de
-DIST fprintd-0.6.0.tar.bz2 67589 BLAKE2B e1828d183ee2b34c6637ab148ec3d8c562c06b370a5102bcdd72481e19ce1c12d03bf374404e5f508dd755ea12a3aaa3509431a4584f44b667285d00a5872406 SHA512 65e0af9e46b2f4e836c54cd1df2deba33d12228c4997fc5bb44b03ccd38c01fc01a48451faba821a8490ff7715721d8697e1e97a93bab5041b4938b5247c39ba
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 EBUILD fprintd-0.5.0.ebuild 1509 BLAKE2B 3ecb04540bd0b11bbf0733e6d40859e4bc926d627a540183c5d5f346c38df2ae8bc59e15efe53d133c9a5a4ea83be5fa0a63c6b45e12ef51827649d3da29e93f SHA512 06380a416b30de228675312d39bdca884476dde70777e01ba14bb316f9652b40997bf00a4bb2e14d46fbd11427e1f09e32eae5b39c10dae025e4cb9cc27b656f
-EBUILD fprintd-0.6.0.ebuild 1517 BLAKE2B b2da7cefc22cd6a78cf2a2541451614887b91cfb1b6df6b01a0ccb0443f0aed518219609de09d0c243506718fabd6a535945788961b68f239ac0a2d14a4f73f6 SHA512 278a8e6c01a32ffe906b3ee4a89ee579f2ee3b2ab914358bc434fab8f35883e0cd9310b9618add7d58f5b6719e82def1e9edf15e287d88a2c1a81cbf389b299c
 EBUILD fprintd-0.8.1.ebuild 1529 BLAKE2B 386238b2381ee3686b0441f5eb07aef1ed77b01f7f7ed43a763718792a76391e3d384a46f463ee57205347defe4512b6b05afdba02f157276aaeede602fb1983 SHA512 878930e6a2310e015952006517de2928fb04a63098915787e914a1a8ff100f1e20c99eced0785e6288142f04bb6686d3e59d8eea686e452890a3a6909d2520f0
 MISC metadata.xml 344 BLAKE2B 9a02f1005090b51c476c6705fe5627cf66dfdc3c4168e917b47651510b0596a6582bb2e4bc09bdd943c202a49a9e3d9bf58a03badeb1bd45f017b6bfef236fe9 SHA512 93369d8bd0b3f7c65b2f6a49f9e35b438879ffdd5c4b4906a4f3e09b0ce74dad1bb6f204c58be724edb88cb4e6a0380e28f516bd1c3bdcd904b8b9e8955dbd8d
diff --git a/sys-auth/fprintd/fprintd-0.6.0.ebuild b/sys-auth/fprintd/fprintd-0.6.0.ebuild
deleted file mode 100644
index 23d5ec0bc453..000000000000
--- a/sys-auth/fprintd/fprintd-0.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools pam systemd versionator
-
-DESCRIPTION="D-Bus service to access fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
-MY_PV="V_$(replace_all_version_separators _)"
-SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc pam static-libs"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-auth/libfprint
-	sys-auth/polkit
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-silent-rules \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_enable doc gtk-doc-html) \
-		$(systemd_with_unitdir)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		pammoddir=$(getpam_mod_dir)
-
-	keepdir /var/lib/fprint
-
-	find "${D}" -name "*.la" -delete || die
-
-	dodoc AUTHORS NEWS README{,.transifex} TODO
-	newdoc pam/README README.pam_fprintd
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins doc/{fprintd-docs,version}.xml
-		insinto /usr/share/doc/${PF}/html/dbus
-		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
-	fi
-}
-
-pkg_postinst() {
-	elog "Please take a look at README.pam_fprintd for integration docs."
-}
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 6ec1635c604d..41a5e1760c30 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -2,6 +2,10 @@ AUX pam_ssh-2.1-dot-ssh-check.patch 701 BLAKE2B 64b7ed30c85e67125ff74f1507454510
 AUX pam_symbols.ver 35 BLAKE2B 7a18277fef3362b21eb99b602781493de6818e93d86a0553fc97e67b780644b38a5233757a0b9b728d9a1cbc26513078bf99177809b6b5f68af273352b377819 SHA512 40e2d23783153bdfefc9ec7d9caf818e1d157bfa4f3074434e034aae47e3aa7d08b04dedbe06ef60ed2a93729f0e04aa09cf8e9f6929dfb15e4ae49c75c9d0d9
 DIST pam_ssh-1.98.tar.bz2 292989 BLAKE2B 08744c6649aa58c7221e5ec07e0c6aefa8d045cf30df01b941962d29f3abdae902b0fbad37923e3ff05536e422a1062732a6998e4b58d978d369df3d866ec1aa SHA512 bf6da4ced0619549d56516c6b24e899664e0948da7a0cc04ff1b536d06cc8c26242c83eb36ed835668c824b777e270aa293162ac77e3c479311386e6e5da39ff
 DIST pam_ssh-2.1.tar.xz 361000 BLAKE2B f22836af20b41ae7254f816c33793bb3a128b604ec36a20b207610deebf61f4d5dd070fd6f5093c6f7b6eb9e14f85cd81ddbbed7e97ee581124e5335722d036b SHA512 8252b15efffa5687f740963f7a3c3479b73f99eca26a17155f915a10b9a71362a2778449adf10f01c174cc8545961ce3ea64459338a7c995c242b209529fd640
+DIST pam_ssh-2.2.tar.xz 382244 BLAKE2B b3e6122530244add64400a6c4ea9811eb6feb0309b11d9ad17d800c3ced555f5459a8dc55ec58b0649017bcce9fb12417d4ba52ab2acd3acdf5e4a0cfe956e57 SHA512 b3caeb6065b2ac925cfd1a12107902f8474badfa1770d6499508d00bf41b54497fa17080f84af9dde0b6b7692d4bd58d33d94257c3106dac7eee79ebcf3b4692
+DIST pam_ssh-2.3.tar.xz 380396 BLAKE2B e228e30c6f353f631c0a1c41e82e31e7a8c573b04ab1cad4038a245b500666b42c0efa9f686d28f2386688596de761085afb1318b94fef5541f8c0ffc1e18b25 SHA512 e3ddcf851ffd8f6fb831e2dee7269c1b89283ae2f8f6aa3487bf7b1bc71d26ac9bcbd2a01c5a67a983b980bbb5151e991402940f4752741286d057843c817895
 EBUILD pam_ssh-1.98.ebuild 1149 BLAKE2B 992b24c2e63a6c3ab9e253e6953f1f31c2087299a9befa13532e94ff376c2790ded71e47d35244f7acee63a02761f5a04bb68ded168246daa7d5a68583b9fcdb SHA512 c1836e72948fe0fe59f2657c9d5d7fe6f05021cc25b94ef035fd33d63d3a6bc04e3e21d7738a662eab1b3a3bc0b23e2cef47fbd3c6f675fbf3a5f6db1febae27
 EBUILD pam_ssh-2.1.ebuild 1674 BLAKE2B 4234af139462e91adcc0184e56372afff1098a666f12e03bfdcb83ee9a8caaffac7fe1814c35159f80e2be5f21e6f419386d15b96ed1d62e231589cd75f3f40d SHA512 12508a96cff523b740ee0dc8cded9ddec545124417e65290fabe7644f5cc9b96206804cf7f071b793722f41305ad4e49ba4612a97ebea6ee01036a5f37cbc62e
+EBUILD pam_ssh-2.2.ebuild 1754 BLAKE2B b0175df5997d4caa2a1f9051777e29fc33f37bf7adb7647dce22e3e14867b81529429e07189b1201c8071f8f841e94f276fe62f47f96c15becf0bc61cdebdf33 SHA512 6e569c3708e7976f1a6a30fcd620d9f2a6bad8350a4f58dec9adf4421b8a88e8caf335b95407404dbcb44ddb64bd4e9d1d9cb244002da97e77c7042a7ee53ffc
+EBUILD pam_ssh-2.3.ebuild 1803 BLAKE2B 4a89e5c492502d3d09a3d47a3b51baecaaf22aaccc2725dd334113e3d54f5e011274bbbb8a610a6dd9fd00cb4739687ae8982dc7f91ff3d50dc0a4aa0b9b30a3 SHA512 3fca7911161f4d9bbe0a5fcbe78073043d860433e599d69e9a7d9dbee5089e35d8599458544a5ed06ec6d12ef4dadfc9011db9285dfac046f1b8aa6d622e766e
 MISC metadata.xml 297 BLAKE2B 98d31672b8829a698e938ce81e26fe28692f3828d224deaf4e9f6e8f0c7c6e065094b3ac504a70e306beb5c863a8776ac2d0b17919e49022c152ed4ed98fa7ad SHA512 f524068347954519bce747d0bcb8b45ef078438da36f5f3ad18b07429b731e15c3ab6f888e7f0d399a9c93ff76fb07d36087bdb55afee3eae1499ffeb8ff1d27
diff --git a/sys-auth/pam_ssh/pam_ssh-2.2.ebuild b/sys-auth/pam_ssh/pam_ssh-2.2.ebuild
new file mode 100644
index 000000000000..8c54ab76bfa8
--- /dev/null
+++ b/sys-auth/pam_ssh/pam_ssh-2.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Uses ssh-agent to provide single sign-on"
+HOMEPAGE="http://pam-ssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
+
+LICENSE="BSD-2 BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Only supports OpenSSH via `ssh-agent` #282993
+DEPEND="virtual/pam
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	net-misc/openssh"
+
+PATCHES=(
+	# 503424#c5
+	"${FILESDIR}"/${PN}-2.1-dot-ssh-check.patch
+)
+
+src_configure() {
+	# hide all the otherwise-exported symbols that may clash with
+	# other software loading the PAM modules (see bug #274924 as an
+	# example).
+	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
+
+	# Set the cache var so the configure script doesn't go probing hardcoded
+	# file system paths and picking up the wrong thing.
+	export ac_cv_openssldir=''
+
+	# Avoid cross-compiling funkiness and requiring openssh at build time.
+	export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent"
+
+	econf \
+		"--with-pam-dir=$(getpam_mod_dir)"
+}
+
+src_install() {
+	default
+
+	# pam_ssh only builds plugins
+	find "${D}" -name '*.la' -delete || die
+
+	local DOC_CONTENTS="
+		You can enable pam_ssh for system authentication by enabling
+		the pam_ssh USE flag on sys-auth/pambase.
+	"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.* ]]; then #554150
+		ewarn "Upstream pam_ssh has changed where ssh keys live.  Only keys in your"
+		ewarn "~/.ssh/login-keys.d/ will be accepted for authentication."
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
new file mode 100644
index 000000000000..43bb29b987aa
--- /dev/null
+++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Uses ssh-agent to provide single sign-on"
+HOMEPAGE="http://pam-ssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
+
+LICENSE="BSD-2 BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Only supports OpenSSH via `ssh-agent` #282993
+DEPEND="virtual/pam
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	net-misc/openssh"
+
+PATCHES=(
+	# 503424#c5
+	"${FILESDIR}"/${PN}-2.1-dot-ssh-check.patch
+)
+
+src_configure() {
+	# hide all the otherwise-exported symbols that may clash with
+	# other software loading the PAM modules (see bug #274924 as an
+	# example).
+	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
+
+	# Set the cache var so the configure script doesn't go probing hardcoded
+	# file system paths and picking up the wrong thing.
+	export ac_cv_openssldir=''
+
+	# Avoid cross-compiling funkiness and requiring openssh at build time.
+	export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent"
+
+	econf \
+		"--with-pam-dir=$(getpam_mod_dir)"
+}
+
+src_install() {
+	default
+
+	# pam_ssh only builds plugins
+	find "${D}" -name '*.la' -delete || die
+
+	local DOC_CONTENTS="
+		You can enable pam_ssh for system authentication by enabling
+		the pam_ssh USE flag on sys-auth/pambase.
+	"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	local i
+	for i in "${REPLACING_VERSIONS}"; do
+		if [[ ${i} == 1.* ]]; then #554150
+			ewarn "Upstream pam_ssh has changed where ssh keys live. Only keys in your"
+			ewarn "~/.ssh/login-keys.d/ will be accepted for authentication."
+			return
+		fi
+	done
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}