Re: daabases/nss_ldap update?

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

On Tue, Jul 11, 2023 at 04:08:57PM +0000, Emmanuel Dreyfus wrote:
> But upstream seems dead, and a future release is unlikely. 
> 
> I can update our package based on upstream HEAD, or I can
> commit and release from https://github.com/manu0401/nss_ldap

Here is an attempt at that. I tagged v266a as HEAD of PADL's
nss_ldap, with all pending pull requests merged.
https://github.com/manu0401/nss_ldap/releases/tag/v266a

Attached is a patch to apply in pkgsrc/databases/nss_ldap to use
v266a. Note that all local patches are gone, so are NetBSD 
portability hacks. Everything is merged in v266a.

Opinions?

-- 
Emmanuel Dreyfus
manu%netbsd.org@localhost

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/nss_ldap/Makefile,v
retrieving revision 1.34
diff -U4 -r1.34 Makefile
--- Makefile	29 Apr 2020 19:57:51 -0000	1.34
+++ Makefile	17 Jul 2023 15:01:57 -0000
@@ -1,18 +1,18 @@
 # $NetBSD: Makefile,v 1.34 2020/04/29 19:57:51 maya 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
 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
 CONFIGURE_ARGS+=	--enable-schema-mapping
@@ -21,31 +21,24 @@
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
 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"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/nss_ldap/distinfo,v
retrieving revision 1.12
diff -U4 -r1.12 distinfo
--- distinfo	26 Oct 2021 10:09:25 -0000	1.12
+++ distinfo	17 Jul 2023 15:01:57 -0000
@@ -1,11 +1,5 @@
 $NetBSD: distinfo,v 1.12 2021/10/26 10:09:25 nia 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