ports/contrib (3.5): nss_ldap: 265 -> 266

28 May 2020

commit 82ff0248302fb8dbe2c5d42929cf1946bf2c6ddd
Author: Tim Biermann <tbier@posteo.de>
Date:   Thu May 28 11:24:07 2020 +0000

    nss_ldap: 265 -> 266

diff --git a/nss_ldap/.footprint b/nss_ldap/.footprint
index 92ae27bad..7439094c2 100644
--- a/nss_ldap/.footprint
+++ b/nss_ldap/.footprint
@@ -2,8 +2,8 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/nss_ldap.conf
 -rw-r--r--	root/root	etc/nsswitch.ldap
 drwxr-xr-x	root/root	lib/
--rwxr-xr-x	root/root	lib/libnss_ldap-2.30.so
-lrwxrwxrwx	root/root	lib/libnss_ldap.so.2 -> libnss_ldap-2.30.so
+-rwxr-xr-x	root/root	lib/libnss_ldap-2.28.so
+lrwxrwxrwx	root/root	lib/libnss_ldap.so.2 -> libnss_ldap-2.28.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libnss_ldap.so.2 -> ../../lib/libnss_ldap.so.2
diff --git a/nss_ldap/.signature b/nss_ldap/.signature
index 5047aa18d..bad0f3995 100644
--- a/nss_ldap/.signature
+++ b/nss_ldap/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38FzlHlBrlyzFMMrnl3ovBlt2/WZN3bhcAC6FWOEY+ueX/kr4GCzc2QZOnfFkx1zfcyY72e81WSwuKTcsocESAA=
-SHA256 (Pkgfile) = 5967ed4dec6bbd29e3ed3cfeb1e6a8b3dca49571c4e37022fda747df44749da1
-SHA256 (.footprint) = e6403146bbd4daf8299cd5b047fb99b3f4ee7a7ecb833448a21612bc100f9df4
-SHA256 (nss_ldap-265.tar.gz) = 77b54d905f50d774f28d5559d49126f1bc76720f741b0864a64bb4936ec226a8
-SHA256 (nss_ldap-265-glibc-2.16.patch) = ea008f78f15b9e23a0dac27448df49d57c863f7a16536ed0153f11e135b12f96
+RWSagIOpLGJF39S/xxi602PEVwXW518rH+bg4+qPSsyH2yqpcSEjvwJjpZpROtSqC4lGUb8DcIexJPRhmHfpA3tWyT03CIWYEQk=
+SHA256 (Pkgfile) = 6ec16c86dca18cbfde1b1d97fdb7379a85d9e84d66f52ad615582ac959a33666
+SHA256 (.footprint) = 65948f6df1182bb97a0b1b1a484c973902260900ebdb147fb0518399ab4a1b30
+SHA256 (154730b5a2b58a4212e419b498476fcb5a60de7b.tar.gz) = 78127d836d75d635037d09cead6709f3d0686d75e7fc89bf780527d9dba8b806
+SHA256 (nss_ldap-249-sasl-compile.patch) = 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6
diff --git a/nss_ldap/Pkgfile b/nss_ldap/Pkgfile
index 9263e3b72..b4bcc8323 100644
--- a/nss_ldap/Pkgfile
+++ b/nss_ldap/Pkgfile
@@ -1,17 +1,20 @@
 # Description:	LDAP NSS module
 # URL:		http://www.padl.com/OSS/nss_ldap.html
 # Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	openldap
+# Depends on:	openldap krb5
 
 name=nss_ldap
-version=265
-release=4
-source=(https://www.padl.com/download/$name-$version.tar.gz nss_ldap-265-glibc-2.16.patch)
+version=266
+release=1
+_commit=154730b5a2b58a4212e419b498476fcb5a60de7b
+source=(https://github.com/PADL/nss_ldap/archive/$_commit.tar.gz
+  nss_ldap-249-sasl-compile.patch)
 
 build() {
-  cd $name-$version
+  cd $name-$_commit
+
+  patch -p0 -i $SRC/nss_ldap-249-sasl-compile.patch
 
-  patch -p1 -i $SRC/nss_ldap-265-glibc-2.16.patch
   sed -i -e 's|CVSVERSIONDIR=\$(top_srcdir) vers_string|CVSVERSIONDIR=\$(top_srcdir) ./vers_string|g' Makefile.am Makefile.in
 
   export PERL5LIB="$PWD"
diff --git a/nss_ldap/nss_ldap-249-sasl-compile.patch b/nss_ldap/nss_ldap-249-sasl-compile.patch
new file mode 100644
index 000000000..1e92c9bb6
--- /dev/null
+++ b/nss_ldap/nss_ldap-249-sasl-compile.patch
@@ -0,0 +1,11 @@
+--- ldap-nss.c~	2006-02-25 02:43:33.503639826 -0800
++++ ldap-nss.c	2006-02-25 02:50:51.943806612 -0800
+@@ -72,6 +72,8 @@
+ #include <sasl/sasl.h>
+ #elif defined(HAVE_SASL_H)
+ #include <sasl.h>
++#elif defined(HAVE_SASL_SASL_H)
++#include <sasl/sasl.h>
+ #endif
+ 
+ #ifndef HAVE_SNPRINTF
diff --git a/nss_ldap/nss_ldap-265-glibc-2.16.patch b/nss_ldap/nss_ldap-265-glibc-2.16.patch
deleted file mode 100644
index 76dc36758..000000000
--- a/nss_ldap/nss_ldap-265-glibc-2.16.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -u -r nss_ldap-265.orig/configure.in nss_ldap-265/configure.in
---- nss_ldap-265.orig/configure.in	2009-11-06 19:28:08.000000000 +0900
-+++ nss_ldap-265/configure.in	2012-12-20 17:04:48.798942465 +0900
-@@ -234,6 +234,7 @@
- AC_CHECK_FUNCS(pthread_once)
- AC_CHECK_FUNCS(ether_aton)
- AC_CHECK_FUNCS(ether_ntoa)
-+AC_CHECK_FUNCS(__libc_once __libc_atfork __libc_lock_lock __libc_lock_unlock)
- 
- AC_MSG_CHECKING(for struct ether_addr)
- AC_TRY_COMPILE([#include <sys/types.h>
-Only in nss_ldap-265: configure.in.orig
-diff -u -r nss_ldap-265.orig/ldap-nss.c nss_ldap-265/ldap-nss.c
---- nss_ldap-265.orig/ldap-nss.c	2009-11-06 19:28:08.000000000 +0900
-+++ nss_ldap-265/ldap-nss.c	2012-12-20 17:04:48.798942465 +0900
-@@ -142,7 +142,7 @@
-  */
- static ldap_session_t __session = { NULL, NULL, 0, LS_UNINITIALIZED };
- 
--#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE)
- static pthread_once_t __once = PTHREAD_ONCE_INIT;
- #endif
- 
-@@ -150,7 +150,7 @@
- static FILE *__debugfile;
- #endif /* LBER_OPT_LOG_PRINT_FILE */
- 
--#ifndef HAVE_PTHREAD_ATFORK
-+#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE)
- /* 
-  * Process ID that opened the session.
-  */
-@@ -162,7 +162,7 @@
- static int __ssl_initialized = 0;
- #endif /* HAVE_LDAPSSL_CLIENT_INIT */
- 
--#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE)
- /*
-  * Prepare for fork(); lock mutex.
-  */
-@@ -513,7 +513,7 @@
- }
- #endif /* HAVE_NSSWITCH_H */
- 
--#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE)
- static void
- do_atfork_prepare (void)
- {
-@@ -547,7 +547,7 @@
- #ifdef HAVE_PTHREAD_ATFORK
-   (void) pthread_atfork (do_atfork_prepare, do_atfork_parent,
- 			 do_atfork_child);
--#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#elif defined(HAVE___LIBC_ATFORK)
-   (void) __libc_atfork (do_atfork_prepare, do_atfork_parent, do_atfork_child);
- #endif
- 
-@@ -1096,7 +1096,7 @@
- do_init (void)
- {
-   ldap_config_t *cfg;
--#ifndef HAVE_PTHREAD_ATFORK
-+#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE)
-   pid_t pid;
- #endif
-   uid_t euid;
-@@ -1113,7 +1113,7 @@
-     }
- 
- #ifndef HAVE_PTHREAD_ATFORK
--#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#if defined(HAVE___LIBC_ONCE)
-   /*
-    * This bogosity is necessary because Linux uses different
-    * PIDs for different threads (like IRIX, which we don't
-@@ -1145,7 +1145,7 @@
-     pid = -1;			/* linked against libpthreads, don't care */
- #else
-   pid = getpid ();
--#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */
-+#endif /* HAVE___LIBC_ONCE */
- #endif /* HAVE_PTHREAD_ATFORK */
- 
-   euid = geteuid ();
-@@ -1155,7 +1155,7 @@
-   syslog (LOG_DEBUG,
- 	  "nss_ldap: __session.ls_state=%d, __session.ls_conn=%p, __euid=%i, euid=%i",
- 	  __session.ls_state, __session.ls_conn, __euid, euid);
--#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#elif defined(HAVE___LIBC_ONCE)
-   syslog (LOG_DEBUG,
- 	  "nss_ldap: libpthreads=%s, __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
-  	  ((__pthread_once == NULL || __pthread_atfork == NULL) ? "FALSE" : "TRUE"),
-@@ -1179,11 +1179,11 @@
-     }
-   else
- #ifndef HAVE_PTHREAD_ATFORK
--#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#if defined(HAVE___LIBC_ONCE)
-   if ((__pthread_once == NULL || __pthread_atfork == NULL) && __pid != pid)
- #else
-   if (__pid != pid)
--#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */
-+#endif /* HAVE___LIBC_ONCE */
-     {
-       do_close_no_unbind ();
-     }
-@@ -1244,9 +1244,9 @@
-       debug ("<== do_init (pthread_once failed)");
-       return NSS_UNAVAIL;
-     }
--#elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) )
-+#elif defined(HAVE_PTHREAD_ATFORK) && defined(HAVE___LIBC_ONCE)
-   __libc_once (__once, do_atfork_setup);
--#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#elif defined(HAVE___LIBC_ONCE)
-   /*
-    * Only install the pthread_atfork() handlers i
-    * we are linked against libpthreads. Otherwise,
-Only in nss_ldap-265: ldap-nss.c.orig
-diff -u -r nss_ldap-265.orig/ldap-nss.h nss_ldap-265/ldap-nss.h
---- nss_ldap-265.orig/ldap-nss.h	2009-11-06 19:28:08.000000000 +0900
-+++ nss_ldap-265/ldap-nss.h	2012-12-20 17:04:48.798942465 +0900
-@@ -670,7 +670,7 @@
- #define NSS_LDAP_LOCK(m)		mutex_lock(&m)
- #define NSS_LDAP_UNLOCK(m)		mutex_unlock(&m)
- #define NSS_LDAP_DEFINE_LOCK(m)		static mutex_t m = DEFAULTMUTEX
--#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
-+#elif defined(HAVE___LIBC_LOCK_LOCK) && defined(HAVE___LIBC_LOCK_UNLOCK)
- #define NSS_LDAP_LOCK(m)		__libc_lock_lock(m)
- #define NSS_LDAP_UNLOCK(m)		__libc_lock_unlock(m)
- #define NSS_LDAP_DEFINE_LOCK(m)		static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER
-Only in nss_ldap-265: ldap-nss.h.orig

    

crux＠crux.nu

tags

participants (1)