CVS commit: pkgsrc/databases/nss_ldap

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sun Jul 30 00:18:07 UTC 2023

Modified Files:
        pkgsrc/databases/nss_ldap: Makefile distinfo
Removed Files:
        pkgsrc/databases/nss_ldap/files: freebsd.c netbsd.c netbsd.h
        pkgsrc/databases/nss_ldap/patches: patch-ab patch-af patch-ag
            patch-configure.in patch-ldap-ethers.c patch-ldap-pwd.c

Log Message:
Switch upstream, as PADL nss_ldap is years-old abandonware

The new upstream is a fork af latest PADL nss_ldap with all pending pull
request merged.

Changes since version 265 from ChangeLog

266a    Emmanuel Dreyfus <manu%netbsd.org@localhost>

        * RFC 2307bis configurable DN search
        * RFC 2307bis filter fix
        * NetBSD support
        * Fix build if sasl.h is not present
        * netgrp ERANGE fix for glibc
        * Align TLS option names on OpenLDAP documentation
        * Build fix when kerberos is not enabled
        * Fix excessive library dependencies

266     Luke Howard <lukeh%padl.com@localhost>

        * fix for BUG#129: native linker doesn't use LDFLAGS
        * fix for BUG#143: don't use getrdnvalue for groups
        * fix for BUG#240: return "x" for shadowAccount password
        * fix for BUG#402: incorrectly detected glibc on armel
        * fix for BUG#411: memory leak in do_init()
        * fix for BUG#412: check whether resolv.conf has changed
        * fix for BUG#412: don't close nested contexts
        * fix for BUG#412: make syslog debugging configurable
        * fix for BUG#412: support configurable site name
        * fix for BUG#412: tidy up bootparams code
        * fix for BUG#412: use macros for ldap_get_option calls
        * fix for BUG#412: better debugging of NSS status codes
        * fix for BUG#412: rewrite and abstract Kerberos support
        * fix for BUG#412: allow runtime configuration of LDAP
          configuration file and keytab using environment
        * fix for BUG#412: correctly clamp max sleep time
        * fix for BUG#412: sort SRV records by weight and priority
        * fix for BUG#412: support microsecond backoff granularity
        * fix for BUG#414: SIGPIPE handling in atfork()
        * fix for BUG#416: FreeBSD 7.x/8.x compatibility
        * fix for BUG#420: _nss_ldap_parse_net() dumps core on
          AIX 5.3 and 6.1
        * fix for BUG#425: nss_ldap doesn't parse IPv4 addresses
          correctly on non-ipv6 systems


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/nss_ldap/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/nss_ldap/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/nss_ldap/files/freebsd.c
cvs rdiff -u -r1.6 -r0 pkgsrc/databases/nss_ldap/files/netbsd.c
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/nss_ldap/files/netbsd.h
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/nss_ldap/patches/patch-ab \
    pkgsrc/databases/nss_ldap/patches/patch-ag
cvs rdiff -u -r1.7 -r0 pkgsrc/databases/nss_ldap/patches/patch-af
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/nss_ldap/patches/patch-configure.in \
    pkgsrc/databases/nss_ldap/patches/patch-ldap-ethers.c \
    pkgsrc/databases/nss_ldap/patches/patch-ldap-pwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/nss_ldap/Makefile
diff -u pkgsrc/databases/nss_ldap/Makefile:1.34 pkgsrc/databases/nss_ldap/Makefile:1.35
--- pkgsrc/databases/nss_ldap/Makefile:1.34     Wed Apr 29 19:57:51 2020
+++ pkgsrc/databases/nss_ldap/Makefile  Sun Jul 30 00:18:07 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2020/04/29 19:57:51 maya Exp $
+# $NetBSD: Makefile,v 1.35 2023/07/30 00:18:07 manu Exp $
 
-DISTNAME=      nss_ldap-265
-PKGREVISION=   8
+DISTNAME=      nss_ldap-266a
+#PKGREVISION=  1
 CATEGORIES=    databases
-MASTER_SITES=  http://www.padl.com/download/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=manu0401/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.padl.com/OSS/nss_ldap.html
@@ -11,7 +11,7 @@ COMMENT=      LDAP client for nsswitch
 LICENSE=       gnu-lgpl-v2
 
 # needs nsswitch
-ONLY_FOR_PLATFORM=     NetBSD-*-* FreeBSD-*-*
+ONLY_FOR_PLATFORM=     NetBSD-*-* FreeBSD-*-* Linux-*-*
 
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
@@ -22,29 +22,22 @@ CONFIGURE_ARGS+=    --with-ldap-dir=${BUILD
 CONFIGURE_ARGS+=       --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
 CONFIGURE_ARGS+=       --with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
 CFLAGS.FreeBSD+=       -DUID_NOBODY=65534 -DGID_NOBODY=65534 # see <sys/conf.h>
-CONFIGURE_ENV+=                ac_cv_header_nsswitch_h=no
 MAKE_FLAGS+=           INST_UID=${BINOWN} INST_GID=${BINGRP}
 
+REPLACE_PERL+=         vers_string
+
+INSTALLATION_DIRS+=    share/examples/nss_ldap
+
 # shared with security/pam-ldap
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=            ${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
-
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-SUBST_CLASSES+=                        fix-opsys
-SUBST_STAGE.fix-opsys=         pre-configure
-SUBST_MESSAGE.fix-opsys=       Fixing system name.
-SUBST_FILES.fix-opsys=         Makefile.in
-SUBST_SED.fix-opsys=           -e 's,@OPSYS@,${OPSYS:tl},g'
+post-install:
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/ldap.conf ${DESTDIR}${EGDIR}/ldap.conf
 
 .include "../../mk/bsd.prefs.mk"
 
-pre-build:
-       ${CP} ${FILESDIR}/netbsd.c  ${FILESDIR}/netbsd.h  ${FILESDIR}/freebsd.c  ${WRKSRC}
-.if ${OPSYS} == "NetBSD"
-       ${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h
-.endif
-
 .include "options.mk"
 
 .include "../../databases/openldap-client/buildlink3.mk"

Index: pkgsrc/databases/nss_ldap/distinfo
diff -u pkgsrc/databases/nss_ldap/distinfo:1.12 pkgsrc/databases/nss_ldap/distinfo:1.13
--- pkgsrc/databases/nss_ldap/distinfo:1.12     Tue Oct 26 10:09:25 2021
+++ pkgsrc/databases/nss_ldap/distinfo  Sun Jul 30 00:18:07 2023
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 10:09:25 nia Exp $
+$NetBSD: distinfo,v 1.13 2023/07/30 00:18:07 manu Exp $
 
-BLAKE2s (nss_ldap-265.tar.gz) = 654573b702f64e4eb24435adf513c232867ec917705182756d5eab37a13a81c4
-SHA512 (nss_ldap-265.tar.gz) = c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
-Size (nss_ldap-265.tar.gz) = 280976 bytes
-SHA1 (patch-ab) = 418fca750b9b6f40dd3a904af84fababf8c55022
-SHA1 (patch-af) = 7a09ee93a903dc7df256a50d9e904b74e6e5747f
-SHA1 (patch-ag) = 4fa04f6b577b7c5a6977403dae3e91a3faab4152
-SHA1 (patch-configure.in) = 45d86bcaae5ca27ad1ab5a8816720c40982f85c4
-SHA1 (patch-ldap-ethers.c) = 0e4e27e4f03e7e8a821aaddabb91c443f5d1db22
-SHA1 (patch-ldap-pwd.c) = 5d4720aaa88e2e7b46d1c1cde9648466b82598e1
+BLAKE2s (nss_ldap-266a.tar.gz) = 8bdbaae42c8bec6e1f3476b00ae9e66d4d9b688b3d636a61cae252a7aee80865
+SHA512 (nss_ldap-266a.tar.gz) = 430b5d97c826b308169b5ee5f1b70f6610700c5d947881bc51ff2974f04311c1da6f46e48a8843f6664a3a45b6989be6d3052bd4af0924f0982ac0de6165c3d8
+Size (nss_ldap-266a.tar.gz) = 303265 bytes