From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- sys-auth/ssh-ldap-pubkey/Manifest | 5 +- .../files/ssh-ldap-pubkey-1.3.3-python3.9.patch | 34 ---------- .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild | 73 ---------------------- .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 60 ++++++++++++++++++ 4 files changed, 62 insertions(+), 110 deletions(-) delete mode 100644 sys-auth/ssh-ldap-pubkey/files/ssh-ldap-pubkey-1.3.3-python3.9.patch delete mode 100644 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild create mode 100644 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild (limited to 'sys-auth/ssh-ldap-pubkey') diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest index 3de32b203270..73ab591f71b4 100644 --- a/sys-auth/ssh-ldap-pubkey/Manifest +++ b/sys-auth/ssh-ldap-pubkey/Manifest @@ -1,4 +1,3 @@ -AUX ssh-ldap-pubkey-1.3.3-python3.9.patch 1226 BLAKE2B 1f3c3f9168b0370301aa31a47f14aaddd41eb1d14f66505ff013e245dd12cb514ae422f7189f3af6952fc6c7a5e22789c7c7cd88343d89f9c4a07b667e6bafef SHA512 54d23323a90cc25b1172291b99151cae37e346eccca027fc1010cfb8a7e69d6a353c71cefceefd4c06f43e60eb476d9141329ee1ff4cba74991cecdde888d72b -DIST ssh-ldap-pubkey-1.3.3.tar.gz 15389 BLAKE2B 24c741646e33cf7af400053eff17efa35b96ec418d1c2b8c370a371dde51fdbbb3af3423f0cc4374f61b302f9836601444ee72613388fa2d4445957f918d64f9 SHA512 b52d4de3e0704817e8ea0fb316c21646da1bac74ed226812c03f9ee5ae449a86e5ef4c679633d212db05382e216b254a185e29d4a2244318ad5de288b909254a -EBUILD ssh-ldap-pubkey-1.3.3.ebuild 1767 BLAKE2B 07f90f0ae83fc4961725035783e054ceaa8829351445efcafe69aa65774f6fa4713b2a6530d2f3ad8c1cac4abf8c092cf19ad63ca64e8e7a3f1bc0e44c82afab SHA512 fae36d8a5d43650ff949f20ea513fe79ee6806165af8d8190177c33c87a093ef014210555ebd30329501c3793882eef6e383c7f87dd8875dd46199aa359ec653 +DIST ssh-ldap-pubkey-1.4.0.tar.gz 15461 BLAKE2B 8e78fd6a5fa76ca97e813c95c9cbfefc3d40024cb31b8992de0c44770592f5abc7d8f0a4673905456dbe9a4272c1ce9a9e12bec69d9f8fa2f32a9b7a1895b978 SHA512 a62929b47f46f18936fcc7c233afaee43f0cef5f7a8de15304986205f98c2644a18f9c0dcabb35598f1cc485b8c4dbeb8b2f07cb2c3dcbb6b271a276aebf88e7 +EBUILD ssh-ldap-pubkey-1.4.0.ebuild 1532 BLAKE2B 425bbd7599738467bf07f0678d2f44ff186d1d7cd9e6381fa67d2aaf8d2be83abab12c88797df479775ca0cf91ceac4ff1b4362f32b3ad503e017eb2d45b8f80 SHA512 5a6e31df274d8551b8416d313cbbdc9e69b7a4622f06716466a0e553106e4fb13625a130858246d679be1bfde7c5f3125707261fe2708a3fc3f3af2394034a8a MISC metadata.xml 524 BLAKE2B cc3dbc1b79b08be66e589243c3fba1e4b6fb5b224b24ed775683260f4f9fe47db9c13a166658ab9093e4bccc94bc46bbe2ec5b55df4599b168892e1c3893cd60 SHA512 94735c9e5e150ebc13f62c2883691a460378a8b4866dcd167293cb037b3d36bc6015d08ecfdacbc0a9d7ab91e1208c14c751f9d078f3272e30ca85f58ab10ad9 diff --git a/sys-auth/ssh-ldap-pubkey/files/ssh-ldap-pubkey-1.3.3-python3.9.patch b/sys-auth/ssh-ldap-pubkey/files/ssh-ldap-pubkey-1.3.3-python3.9.patch deleted file mode 100644 index b646603a134a..000000000000 --- a/sys-auth/ssh-ldap-pubkey/files/ssh-ldap-pubkey-1.3.3-python3.9.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 56b4b77bfa2b063b3f3686b54d8e39f6bce1d2a0 -Author: Thomas Deutschmann -AuthorDate: Wed Jun 2 17:40:06 2021 +0200 -Commit: Thomas Deutschmann -CommitDate: Wed Jun 2 18:01:16 2021 +0200 - - Use decodebytes instead of decodestring in Python 3.9 - - base64.decodestring(), alias deprecated since Python 3.1, has been removed - in Python 3.9 in favor of new base64.decodebytes() function [Link 1]. - - Link 1: https://docs.python.org/3.9/whatsnew/3.9.html#removed - Closes: https://github.com/jirutka/ssh-ldap-pubkey/issues/49 - -diff --git a/ssh_ldap_pubkey/__init__.py b/ssh_ldap_pubkey/__init__.py -index 5da2ade..d80b335 100644 ---- a/ssh_ldap_pubkey/__init__.py -+++ b/ssh_ldap_pubkey/__init__.py -@@ -39,8 +39,14 @@ def is_valid_openssh_pubkey(pubkey): - key_type, data64 = map(_encode, pubkey.split()[0:2]) - except (ValueError, AttributeError): - return False -+ -+ if hasattr(base64, "decodebytes"): -+ decodebytes = base64.decodebytes -+ else: -+ decodebytes = base64.decodestring -+ - try: -- data = base64.decodestring(data64) -+ data = decodebytes(data64) - except base64.binascii.Error: - return False - diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild deleted file mode 100644 index ac7bd5162af7..000000000000 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..9} ) -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 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" -fi - -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 ) - -PATCHES=( "${FILESDIR}"/${P}-python3.9.patch ) - -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}" -} diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild new file mode 100644 index 000000000000..f47d13393d96 --- /dev/null +++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +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 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="schema" + +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-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 ) + +distutils_enable_tests pytest + +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}" +} -- cgit v1.2.3