From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- sys-auth/nss-pam-ldapd/Manifest | 2 - ...nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch | 25 ---- .../nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild | 163 --------------------- 3 files changed, 190 deletions(-) delete mode 100644 sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch delete mode 100644 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild (limited to 'sys-auth/nss-pam-ldapd') diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest index 977d0c9aadcd..55744cd0670a 100644 --- a/sys-auth/nss-pam-ldapd/Manifest +++ b/sys-auth/nss-pam-ldapd/Manifest @@ -2,7 +2,6 @@ AUX nslcd-tmpfiles.conf 32 BLAKE2B 082266c3fd69fe866b9698283911e166e48e416b3fd35 AUX nslcd.init 513 BLAKE2B 163a960a9d42b13023064e3adebf1aa8a8d4566d4bb472a224d0cbf58ec5c3f03fabd99917931ce7d36ec24490329986f4525e1a982b3e15c1632a534f1935f8 SHA512 7637cd4751fabb9f645820a7935e71606df95d4ddfbe2f21cb447d6b3bd67d087e61ff71fa88832edecaa306ae37252eb4cef60d11fb982aee7fbc5db24ac995 AUX nslcd.s6 44 BLAKE2B af69fd0202732721739501a65f608fb9fadfdd7e8a58052103a347bd3cfabecc84e5d5478fe689f565ee47f839c4f280d6ad8e88846339995f05fba8942dc8ac SHA512 190cd1440ab30dc32d09d7de9dee783d5d149547e491930d5f514b4bd53197e45a307906762d0e650ef802aa18ba266b40f61483569208c57709b2cbd74d3ae9 AUX nslcd.service 320 BLAKE2B 18a675fcc821d2c5f7766c0739c3bada8550e5e55f7b589fd9806bd961e9d4149be4a145ac51b9aeabad49293d70c726c1a8dd6a78ff724114e3b34e2270c32b SHA512 f04b66e05bfaefd485a4251c46d2b172a193be77554595086241dcd66a7787cf7678c8e5f6be954192a85a69fd2426965e4ca82c00e610ead8c6dd93a9aa21b1 -AUX nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch 537 BLAKE2B 40167724748124428393c2cc0d70c2fa88abd5fc9c2b12739d79f6dbd9f39e7b53351a68fb6db0e4f11bc0f40b960d1ab4ea256ab1f8aa8c75fe9601fc5674c3 SHA512 2fd21d4851f255264cd0e95f88f45fbca62ad8124c1326569c18bea769c205d4992f88a5fff7ca4bf19cd07c9123a39ecd3df2d5221a0430fb1d25d7b4668a30 AUX nss-pam-ldapd-0.9.11-relative-imports.patch 12280 BLAKE2B 9ae632b572a9a997cf704698b6aca7fc19c32e1f08f29de0f0457a6ee567596abf09ed2aeec2fab5535e98280eb887f6adb7a29ad4406216f0a3355c9931b2aa SHA512 2275d1c8ded5d8c2824c97dc361e84b62613453ec502a9685d7e27e54bc1a72da7830d119727f8f1e4df000b1dff53d631f8967eaf70bf75e043e0e302d9afac AUX nss-pam-ldapd-0.9.11-tests-py39.patch 1143 BLAKE2B b4eb5d25ba9c40f00f3d84c9385a1ffc23cf5ec357ce33ba74c954378144e4d88fb811de9c1e802283f03d6be88052677624c1f75bc481938762c5bb0cef9b69 SHA512 f0d0d3345fd83bf1ecbbd5bd7784836b8d8c27b0238a4aefd15ad34b93ffbfc8474edd5a3c7955a2c90e822e426a59f578c6dbb80aed6c2e4b15543ce9dfc286 AUX nss-pam-ldapd-0.9.11-tests.patch 1226 BLAKE2B f8fd1170bae8d206dab6fb11437db7290b488caf8f609f5676f46f55f3d31ba5a4fc59c5484e7151da8fb4a20c50f6739fa7de3115bc8ce706022422e753f31b SHA512 e60122304d4cad52a8e11ba804fd432da8102dc021e9272d0e284d88f3a1b5e7392ef71bfcb460eb3a5faf9ae7e95de943c4e35da03b17d029f058496b6a8087 @@ -10,6 +9,5 @@ AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645 -EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4159 BLAKE2B bc4e732144a72a94bf9f8b98db8410ebf7e67a06118cd79461dab556eaac56e4bb9da6a151e07f35e5d7e324ff27cfac428091721c8696efa89325f5d2154c65 SHA512 9108eff0d788cca661f8789e121f9cf9f9331f56db4d3cec094d8376ced0c7f8d9742d1e10b63d1c774f617354eef94d6adef3ba23c765cb7314b314454d0764 EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4505 BLAKE2B 7f5a6430cab68536705bc6c5c9cec24966f0ba20c7821d67de11f78752dcc58e77f5414376a25d38cea44efe22eb69570aff4aad6357d72bc47a974ad92e2c66 SHA512 afb00da2ba95518aef803135eb591f3ecc4529774f6dd0994d539c9e88d0e3cfc0265b7c3285354145ac5177bd6cff23b62660e0aa31e382f3a03176516483e1 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch deleted file mode 100644 index 75ad1015afc1..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py -index 0691b61..df2ca4a 100755 ---- a/pynslcd/pynslcd.py -+++ b/pynslcd/pynslcd.py -@@ -30,13 +30,13 @@ import threading - import daemon - import ldap - --import cfg --import common --import constants --import invalidator --import mypidfile --import search --from tio import TIOStream -+import pynslcd.cfg -+import pynslcd.common -+import pynslcd.constants -+import pynslcd.invalidator -+import pynslcd.mypidfile -+import pynslcd.search -+from pynslcd.tio import TIOStream - - - # the name of the program diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild deleted file mode 100644 index 58c7e24d6301..000000000000 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=(python3_7) -inherit prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles - -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" -RESTRICT="!test? ( test )" - -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.11-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 nslcd - s6_install_service nslcd "${FILESDIR}"/nslcd.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.init pynslcd - fi - - newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf - systemd_newunit "${FILESDIR}"/nslcd.service 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 -} -- cgit v1.2.3