Re: [PR PATCH] [Updated] nss-pam-ldapd: build libnss_ldap.so.2 for musl

[klarasm <klarasm@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages nss-pam-ldapd/musl
https://github.com/void-linux/void-packages/pull/49070

nss-pam-ldapd: build libnss_ldap.so.2 for musl
Don't disable nss in configure. Grab patch from Gentoo for defines missing in musl netdb.h. Disable netgroup_lookup test for musl.

Also remove -F flag in runit script for musl-nscd as it's not recognized.

Tested against my ldap servers and can confirm that it fetches the data defined by nsswitch.conf.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
  - aarch64-musl
  - armv7l
  - armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/49070.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-pam-ldapd/musl-49070.patch --]
[-- Type: text/x-diff, Size: 3757 bytes --]

From c142399607c5c5ac122603e4a3869deea96660a3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 4 Mar 2024 00:28:30 +0100
Subject: [PATCH 1/2] nss-pam-ldapd: build libnss_ldap.so for musl

Use patch from gentoo for missing define in netdb.h. Disable lookup_netgroup
test for musl which fails otherwise.
---
 .../nss-pam-ldapd-0.9.12-netdb-defines.patch  | 26 +++++++++++++++++++
 srcpkgs/nss-pam-ldapd/template                |  9 +++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nss-pam-ldapd/patches/nss-pam-ldapd-0.9.12-netdb-defines.patch

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
new file mode 100644
index 00000000000000..1b43686c28e73e
--- /dev/null
+++ b/srcpkgs/nss-pam-ldapd/patches/nss-pam-ldapd-0.9.12-netdb-defines.patch
@@ -0,0 +1,26 @@
+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 2b3a35ae85a334..83944593610ef4 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
 # Template file for 'nss-pam-ldapd'
 pkgname=nss-pam-ldapd
 version=0.9.12
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
 conf_files="/etc/nslcd.conf"
@@ -16,10 +16,15 @@ checksum=829b2371be42c040108165d2ea422eb6f6cacba6a01083f67025752a574a685b
 system_accounts="nslcd"
 
 case "$XBPS_TARGET_MACHINE" in
-	*musl) configure_args+=" --disable-nss";;
+	*musl) makedepends+=" musl-nscd-devel" ;;
 esac
 
 pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*musl)
+			vsed -i 's/ lookup_netgroup / /' tests/Makefile.am
+			;;
+	esac
 	./autogen.sh
 }
 

From aed418e9ea698be43215251f973e23cdcbab8a45 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 4 Mar 2024 00:34:35 +0100
Subject: [PATCH 2/2] musl-nscd: remove -F option in run file, not recognized

---
 srcpkgs/musl-nscd/files/nscd/run | 2 +-
 srcpkgs/musl-nscd/template       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musl-nscd/files/nscd/run b/srcpkgs/musl-nscd/files/nscd/run
index 53127524af2b10..f1a5684daeb3fd 100755
--- a/srcpkgs/musl-nscd/files/nscd/run
+++ b/srcpkgs/musl-nscd/files/nscd/run
@@ -2,4 +2,4 @@
 exec 2>&1
 [ -r conf ] && . ./conf
 mkdir -p /var/run/nscd /var/db/nscd
-exec nscd -F ${OPTS} >/dev/null
+exec nscd ${OPTS} >/dev/null
diff --git a/srcpkgs/musl-nscd/template b/srcpkgs/musl-nscd/template
index 39a66105b222b2..f3bcbf9a8ac88d 100644
--- a/srcpkgs/musl-nscd/template
+++ b/srcpkgs/musl-nscd/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-nscd'
 pkgname=musl-nscd
 version=1.1.1
-revision=1
+revision=2
 archs="*-musl"
 build_style=gnu-configure
 hostmakedepends="bison flex"