gentoo resync : 24.12.2018

3 files changed, 90 insertions, 2 deletions

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index 1e152cb8be61..edbf20d8ae3b 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,4 +1,7 @@
 DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
-EBUILD ssh-ldap-pubkey-1.3.0-r1.ebuild 1706 BLAKE2B 5a2a77fe3a77d39ac4265fbaa7fb63e226d13419c8196bc3cefa346d37c7becd7356be570653fba2f8bd40866c1e9dd4fcd90b0d40e452bf966afe63ecb25f46 SHA512 394364b3dcee480125c649278f06df2b6a6e304794bf5df145315f4e5321e9ac7a793e6cdfaabf559439304f8b87c216ab63671ef1e112db3c6ebe43763c5e14
+DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
+DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
+EBUILD ssh-ldap-pubkey-1.3.0-r1.ebuild 1711 BLAKE2B b325fc66e5ccfef660ae855a9ab18bb94871ba97a342cba8e2af0304537fdec139715af80baf2ac329f626890f75e0e044f3dd8ac03189dd75c2fd5e8e158cf6 SHA512 e19ccf30f9102fd210cf372a2230ce5f573535efadf75cb1214fe17fef632476a56af450b9ebb155f2db36371735faa28eef2c2bcc38d7fd6ada147912a5de81
+EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2209 BLAKE2B d5eddff6e473e6f5de77110107699029f9a9025b27c88ebe88ce1fd07ca4f4f019b8c1d78fa71168e6befe1601d2aacc4f0fb2cb85a62d52b773214d9f3d36a9 SHA512 a4f164e1da2f79aab69d475ecf8ce525281d7029b295e3266b181d805fdb5354243e5f962e9cfc36aad5553692fe28ff8a54d0bd241da1a4b79a1ddb6bfc9576
 EBUILD ssh-ldap-pubkey-1.3.0.ebuild 1592 BLAKE2B 0f9e074a466098a493740e3476e05425b223db18e47c6407429243952f2e794fc465cfd2dbb08a0b39861207bbc5c99c7c91b000c7839ce2eaba59b1be22729d SHA512 d9652275517dec7a8df0bd19401c128c7440112e01ff45f58f1afe953a4f60b245fd1d51f604e872024c9cad3c6c9b380ec5d06c3c28a2351f298453c8500d63
 MISC metadata.xml 523 BLAKE2B 0a9308f1acc865d1150c5d1f7275ab7d213965be821936aadc1e92b6a0ca0f3ba90a8e4b28a1683b182fe1d540991ff032407e641ce0ea4b4f8511a880e74d99 SHA512 f9db947dfb435f981350a30cd8d6d9163b9b5067f610eae87f17c85d6a123a2dd620aa06d1a290ed148321d68c37877662885b07b5af15fce3f13d0afbba67dc
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
index 33d171a2c2b0..5460e0995c46 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..2e4b4ba04411
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
+HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+fi
+PATCHES=( )
+PATCH_COMMITS=(
+	# https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
+	# config.parse_config: fix parsing of non-word characters
+	130478a7532a8d3dfb0c8e3fbeac494908b8ec55
+	# https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
+	# find_dn_by_login: handle complex filters
+	8d718357dfa5a62f919e61cf620a862cae87e833
+)
+for c in "${PATCH_COMMITS[@]}" ; do
+	d="${PN}-${c}.patch"
+	PATCHES+=( "${DISTDIR}/${d}" )
+	SRC_URI="${SRC_URI} https://github.com/jirutka/${PN}/commit/${c}.patch -> ${d}"
+done
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="schema test"
+RESTRICT="!test? ( test )"
+
+MY_CDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
+	virtual/logger"
+
+DEPEND="
+	${MY_CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-describe[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+# We need to block previous net-misc/openssh packages
+# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
+RDEPEND="${MY_CDEPEND}
+	schema? ( !net-misc/openssh[ldap] )"
+
+DOCS=( README.md CHANGELOG.adoc )
+
+src_prepare() {
+	sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use schema; then
+		insinto /etc/openldap/schema
+		doins etc/openssh-lpk.schema
+	fi
+
+	local MY_DOCDIR="/usr/share/doc/${PF}/examples"
+	insinto "${MY_DOCDIR}"
+	doins etc/ldap.conf
+
+	# We don't want to compress this small file to allow user
+	# to diff configuration against upstream's default
+	docompress -x "${MY_DOCDIR}"
+}