diff --git a/srcpkgs/nss-pam-ldapd/files/nslcd/run b/srcpkgs/nss-pam-ldapd/files/nslcd/run index c17fecb4e4a..67e6eac2d51 100644 --- a/srcpkgs/nss-pam-ldapd/files/nslcd/run +++ b/srcpkgs/nss-pam-ldapd/files/nslcd/run @@ -1,5 +1,10 @@ #!/bin/sh exec 2>&1 + +[ -r conf ] && . ./conf + +NSLCD_CONF=${NSLCD_CONF:-/etc/nslcd.conf} + mkdir -p /var/run/nslcd chown nslcd:nslcd /var/run/nslcd -exec chpst -u nslcd:nslcd nslcd -n +exec chpst -u nslcd:nslcd nslcd -n -f "$NSLCD_CONF" diff --git a/srcpkgs/nss-pam-ldapd/patches/nss-pam-ldapd-0.9.12-netdb-defines.patch b/srcpkgs/nss-pam-ldapd/patches/nss-pam-ldapd-0.9.12-netdb-defines.patch deleted file mode 100644 index 1b43686c28e..00000000000 --- a/srcpkgs/nss-pam-ldapd/patches/nss-pam-ldapd-0.9.12-netdb-defines.patch +++ /dev/null @@ -1,26 +0,0 @@ -Bug: https://bugs.gentoo.org/716272 - ---- a/nss/hosts.c -+++ b/nss/hosts.c -@@ -49,6 +49,9 @@ - *h_errnop = NO_RECOVERY; \ - return NSS_STATUS_UNAVAIL; - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL -1 -+#endif - #undef ERROR_OUT_BUFERROR - #define ERROR_OUT_BUFERROR(fp) \ - *errnop = ERANGE; \ ---- a/nss/networks.c -+++ b/nss/networks.c -@@ -49,6 +49,9 @@ - *h_errnop = NO_RECOVERY; \ - return NSS_STATUS_UNAVAIL; - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL -1 -+#endif - #undef ERROR_OUT_BUFERROR - #define ERROR_OUT_BUFERROR(fp) \ - *errnop = ERANGE; \ diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template index 83944593610..5edb8f641a7 100644 --- a/srcpkgs/nss-pam-ldapd/template +++ b/srcpkgs/nss-pam-ldapd/template @@ -1,18 +1,18 @@ # Template file for 'nss-pam-ldapd' pkgname=nss-pam-ldapd -version=0.9.12 -revision=3 +version=0.9.13 +revision=1 build_style=gnu-configure configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/" conf_files="/etc/nslcd.conf" hostmakedepends="autoconf automake" makedepends="pam-devel libldap-devel libsasl-devel mit-krb5-devel" -short_desc="LDAP identity management via nsswitch" +short_desc="NSS and PAM support for LDAP" maintainer="Michael Aldridge " license="LGPL-2.1-or-later" homepage="https://arthurdejong.org/nss-pam-ldapd/" -distfiles="https://github.com/arthurdejong/nss-pam-ldapd/archive/$version.tar.gz" -checksum=829b2371be42c040108165d2ea422eb6f6cacba6a01083f67025752a574a685b +distfiles="https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-${version}.tar.gz" +checksum=e01784e17cb533bb66bd0601e205e785263445c3c2df7a6f90232ab4131c716d system_accounts="nslcd" case "$XBPS_TARGET_MACHINE" in @@ -23,11 +23,16 @@ pre_configure() { case "$XBPS_TARGET_MACHINE" in *musl) vsed -i 's/ lookup_netgroup / /' tests/Makefile.am + autoreconf -fi ;; esac - ./autogen.sh } post_install() { vsv nslcd + vman man/nslcd.8 + vman man/nslcd.conf.5 + vman man/chsh.ldap.1 + vman man/getent.ldap.1 + vman man/pam_ldap.8 }