[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2023-10-22 Thread Michał Górny
commit: 0d6f35d578f18d9d761912ad7fab41078100eb28
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 22 19:06:38 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 22 19:14:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6f35d5

sys-auth/ssh-ldap-pubkey: Explicitly enable pytest-describe

Signed-off-by: Michał Górny  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
index 8d42ae8afb8a..999f36b3d109 100644
--- 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
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
@@ -37,6 +38,10 @@ DOCS=( README.md CHANGELOG.adoc )
 
 distutils_enable_tests pytest
 
+python_test() {
+   epytest -p pytest-describe
+}
+
 python_install_all() {
distutils-r1_python_install_all
 



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2023-05-07 Thread David Seifert
commit: ae8246c2645c785a1040650b3ff67d503cc23376
Author: David Seifert  gentoo  org>
AuthorDate: Sun May  7 10:37:30 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May  7 10:37:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8246c2

sys-auth/ssh-ldap-pubkey: remove stale blocker on net-misc/openssh[ldap(-)]

Signed-off-by: David Seifert  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

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
index f43d63126cf9..8d42ae8afb8a 100644
--- 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
@@ -23,21 +23,16 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="schema"
 
-MY_CDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
virtual/logger"
-DEPEND="${MY_CDEPEND}
+DEPEND="${RDEPEND}
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



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2023-03-07 Thread Sam James
commit: a1328bbad604f5a0131923541ad3452589261f03
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  7 09:00:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  7 09:21:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1328bba

sys-auth/ssh-ldap-pubkey: enable py3.11

Closes: https://github.com/mgorny/python-bump-testing/issues/68
Closes: https://bugs.gentoo.org/897272
Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 1f5cd230ec5a..f43d63126cf9 100644
--- 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/, sys-auth/ssh-ldap-pubkey/files/

2022-06-21 Thread David Seifert
commit: fc9ddabfcc5fa9967e0e21ed68d25db15f53e06f
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 21 09:40:45 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 21 09:40:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9ddabf

sys-auth/ssh-ldap-pubkey: drop 1.3.3

Signed-off-by: David Seifert  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 -
 .../files/ssh-ldap-pubkey-1.3.3-python3.9.patch| 34 --
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild   | 73 --
 3 files changed, 108 deletions(-)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index fcc55b832db2..4a42d309fcbe 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,2 +1 @@
-DIST ssh-ldap-pubkey-1.3.3.tar.gz 15389 BLAKE2B 
24c741646e33cf7af400053eff17efa35b96ec418d1c2b8c370a371dde51fdbbb3af3423f0cc4374f61b302f9836601444ee72613388fa2d4445957f918d64f9
 SHA512 
b52d4de3e0704817e8ea0fb316c21646da1bac74ed226812c03f9ee5ae449a86e5ef4c679633d212db05382e216b254a185e29d4a2244318ad5de288b909254a
 DIST ssh-ldap-pubkey-1.4.0.tar.gz 15461 BLAKE2B 
8e78fd6a5fa76ca97e813c95c9cbfefc3d40024cb31b8992de0c44770592f5abc7d8f0a4673905456dbe9a4272c1ce9a9e12bec69d9f8fa2f32a9b7a1895b978
 SHA512 
a62929b47f46f18936fcc7c233afaee43f0cef5f7a8de15304986205f98c2644a18f9c0dcabb35598f1cc485b8c4dbeb8b2f07cb2c3dcbb6b271a276aebf88e7

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..
--- 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..
--- 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} == "" ]]; 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

[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2022-06-07 Thread Sam James
commit: 6f82c2c91f625af18f457cb6b43b6fe94b4fa24f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 06:02:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 06:02:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f82c2c9

sys-auth/ssh-ldap-pubkey: Stabilize 1.4.0 x86, #850244

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 8ba8471aab27..f47d13393d96 100644
--- 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
@@ -16,7 +16,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2022-06-06 Thread Sam James
commit: bd3d79f959f7dd23e601effefd520fce7d37b5d7
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 05:54:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 05:54:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3d79f9

sys-auth/ssh-ldap-pubkey: Stabilize 1.4.0 amd64, #850244

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 287a064c5b7e..8ba8471aab27 100644
--- 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
@@ -16,7 +16,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2022-05-21 Thread Sam James
commit: aa59782395bf58de333a752235d277801261c8bf
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 03:13:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 03:13:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa597823

sys-auth/ssh-ldap-pubkey: destabilize 1.4.0 for ~amd64, ~x86

Accidentally pushed as stable.

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f47d13393d96..287a064c5b7e 100644
--- 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
@@ -16,7 +16,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2022-05-21 Thread Sam James
commit: 13ca6d2b2253ab17db68572553f3b4ed34450fd3
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 02:12:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 02:30:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ca6d2b

sys-auth/ssh-ldap-pubkey: add 1.4.0

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 +
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild   | 60 ++
 2 files changed, 61 insertions(+)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index 2316da6720b1..fcc55b832db2 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1 +1,2 @@
 DIST ssh-ldap-pubkey-1.3.3.tar.gz 15389 BLAKE2B 
24c741646e33cf7af400053eff17efa35b96ec418d1c2b8c370a371dde51fdbbb3af3423f0cc4374f61b302f9836601444ee72613388fa2d4445957f918d64f9
 SHA512 
b52d4de3e0704817e8ea0fb316c21646da1bac74ed226812c03f9ee5ae449a86e5ef4c679633d212db05382e216b254a185e29d4a2244318ad5de288b909254a
+DIST ssh-ldap-pubkey-1.4.0.tar.gz 15461 BLAKE2B 
8e78fd6a5fa76ca97e813c95c9cbfefc3d40024cb31b8992de0c44770592f5abc7d8f0a4673905456dbe9a4272c1ce9a9e12bec69d9f8fa2f32a9b7a1895b978
 SHA512 
a62929b47f46f18936fcc7c233afaee43f0cef5f7a8de15304986205f98c2644a18f9c0dcabb35598f1cc485b8c4dbeb8b2f07cb2c3dcbb6b271a276aebf88e7

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 ..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} ==  ]] ; 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}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2021-06-14 Thread David Seifert
commit: 80f2c3f0a5afc8ec16545f6f8d1db5efc2e52c73
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 14 09:19:21 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 14 09:19:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f2c3f0

sys-auth/ssh-ldap-pubkey: drop 1.3.2

Signed-off-by: David Seifert  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 -
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild   | 71 --
 2 files changed, 72 deletions(-)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index e7fba398136..2316da6720b 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,2 +1 @@
-DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B 
a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3
 SHA512 
8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
 DIST ssh-ldap-pubkey-1.3.3.tar.gz 15389 BLAKE2B 
24c741646e33cf7af400053eff17efa35b96ec418d1c2b8c370a371dde51fdbbb3af3423f0cc4374f61b302f9836601444ee72613388fa2d4445957f918d64f9
 SHA512 
b52d4de3e0704817e8ea0fb316c21646da1bac74ed226812c03f9ee5ae449a86e5ef4c679633d212db05382e216b254a185e29d4a2244318ad5de288b909254a

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
deleted file mode 100644
index 8b28be2a5b7..000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
-HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey;
-
-if [[ ${PV} == "" ]]; 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 )
-
-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}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2021-06-07 Thread Sam James
commit: c6befc635ad32428cf6c9df15d718b5641fb78d0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  8 04:02:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  8 04:02:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6befc63

sys-auth/ssh-ldap-pubkey: Stabilize 1.3.3 amd64, #793923

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index b6cfa97d646..ac7bd5162af 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
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"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2021-06-07 Thread Sam James
commit: 2db6a492580404cb03afabfd4f3ab961ba9a895a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  8 04:02:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  8 04:02:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db6a492

sys-auth/ssh-ldap-pubkey: Stabilize 1.3.3 x86, #793923

Signed-off-by: Sam James  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c34e4af8ac9..b6cfa97d646 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/, sys-auth/ssh-ldap-pubkey/files/

2021-06-02 Thread Thomas Deutschmann
commit: 4e071c4943bc0240977d7499caac736bf209aa3c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  2 15:20:10 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  2 16:15:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e071c49

sys-auth/ssh-ldap-pubkey: bump to v1.3.3

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 +
 .../files/ssh-ldap-pubkey-1.3.3-python3.9.patch| 34 ++
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild   | 73 ++
 3 files changed, 108 insertions(+)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index d9319450c0c..e7fba398136 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1 +1,2 @@
 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B 
a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3
 SHA512 
8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
+DIST ssh-ldap-pubkey-1.3.3.tar.gz 15389 BLAKE2B 
24c741646e33cf7af400053eff17efa35b96ec418d1c2b8c370a371dde51fdbbb3af3423f0cc4374f61b302f9836601444ee72613388fa2d4445957f918d64f9
 SHA512 
b52d4de3e0704817e8ea0fb316c21646da1bac74ed226812c03f9ee5ae449a86e5ef4c679633d212db05382e216b254a185e29d4a2244318ad5de288b909254a

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
new file mode 100644
index 000..b646603a134
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/files/ssh-ldap-pubkey-1.3.3-python3.9.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000..c34e4af8ac9
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.3.ebuild
@@ -0,0 +1,73 @@
+# 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} == "" ]]; 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 

[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2020-09-02 Thread Thomas Deutschmann
commit: 8961b3856c9e6cc09f2c26c5303ae771cd67c319
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep  2 16:15:51 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep  2 16:15:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8961b385

sys-auth/ssh-ldap-pubkey: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  4 -
 .../ssh-ldap-pubkey-1.3.0-r2.ebuild| 85 --
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild   | 71 --
 3 files changed, 160 deletions(-)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index efaac702b49..d9319450c0c 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,5 +1 @@
-DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 
1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea
 SHA512 
0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
-DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B 
e073093ff5c2e5ebb560d00b4973a0d26c708d647974a1e2a3298d5be656a2a8f9099c9fa805eda9c0e69b615dccbf43c6eaec5a7284d612e8d7d71784c3d673
 SHA512 
fe17ad5515e044052350d68222ae1f2ba2b8dde796c3665a1e41094c0311609d37e27f95bf6f048ba881bd722717cb80b127d48c083c2c7ae9c53661ad4039e4
 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B 
a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3
 SHA512 
8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
-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
deleted file mode 100644
index d4129f617cb..000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
-HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey;
-
-if [[ ${PV} == "" ]]; 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
-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 

[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2020-09-02 Thread Thomas Deutschmann
commit: 0d880a5ccf5c3d797b899e87b37c65d420c6f5a7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep  2 16:15:31 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep  2 16:15:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d880a5c

sys-auth/ssh-ldap-pubkey: add Python 3.8 support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
index 15c6338cb35..e34d60f6eb7 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2020-02-05 Thread Michał Górny
commit: e66fa6468bbee475a268c549f949a64d78f40dfa
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Feb  5 19:59:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  5 20:10:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66fa646

sys-auth/ssh-ldap-pubkey: Remove py2

Signed-off-by: Michał Górny  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild | 2 +-
 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild| 2 +-
 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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
index 17407783a2d..d4129f617cb 100644
--- 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
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
index f0323772233..f9b87b29b31 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
index 6aad75f5030..15c6338cb35 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-11-27 Thread Thomas Deutschmann
commit: 2c73b5b7efcb8abd738c19699f808bc1876f1a1c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 27 08:51:29 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 27 08:51:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c73b5b7

sys-auth/ssh-ldap-pubkey: bump to v1.3.2

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 +
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild   | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index ad3db6abc45..efaac702b49 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,4 +1,5 @@
 DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 
1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea
 SHA512 
0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
 DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B 
e073093ff5c2e5ebb560d00b4973a0d26c708d647974a1e2a3298d5be656a2a8f9099c9fa805eda9c0e69b615dccbf43c6eaec5a7284d612e8d7d71784c3d673
 SHA512 
fe17ad5515e044052350d68222ae1f2ba2b8dde796c3665a1e41094c0311609d37e27f95bf6f048ba881bd722717cb80b127d48c083c2c7ae9c53661ad4039e4
+DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B 
a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3
 SHA512 
8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
 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.2.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
new file mode 100644
index 000..bbe6ce57011
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
+HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey;
+
+if [[ ${PV} == "" ]]; 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 )
+
+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}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-07-22 Thread Thomas Deutschmann
commit: 0dfb40c2bb74ed7b892a4b58e8cbbbe7809fae8e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 22 16:42:16 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 22 16:58:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dfb40c2

sys-auth/ssh-ldap-pubkey: bump to v1.3.1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 +
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild   | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
index 7874cae4be7..ad3db6abc45 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,3 +1,4 @@
 DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 
1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea
 SHA512 
0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
+DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B 
e073093ff5c2e5ebb560d00b4973a0d26c708d647974a1e2a3298d5be656a2a8f9099c9fa805eda9c0e69b615dccbf43c6eaec5a7284d612e8d7d71784c3d673
 SHA512 
fe17ad5515e044052350d68222ae1f2ba2b8dde796c3665a1e41094c0311609d37e27f95bf6f048ba881bd722717cb80b127d48c083c2c7ae9c53661ad4039e4
 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.1.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
new file mode 100644
index 000..6b65fd29922
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{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} == "" ]]; 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 )
+
+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}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-04-18 Thread Aaron Bauman
commit: 703aa99c0635c65d76a022b19c6a4a9315a31cff
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Apr 18 21:20:00 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 18 21:21:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703aa99c

sys-auth/ssh-ldap-pubkey: arm64 keyworded (bug #662814)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 2834edef3a7..187aa053842 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 PATCHES=( )
 PATCH_COMMITS=(



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-03-15 Thread Michał Górny
commit: 96af924862032f6a2da72dcc5f3bf6b0ce3d3373
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 15 09:33:17 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 15 09:35:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96af9248

sys-auth/ssh-ldap-pubkey: Remove old revisions

Remove old revisions as part of dev-python/pyldap cleanup.

Signed-off-by: Michał Górny  gentoo.org>

 .../ssh-ldap-pubkey-1.3.0-r1.ebuild| 71 --
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild   | 66 
 2 files changed, 137 deletions(-)

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
deleted file mode 100644
index fb9c5709b98..000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 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} == "" ]]; 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 ~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 )
-
-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.3.0.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
deleted file mode 100644
index 7d04c5fd300..000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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} == "" ]]; 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
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="schema test"
-RESTRICT="!test? ( test )"
-
-MY_CDEPEND="
-   dev-python/docopt[${PYTHON_USEDEP}]
-   dev-python/pyldap[${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 )
-
-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 

[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-02-17 Thread Sergei Trofimovich
commit: 757e84828dde2f98bf6c24e277de8c134c924be7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:33:13 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=757e8482

sys-auth/ssh-ldap-pubkey: keyworded 1.3.0-r1 for ppc, bug #662814

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7d5b3c2c40f..fb9c5709b98 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} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-02-17 Thread Sergei Trofimovich
commit: b5d106f5a06d4b66ef3818d58144621ff1ca996a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:33:17 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d106f5

sys-auth/ssh-ldap-pubkey: keyworded 1.3.0-r2 for ppc, bug #662814

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 082ac6817cf..a09bde34c0d 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 PATCHES=( )
 PATCH_COMMITS=(



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-02-15 Thread Mikle Kolyada
commit: f6b43bddda8bd76292ad09287b51307e0ae727d1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Feb 15 17:45:25 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Feb 15 17:46:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b43bdd

sys-auth/ssh-ldap-pubkey: Add ~arm keyword wrt bug #662814

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="~arm"

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 9e7a281a5fc..082ac6817cf 100644
--- 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
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 fi
 PATCHES=( )
 PATCH_COMMITS=(



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-01-03 Thread Sergei Trofimovich
commit: ba0e6638bc45baf5fb42872e3e78f085944507d2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan  3 14:59:53 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jan  3 14:59:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0e6638

sys-auth/ssh-ldap-pubkey: keyworded 1.3.0-r2 for ia64, bug #662814

Package-Manager: Portage-2.3.53, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 2e4b4ba0441..9e7a281a5fc 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; 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 ~ia64 ~ppc64 ~x86"
 fi
 PATCHES=( )
 PATCH_COMMITS=(



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2019-01-03 Thread Sergei Trofimovich
commit: 434225748f545373cb7e6b660666e4cf46579b23
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan  3 14:59:25 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jan  3 14:59:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43422574

sys-auth/ssh-ldap-pubkey: keyworded 1.3.0-r1 for ia64, bug #662814

Package-Manager: Portage-2.3.53, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 5460e0995c4..7d5b3c2c40f 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-11-18 Thread Robin H. Johnson
commit: 9e8143eb1adca61845444132a576fc50b6ff47bd
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Nov 19 00:41:51 2018 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Nov 19 00:42:18 2018 +
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 000..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} == "" ]]; 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}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-11-18 Thread Mikle Kolyada
commit: 57ac7ed2979ab26f9362c8dead43d81f7751800f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Nov 18 09:38:18 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Nov 18 09:38:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ac7ed2

sys-auth/ssh-ldap-pubkey: Add ~arm keyword wrt bug #662814

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 33d171a2c2b..5460e0995c4 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} == "" ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-11-13 Thread Robin H. Johnson
commit: 5d2eef62c1e6dea87e974fdf99667914ec6a1807
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Nov 14 07:03:52 2018 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Wed Nov 14 07:06:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2eef62

sys-auth/ssh-ldap-pubkey: selectively install LPK schema file

The LPK schema file is only needed on LDAP servers, and otherwise causes
this package to block the OpenSSH upgrade everywhere. By making it
optional and not enabled by default, the OpenSSH upgrade is much
smoother.

Signed-off-by: Robin H. Johnson  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.10

 sys-auth/ssh-ldap-pubkey/metadata.xml|  3 +++
 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild | 10 ++
 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild| 12 +++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/sys-auth/ssh-ldap-pubkey/metadata.xml 
b/sys-auth/ssh-ldap-pubkey/metadata.xml
index 798419df911..d01451ddfcc 100644
--- a/sys-auth/ssh-ldap-pubkey/metadata.xml
+++ b/sys-auth/ssh-ldap-pubkey/metadata.xml
@@ -9,4 +9,7 @@

https://github.com/jirutka/ssh-ldap-pubkey/issues
jirutka/ssh-ldap-pubkey

+   
+   Install a copy of the LPK schema, only 
needed on LDAP servers.
+   
 

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 628ee8f4f19..33d171a2c2b 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
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
+IUSE="schema test"
 RESTRICT="!test? ( test )"
 
 MY_CDEPEND="
@@ -40,7 +40,7 @@ DEPEND="
 # We need to block previous net-misc/openssh packages
 # to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
 RDEPEND="${MY_CDEPEND}
-   !net-misc/openssh[ldap]"
+   schema? ( !net-misc/openssh[ldap] )"
 
 DOCS=( README.md CHANGELOG.adoc )
 
@@ -56,8 +56,10 @@ python_test() {
 python_install_all() {
distutils-r1_python_install_all
 
-   insinto /etc/openldap/schema
-   doins etc/openssh-lpk.schema
+   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}"

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
index 1c422cf550f..7d04c5fd300 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
+IUSE="schema test"
 RESTRICT="!test? ( test )"
 
 MY_CDEPEND="
@@ -40,7 +40,7 @@ DEPEND="
 # We need to block previous net-misc/openssh packages
 # to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
 RDEPEND="${MY_CDEPEND}
-   !net-misc/openssh[ldap]"
+   schema? ( !net-misc/openssh[ldap] )"
 
 DOCS=( README.md CHANGELOG.adoc )
 
@@ -51,8 +51,10 @@ python_test() {
 python_install_all() {
distutils-r1_python_install_all
 
-   insinto /etc/openldap/schema
-   doins etc/openssh-lpk.schema
+   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}"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-10-25 Thread Brian Evans
commit: 2220bb3098a2c45f750b6315a02fe384d276b01e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Oct 25 17:33:34 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Oct 25 17:33:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2220bb30

sys-auth/ssh-ldap-pubkey: Revbump to change dependency

Non-maintainer commit
pyldap is now part of python-ldap-3.0 and deprecated as a project

Tests pass

Bug: https://bugs.gentoo.org/668066
Signed-off-by: Brian Evans  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../ssh-ldap-pubkey-1.3.0-r1.ebuild| 69 ++
 1 file changed, 69 insertions(+)

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
new file mode 100644
index 000..628ee8f4f19
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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} == "" ]]; 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
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="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}
+   !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
+
+   insinto /etc/openldap/schema
+   doins etc/openssh-lpk.schema
+
+   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}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-10-17 Thread Tobias Klausmann
commit: 3b589bac453cce3c494b9153221e1655984c582f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Oct 17 12:10:58 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Oct 17 12:11:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b589bac

sys-auth/ssh-ldap-pubkey-1.3.0-r0: add ~alpha keyword

Bug: http://bugs.gentoo.org/662814
Signed-off-by: Tobias Klausmann  gentoo.org>

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
index 6381fe6c429..1c422cf550f 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-08-06 Thread Sergei Trofimovich
commit: 1f3572b17e4d0aa126662029435826e29da48d84
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Aug  6 09:12:11 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Aug  6 09:12:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3572b1

sys-auth/ssh-ldap-pubkey: keyworded 1.3.0 for ppc64, bug #662814

Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
index 861c41ba1ef..6381fe6c429 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/

2018-08-04 Thread Thomas Deutschmann
commit: 1a2d49ef9bfb9c155f532a290a05acfe79b9c780
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug  4 20:21:17 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug  4 20:21:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2d49ef

sys-auth/ssh-ldap-pubkey: new package

Bug: https://bugs.gentoo.org/658044
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-auth/ssh-ldap-pubkey/Manifest  |  1 +
 sys-auth/ssh-ldap-pubkey/metadata.xml  | 12 
 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild   | 64 ++
 3 files changed, 77 insertions(+)

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest 
b/sys-auth/ssh-ldap-pubkey/Manifest
new file mode 100644
index 000..dc55673bcde
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -0,0 +1 @@
+DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 
1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea
 SHA512 
0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16

diff --git a/sys-auth/ssh-ldap-pubkey/metadata.xml 
b/sys-auth/ssh-ldap-pubkey/metadata.xml
new file mode 100644
index 000..798419df911
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
+   
+   
https://github.com/jirutka/ssh-ldap-pubkey/issues
+   jirutka/ssh-ldap-pubkey
+   
+

diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild 
b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
new file mode 100644
index 000..861c41ba1ef
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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} == "" ]]; 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="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+MY_CDEPEND="
+   dev-python/docopt[${PYTHON_USEDEP}]
+   dev-python/pyldap[${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}
+   !net-misc/openssh[ldap]"
+
+DOCS=( README.md CHANGELOG.adoc )
+
+python_test() {
+   pytest -vv || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   insinto /etc/openldap/schema
+   doins etc/openssh-lpk.schema
+
+   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}"
+}