From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28439138336 for ; Wed, 6 Nov 2019 19:49:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44485E097D; Wed, 6 Nov 2019 19:49:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D5BAE097D for ; Wed, 6 Nov 2019 19:49:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0AD934C9B6 for ; Wed, 6 Nov 2019 19:49:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F41A18A9 for ; Wed, 6 Nov 2019 19:49:38 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1573069774.befce93d29468887b23c87fb606f544d4cdd638b.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/nss-pam-ldapd/Manifest sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild X-VCS-Directories: sys-auth/nss-pam-ldapd/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: befce93d29468887b23c87fb606f544d4cdd638b X-VCS-Branch: master Date: Wed, 6 Nov 2019 19:49:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c0f974e-f27f-4168-b94a-7764933b41be X-Archives-Hash: c74458b0aa125c749a6eee4b54266b63 commit: befce93d29468887b23c87fb606f544d4cdd638b Author: Matthew Thode gentoo org> AuthorDate: Wed Nov 6 19:17:40 2019 +0000 Commit: Matthew Thode gentoo org> CommitDate: Wed Nov 6 19:49:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befce93d sys-auth/nss-pam-ldapd: 0.9.11 stable amd64 / x86 with cleakup Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Matthew Thode gentoo.org> sys-auth/nss-pam-ldapd/Manifest | 2 - .../nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild | 86 ----------- sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild | 2 +- sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild | 163 --------------------- 4 files changed, 1 insertion(+), 252 deletions(-) diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest index 9c3c0f5fcec..f6ad466265f 100644 --- a/sys-auth/nss-pam-ldapd/Manifest +++ b/sys-auth/nss-pam-ldapd/Manifest @@ -1,4 +1,2 @@ -DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 DIST nss-pam-ldapd-0.9.10.tar.gz 749302 BLAKE2B 38cdc0e2a5b971d18412d7a583a265cdc87249342139dd4af9cddc61d17bc3d4d19b43c6705fdabc9dccc5ad4f7dad5ea473f75cde2915e485252fdf9116a1c6 SHA512 be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645 -DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3 diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild deleted file mode 100644 index cc75900588e..00000000000 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib-minimal user - -DESCRIPTION="NSS module for name lookups using LDAP" -HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/" -SRC_URI="https://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug kerberos sasl +pam" - -DEPEND=" - net-nds/openldap - sasl? ( dev-libs/cyrus-sasl ) - kerberos? ( virtual/krb5 ) - sys-libs/pam - !sys-auth/nss_ldap - !sys-auth/pam_ldap" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup nslcd - enewuser nslcd -1 -1 -1 nslcd -} - -multilib_src_configure() { - # nss libraries always go in /lib on Gentoo - myconf=" - --enable-warnings - --with-ldap-lib=openldap - --with-ldap-conf-file=/etc/nslcd.conf - --with-nslcd-pidfile=/run/nslcd/nslcd.pid - --with-nslcd-socket=/run/nslcd/socket - --with-pam-seclib-dir=/$(get_libdir)/security - --libdir=/$(get_libdir) - $(use_enable debug) - $(use_enable kerberos) - $(use_enable pam) - $(use_enable sasl)" - - if use x86-fbsd; then - myconf+=" --with-nss-flavour=freebsd" - else - myconf+=" --with-nss-flavour=glibc" - fi - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_install() { - default - - # for socket and pid file (not needed bug 452992) - #keepdir /run/nslcd - - # init script - newinitd "${FILESDIR}"/nslcd-init-r1 nslcd - - # make an example copy - insinto /usr/share/nss-pam-ldapd - doins "${WORKDIR}/${P}/nslcd.conf" - - fperms o-r /etc/nslcd.conf -} - -pkg_postinst() { - echo - elog "For this to work you must configure /etc/nslcd.conf" - elog "This configuration is similar to pam_ldap's /etc/ldap.conf" - echo - elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can" - elog "start it like this:" - elog " # /etc/init.d/nslcd start" - echo - elog "You can add it to the default runlevel like so:" - elog " # rc-update add nslcd default" - elog - elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf" - elog " is now named /etc/nslcd.conf" - echo -} diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild index 022bcfde57b..3baa31da072 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug kerberos +pam pynslcd sasl test +utils" COMMON_DEP=" diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild deleted file mode 100644 index d228d7658e4..00000000000 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=(python2_7) -inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6 - -DESCRIPTION="NSS module for name lookups using LDAP" -HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/" -SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug kerberos +pam pynslcd sasl test +utils" - -COMMON_DEP=" - net-nds/openldap[${MULTILIB_USEDEP}] - sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - sys-libs/pam[${MULTILIB_USEDEP}] - utils? ( ${PYTHON_DEPS} ) - pynslcd? ( - dev-python/python-ldap[${PYTHON_USEDEP}] - dev-python/python-daemon[${PYTHON_USEDEP}] - ) - !sys-auth/nss_ldap - !sys-auth/pam_ldap" -RDEPEND="${COMMON_DEP}" -DEPEND="${COMMON_DEP} - test? ( - ${PYTHON_DEPS} - dev-python/pylint[${PYTHON_USEDEP}] - ) - sys-devel/automake" - -REQUIRED_USE=" - utils? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} pynslcd )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch - "${FILESDIR}"/${PN}-0.9.8-pynslcd-module-paths.patch -) - -pkg_setup() { - enewgroup nslcd - enewuser nslcd -1 -1 -1 nslcd -} - -src_prepare() { - cp pynslcd/pynslcd.py "${S}" || die "Copying pynslcd failed" - - default - use utils && python_setup - touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd" -} - -multilib_src_configure() { - local -a myconf - - myconf=( - --disable-utils - --enable-warnings - --with-ldap-lib=openldap - --with-ldap-conf-file=/etc/nslcd.conf - --with-nslcd-pidfile=/run/nslcd/nslcd.pid - --with-nslcd-socket=/run/nslcd/socket - $(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc') - $(use_enable pynslcd) - $(use_enable debug) - $(use_enable kerberos) - $(use_enable pam) - $(use_enable sasl) - ) - - # nss libraries always go in /lib on Gentoo - if multilib_is_native_abi ; then - myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security") - myconf+=("--libdir=${EPREFIX}/$(get_libdir)") - else - myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security") - myconf+=("--libdir=/$(get_libdir)") - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - local script - - newinitd "${FILESDIR}"/nslcd-init-r1 nslcd - newinitd "${FILESDIR}"/nslcd-init-r2 nslcd - s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6 - - insinto /usr/share/nss-pam-ldapd - doins "${WORKDIR}/${P}/nslcd.conf" - - fperms o-r /etc/nslcd.conf - - if use utils; then - python_moduleinto nslcd - python_foreach_impl python_domodule utils/*.py - - for script in chsh getent; do - python_foreach_impl python_newscript utils/${script}.py ${script}.ldap - done - fi - if use pynslcd; then - rm -rf "${D}"/usr/share/pynslcd - python_moduleinto pynslcd - python_foreach_impl python_domodule pynslcd/*.py - python_scriptinto /usr/sbin - python_newscript pynslcd.py pynslcd - newinitd "${FILESDIR}"/pynslcd.initd pynslcd - fi - - systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf - systemd_dounit "${FILESDIR}"/nslcd.service -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use pynslcd; then - python_moduleinto pynslcd - python_foreach_impl python_domodule pynslcd/*.py - fi -} - -python_test() { - PYTHONPATH="${S}" emake check -} - -multilib_src_test() { - pushd "${BUILD_DIR}" - ln -s ../pynslcd/constants.py utils/constants.py - python_foreach_impl python_test - popd -} - -pkg_postinst() { - echo - elog "For this to work you must configure /etc/nslcd.conf" - elog "This configuration is similar to pam_ldap's /etc/ldap.conf" - echo - elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can" - elog "start it like this:" - elog " # /etc/init.d/nslcd start" - echo - elog "You can add it to the default runlevel like so:" - elog " # rc-update add nslcd default" - elog - elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6" - elog "to supervise this service." - elog "To do this, emerge sys-apps/s6 then add nslcd-s6" - elog "default runlevel instead of nslcd." - elog - elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf" - elog " is now named /etc/nslcd.conf" - echo -}