ports/146154: [PATCH] net/nss_ldapd: update to 0.7.3

[Jim Riggs]

>Number:         146154
>Category:       ports
>Synopsis:       [PATCH] net/nss_ldapd: update to 0.7.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 29 17:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jim Riggs
>Release:        FreeBSD 6.3-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD zion.christianserving.org 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #3: Mon May  5 21:27:22 CDT
>Description:
- Update to 0.7.3
- Add predefined nslcd user and group

Added file(s):
- files/patch-nslcd.conf

Port maintainer (melifaro at ipfw.ru) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- nss_ldapd-0.7.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/GIDs /var/tmp/portwork/GIDs
--- /usr/ports/GIDs     2010-04-29 12:15:02.524741566 -0500
+++ /var/tmp/portwork/GIDs      2010-04-29 07:24:17.418823000 -0500
@@ -158,3 +158,4 @@
 mfs:*:925:
 minbif:*:926:
 kumofs:*:927:
+nslcd:*:928:
diff -ruN --exclude=CVS /usr/ports/UIDs /var/tmp/portwork/UIDs
--- /usr/ports/UIDs     2010-04-29 12:14:56.590520300 -0500
+++ /var/tmp/portwork/UIDs      2010-04-29 07:24:06.490444000 -0500
@@ -168,3 +168,4 @@
 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 -ruN --exclude=CVS /usr/ports/net/nss_ldapd/Makefile /root/portwork/nslcd/net/nss_ldapd/Makefile
--- /usr/ports/net/nss_ldapd/Makefile	2010-01-09 16:45:55.000000000 -0600
+++ /root/portwork/nslcd/net/nss_ldapd/Makefile	2010-04-29 07:24:38.000000000 -0500
@@ -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 @@
 			SASL		"Enable SASL" off \
 			PAM		"Build pam_ldap" on
 
+USERS=			nslcd
+GROUPS=			nslcd
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
diff -ruN --exclude=CVS /usr/ports/net/nss_ldapd/distinfo /root/portwork/nslcd/net/nss_ldapd/distinfo
--- /usr/ports/net/nss_ldapd/distinfo	2010-01-09 16:45:55.000000000 -0600
+++ /root/portwork/nslcd/net/nss_ldapd/distinfo	2010-04-29 07:25:35.000000000 -0500
@@ -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 -ruN --exclude=CVS /usr/ports/net/nss_ldapd/files/patch-configure /root/portwork/nslcd/net/nss_ldapd/files/patch-configure
--- /usr/ports/net/nss_ldapd/files/patch-configure	2010-01-09 16:45:55.000000000 -0600
+++ /root/portwork/nslcd/net/nss_ldapd/files/patch-configure	2010-04-29 07:30:55.000000000 -0500
@@ -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 -ruN --exclude=CVS /usr/ports/net/nss_ldapd/files/patch-nslcd.conf /root/portwork/nslcd/net/nss_ldapd/files/patch-nslcd.conf
--- /usr/ports/net/nss_ldapd/files/patch-nslcd.conf	1969-12-31 18:00:00.000000000 -0600
+++ /root/portwork/nslcd/net/nss_ldapd/files/patch-nslcd.conf	2010-04-29 07:45:49.000000000 -0500
@@ -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 -ruN --exclude=CVS /usr/ports/net/nss_ldapd/files/patch-nss__prototypes.h /root/portwork/nslcd/net/nss_ldapd/files/patch-nss__prototypes.h
--- /usr/ports/net/nss_ldapd/files/patch-nss__prototypes.h	2010-01-09 16:45:55.000000000 -0600
+++ /root/portwork/nslcd/net/nss_ldapd/files/patch-nss__prototypes.h	2010-04-29 07:33:10.000000000 -0500
@@ -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' */
  };
--- nss_ldapd-0.7.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: