[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-31 Thread Robin H. Johnson 
commit: 61869d38dc6718e9ab3a79c8ff5f08600551f2f9
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Feb  1 06:38:33 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Feb  1 07:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61869d38

net-nds/nsscache: QA fixes

Bug: https://bugs.gentoo.org/923061
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/nsscache-0.49.ebuild | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 2674e1db5d26..7c9dfe0b027a 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.ebuild
@@ -58,8 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-   # Yes, tell setup.py to be verbose
-   distutils-r1_python_compile --verbose
+   distutils-r1_python_compile
 }
 
 python_install() {
@@ -69,13 +68,15 @@ python_install() {
python_doexe examples/authorized-keys-command.py
 
# Do not install the tests as functional source.
-   find "${D}" \
-   -path '*/site-packages/nss_cache/*' \( \
-   -iname '*_test.py*' \
-   -o -iname '*_test.*.py*' \
-   \) \
-   -delete \
-   || die "find failed"
+   # Subject to some debate, see bug 923061
+   # To be raised on gentoo-dev 2024/02/01
+   #find "${D}" \
+   #   -path '*/site-packages/nss_cache/*' \( \
+   #   -iname '*_test.py*' \
+   #   -o -iname '*_test.*.py*' \
+   #   \) \
+   #   -delete \
+   #|| die "find failed"
 }
 
 python_install_all() {

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-30 Thread Robin H. Johnson 
commit: 2a1b5b12cae92e28d456ede0ff394e98b3ac3b48
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Jan 30 08:22:51 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Jan 30 08:23:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1b5b12

net-nds/nsscache: QA fixes

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: https://bugs.gentoo.org/923061

 net-nds/nsscache/nsscache-0.49.ebuild | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 90f77100fc73..2674e1db5d26 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,21 +12,22 @@ DESCRIPTION="commandline tool to sync directory services to 
local cache"
 HOMEPAGE="https://github.com/google/nsscache;
 SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz"
 
-LICENSE="GPL-2"
+# upstream *sources* say "or later", but upstream metadata does not include the
+# 'or later' clause.
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nsscache s3 test"
 
-# testing requires local network (e.g. spin up slapd, httpd)
-#PROPERTIES="test_network"
-#RESTRICT="test"
-
 # Optional extras:
 # TODO: gcs? ( https://pypi.org/project/google-cloud-storage/ )
 #
 # Testing:
 # *unit* tests do not require networking.
 # *integration* tests require openldap's slapd and networking
+#
+# The ebuild runs the unit testing explicitly, as upstream uses Docker to run
+# the integration tests.
 RDEPEND="
nsscache? ( >=sys-auth/libnss-cache-0.10 )
>=dev-python/python-ldap-3.4[${PYTHON_USEDEP}]
@@ -35,11 +36,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-python/packaging[${PYTHON_USEDEP}]
test? (
-   dev-python/pytest-cov[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
)"
 
 S="${WORKDIR}/${PN}-version-${PV}"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
# nsscache.conf is example only, and should be installed in docs.
# Default config tries $PREFIX/config/nsscache.conf
@@ -55,6 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # Yes, tell setup.py to be verbose
distutils-r1_python_compile --verbose
 }
 
@@ -70,10 +74,8 @@ python_install() {
-iname '*_test.py*' \
-o -iname '*_test.*.py*' \
\) \
-   -delete
-
-   # Ignore any exit code from find.
-   return 0
+   -delete \
+   || die "find failed"
 }
 
 python_install_all() {
@@ -84,5 +86,3 @@ python_install_all() {
 
keepdir /var/lib/nsscache
 }
-
-distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-27 Thread Robin H. Johnson 
commit: 854aa3695b55ac48d199e269e0029d0c68363e86
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan 27 19:27:56 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan 27 19:31:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854aa369

net-nds/nsscache: bump, passes tests on py3.10..12

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/Manifest|  4 +-
 net-nds/nsscache/nsscache-0.39-r1.ebuild | 66 
 net-nds/nsscache/nsscache-0.47.ebuild| 72 --
 net-nds/nsscache/nsscache-0.49.ebuild| 88 
 4 files changed, 89 insertions(+), 141 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index e7b222c0c8a1..f86151e1c237 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,3 +1 @@
-DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 
4272bab8d85ef0f39c8b26fd035009d3c77dd629fd7853e0072232393d329af1885ce44c4877d7718a37154661d9c85bb1f5276463875f9dfbbd023106d9d15a
 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
-DIST nsscache-0.39.tar.gz 127896 BLAKE2B 
8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd
 SHA512 
f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376
-DIST nsscache-0.47.tar.gz 126225 BLAKE2B 
f238d4a6565038420dee7359edadf348a0e5fb581b8238b23d3835cc10ad9676917bfa6573c6a1d462d7afee36398954744ff2d498b4c1ed3459666b3aa6ad5c
 SHA512 
94cd9a62169146f1e10f78476a950dfc708b6c2063cffed3617bbfa9c43aaf134b1f038a94079df408e168877d32f07b64b61f048d34fed283828cc75e7dd2cf
+DIST nsscache-0.49.tar.gz 128598 BLAKE2B 
2d0c9c2818f7dbab44bd4fd17b7e1dceb3f1a236c18c96be4cc5dcf8329c748c0b1f8dc0f462e186458b3ede380ebc408fe56bfe21bc5aa8720a15122f90cec6
 SHA512 
941f6fcb8f52294f910dcf8e1aaf7f07bf83e7812d9325a709248c49013b46a959c6abdbaafd161ddcef96525d02aa939c68c9548841a6b66b94417f86b67527

diff --git a/net-nds/nsscache/nsscache-0.39-r1.ebuild 
b/net-nds/nsscache/nsscache-0.39-r1.ebuild
deleted file mode 100644
index f486563ad771..
--- a/net-nds/nsscache/nsscache-0.39-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb nsscache s3"
-RESTRICT="test" # requires network
-
-DEPEND="
-   dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-python/pycurl[${PYTHON_USEDEP}]
-   berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-
-S="${WORKDIR}/${PN}-version-${PV}"
-
-python_prepare_all() {
-   sed -i \
-   -e "/setup_requires/s,'pytest-runner',,g" \
-   -e '/tests_require/s,\[.*\],[],g' \
-   setup.py || die
-   sed -i \
-   -e '/test=pytest/d' \
-   setup.cfg || die
-   sed -i \
-   -e '/pytest/d' \
-   requirements.txt || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_compile() {
-   distutils-r1_python_compile --verbose
-}
-
-python_install() {
-   distutils-r1_python_install
-
-   python_scriptinto /usr/libexec/nsscache
-   python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-
-   doman nsscache.1 nsscache.conf.5
-   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-
-   keepdir /var/lib/nsscache
-}

diff --git a/net-nds/nsscache/nsscache-0.47.ebuild 
b/net-nds/nsscache/nsscache-0.47.ebuild
deleted file mode 100644
index e399b4dd7a00..
--- a/net-nds/nsscache/nsscache-0.47.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
-
-LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2023-01-10 Thread Michał Górny 
commit: 0c8809f82b1ff084b8e4010962a60423604ffc2b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 10 14:35:12 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 10 14:35:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8809f8

net-nds/nsscache: Remove Python < 3.10

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

 net-nds/nsscache/nsscache-0.39-r1.ebuild | 4 ++--
 net-nds/nsscache/nsscache-0.47.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.39-r1.ebuild 
b/net-nds/nsscache/nsscache-0.39-r1.ebuild
index 7f30d2de2a53..f486563ad771 100644
--- a/net-nds/nsscache/nsscache-0.39-r1.ebuild
+++ b/net-nds/nsscache/nsscache-0.39-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit distutils-r1
 

diff --git a/net-nds/nsscache/nsscache-0.47.ebuild 
b/net-nds/nsscache/nsscache-0.47.ebuild
index 9d67d529c0be..e399b4dd7a00 100644
--- a/net-nds/nsscache/nsscache-0.47.ebuild
+++ b/net-nds/nsscache/nsscache-0.47.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit distutils-r1

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2022-11-15 Thread Michał Górny 
commit: 5344e57122b4ff3335549ad399dba8941fbf7ead
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 15 18:17:38 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov 15 18:17:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5344e571

net-nds/nsscache: Remove py3.8-only versions

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

 net-nds/nsscache/nsscache-0.39.ebuild | 66 ---
 1 file changed, 66 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.39.ebuild 
b/net-nds/nsscache/nsscache-0.39.ebuild
deleted file mode 100644
index 1b85909b4234..
--- a/net-nds/nsscache/nsscache-0.39.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb nsscache s3"
-RESTRICT="test" # requires network
-
-DEPEND="
-   dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-python/pycurl[${PYTHON_USEDEP}]
-   berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-
-S="${WORKDIR}/${PN}-version-${PV}"
-
-python_prepare_all() {
-   sed -i \
-   -e "/setup_requires/s,'pytest-runner',,g" \
-   -e '/tests_require/s,\[.*\],[],g' \
-   setup.py || die
-   sed -i \
-   -e '/test=pytest/d' \
-   setup.cfg || die
-   sed -i \
-   -e '/pytest/d' \
-   requirements.txt || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_compile() {
-   distutils-r1_python_compile --verbose
-}
-
-python_install() {
-   distutils-r1_python_install
-
-   python_scriptinto /usr/libexec/nsscache
-   python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-
-   doman nsscache.1 nsscache.conf.5
-   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-
-   keepdir /var/lib/nsscache
-}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2022-09-10 Thread Robin H. Johnson 
commit: 3c8d7e6a7eb3851c79c9699bce6a34a4bd8a79a3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 10 21:12:29 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 10 21:12:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8d7e6a

net-nds/nsscache: bump, needs more testing before ~keywording

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/Manifest|  1 +
 net-nds/nsscache/nsscache-0.39-r1.ebuild | 66 +
 net-nds/nsscache/nsscache-0.47.ebuild| 72 
 3 files changed, 139 insertions(+)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 6686a51026c0..e7b222c0c8a1 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,2 +1,3 @@
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 
4272bab8d85ef0f39c8b26fd035009d3c77dd629fd7853e0072232393d329af1885ce44c4877d7718a37154661d9c85bb1f5276463875f9dfbbd023106d9d15a
 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
 DIST nsscache-0.39.tar.gz 127896 BLAKE2B 
8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd
 SHA512 
f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376
+DIST nsscache-0.47.tar.gz 126225 BLAKE2B 
f238d4a6565038420dee7359edadf348a0e5fb581b8238b23d3835cc10ad9676917bfa6573c6a1d462d7afee36398954744ff2d498b4c1ed3459666b3aa6ad5c
 SHA512 
94cd9a62169146f1e10f78476a950dfc708b6c2063cffed3617bbfa9c43aaf134b1f038a94079df408e168877d32f07b64b61f048d34fed283828cc75e7dd2cf

diff --git a/net-nds/nsscache/nsscache-0.39-r1.ebuild 
b/net-nds/nsscache/nsscache-0.39-r1.ebuild
new file mode 100644
index ..7f30d2de2a53
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.39-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb nsscache s3"
+RESTRICT="test" # requires network
+
+DEPEND="
+   dev-python/ldap3[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
+   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+python_prepare_all() {
+   sed -i \
+   -e "/setup_requires/s,'pytest-runner',,g" \
+   -e '/tests_require/s,\[.*\],[],g' \
+   setup.py || die
+   sed -i \
+   -e '/test=pytest/d' \
+   setup.cfg || die
+   sed -i \
+   -e '/pytest/d' \
+   requirements.txt || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile() {
+   distutils-r1_python_compile --verbose
+}
+
+python_install() {
+   distutils-r1_python_install
+
+   python_scriptinto /usr/libexec/nsscache
+   python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+
+   keepdir /var/lib/nsscache
+}

diff --git a/net-nds/nsscache/nsscache-0.47.ebuild 
b/net-nds/nsscache/nsscache-0.47.ebuild
new file mode 100644
index ..9d67d529c0be
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.47.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS="" # pending infra testing
+IUSE="nsscache s3 test"
+RESTRICT="test" # requires network
+
+#test? ( dev-python/pytest-cov[${PYTHON_USEDEP}] 
dev-python/mox3[${PYTHON_USEDEP}] )
+DEPEND="
+   dev-python/ldap3[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2021-05-26 Thread Sam James 
commit: b5e704d156f1ff9962e9c93685d1ff9b40164c63
Author: Sam James  gentoo  org>
AuthorDate: Wed May 26 10:27:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 26 10:30:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e704d1

net-nds/nsscache: hide bsddb3 usage behind USE=berkdb

We're looking at deprecating sys-libs/db usage where possible.

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

 net-nds/nsscache/nsscache-0.39.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.39.ebuild 
b/net-nds/nsscache/nsscache-0.39.ebuild
index 10bc2e80945..1b85909b423 100644
--- a/net-nds/nsscache/nsscache-0.39.ebuild
+++ b/net-nds/nsscache/nsscache-0.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,13 +17,13 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nsscache s3"
+IUSE="berkdb nsscache s3"
 RESTRICT="test" # requires network
 
 DEPEND="
dev-python/ldap3[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
-   dev-python/bsddb3[${PYTHON_USEDEP}]
+   berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}
nsscache? ( >=sys-auth/libnss-cache-0.10 )"

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2020-06-29 Thread David Seifert 
commit: 3f3a3b7a6eaa92dc3e3d7c38eda42b976d9bcb22
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 29 12:32:59 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 29 12:32:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3a3b7a

net-nds/nsscache: [QA] Fix various python issues

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 net-nds/nsscache/nsscache-0.39.ebuild | 45 ---
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.39.ebuild 
b/net-nds/nsscache/nsscache-0.39.ebuild
index f615656a1ee..f50a61c5cd8 100644
--- a/net-nds/nsscache/nsscache-0.39.ebuild
+++ b/net-nds/nsscache/nsscache-0.39.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="commandline tool to sync directory services to local cache"
 HOMEPAGE="https://github.com/google/nsscache;
@@ -16,44 +17,50 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="nsscache s3"
+RESTRICT="test" # requires network
 
-DEPEND="${PYTHON_DEPS}
-   dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-python/pycurl[${PYTHON_USEDEP}]
-   dev-python/bsddb3[${PYTHON_USEDEP}]
-   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
+DEPEND="
+   dev-python/ldap3[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   dev-python/bsddb3[${PYTHON_USEDEP}]
+   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}
-   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test" # requires network
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+
 S="${WORKDIR}/${PN}-version-${PV}"
 
-src_prepare() {
+python_prepare_all() {
sed -i \
-e "/setup_requires/s,'pytest-runner',,g" \
-e '/tests_require/s,\[.*\],[],g' \
-   "${S}"/setup.py || die
+   setup.py || die
sed -i \
-e '/test=pytest/d' \
-   "${S}"/setup.cfg || die
+   setup.cfg || die
sed -i \
-e '/pytest/d' \
-   "${S}"/requirements.txt || die
-   distutils-r1_src_prepare
+   requirements.txt || die
+
+   distutils-r1_python_prepare_all
 }
 
 python_compile() {
distutils-r1_python_compile --verbose
 }
 
-src_install() {
-   distutils-r1_src_install
+python_install() {
+   distutils-r1_python_install
+
+   python_scriptinto /usr/libexec/nsscache
+   python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
 
doman nsscache.1 nsscache.conf.5
dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-   exeinto /usr/libexec/nsscache
-   newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
 
keepdir /var/lib/nsscache
 }

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2020-06-29 Thread David Seifert 
commit: bd05b41fcc05a09a874143b446ab8440884997cb
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 29 12:32:56 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 29 12:32:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd05b41f

net-nds/nsscache: Remove old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 net-nds/nsscache/Manifest|  4 ---
 net-nds/nsscache/nsscache-0.30-r2.ebuild | 46 ---
 net-nds/nsscache/nsscache-0.30.ebuild| 41 
 net-nds/nsscache/nsscache-0.31.ebuild| 47 
 net-nds/nsscache/nsscache-0.32.ebuild| 47 
 5 files changed, 185 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index c51df7a7c19..6686a51026c 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,6 +1,2 @@
-DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 BLAKE2B 
d5acb0edf6389a7dd1382aad290b1541f147c11d06e1e8458aa1c6a7a3dd9e5d1db0a1a0f6f63d489c0bc464d545c6a1b6cf752f8a0050f9efb6f6d576e6e32f
 SHA512 
58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 
4272bab8d85ef0f39c8b26fd035009d3c77dd629fd7853e0072232393d329af1885ce44c4877d7718a37154661d9c85bb1f5276463875f9dfbbd023106d9d15a
 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
-DIST nsscache-0.30.tar.gz 109615 BLAKE2B 
1b67da7241a974a541514849643115d8e6dd0e587dbd39e1919eaca5064b6fde79678c3443246444d1b8c75c4455ad008231ee1f1a6b74511d9a38e742be2c6e
 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
-DIST nsscache-0.31.tar.gz 108073 BLAKE2B 
c730786e4a273d039273f104d1458587741c5bc8b2e470d12a551765f3141aafb33df811feca432b493415e20c9abb07244b9c624e38053b95c15c5e41ba8303
 SHA512 
1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
-DIST nsscache-0.32.tar.gz 112333 BLAKE2B 
ac477eef53e8e9d8cdcc7a0d7b460046883aaba8836ec5d49f449aae0d4f0ea34cd10f89a98849a18e0a0b1b5d1eb4f4c99a138d6eb2bc6bc608a1cc33c28ac2
 SHA512 
c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
 DIST nsscache-0.39.tar.gz 127896 BLAKE2B 
8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd
 SHA512 
f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376

diff --git a/net-nds/nsscache/nsscache-0.30-r2.ebuild 
b/net-nds/nsscache/nsscache-0.30-r2.ebuild
deleted file mode 100644
index 522bf545439..000
--- a/net-nds/nsscache/nsscache-0.30-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SRC_URI="
-   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~robbat2/nsscache-0.30-gentoo-authorized-keys-command.py;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nsscache"
-
-DEPEND="${PYTHON_DEPS}
-   dev-python/python-ldap[${PYTHON_USEDEP}]
-   dev-python/pycurl[${PYTHON_USEDEP}]
-   dev-python/bsddb3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-src_prepare() {
-   find "${S}" -name '*.py' -exec \
-   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
-   {} \+
-   distutils-r1_src_prepare
-}
-
-src_install() {
-   distutils-r1_src_install
-
-   doman nsscache.1 nsscache.conf.5
-   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-   exeinto /usr/libexec/nsscache
-   newexe "${DISTDIR}"/nsscache-0.30-gentoo-authorized-keys-command.py 
authorized-keys-command.py
-
-   keepdir /var/lib/nsscache
-}

diff --git a/net-nds/nsscache/nsscache-0.30.ebuild 
b/net-nds/nsscache/nsscache-0.30.ebuild
deleted file mode 100644
index 822766f671c..000
--- a/net-nds/nsscache/nsscache-0.30.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2020-06-28 Thread Robin H. Johnson 
commit: 8e7e9de1c45c99f11fc19f47fa2ecd754900e837
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 29 05:12:43 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 29 05:37:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7e9de1

net-nds/nsscache: bump for py3

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/Manifest |  1 +
 net-nds/nsscache/metadata.xml |  1 +
 net-nds/nsscache/nsscache-0.39.ebuild | 59 +++
 3 files changed, 61 insertions(+)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index ea087fb9106..c51df7a7c19 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -3,3 +3,4 @@ DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 
BLAKE2B 4272bab8d8
 DIST nsscache-0.30.tar.gz 109615 BLAKE2B 
1b67da7241a974a541514849643115d8e6dd0e587dbd39e1919eaca5064b6fde79678c3443246444d1b8c75c4455ad008231ee1f1a6b74511d9a38e742be2c6e
 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 DIST nsscache-0.31.tar.gz 108073 BLAKE2B 
c730786e4a273d039273f104d1458587741c5bc8b2e470d12a551765f3141aafb33df811feca432b493415e20c9abb07244b9c624e38053b95c15c5e41ba8303
 SHA512 
1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
 DIST nsscache-0.32.tar.gz 112333 BLAKE2B 
ac477eef53e8e9d8cdcc7a0d7b460046883aaba8836ec5d49f449aae0d4f0ea34cd10f89a98849a18e0a0b1b5d1eb4f4c99a138d6eb2bc6bc608a1cc33c28ac2
 SHA512 
c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
+DIST nsscache-0.39.tar.gz 127896 BLAKE2B 
8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd
 SHA512 
f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376

diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 2391c0ec85c..49a9b9a18f2 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -6,6 +6,7 @@


Depend on sys-auth/libnss-cache to handle 
flat files
+   Support for S3-based NSS sources


google/nsscache

diff --git a/net-nds/nsscache/nsscache-0.39.ebuild 
b/net-nds/nsscache/nsscache-0.39.ebuild
new file mode 100644
index 000..f615656a1ee
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.39.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nsscache s3"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/ldap3[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   dev-python/bsddb3[${PYTHON_USEDEP}]
+   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test" # requires network
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+   sed -i \
+   -e "/setup_requires/s,'pytest-runner',,g" \
+   -e '/tests_require/s,\[.*\],[],g' \
+   "${S}"/setup.py || die
+   sed -i \
+   -e '/test=pytest/d' \
+   "${S}"/setup.cfg || die
+   sed -i \
+   -e '/pytest/d' \
+   "${S}"/requirements.txt || die
+   distutils-r1_src_prepare
+}
+
+python_compile() {
+   distutils-r1_python_compile --verbose
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+   exeinto /usr/libexec/nsscache
+   newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/files/

2017-01-26 Thread David Seifert 
commit: 04b5ecd7498ff95f87c86fa978bb9a213ce272cc
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Jan 26 17:16:46 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 22:36:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b5ecd7

net-nds/nsscache: remove unused file/patch

Closes: https://github.com/gentoo/gentoo/pull/3666

 net-nds/nsscache/files/nsscache-0.30-ldapssh.patch |  41 ---
 net-nds/nsscache/files/nsscache.conf   | 122 -
 2 files changed, 163 deletions(-)

diff --git a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch 
b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
deleted file mode 100644
index 59adde1..
--- a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cc0f2d7485205d6f9b8c434cb0da292e12448216 Mon Sep 17 00:00:00 2001
-From: Thomas Glanzmann 
-Date: Wed, 2 Sep 2015 17:01:40 +0200
-Subject: [PATCH] Provider parameter when calling SshkeyUpdateGetter in order
- to fix sshkey
-
-Without this change retrieving the map sshkey results in the following 
exception:
-
-(localhost) [~/work/nsscache] nsscache update
-Traceback (most recent call last):
-  File "/usr/bin/nsscache", line 33, in 
-return_value = nsscache_app.Run(sys.argv[1:], os.environ)
-  File "/usr/lib/python2.6/site-packages/nss_cache/app.py", line 240, in Run
-retval = command_callable().Run(conf=conf, args=args)
-  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 230, in 
Run
-force_lock=options.force_lock)
-  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 303, in 
UpdateMaps
-force_write=force_write)
-  File "/usr/lib/python2.6/site-packages/nss_cache/update/updater.py", line 
265, in UpdateFromSource
-force_write, location=None)
-  File "/usr/lib/python2.6/site-packages/nss_cache/update/map_updater.py", 
line 75, in UpdateCacheFromSource
-location=location)
-  File "/usr/lib/python2.6/site-packages/nss_cache/sources/source.py", line 
65, in GetMap
-return self.GetSshkeyMap(since)
-  File "/usr/lib/python2.6/site-packages/nss_cache/sources/ldapsource.py", 
line 274, in GetSshkeyMap
-return SshkeyUpdateGetter().GetUpdates(source=self,
-TypeError: __init__() takes exactly 2 arguments (1 given)
-
-diff --git a/nss_cache/sources/ldapsource.py b/nss_cache/sources/ldapsource.py
-index 2af170e..5ffea81 100644
 a/nss_cache/sources/ldapsource.py
-+++ b/nss_cache/sources/ldapsource.py
-@@ -271,7 +271,7 @@ class LdapSource(source.Source):
- Returns:
-   instance of maps.SshkeyMap
- """
--return SshkeyUpdateGetter().GetUpdates(source=self,
-+return SshkeyUpdateGetter(self.conf).GetUpdates(source=self,
-search_base=self.conf['base'],
-search_filter=self.conf['filter'],
-search_scope=self.conf['scope'],

diff --git a/net-nds/nsscache/files/nsscache.conf 
b/net-nds/nsscache/files/nsscache.conf
deleted file mode 100644
index c17f4a2..
--- a/net-nds/nsscache/files/nsscache.conf
+++ /dev/null
@@ -1,122 +0,0 @@
-# Example /etc/nsscache.conf - configuration for nsscache
-#
-# nsscache loads a config file from the environment variable NSSCACHE_CONFIG
-#
-# By default this is /etc/nsscache.conf
-#
-# Commented values are overrideable defaults, uncommented values
-# require you to set them.
-
-[DEFAULT]
-
-# Default NSS data source module name
-source = ldap
-
-# Default NSS data cache module name
-cache = nssdb
-#cache = files
-
-# NSS maps to be cached
-maps = passwd, group, shadow, netgroup
-
-# Directory to store our update/modify timestamps
-timestamp_dir = /var/lib/nsscache
-
-# Lockfile to use for update/repair operations
-#lockfile = /var/run/nsscache
-
-# Defaults for specific modules; prefaced with "modulename_"
-
-##
-# ldap module defaults.
-#
-
-# LDAP URI to query for NSS data
-ldap_uri = ldaps://ldap
-
-# Base for LDAP searches
-ldap_base = ou=people,dc=example,dc=com
-
-# Default LDAP search filter for maps
-ldap_filter = (objectclass=posixAccount)
-
-# Default LDAP search scope
-#ldap_scope = one
-
-# Default LDAP BIND DN, empty string is an anonymous bind
-#ldap_bind_dn = ""
-
-# Default LDAP password, empty DN and empty password is used for
-# anonymous binds
-#ldap_bind_password = ""
-
-# Default timelimit for LDAP queries, in seconds.
-# The query will block for this number of seconds, or indefinitely if negative.
-#ldap_timelimit = -1
-
-# Default number of retry attempts
-#ldap_retry_max = 3
-
-# Default delay in between retry attempts
-#ldap_retry_delay = 5
-
-# Default setting for requiring tls certificates, one of:
-# never, hard, demand, allow, try
-#ldap_tls_require_cert = 'demand'
-
-# Default directoy for trusted CAs
-#ldap_tls_cacertdir = '/usr/share/ssl'
-
-# Default filename for trusted CAs

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/files/, net-nds/nsscache/

2016-11-05 Thread Robin H. Johnson 
commit: ac6d3e8d3fd25f13f7459c7d92344b09fa699004
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  6 00:00:44 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  6 00:00:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6d3e8d

net-nds/nsscache:  cleanup googlecode references.

Package-Manager: portage-2.3.2

 net-nds/nsscache/Manifest  |  1 -
 .../nsscache/files/nsscache-0.8.3-starttls.patch   | 53 --
 net-nds/nsscache/metadata.xml  |  1 -
 net-nds/nsscache/nsscache-0.23-r1.ebuild   | 43 --
 net-nds/nsscache/nsscache-0.23-r2.ebuild   | 43 --
 net-nds/nsscache/nsscache-0.23.ebuild  | 42 -
 6 files changed, 183 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 702d918..867a64f 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,4 +1,3 @@
-DIST nsscache-0.23.tar.gz 92603 SHA256 
b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3f382c879f0af8c6215d0d9e SHA512 
2bce655f6e8b64eb258779f80620d4514729d221ce9ed9ca7f675c22faeca400478827f27befa9cdac5e95f33934609d84d520af71f756721e22aa0c7cef82d6
 WHIRLPOOL 
78d6e8abdc4d66df667d2c9e3ab4c6e1c065a224283c94ab44bd51209db373d896b7221923d1948e7cdc36dcfc752d9f98162c3ece95955578b9b7c0c5b28dd8
 DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 SHA256 
956323bc311381da23c788e143706e732eef86ad37cf570209b28206ecea6a1f SHA512 
58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 WHIRLPOOL 
5612cce26ab4172fcf019de702b5d26d830850cff3002dd23a2061b25ebb98d4c4a5436c17a6bcacc952ecdeb2027b677893552fce0520089a0d1f793cac7b75
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 SHA256 
90069477763e1f81d5febe8d3d6d50c663da10cf8087512bb45c52bf0b109a05 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
 WHIRLPOOL 
91c94a867960ec0527af15be69107fb05d080f64e2a91bcbfa5f686cb98c34cb31551be47a76cc3616094bb5a36f31db07d3e6a5f5d14e85e2891781d3899d1c
 DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718

diff --git a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch 
b/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
deleted file mode 100644
index 2ca9c1f..
--- a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Some LDAP configurations require STARTTLS, like the Gentoo infrastructure one.
-Add a new configuration file to do it.
-
-Signed-off-by: Robin H. Johnson 
-
-diff -Nuar nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py 
nsscache-0.8.3/nss_cache/sources/ldapsource.py
 nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py2008-09-08 
18:31:58.0 -0700
-+++ nsscache-0.8.3/nss_cache/sources/ldapsource.py 2009-05-24 
16:50:59.579112740 -0700
-@@ -76,6 +76,8 @@
-   self.conn = rlo(uri=conf['uri'],
-   retry_max=conf['retry_max'],
-   retry_delay=conf['retry_delay'])
-+  if conf['tls_starttls'] == 1:
-+  self.conn.start_tls_s()
- else:
-   self.conn = conn
- 
-@@ -107,6 +109,8 @@
-   configuration['tls_cacertdir'] = self.TLS_CACERTDIR
- if not 'tls_cacertfile' in configuration:
-   configuration['tls_cacertfile'] = self.TLS_CACERTFILE
-+if not 'tls_starttls' in configuration:
-+  configuration['tls_starttls'] = 0
- 
- # Translate tls_require into appropriate constant, if necessary.
- if configuration['tls_require_cert'] == 'never':
-@@ -120,6 +124,13 @@
- elif configuration['tls_require_cert'] == 'try':
-   configuration['tls_require_cert'] = ldap.OPT_X_TLS_TRY
- 
-+# Should we issue STARTTLS?
-+if configuration['tls_starttls'] in (1, '1', 'on', 'yes', 'true'):
-+configuration['tls_starttls'] = 1
-+#if not configuration['tls_starttls']:
-+else:
-+  configuration['tls_starttls'] = 0
-+
- # Setting global ldap defaults.
- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT,
- configuration['tls_require_cert'])
-diff -Nuar nsscache-0.8.3.orig/nsscache.conf nsscache-0.8.3/nsscache.conf
 nsscache-0.8.3.orig/nsscache.conf  2008-09-08 18:31:58.0 -0700
-+++ nsscache-0.8.3/nsscache.conf   2009-05-24 16:51:25.468374563 -0700
-@@ -70,6 +70,9 @@
- # Default filename for trusted CAs
- #ldap_tls_cacertfile = '/usr/share/ssl/cert.pem'
- 
-+# Should we issue STARTTLS?
-+# ldap_tls_starttls = 1
-+
- 
- ##

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-02-01 Thread Robin H. Johnson 
commit: 2449765dd274313c0fcee98505df48b31ff96743
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Feb  2 00:21:18 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Feb  2 00:43:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2449765d

net-nds/nsscache: bump.

Package-Manager: portage-2.2.27
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/Manifest |  1 +
 net-nds/nsscache/nsscache-0.32.ebuild | 49 +++
 2 files changed, 50 insertions(+)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index c567885..702d918 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -3,3 +3,4 @@ DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 
SHA256 956323bc311381d
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 SHA256 
90069477763e1f81d5febe8d3d6d50c663da10cf8087512bb45c52bf0b109a05 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
 WHIRLPOOL 
91c94a867960ec0527af15be69107fb05d080f64e2a91bcbfa5f686cb98c34cb31551be47a76cc3616094bb5a36f31db07d3e6a5f5d14e85e2891781d3899d1c
 DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718
 DIST nsscache-0.31.tar.gz 108073 SHA256 
ce70d854062bea68e6af37b0889ec9fc00371eb361cd205e8137604ccb90f646 SHA512 
1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
 WHIRLPOOL 
327806f957492273ca4d3b3c3d62987a335f222448fa8f8545ff217108e5ad630c08676adab7c0425c1f4efbcb5064903de1964e1ef8cbc34f9c876cfbc6f508
+DIST nsscache-0.32.tar.gz 112333 SHA256 
b6cd574f38230ce509064010fcf646429eb4dfb98eb2a00ed0c9ae21a6f4f279 SHA512 
c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
 WHIRLPOOL 
3e04b0c22e2d4ca676cb5d7ffae8c735db10179c0b2dd55b947d237b25b280d28126632ebbef85918ca76a2bc9d8a9b9a626a0a216ef937059fdde22896c1fa5

diff --git a/net-nds/nsscache/nsscache-0.32.ebuild 
b/net-nds/nsscache/nsscache-0.32.ebuild
new file mode 100644
index 000..11f8167
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.32.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/python-ldap[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   dev-python/bsddb3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   nssdb? ( sys-libs/nss-db )
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+   find "${S}" -name '*.py' -exec \
+   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+   {} \+
+   distutils-r1_src_prepare
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+   exeinto /usr/libexec/nsscache
+   newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-11 Thread Robin H. Johnson 
commit: f596c0eff3fa839e21b789b59ad5485803b24f09
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan 11 00:03:12 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 11 20:46:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f596c0ef

net-nds/nsscache: bump; fixes bug #571498.

Package-Manager: portage-2.2.24

 net-nds/nsscache/Manifest  | 1 +
 net-nds/nsscache/{nsscache-0.30-r3.ebuild => nsscache-0.31.ebuild} | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 3afee79..c567885 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -2,3 +2,4 @@ DIST nsscache-0.23.tar.gz 92603 SHA256 
b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3
 DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 SHA256 
956323bc311381da23c788e143706e732eef86ad37cf570209b28206ecea6a1f SHA512 
58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 WHIRLPOOL 
5612cce26ab4172fcf019de702b5d26d830850cff3002dd23a2061b25ebb98d4c4a5436c17a6bcacc952ecdeb2027b677893552fce0520089a0d1f793cac7b75
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 SHA256 
90069477763e1f81d5febe8d3d6d50c663da10cf8087512bb45c52bf0b109a05 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
 WHIRLPOOL 
91c94a867960ec0527af15be69107fb05d080f64e2a91bcbfa5f686cb98c34cb31551be47a76cc3616094bb5a36f31db07d3e6a5f5d14e85e2891781d3899d1c
 DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718
+DIST nsscache-0.31.tar.gz 108073 SHA256 
ce70d854062bea68e6af37b0889ec9fc00371eb361cd205e8137604ccb90f646 SHA512 
1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
 WHIRLPOOL 
327806f957492273ca4d3b3c3d62987a335f222448fa8f8545ff217108e5ad630c08676adab7c0425c1f4efbcb5064903de1964e1ef8cbc34f9c876cfbc6f508

diff --git a/net-nds/nsscache/nsscache-0.30-r3.ebuild 
b/net-nds/nsscache/nsscache-0.31.ebuild
similarity index 86%
rename from net-nds/nsscache/nsscache-0.30-r3.ebuild
rename to net-nds/nsscache/nsscache-0.31.ebuild
index ca3a626..11f8167 100644
--- a/net-nds/nsscache/nsscache-0.30-r3.ebuild
+++ b/net-nds/nsscache/nsscache-0.31.ebuild
@@ -9,9 +9,10 @@ inherit eutils distutils-r1
 
 DESCRIPTION="commandline tool to sync directory services to local cache"
 HOMEPAGE="https://github.com/google/nsscache;
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
 SRC_URI="
https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py;
+   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -42,7 +43,7 @@ src_install() {
doman nsscache.1 nsscache.conf.5
dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
exeinto /usr/libexec/nsscache
-   newexe "${DISTDIR}"/nsscache-0.30-gentoo-authorized-keys-command.py 
authorized-keys-command.py
+   newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
 
keepdir /var/lib/nsscache
 }

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-09 Thread Robin H. Johnson 
commit: 7da3217747caaf28243dbc4872b8dd8772cca521
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jan 10 07:58:23 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Jan 10 07:58:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da32177

net-nds/nsscache: new version of AuthorizedKeysCommand.

Package-Manager: portage-2.2.24

 net-nds/nsscache/Manifest|  1 +
 net-nds/nsscache/nsscache-0.30-r3.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 7facc4c..3afee79 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,3 +1,4 @@
 DIST nsscache-0.23.tar.gz 92603 SHA256 
b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3f382c879f0af8c6215d0d9e SHA512 
2bce655f6e8b64eb258779f80620d4514729d221ce9ed9ca7f675c22faeca400478827f27befa9cdac5e95f33934609d84d520af71f756721e22aa0c7cef82d6
 WHIRLPOOL 
78d6e8abdc4d66df667d2c9e3ab4c6e1c065a224283c94ab44bd51209db373d896b7221923d1948e7cdc36dcfc752d9f98162c3ece95955578b9b7c0c5b28dd8
 DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 SHA256 
956323bc311381da23c788e143706e732eef86ad37cf570209b28206ecea6a1f SHA512 
58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 WHIRLPOOL 
5612cce26ab4172fcf019de702b5d26d830850cff3002dd23a2061b25ebb98d4c4a5436c17a6bcacc952ecdeb2027b677893552fce0520089a0d1f793cac7b75
+DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 SHA256 
90069477763e1f81d5febe8d3d6d50c663da10cf8087512bb45c52bf0b109a05 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
 WHIRLPOOL 
91c94a867960ec0527af15be69107fb05d080f64e2a91bcbfa5f686cb98c34cb31551be47a76cc3616094bb5a36f31db07d3e6a5f5d14e85e2891781d3899d1c
 DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718

diff --git a/net-nds/nsscache/nsscache-0.30-r3.ebuild 
b/net-nds/nsscache/nsscache-0.30-r3.ebuild
new file mode 100644
index 000..ca3a626
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.30-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/python-ldap[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   dev-python/bsddb3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   nssdb? ( sys-libs/nss-db )
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+   find "${S}" -name '*.py' -exec \
+   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+   {} \+
+   distutils-r1_src_prepare
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+   exeinto /usr/libexec/nsscache
+   newexe "${DISTDIR}"/nsscache-0.30-gentoo-authorized-keys-command.py 
authorized-keys-command.py
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/, net-nds/nsscache/files/

2016-01-05 Thread Robin H. Johnson 
commit: 4aac468dd735c08eb7441e1129c180381a2c7689
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Jan  5 23:08:09 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Wed Jan  6 07:37:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aac468d

net-nds/nsscache: much better authorized_keys command, in use in infra soon.

Package-Manager: portage-2.2.24

 net-nds/nsscache/Manifest  |  1 +
 net-nds/nsscache/files/authorized-keys-command.py  | 52 --
 ...ache-0.30-r1.ebuild => nsscache-0.30-r2.ebuild} |  6 ++-
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 2380aec..7facc4c 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,2 +1,3 @@
 DIST nsscache-0.23.tar.gz 92603 SHA256 
b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3f382c879f0af8c6215d0d9e SHA512 
2bce655f6e8b64eb258779f80620d4514729d221ce9ed9ca7f675c22faeca400478827f27befa9cdac5e95f33934609d84d520af71f756721e22aa0c7cef82d6
 WHIRLPOOL 
78d6e8abdc4d66df667d2c9e3ab4c6e1c065a224283c94ab44bd51209db373d896b7221923d1948e7cdc36dcfc752d9f98162c3ece95955578b9b7c0c5b28dd8
+DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 SHA256 
956323bc311381da23c788e143706e732eef86ad37cf570209b28206ecea6a1f SHA512 
58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 WHIRLPOOL 
5612cce26ab4172fcf019de702b5d26d830850cff3002dd23a2061b25ebb98d4c4a5436c17a6bcacc952ecdeb2027b677893552fce0520089a0d1f793cac7b75
 DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718

diff --git a/net-nds/nsscache/files/authorized-keys-command.py 
b/net-nds/nsscache/files/authorized-keys-command.py
deleted file mode 100644
index 085be71..000
--- a/net-nds/nsscache/files/authorized-keys-command.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-# vim: ts=4 sts=4 et:
-# pylint: disable=invalid-name
-"""
-OpenSSH AuthorizedKeysCommand: NSSCache input
-Copyright 2016 Gentoo Foundation
-Distributed is distributed under the BSD license.
-
-This script returns one or more authorized keys for use by SSH, by extracting
-them from a local cache file /etc/sshkey.cache.
-
-Two variants are supported, based on the existing nsscache code:
-Format 1:
- username:key1
- username:key2
-Format 2:
- username:['key1', 'key2']
-
-Ensure this script is mentioned in the sshd_config like so:
-AuthorizedKeysCommand /path/to/nsscache/authorized-keys-command.py
-"""
-from __future__ import print_function
-from ast import literal_eval
-from os.path import basename
-import sys
-import errno
-
-SSHKEY_CACHE = '/etc/sshkey.cache'
-
-if __name__ == "__main__":
-if len(sys.argv) != 2:
-sys.exit("Usage: %s %s" % (basename(sys.argv[0]), 'USERNAME'))
-
-try:
-with open(SSHKEY_CACHE, 'r') as f:
-for line in f:
-(username, key) = line.split(':', 1)
-if username != sys.argv[1]:
-continue
-key = key.strip()
-if key.startswith("[") and key.endswith("]"):
-# Python array
-for i in literal_eval(key):
-print(i.strip())
-else:
-# Raw key
-print(key)
-except IOError as err:
-if err.errno in [errno.EPERM, errno.ENOENT]:
-pass
-else:
-raise err

diff --git a/net-nds/nsscache/nsscache-0.30-r1.ebuild 
b/net-nds/nsscache/nsscache-0.30-r2.ebuild
similarity index 79%
rename from net-nds/nsscache/nsscache-0.30-r1.ebuild
rename to net-nds/nsscache/nsscache-0.30-r2.ebuild
index 5be043c..b645612 100644
--- a/net-nds/nsscache/nsscache-0.30-r1.ebuild
+++ b/net-nds/nsscache/nsscache-0.30-r2.ebuild
@@ -9,7 +9,9 @@ inherit eutils distutils-r1
 
 DESCRIPTION="commandline tool to sync directory services to local cache"
 HOMEPAGE="https://github.com/google/nsscache;
-SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~robbat2/nsscache-0.30-gentoo-authorized-keys-command.py;
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,7 +42,7 @@ src_install() {
doman nsscache.1 nsscache.conf.5
dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
exeinto /usr/libexec/nsscache
-   doexe "${FILESDIR}"/authorized-keys-command.py
+   newexe "${DISTDIR}"/nsscache-0.30-gentoo-authorized-keys-command.py

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-02 Thread Robin H. Johnson 
commit: 072752b8b9ba5162deb4f0c6ec9487ac7c1f1708
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jan  1 19:20:57 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan  2 19:44:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072752b8

net-nds/nsscache: bump.

Package-Manager: portage-2.2.24

 net-nds/nsscache/Manifest |  1 +
 net-nds/nsscache/nsscache-0.30.ebuild | 44 +++
 2 files changed, 45 insertions(+)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 12bd683..2380aec 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1 +1,2 @@
 DIST nsscache-0.23.tar.gz 92603 SHA256 
b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3f382c879f0af8c6215d0d9e SHA512 
2bce655f6e8b64eb258779f80620d4514729d221ce9ed9ca7f675c22faeca400478827f27befa9cdac5e95f33934609d84d520af71f756721e22aa0c7cef82d6
 WHIRLPOOL 
78d6e8abdc4d66df667d2c9e3ab4c6e1c065a224283c94ab44bd51209db373d896b7221923d1948e7cdc36dcfc752d9f98162c3ece95955578b9b7c0c5b28dd8
+DIST nsscache-0.30.tar.gz 109615 SHA256 
9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 
22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 WHIRLPOOL 
b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718

diff --git a/net-nds/nsscache/nsscache-0.30.ebuild 
b/net-nds/nsscache/nsscache-0.30.ebuild
new file mode 100644
index 000..18a0d1c
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.30.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/python-ldap[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   nssdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+   nssdb? ( sys-libs/nss-db )
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+   find "${S}" -name '*.py' -exec \
+   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+   {} \+
+   distutils-r1_src_prepare
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-02 Thread Robin H. Johnson 
commit: bff778c6816bf5b77e986a28d59331d9804fd9b5
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan  2 19:43:55 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan  2 19:44:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff778c6

net-nds/nsscache: upstream codebase is dumb and unconditionally needs bsddb 
even when nssdb is not used.

Package-Manager: portage-2.2.24

 net-nds/nsscache/nsscache-0.23-r2.ebuild | 43 
 1 file changed, 43 insertions(+)

diff --git a/net-nds/nsscache/nsscache-0.23-r2.ebuild 
b/net-nds/nsscache/nsscache-0.23-r2.ebuild
new file mode 100644
index 000..77d5e07
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.23-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/python-ldap[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   dev-python/bsddb3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   nssdb? ( sys-libs/nss-db )
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+
+src_prepare() {
+   find "${S}" -name '*.py' -exec \
+   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+   {} \+
+   distutils-r1_src_prepare
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-02 Thread Robin H. Johnson 
commit: aa36e7c4e8d43429d4937f2da8aacadd0a93c9d1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan  2 23:29:14 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan  2 23:29:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa36e7c4

net-nds/nsscache: repoman happiness.

Package-Manager: portage-2.2.24

 net-nds/nsscache/nsscache-0.30-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.30-r1.ebuild 
b/net-nds/nsscache/nsscache-0.30-r1.ebuild
index e34e87b..5be043c 100644
--- a/net-nds/nsscache/nsscache-0.30-r1.ebuild
+++ b/net-nds/nsscache/nsscache-0.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,7 +40,7 @@ src_install() {
doman nsscache.1 nsscache.conf.5
dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
exeinto /usr/libexec/nsscache
-   doexe $FILESDIR/authorized-keys-command.py
+   doexe "${FILESDIR}"/authorized-keys-command.py
 
keepdir /var/lib/nsscache
 }

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/files/, net-nds/nsscache/

2016-01-02 Thread Robin H. Johnson 
commit: fd568c0975ab6ef95dc75af7d888cdfa4177c374
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan  2 23:28:07 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan  2 23:29:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd568c09

net-nds/nsscache: backport LDAP fix, add safe AuthorizedKeysCommand (upstream 
example has security issue).

Package-Manager: portage-2.2.24

 net-nds/nsscache/files/authorized-keys-command.py  | 52 ++
 net-nds/nsscache/files/nsscache-0.30-ldapssh.patch | 41 +
 net-nds/nsscache/nsscache-0.30-r1.ebuild   | 46 +++
 3 files changed, 139 insertions(+)

diff --git a/net-nds/nsscache/files/authorized-keys-command.py 
b/net-nds/nsscache/files/authorized-keys-command.py
new file mode 100644
index 000..085be71
--- /dev/null
+++ b/net-nds/nsscache/files/authorized-keys-command.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# vim: ts=4 sts=4 et:
+# pylint: disable=invalid-name
+"""
+OpenSSH AuthorizedKeysCommand: NSSCache input
+Copyright 2016 Gentoo Foundation
+Distributed is distributed under the BSD license.
+
+This script returns one or more authorized keys for use by SSH, by extracting
+them from a local cache file /etc/sshkey.cache.
+
+Two variants are supported, based on the existing nsscache code:
+Format 1:
+ username:key1
+ username:key2
+Format 2:
+ username:['key1', 'key2']
+
+Ensure this script is mentioned in the sshd_config like so:
+AuthorizedKeysCommand /path/to/nsscache/authorized-keys-command.py
+"""
+from __future__ import print_function
+from ast import literal_eval
+from os.path import basename
+import sys
+import errno
+
+SSHKEY_CACHE = '/etc/sshkey.cache'
+
+if __name__ == "__main__":
+if len(sys.argv) != 2:
+sys.exit("Usage: %s %s" % (basename(sys.argv[0]), 'USERNAME'))
+
+try:
+with open(SSHKEY_CACHE, 'r') as f:
+for line in f:
+(username, key) = line.split(':', 1)
+if username != sys.argv[1]:
+continue
+key = key.strip()
+if key.startswith("[") and key.endswith("]"):
+# Python array
+for i in literal_eval(key):
+print(i.strip())
+else:
+# Raw key
+print(key)
+except IOError as err:
+if err.errno in [errno.EPERM, errno.ENOENT]:
+pass
+else:
+raise err

diff --git a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch 
b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
new file mode 100644
index 000..59adde1
--- /dev/null
+++ b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
@@ -0,0 +1,41 @@
+From cc0f2d7485205d6f9b8c434cb0da292e12448216 Mon Sep 17 00:00:00 2001
+From: Thomas Glanzmann 
+Date: Wed, 2 Sep 2015 17:01:40 +0200
+Subject: [PATCH] Provider parameter when calling SshkeyUpdateGetter in order
+ to fix sshkey
+
+Without this change retrieving the map sshkey results in the following 
exception:
+
+(localhost) [~/work/nsscache] nsscache update
+Traceback (most recent call last):
+  File "/usr/bin/nsscache", line 33, in 
+return_value = nsscache_app.Run(sys.argv[1:], os.environ)
+  File "/usr/lib/python2.6/site-packages/nss_cache/app.py", line 240, in Run
+retval = command_callable().Run(conf=conf, args=args)
+  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 230, in 
Run
+force_lock=options.force_lock)
+  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 303, in 
UpdateMaps
+force_write=force_write)
+  File "/usr/lib/python2.6/site-packages/nss_cache/update/updater.py", line 
265, in UpdateFromSource
+force_write, location=None)
+  File "/usr/lib/python2.6/site-packages/nss_cache/update/map_updater.py", 
line 75, in UpdateCacheFromSource
+location=location)
+  File "/usr/lib/python2.6/site-packages/nss_cache/sources/source.py", line 
65, in GetMap
+return self.GetSshkeyMap(since)
+  File "/usr/lib/python2.6/site-packages/nss_cache/sources/ldapsource.py", 
line 274, in GetSshkeyMap
+return SshkeyUpdateGetter().GetUpdates(source=self,
+TypeError: __init__() takes exactly 2 arguments (1 given)
+
+diff --git a/nss_cache/sources/ldapsource.py b/nss_cache/sources/ldapsource.py
+index 2af170e..5ffea81 100644
+--- a/nss_cache/sources/ldapsource.py
 b/nss_cache/sources/ldapsource.py
+@@ -271,7 +271,7 @@ class LdapSource(source.Source):
+ Returns:
+   instance of maps.SshkeyMap
+ """
+-return SshkeyUpdateGetter().GetUpdates(source=self,
++return SshkeyUpdateGetter(self.conf).GetUpdates(source=self,
+search_base=self.conf['base'],
+search_filter=self.conf['filter'],
+search_scope=self.conf['scope'],

diff --git

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2016-01-01 Thread Robin H. Johnson 
commit: 3f1eca2bad3105fa709323298a683a9f55f9e627
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jan  1 19:09:18 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  1 19:09:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1eca2b

net-nds/nsscache: dev-python/bsddb3 port, also newer python eclass usage

Package-Manager: portage-2.2.24

 net-nds/nsscache/nsscache-0.23-r1.ebuild | 43 
 1 file changed, 43 insertions(+)

diff --git a/net-nds/nsscache/nsscache-0.23-r1.ebuild 
b/net-nds/nsscache/nsscache-0.23-r1.ebuild
new file mode 100644
index 000..aaa5aad
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.23-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache;
+SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+   dev-python/python-ldap[${PYTHON_USEDEP}]
+   dev-python/pycurl[${PYTHON_USEDEP}]
+   nssdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+   nssdb? ( sys-libs/nss-db )
+   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+
+src_prepare() {
+   find "${S}" -name '*.py' -exec \
+   sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+   {} \+
+   distutils-r1_src_prepare
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   doman nsscache.1 nsscache.conf.5
+   dodoc THANKS nsscache.cron
+
+   keepdir /var/lib/nsscache
+}

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2015-09-01 Thread Tobias Klausmann 
commit: 7491b5ba96f98b0bb64c8884cb4198115bb593ff
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Sep  1 19:53:33 2015 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Sep  1 19:53:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7491b5ba

net-nds/nsscache: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 net-nds/nsscache/nsscache-0.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nds/nsscache/nsscache-0.23.ebuild 
b/net-nds/nsscache/nsscache-0.23.ebuild
index 9ba7357..5e93369 100644
--- a/net-nds/nsscache/nsscache-0.23.ebuild
+++ b/net-nds/nsscache/nsscache-0.23.ebuild
@@ -13,7 +13,7 @@ PYTHON_USE_WITH_OPT="nssdb"
 inherit eutils python distutils
 
 DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://code.google.com/p/nsscache/;
+HOMEPAGE="https://github.com/google/nsscache;
 SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz;
 
 LICENSE="GPL-2"