- Update to 0.7.3

- Add predefined nslcd user and group

PR:		ports/146154
Submitted by:	Jim Riggs <ports@christianserving.org>
Approved by:	maintainer timeout (14 days)

12 files changed, 60 insertions, 46 deletions

diff --git a/GIDs b/GIDs
index c854ebddd2bc..47a3723ba86c 100644
--- a/GIDs
+++ b/GIDs
@@ -159,3 +159,4 @@ postpals:*:924:
 mfs:*:925:
 minbif:*:926:
 kumofs:*:927:
+nslcd:*:928:
diff --git a/UIDs b/UIDs
index eb187190df67..7f4b0a84c157 100644
--- a/UIDs
+++ b/UIDs
@@ -169,3 +169,4 @@ postpals:*:924:924::0:0:postpals user:/nonexistent:/usr/sbin/nologin
 mfs:*:925:925::0:0:MooseFS User:/nonexistent:/usr/sbin/nologin
 minbif:*:926:926::0:0:Minbif Daemon User:/nonexistent:/usr/sbin/nologin
 kumofs:*:927:927::0:0:kumofs daemon:/nonexistent:/usr/sbin/nologin
+nslcd:*:928:928::0:0:nslcd daemon:/nonexistent:/usr/sbin/nologin
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 1cde7ad687f4..aafc9e8305c4 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		nss_ldapd
-PORTVERSION=		0.7.1
+PORTVERSION=		0.7.3
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			http://static.ipfw.ru/files/
@@ -28,6 +28,9 @@ OPTIONS=		NSS_COMPAT	"Enable nss_ldap compatibility" on \
 			SASL		"Enable SASL" off \
 			PAM		"Build pam_ldap" on
 
+USERS=			nslcd
+GROUPS=			nslcd
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
diff --git a/net/nss-pam-ldapd/distinfo b/net/nss-pam-ldapd/distinfo
index 40ca8cb72c34..b066d6e5d9da 100644
--- a/net/nss-pam-ldapd/distinfo
+++ b/net/nss-pam-ldapd/distinfo
@@ -1,3 +1,3 @@
-MD5 (nss-pam-ldapd-0.7.1.tar.gz) = 11a31772554a452a5d978b39665fcf80
-SHA256 (nss-pam-ldapd-0.7.1.tar.gz) = c1a80ecb7def43171b36600f48ba32fe7822aa07541f90edb9481c641539467f
-SIZE (nss-pam-ldapd-0.7.1.tar.gz) = 430508
+MD5 (nss-pam-ldapd-0.7.3.tar.gz) = 688833d959f1878a139d484e980d160e
+SHA256 (nss-pam-ldapd-0.7.3.tar.gz) = db300db75fdf7ab74fae8fcb7cfecb5adace49ecf715d308581b22575bc128da
+SIZE (nss-pam-ldapd-0.7.3.tar.gz) = 443042
diff --git a/net/nss-pam-ldapd/files/patch-configure b/net/nss-pam-ldapd/files/patch-configure
index 9432d4415861..adbb1e557776 100644
--- a/net/nss-pam-ldapd/files/patch-configure
+++ b/net/nss-pam-ldapd/files/patch-configure
@@ -10,25 +10,25 @@
  /* Define to 1 if you have the <aliases.h> header file. */
  #undef HAVE_ALIASES_H
  
---- configure.orig	19:44:43.000000000 +0300
-+++ configure	2009-12-20 19:47:20.000000000 +0300
-@@ -779,6 +779,7 @@
+--- configure.orig	2010-02-27 09:17:45.000000000 -0600
++++ configure	2010-04-29 07:28:11.044647697 -0500
+@@ -738,6 +738,7 @@
  enable_sasl
  enable_kerberos
  enable_configfile_checking
 +enable_nss_compat
  with_ldap_conf_file
+ with_bindpw_file
  with_nslcd_pidfile
- with_nslcd_socket
-@@ -1437,6 +1438,7 @@
-   --disable-kerberos      disable Kerberos support [default=yes]
+@@ -1386,6 +1387,7 @@
+   --disable-kerberos      disable Kerberos support [[default=enabled]]
    --disable-configfile-checking
-                           check configfile options [default=yes]
-+  --enable-nss_compat     check nss_compat option [default=no]
+                           check configfile options [[default=enabled]]
++  --enable-nss_compat     check nss_compat option [[default=disabled]]
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -5117,6 +5119,181 @@
+@@ -4782,6 +4784,181 @@
  
  fi
  
diff --git a/net/nss-pam-ldapd/files/patch-nslcd.conf b/net/nss-pam-ldapd/files/patch-nslcd.conf
new file mode 100644
index 000000000000..4c2a5b05b461
--- /dev/null
+++ b/net/nss-pam-ldapd/files/patch-nslcd.conf
@@ -0,0 +1,13 @@
+--- nslcd.conf.orig	2010-04-29 07:44:58.355014955 -0500
++++ nslcd.conf	2010-04-29 07:45:10.741047860 -0500
+@@ -4,6 +4,10 @@
+ # information in the directory.
+ # See the manual page nslcd.conf(5) for more information.
+ 
++# The underprivileged user and group used for running the daemon.
++uid nslcd
++gid nslcd
++
+ # The uri pointing to the LDAP server to use for name lookups.
+ # Multiple entries may be specified. The address that is used
+ # here should be resolvable without using LDAP (obviously).
diff --git a/net/nss-pam-ldapd/files/patch-nss__prototypes.h b/net/nss-pam-ldapd/files/patch-nss__prototypes.h
index e09565af545d..53003f014ae2 100644
--- a/net/nss-pam-ldapd/files/patch-nss__prototypes.h
+++ b/net/nss-pam-ldapd/files/patch-nss__prototypes.h
@@ -1,15 +1,5 @@
 --- nss/prototypes.h.orig	2009-09-04 15:55:35.000000000 +0400
 +++ nss/prototypes.h	2009-12-20 15:37:57.000000000 +0300
-@@ -24,7 +24,9 @@
- #define _NSS_EXPORTS_H 1
- 
- #include <nss.h>
-+#ifdef HAVE_ALIASES_H
- #include <aliases.h>
-+#endif
- #ifdef HAVE_NETINET_ETHER_H
- #include <netinet/ether.h>
- #endif /* HAVE_NETINET_ETHER_H */
 @@ -84,6 +86,27 @@
    void *nip; /* changed from `service_user *nip' */
  };
diff --git a/net/nss_ldapd/Makefile b/net/nss_ldapd/Makefile
index 1cde7ad687f4..aafc9e8305c4 100644
--- a/net/nss_ldapd/Makefile
+++ b/net/nss_ldapd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		nss_ldapd
-PORTVERSION=		0.7.1
+PORTVERSION=		0.7.3
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			http://static.ipfw.ru/files/
@@ -28,6 +28,9 @@ OPTIONS=		NSS_COMPAT	"Enable nss_ldap compatibility" on \
 			SASL		"Enable SASL" off \
 			PAM		"Build pam_ldap" on
 
+USERS=			nslcd
+GROUPS=			nslcd
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
diff --git a/net/nss_ldapd/distinfo b/net/nss_ldapd/distinfo
index 40ca8cb72c34..b066d6e5d9da 100644
--- a/net/nss_ldapd/distinfo
+++ b/net/nss_ldapd/distinfo
@@ -1,3 +1,3 @@
-MD5 (nss-pam-ldapd-0.7.1.tar.gz) = 11a31772554a452a5d978b39665fcf80
-SHA256 (nss-pam-ldapd-0.7.1.tar.gz) = c1a80ecb7def43171b36600f48ba32fe7822aa07541f90edb9481c641539467f
-SIZE (nss-pam-ldapd-0.7.1.tar.gz) = 430508
+MD5 (nss-pam-ldapd-0.7.3.tar.gz) = 688833d959f1878a139d484e980d160e
+SHA256 (nss-pam-ldapd-0.7.3.tar.gz) = db300db75fdf7ab74fae8fcb7cfecb5adace49ecf715d308581b22575bc128da
+SIZE (nss-pam-ldapd-0.7.3.tar.gz) = 443042
diff --git a/net/nss_ldapd/files/patch-configure b/net/nss_ldapd/files/patch-configure
index 9432d4415861..adbb1e557776 100644
--- a/net/nss_ldapd/files/patch-configure
+++ b/net/nss_ldapd/files/patch-configure
@@ -10,25 +10,25 @@
  /* Define to 1 if you have the <aliases.h> header file. */
  #undef HAVE_ALIASES_H
  
---- configure.orig	19:44:43.000000000 +0300
-+++ configure	2009-12-20 19:47:20.000000000 +0300
-@@ -779,6 +779,7 @@
+--- configure.orig	2010-02-27 09:17:45.000000000 -0600
++++ configure	2010-04-29 07:28:11.044647697 -0500
+@@ -738,6 +738,7 @@
  enable_sasl
  enable_kerberos
  enable_configfile_checking
 +enable_nss_compat
  with_ldap_conf_file
+ with_bindpw_file
  with_nslcd_pidfile
- with_nslcd_socket
-@@ -1437,6 +1438,7 @@
-   --disable-kerberos      disable Kerberos support [default=yes]
+@@ -1386,6 +1387,7 @@
+   --disable-kerberos      disable Kerberos support [[default=enabled]]
    --disable-configfile-checking
-                           check configfile options [default=yes]
-+  --enable-nss_compat     check nss_compat option [default=no]
+                           check configfile options [[default=enabled]]
++  --enable-nss_compat     check nss_compat option [[default=disabled]]
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -5117,6 +5119,181 @@
+@@ -4782,6 +4784,181 @@
  
  fi
  
diff --git a/net/nss_ldapd/files/patch-nslcd.conf b/net/nss_ldapd/files/patch-nslcd.conf
new file mode 100644
index 000000000000..4c2a5b05b461
--- /dev/null
+++ b/net/nss_ldapd/files/patch-nslcd.conf
@@ -0,0 +1,13 @@
+--- nslcd.conf.orig	2010-04-29 07:44:58.355014955 -0500
++++ nslcd.conf	2010-04-29 07:45:10.741047860 -0500
+@@ -4,6 +4,10 @@
+ # information in the directory.
+ # See the manual page nslcd.conf(5) for more information.
+ 
++# The underprivileged user and group used for running the daemon.
++uid nslcd
++gid nslcd
++
+ # The uri pointing to the LDAP server to use for name lookups.
+ # Multiple entries may be specified. The address that is used
+ # here should be resolvable without using LDAP (obviously).
diff --git a/net/nss_ldapd/files/patch-nss__prototypes.h b/net/nss_ldapd/files/patch-nss__prototypes.h
index e09565af545d..53003f014ae2 100644
--- a/net/nss_ldapd/files/patch-nss__prototypes.h
+++ b/net/nss_ldapd/files/patch-nss__prototypes.h
@@ -1,15 +1,5 @@
 --- nss/prototypes.h.orig	2009-09-04 15:55:35.000000000 +0400
 +++ nss/prototypes.h	2009-12-20 15:37:57.000000000 +0300
-@@ -24,7 +24,9 @@
- #define _NSS_EXPORTS_H 1
- 
- #include <nss.h>
-+#ifdef HAVE_ALIASES_H
- #include <aliases.h>
-+#endif
- #ifdef HAVE_NETINET_ETHER_H
- #include <netinet/ether.h>
- #endif /* HAVE_NETINET_ETHER_H */
 @@ -84,6 +86,27 @@
    void *nip; /* changed from `service_user *nip' */
  };