From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A6B9138334 for ; Mon, 19 Nov 2018 00:42:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCCAFE09EF; Mon, 19 Nov 2018 00:42:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DC20E09EF for ; Mon, 19 Nov 2018 00:42:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FA0D335C38 for ; Mon, 19 Nov 2018 00:42:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59587463 for ; Mon, 19 Nov 2018 00:42:27 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1542588138.9e8143eb1adca61845444132a576fc50b6ff47bd.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/ssh-ldap-pubkey/Manifest sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild X-VCS-Directories: sys-auth/ssh-ldap-pubkey/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 9e8143eb1adca61845444132a576fc50b6ff47bd X-VCS-Branch: master Date: Mon, 19 Nov 2018 00:42:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ab12515-9590-479b-8371-34c4e22f9427 X-Archives-Hash: 272055b5e07a4e524214674e180ee19e commit: 9e8143eb1adca61845444132a576fc50b6ff47bd Author: Robin H. Johnson gentoo org> AuthorDate: Mon Nov 19 00:41:51 2018 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Nov 19 00:42:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8143eb sys-auth/ssh-ldap-pubkey: fixes for complex LDAP filters Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> sys-auth/ssh-ldap-pubkey/Manifest | 2 + .../ssh-ldap-pubkey-1.3.0-r2.ebuild | 85 ++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest index dc55673bcde..7874cae4be7 100644 --- a/sys-auth/ssh-ldap-pubkey/Manifest +++ b/sys-auth/ssh-ldap-pubkey/Manifest @@ -1 +1,3 @@ DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16 +DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472 +DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63 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 00000000000..2e4b4ba0441 --- /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}" +}