[gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
@ 2017-07-31 23:01 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2017-07-31 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1756fc0f53d40072e7b634ed3baf8a87152fd6af
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 22:58:54 2017 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 23:01:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1756fc0f

sys-auth/nss-pam-ldapd: Revision bump, make python deps optional

 .../nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch |  25 ++++
 sys-auth/nss-pam-ldapd/files/pynslcd.initd         |  28 ++++
 sys-auth/nss-pam-ldapd/metadata.xml                |   1 +
 .../nss-pam-ldapd/nss-pam-ldapd-0.9.8-r1.ebuild    | 164 +++++++++++++++++++++
 4 files changed, 218 insertions(+)

diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch
new file mode 100644
index 00000000000..11c86eff2e2
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch
@@ -0,0 +1,25 @@
+diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py
+index d367a8c..9a52120 100755
+--- a/pynslcd.py
++++ b/pynslcd.py
+@@ -30,13 +30,13 @@ import threading
+ import daemon
+ import ldap
+ 
+-from tio import TIOStream
+-import cfg
+-import common
+-import constants
+-import invalidator
+-import mypidfile
+-import search
++from pynslcd.tio import TIOStream
++import pynslcd.cfg as cfg
++import pynslcd.common as common
++import pynslcd.constants as constants
++import pynslcd.invalidator as invalidator
++import pynslcd.mypidfile as mypidfile
++import pynslcd.search as search
+ 
+ 
+ # the name of the program

diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd b/sys-auth/nss-pam-ldapd/files/pynslcd.initd
new file mode 100644
index 00000000000..7b6540810ae
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/pynslcd.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/pynslcd
+pidfile=/var/run/nslcd/nslcd.pid
+extra_commands="checkconfig"
+cfg="/etc/nslcd.conf"
+
+depend() {
+	need net	
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "$cfg" ] ; then
+		eerror "Please create $cfg"
+		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkpath -q -d /run/nslcd -o nslcd:nslcd
+	checkconfig
+	return $?
+}

diff --git a/sys-auth/nss-pam-ldapd/metadata.xml b/sys-auth/nss-pam-ldapd/metadata.xml
index f76306794b1..ad8b010a0a0 100644
--- a/sys-auth/nss-pam-ldapd/metadata.xml
+++ b/sys-auth/nss-pam-ldapd/metadata.xml
@@ -11,6 +11,7 @@
   </maintainer>
   <use>
     <flag name="utils">Install the command-line utilities</flag>
+    <flag name="pynslcd">Install the python implementation along with the standard implementation</flag>
   </use>
   <longdescription lang="en">
     Provides a Name Service Switch (NSS) module that allows your LDAP

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r1.ebuild
new file mode 100644
index 00000000000..f8ec1cb488f
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="http://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}]
+	dev-python/python-ldap[${PYTHON_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	virtual/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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
@ 2017-07-31 23:01 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2017-07-31 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     8a051c99a81d14bcf8003868a59c2fe682717fae
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 23:01:02 2017 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 23:01:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a051c99

sys-auth/nss-pam-ldapd: Remove empty s6 init script

Gentoo-Bug: 622416
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-auth/nss-pam-ldapd/files/nslcd-init-s6        | 0
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild | 3 +--
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-s6 b/sys-auth/nss-pam-ldapd/files/nslcd-init-s6
deleted file mode 100644
index e69de29bb2d..00000000000

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
index ddcc9dbe69f..22abd70bba2 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -80,7 +80,6 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
 	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
 
 	insinto /usr/share/nss-pam-ldapd

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
index 760ed21c4fe..edce3791910 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild
@@ -81,7 +81,6 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
 	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
 	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
 
 	insinto /usr/share/nss-pam-ldapd


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
@ 2020-03-16 17:58 Matthew Thode
  0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2020-03-16 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     056d51d2c8cff5c9bac5cae69e142eea8e14f678
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 17:53:28 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 17:58:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056d51d2

sys-auth/nss-pam-ldapd: cleanup

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 sys-auth/nss-pam-ldapd/Manifest                    |   1 -
 sys-auth/nss-pam-ldapd/files/nslcd-init-r1         |  36 -----
 sys-auth/nss-pam-ldapd/files/nslcd-init-r2         |  28 ----
 sys-auth/nss-pam-ldapd/files/nslcd.service         |  14 --
 .../nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch |  25 ----
 sys-auth/nss-pam-ldapd/files/pynslcd.initd         |  28 ----
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild | 164 ---------------------
 .../nss-pam-ldapd/nss-pam-ldapd-0.9.11-r1.ebuild   | 164 ---------------------
 sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild | 164 ---------------------
 9 files changed, 624 deletions(-)

diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index f6ad466265f..50faf9e717f 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -1,2 +1 @@
-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

diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r1 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r1
deleted file mode 100644
index 776a7b3009e..00000000000
--- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-cfg="/etc/nslcd.conf"
-
-depend() {
-	need net	
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "$cfg" ] ; then
-		eerror "Please create $cfg"
-		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-    checkpath -q -d /run/nslcd -o nslcd:nslcd
-	checkconfig || return $?
-
-	ebegin "Starting nslcd"
-	start-stop-daemon --start --pidfile /var/run/nslcd/nslcd.pid \
-		--exec /usr/sbin/nslcd
-	eend $? "Failed to start nslcd"
-}
-
-stop() {
-	ebegin "Stopping nslcd"
-	start-stop-daemon --stop --pidfile /var/run/nslcd/nslcd.pid
-	eend $? "Failed to stop nslcd"
-}

diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
deleted file mode 100644
index 55ef9a53774..00000000000
--- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/nslcd
-pidfile=/var/run/nslcd/nslcd.pid
-extra_commands="checkconfig"
-cfg="/etc/nslcd.conf"
-
-depend() {
-	need net	
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "$cfg" ] ; then
-		eerror "Please create $cfg"
-		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
-		return 1
-	fi
-	return 0
-}
-
-start_pre() {
-	checkpath -q -d /run/nslcd -o nslcd:nslcd
-	checkconfig
-	return $?
-}

diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.service b/sys-auth/nss-pam-ldapd/files/nslcd.service
deleted file mode 100644
index 030cc2c90eb..00000000000
--- a/sys-auth/nss-pam-ldapd/files/nslcd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NSS and PAM LDAP client daemon
-After=network-online.target
-Wants=network-online.target nss-lookup.target syslog.service
-Before=nss-user-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
-ExecStart=/usr/sbin/nslcd
-
-[Install]
-WantedBy=multi-user.target
-RequiredBy=nss-user-lookup.target

diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch
deleted file mode 100644
index 11c86eff2e2..00000000000
--- a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py
-index d367a8c..9a52120 100755
---- a/pynslcd.py
-+++ b/pynslcd.py
-@@ -30,13 +30,13 @@ import threading
- import daemon
- import ldap
- 
--from tio import TIOStream
--import cfg
--import common
--import constants
--import invalidator
--import mypidfile
--import search
-+from pynslcd.tio import TIOStream
-+import pynslcd.cfg as cfg
-+import pynslcd.common as common
-+import pynslcd.constants as constants
-+import pynslcd.invalidator as invalidator
-+import pynslcd.mypidfile as mypidfile
-+import pynslcd.search as search
- 
- 
- # the name of the program

diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd b/sys-auth/nss-pam-ldapd/files/pynslcd.initd
deleted file mode 100644
index 7b6540810ae..00000000000
--- a/sys-auth/nss-pam-ldapd/files/pynslcd.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/pynslcd
-pidfile=/var/run/nslcd/nslcd.pid
-extra_commands="checkconfig"
-cfg="/etc/nslcd.conf"
-
-depend() {
-	need net	
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "$cfg" ] ; then
-		eerror "Please create $cfg"
-		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
-		return 1
-	fi
-	return 0
-}
-
-start_pre() {
-	checkpath -q -d /run/nslcd -o nslcd:nslcd
-	checkconfig
-	return $?
-}

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
deleted file mode 100644
index cd3b7304b1d..00000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild
+++ /dev/null
@@ -1,164 +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"
-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.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
-}

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r1.ebuild
deleted file mode 100644
index 606482cbb09..00000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python2_7 python3_6)
-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"
-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-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
-}

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
deleted file mode 100644
index ac134db8549..00000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild
+++ /dev/null
@@ -1,164 +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"
-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-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
@ 2021-05-31 21:00 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-05-31 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     9e08547fd71306256ba4ab5518c5067b12ef8040
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 20:59:34 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 31 20:59:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e08547f

sys-auth/nss-pam-ldapd: Remove old

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

 ...nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch |  25 ----
 .../nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild   | 163 ---------------------
 2 files changed, 188 deletions(-)

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 75ad1015afc..00000000000
--- 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 58c7e24d630..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/
@ 2024-07-08 17:17 Matthew Thode
  0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2024-07-08 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1905d5242be1770a6c7fe2c3fca2397eebcfaef4
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Wed Jun 26 01:12:18 2024 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 17:16:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1905d524

sys-auth/nss-pam-ldapd: Fix build on clang

Upstream pull request: https://github.com/arthurdejong/nss-pam-ldapd/pull/68

Closes: https://bugs.gentoo.org/832002
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37304
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 ...d-0.9.12-configure-CFLAGS-decontamination.patch | 55 ++++++++++++++++++++++
 .../nss-pam-ldapd/nss-pam-ldapd-0.9.12-r4.ebuild   |  5 ++
 2 files changed, 60 insertions(+)

diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.12-configure-CFLAGS-decontamination.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.12-configure-CFLAGS-decontamination.patch
new file mode 100644
index 000000000000..00687e2c7492
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.12-configure-CFLAGS-decontamination.patch
@@ -0,0 +1,55 @@
+diff --git a/configure.ac b/configure.ac
+index 12bf35c..beb13bf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,39 +101,25 @@ then
+ fi
+ 
+ # check for debugging options
++DEBUG_CFLAGS=""
+ AC_ARG_ENABLE(debug,
+               AS_HELP_STRING([--enable-debug],
+                              [enable extensive debugging and logging]),
+-              [if test "x$enableval" != "xno" ; then CFLAGS="-g -DDEBUG $CFLAGS" ; fi])
++              [AS_IF([test "x$enableval" != "xno"],
++		    [AX_APPEND_COMPILE_FLAGS([-g -DDEBUG],[DEBUG_CFLAGS])]
++              )])
++AC_SUBST([DEBUG_CFLAGS])
+ 
+ # check for extra compiler warnings
+-DESIRED_CFLAGS=""
++EXTRA_CFLAGS=""
+ AC_ARG_ENABLE(warnings,
+               AS_HELP_STRING([--enable-warnings],
+                              [enable extra compiler warnings (gcc)]),
+-              [if test "x$enableval" != "no"
+-               then
+-                 CFLAGS="$CFLAGS -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Waggregate-return -Wmissing-declarations -Wunused -Wformat=2 -Wswitch-default -Wswitch-enum -Wfloat-equal -Wbad-function-cast -Wredundant-decls"
+-                 DESIRED_CFLAGS="$DESIRED_CFLAGS -Wextra -Wdeclaration-after-statement -Werror-implicit-function-declaration -Werror=implicit"
+-               fi])
+-test_gcc_flag() {
+-  AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+-  $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null
+-  ret=$?
+-  rm -f conftest.o
+-  return $ret
+-}
+-for flag in $DESIRED_CFLAGS
+-do
+-  AC_MSG_CHECKING([whether $CC accepts $flag])
+-  if test_gcc_flag $flag
+-  then
+-    CFLAGS="$CFLAGS $flag"
+-    AC_MSG_RESULT([yes])
+-  else
+-    AC_MSG_RESULT([no])
+-  fi
+-done
++              [AS_IF([test "x$enableval" != "xno"],[
++                 AX_APPEND_COMPILE_FLAGS([-pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Waggregate-return -Wmissing-declarations -Wunused -Wformat=2 -Wswitch-default -Wswitch-enum -Wfloat-equal -Wbad-function-cast -Wredundant-decls],[EXTRA_CFLAGS],[-Werror])
++                 AX_APPEND_COMPILE_FLAGS([-Wextra -Wdeclaration-after-statement -Werror-implicit-function-declaration -Werror=implicit],[EXTRA_CFLAGS],[-Werror])
++               ])])
++AC_SUBST([EXTRA_CFLAGS])
+ 
+ # check for Position Independent Code compiler option
+ PIC_CFLAGS=""

diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r4.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r4.ebuild
index 85c045be9ab5..1073dd8e15e7 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r4.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r4.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests.patch
 	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests-py39.patch
 	"${FILESDIR}"/nss-pam-ldapd-0.9.12-netdb-defines.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.12-configure-CFLAGS-decontamination.patch
 )
 
 pkg_setup() {
@@ -64,6 +65,10 @@ src_prepare() {
 	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
 	mv pynslcd/pynslcd.py pynslcd/main.py || die
 
+        find "${S}" -name Makefile.am -exec \
+        sed -e '/^AM_CFLAGS/ s/$/ \$(DEBUG_CFLAGS) \$(EXTRA_CFLAGS)/g' \
+        -i {} \; || die
+
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-07-08 17:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-08 17:17 [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/files/, sys-auth/nss-pam-ldapd/ Matthew Thode
  -- strict thread matches above, loose matches on Subject: below --
2021-05-31 21:00 Michał Górny
2020-03-16 17:58 Matthew Thode
2017-07-31 23:01 Patrick McLean
2017-07-31 23:01 Patrick McLean

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox