nss-pam-ldapd: Update wip/nss-pam-ldapd from 0.9.7 to 0.9.10

[Timshel Knoll-Miller <timshel%shels.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Timshel Knoll-Miller <timshel%shels.net@localhost>
Pushed By:	timshel
Date:		Wed Jun 12 10:00:36 2019 +1000
Changeset:	aac917ccbeb01fe62a69f522fce2d3b8c4069805

Modified Files:
	nss-pam-ldapd/Makefile
	nss-pam-ldapd/distinfo
	nss-pam-ldapd/patches/patch-nss_bsdnss.c

Log Message:
nss-pam-ldapd: Update wip/nss-pam-ldapd from 0.9.7 to 0.9.10

Pkgsrc changes:

 * additional bsdnss.c patch to port new getnetgr* support to NetBSD
 * additional patch to fix compile error due to duplicate switch case values,
   by disabling NS_RETURN switch case on NetBSD
   (patched NetBSD nss-compat support never returns NS_RETURN)

Upstream changes:

changes from 0.9.9 to 0.9.10
----------------------------

 * add FreeBSD netgroup support (thanks HWLin and Mango Yen)
 * make password expiry messages correct and consistent (thanks Têko Mihinto)
 * add domain variable for use in pam_authz_search
 * allow logging longer lines
 * create nslcd socket after dropping privileges to avoid slow start-ups

changes from 0.9.8 to 0.9.9
---------------------------

 * support spaces in attribute mapping expressions
 * allow parsing longer lines in the configuration file
 * allow for longer host names

changes from 0.9.7 to 0.9.8
---------------------------

 * add a pam_authc_search option that can be used to configure the search
   operation that is performed after authentication
 * add nss_uid_offset and nss_gid_offset options that can be used to change
   returned numeric user and group ids from LDAP (thanks Seth Wright)
 * do not retry failed user password on second LDAP server
 * fix a crash in the PAM module on FreeBSD when showing password expiration
   messages
 * the validnames option now also applies to shadow lookups
 * support ethernet addresses in LDAP in compact and long formats
 * improvements to getent.ldap command (a few minor bug fixes and preparations
   for Python 3 support)
 * log entries and lookups failing nss_min_uid at debug level
 * improvements to the test suite (including tests for getent.ldap)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aac917ccbeb01fe62a69f522fce2d3b8c4069805

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

diffstat:
 nss-pam-ldapd/Makefile                   |  2 +-
 nss-pam-ldapd/distinfo                   | 10 ++++----
 nss-pam-ldapd/patches/patch-nss_bsdnss.c | 41 +++++++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 14 deletions(-)

diffs:
diff --git a/nss-pam-ldapd/Makefile b/nss-pam-ldapd/Makefile
index 9bf5aae923..5be19d8d70 100644
--- a/nss-pam-ldapd/Makefile
+++ b/nss-pam-ldapd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2012/12/13 18:20:29 ftigeot Exp $
 
-DISTNAME=	nss-pam-ldapd-0.9.7
+DISTNAME=	nss-pam-ldapd-0.9.10
 CATEGORIES=	databases
 MASTER_SITES=	http://arthurdejong.org/nss-pam-ldapd/
 
diff --git a/nss-pam-ldapd/distinfo b/nss-pam-ldapd/distinfo
index c8ba3f7c38..c0ec929900 100644
--- a/nss-pam-ldapd/distinfo
+++ b/nss-pam-ldapd/distinfo
@@ -1,14 +1,14 @@
 $NetBSD: distinfo,v 1.1 2012/12/11 20:21:43 ftigeot Exp $
 
-SHA1 (nss-pam-ldapd-0.9.7.tar.gz) = 66bd9024d2dfa46097aa75cf144ff2b894073659
-RMD160 (nss-pam-ldapd-0.9.7.tar.gz) = 57a364d2fe0c8e88ab71a07b830ccd1ac97bdc14
-SHA512 (nss-pam-ldapd-0.9.7.tar.gz) = 2117262f41c4fc54987f9f663ed71126100420ecff391cc280e98d7864094db201a81a4ebf7e5634436982092be3c751971d8aee53e39c42a8572ab57b561284
-Size (nss-pam-ldapd-0.9.7.tar.gz) = 762743 bytes
+SHA1 (nss-pam-ldapd-0.9.10.tar.gz) = e5e2cc2941569d7a99734e8fc3b3c12f9c18ef3d
+RMD160 (nss-pam-ldapd-0.9.10.tar.gz) = 1a19cf2abb2de438e532f2bbcde5ab4f9c8de361
+SHA512 (nss-pam-ldapd-0.9.10.tar.gz) = be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218
+Size (nss-pam-ldapd-0.9.10.tar.gz) = 749302 bytes
 SHA1 (patch-Makefile.am) = 4ced568a0c1bf824be6dfaf3672dfcd33da6297c
 SHA1 (patch-Makefile.in) = 2deea5a0fff3ed05c0989210e5df783530d23ab1
 SHA1 (patch-compat_getpeercred.c) = cebcfb38f09d829ae3ab8640fd8ee7dbdb43672a
 SHA1 (patch-compat_nss_compat.c) = 22857c0a0d7f6ae068982373f34448330e1b5840
 SHA1 (patch-compat_nss_compat.h) = f31b2b1c43a9ccc6617fd283d62db7a0abd889c6
 SHA1 (patch-configure.ac) = 8300ed640f8ab8810b44807678eb8aac177ed95e
-SHA1 (patch-nss_bsdnss.c) = baf451c893a76d81b88e2563dbacba7ce24bde3b
+SHA1 (patch-nss_bsdnss.c) = f6a2eebd5db46a66fdbf67e43723728d48644a3f
 SHA1 (patch-pynslcd_Makefile.in) = 61f5f0e1c9e059e410fba1e28e914324381ebbf2
diff --git a/nss-pam-ldapd/patches/patch-nss_bsdnss.c b/nss-pam-ldapd/patches/patch-nss_bsdnss.c
index d7420d1e5e..d123538c07 100644
--- a/nss-pam-ldapd/patches/patch-nss_bsdnss.c
+++ b/nss-pam-ldapd/patches/patch-nss_bsdnss.c
@@ -3,9 +3,9 @@ $NetBSD$
 NetBSD does not have __nss_compat_xxx functions in its C library.
 It also need non-_r variants.
 
---- nss/bsdnss.c.orig	2012-05-18 15:34:22.000000000 +0200
-+++ nss/bsdnss.c	2013-12-03 17:18:50.000000000 +0100
-@@ -40,111 +40,110 @@
+--- nss/bsdnss.c.orig	2018-09-01 09:09:35.000000000 +0000
++++ nss/bsdnss.c
+@@ -46,21 +46,27 @@ struct name_list {
  NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r);
  NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r);
  NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r);
@@ -30,7 +30,12 @@ It also need non-_r variants.
 -NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname2);
  NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyaddr);
  
- static ns_mtab methods[] = {
+ NSS_METHOD_PROTOTYPE(__nss_compat_getnetgrent_r);
++NSS_METHOD_PROTOTYPE(__nss_compat_getnetgrent);
+ NSS_METHOD_PROTOTYPE(__nss_compat_setnetgrent);
+ NSS_METHOD_PROTOTYPE(__nss_compat_endnetgrent);
+ 
+@@ -68,33 +74,45 @@ static ns_mtab methods[] = {
    { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, (void *)NSS_NAME(getgrnam_r) },
    { NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, (void *)NSS_NAME(getgrgid_r) },
    { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, (void *)NSS_NAME(getgrent_r) },
@@ -72,9 +77,13 @@ It also need non-_r variants.
    { NSDB_PASSWD_COMPAT, "endpwent",   __nss_compat_endpwent,   (void *)NSS_NAME(endpwent) },
 +  { NSDB_PASSWD_COMPAT, "getpwnam",   __nss_compat_getpwnam,   (void *)NSS_NAME(getpwnam_r) },
 +  { NSDB_PASSWD_COMPAT, "getpwuid",   __nss_compat_getpwuid,   (void *)NSS_NAME(getpwuid_r) },
-+
- };
  
+   { NSDB_NETGROUP, "getnetgrent_r", __nss_compat_getnetgrent_r, (void *)NSS_NAME(getnetgrent_r) },
++  { NSDB_NETGROUP, "getnetgrent", __nss_compat_getnetgrent_r, (void *)NSS_NAME(getnetgrent_r) },
+   { NSDB_NETGROUP, "setnetgrent", __nss_compat_setnetgrent, (void *)NSS_NAME(setnetgrent) },
+   { NSDB_NETGROUP, "endnetgrent", __nss_compat_endnetgrent, (void *)NSS_NAME(endnetgrent) },
+ };
+@@ -102,63 +120,45 @@ static ns_mtab methods[] = {
  typedef nss_status_t (*gethbn_t)(const char *, struct hostent *, char *, size_t, int *, int *);
  typedef nss_status_t (*gethba_t)(struct in_addr *, int, int, struct hostent *, char *, size_t, int *, int *);
  
@@ -116,7 +125,7 @@ It also need non-_r variants.
 -  fn = (gethbn_t)mdata;
 +  fn = (gethbn_t)cbdata;
    name = va_arg(ap, const char *);
-+  namelen=va_arg(ap,int);
++  namelen = va_arg(ap, int);
    af = va_arg(ap, int);
 -  result = va_arg(ap, struct hostent *);
 -  status = fn(name, result, buffer, sizeof(buffer), &errnop, &h_errnop);
@@ -153,7 +162,7 @@ It also need non-_r variants.
    status = __nss_compat_result(status, errnop);
    h_errno = h_errnop;
    return status;
-@@ -168,23 +167,27 @@ static int __gr_addgid(gid_t gid, gid_t 
+@@ -182,23 +182,27 @@ static int __gr_addgid(gid_t gid, gid_t 
    return ret;
  }
  
@@ -182,3 +191,19 @@ It also need non-_r variants.
    tmpgroups = malloc(maxgrp * sizeof(gid_t));
    if (tmpgroups == NULL)
      return NSS_STATUS_UNAVAIL;
+@@ -270,6 +274,7 @@ int __nss_compat_getnetgrent_r(void UNUS
+           return (NS_SUCCESS);
+         }
+         break;
++#ifndef __NetBSD__
+       case NS_RETURN:
+         netlist = netgr->needed_groups;
+         if(netlist != NULL){
+@@ -280,6 +285,7 @@ int __nss_compat_getnetgrent_r(void UNUS
+           ret = NS_TRYAGAIN;
+         }
+         break;
++#endif
+       default:
+         ;
+     }