[packages/nss_ldap] Rel 4; rediff patches; add https://svnweb.freebsd.org/ports/head/net/nss_ldap/files/patch-ldap-nss.h
arekm
arekm at pld-linux.org
Mon Nov 24 19:06:20 CET 2025
commit 1b5848529745482b1698b8f75bac3fb9908e5242
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Nov 24 19:06:11 2025 +0100
Rel 4; rediff patches; add https://svnweb.freebsd.org/ports/head/net/nss_ldap/files/patch-ldap-nss.h?revision=340725&view=co; fix perl include
nss_ldap-am_fixes.patch | 22 ++++++++++------------
nss_ldap-gecos-optional.patch | 13 ++++++-------
nss_ldap-heimdal.patch | 12 ++++++++++++
nss_ldap-nolibs.patch | 14 +++++++-------
nss_ldap.spec | 3 ++-
5 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/nss_ldap.spec b/nss_ldap.spec
index 5ce042c..9b48a05 100644
--- a/nss_ldap.spec
+++ b/nss_ldap.spec
@@ -4,7 +4,7 @@ Summary(pl.UTF-8): Moduł NSS LDAP
Summary(pt_BR.UTF-8): Biblioteca NSS para LDAP
Name: nss_ldap
Version: 265
-Release: 3
+Release: 4
License: LGPL
Group: Base
Source0: http://www.padl.com/download/%{name}-%{version}.tar.gz
@@ -84,6 +84,7 @@ etc.
%{__autoconf}
%{__autoheader}
%{__automake}
+PERL5LIB=$(pwd); export PERL5LIB
CFLAGS="%{rpmcflags} -DHEIMDAL" ; export CFLAGS
%configure \
--with-ldap-lib=openldap \
diff --git a/nss_ldap-am_fixes.patch b/nss_ldap-am_fixes.patch
index 13b09b5..245ca7b 100644
--- a/nss_ldap-am_fixes.patch
+++ b/nss_ldap-am_fixes.patch
@@ -1,7 +1,7 @@
-diff -urN nss_ldap-238.orig/Makefile.am nss_ldap-238/Makefile.am
---- nss_ldap-238.orig/Makefile.am 2005-03-24 01:03:40.000000000 +0100
-+++ nss_ldap-238/Makefile.am 2005-04-04 22:43:48.718957120 +0200
-@@ -6,15 +6,10 @@
+diff -urNp -x '*.orig' nss_ldap-265.org/Makefile.am nss_ldap-265/Makefile.am
+--- nss_ldap-265.org/Makefile.am 2009-11-06 11:28:08.000000000 +0100
++++ nss_ldap-265/Makefile.am 2025-11-24 18:51:20.579108402 +0100
+@@ -6,15 +6,10 @@ endif
noinst_PROGRAMS = nss_ldap.so $(authmod)
INST_UID=root
@@ -19,17 +19,17 @@ diff -urN nss_ldap-238.orig/Makefile.am nss_ldap-238/Makefile.am
man_MANS = nss_ldap.5
-@@ -30,8 +25,7 @@
+@@ -34,8 +29,7 @@ NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c
util.c ltf.c snprintf.c resolve.c dnsconfig.c \
- irs-nss.c pagectrl.c aix_authmeth.c
+ irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c vers.c
-NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
-DEFS = @DEFS@
+NSS_LDAP_LDFLAGS = -enss_ldap_initialize -lsys -lcsys -lc
#INCLUDES = -I$(top_builddir) -I$(srcdir)
- if GLIBC
-@@ -39,24 +39,12 @@
+ if GCC
+@@ -52,24 +46,12 @@ NSS_VERS = $(shell ls /lib/$(MULTI_OS_DI
NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS)
endif
@@ -54,7 +54,7 @@ diff -urN nss_ldap-238.orig/Makefile.am nss_ldap-238/Makefile.am
$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) NSS_LDAP $(DESTDIR)$(libdir)/security/NSS_LDAP
else
-@@ -66,21 +54,16 @@
+@@ -79,21 +61,16 @@ else
install-exec-local: nss_ldap.so
@$(NORMAL_INSTALL)
if GLIBC
@@ -78,7 +78,7 @@ diff -urN nss_ldap-238.orig/Makefile.am nss_ldap-238/Makefile.am
endif
-@@ -88,9 +71,9 @@
+@@ -101,13 +78,13 @@ install-data-local:
@$(NORMAL_INSTALL)
@if test ! -f $(DESTDIR)$(NSS_LDAP_PATH_CONF); then \
$(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \
@@ -90,8 +90,6 @@ diff -urN nss_ldap-238.orig/Makefile.am nss_ldap-238/Makefile.am
uninstall-local:
@$(NORMAL_UNINSTALL)
-@@ -86,5 +86,5 @@
- @$(NORMAL_UNINSTALL)
vers.c: $(top_srcdir)/CVSVersionInfo.txt
- CVSVERSIONDIR=$(top_srcdir) vers_string -v
diff --git a/nss_ldap-gecos-optional.patch b/nss_ldap-gecos-optional.patch
index 6f80ea2..f678510 100644
--- a/nss_ldap-gecos-optional.patch
+++ b/nss_ldap-gecos-optional.patch
@@ -1,13 +1,12 @@
-diff -ur nss_ldap-211-orig/ldap-pwd.c nss_ldap-211/ldap-pwd.c
---- nss_ldap-211-orig/ldap-pwd.c 2003-09-10 02:45:15.000000000 -0600
-+++ nss_ldap-211/ldap-pwd.c 2003-11-14 21:45:45.000000000 -0700
-@@ -143,7 +143,7 @@
- _nss_ldap_assign_attrval (ld, e, AT (cn), &pw->pw_gecos, &buffer,
- &buflen);
+diff -urNp -x '*.orig' nss_ldap-265.org/ldap-pwd.c nss_ldap-265/ldap-pwd.c
+--- nss_ldap-265.org/ldap-pwd.c 2009-11-06 11:28:08.000000000 +0100
++++ nss_ldap-265/ldap-pwd.c 2025-11-24 18:51:52.036464039 +0100
+@@ -159,7 +159,7 @@ _nss_ldap_parse_pw (LDAPMessage * e,
+ _nss_ldap_assign_attrval (e, ATM (LM_PASSWD, cn), &pw->pw_gecos,
+ &buffer, &buflen);
if (stat != NSS_SUCCESS)
- return stat;
+ (void) _nss_ldap_assign_emptystring (&pw->pw_gecos, &buffer, &buflen);
}
stat =
-Only in nss_ldap-211: ldap-pwd.c~
diff --git a/nss_ldap-heimdal.patch b/nss_ldap-heimdal.patch
index bd76645..a8bd8d8 100644
--- a/nss_ldap-heimdal.patch
+++ b/nss_ldap-heimdal.patch
@@ -65,3 +65,15 @@ diff -ur nss_ldap-264/ldap-init-krb5-cache.c nss_ldap-264-heim/ldap-init-krb5-ca
}
}
+--- a/ldap-nss.h.orig
++++ b/ldap-nss.h
+@@ -923,6 +923,8 @@
+ int _nss_ldap_get_ld_errno (char **m, char **s);
+
+ #ifdef CONFIGURE_KRB5_KEYTAB
+-int do_init_krb5_cache(ldap_config_t *config);
++int do_init_krb5_cache (ldap_config_t *config);
++int do_select_krb5_cache (ldap_config_t * config);
++int do_restore_krb5_cache (ldap_config_t * config);
+ #endif /* CONFIGURE_KRB5_KEYTAB */
+ #endif /* _LDAP_NSS_LDAP_LDAP_NSS_H */
diff --git a/nss_ldap-nolibs.patch b/nss_ldap-nolibs.patch
index 7dbf154..be9a8ff 100644
--- a/nss_ldap-nolibs.patch
+++ b/nss_ldap-nolibs.patch
@@ -1,13 +1,13 @@
-diff -ur nss_ldap-226.orig/configure.in nss_ldap-226/configure.in
---- nss_ldap-226.orig/configure.in 2004-09-28 04:20:11.000000000 +0200
-+++ nss_ldap-226/configure.in 2004-10-06 16:20:33.298152312 +0200
-@@ -157,9 +157,10 @@
- AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)
-
+diff -urNp -x '*.orig' nss_ldap-265.org/configure.in nss_ldap-265/configure.in
+--- nss_ldap-265.org/configure.in 2009-11-06 11:28:08.000000000 +0100
++++ nss_ldap-265/configure.in 2025-11-24 18:51:36.961335462 +0100
+@@ -189,9 +189,10 @@ AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gs
+ AC_CHECK_HEADERS(krb5.h)
+
AC_CHECK_LIB(resolv, main)
-AC_CHECK_LIB(nsl, main)
AC_CHECK_LIB(socket, main)
-
+
+AC_SEARCH_LIBS(gethostbyname, nsl)
+
AC_CHECK_FUNCS(strtok_r)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nss_ldap.git/commitdiff/1b5848529745482b1698b8f75bac3fb9908e5242
More information about the pld-cvs-commit
mailing list