5 files changed, 12 insertions, 107 deletions

diff --git a/net/nss-pam-ldapd/files/patch-Makefile.in b/net/nss-pam-ldapd/files/patch-Makefile.in
deleted file mode 100644
index dfe7831c293f..000000000000
--- a/net/nss-pam-ldapd/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	2012-03-02 12:50:47.000000000 -0900
-+++ Makefile.in	2012-03-02 13:01:13.000000000 -0900
-@@ -774,6 +774,7 @@
- 
- # install a default configuration file if it is not already there
- install-nslcd_conf:
-+	$(INSTALL_DATA) $(srcdir)/nslcd.conf $(DESTDIR)/$(NSLCD_CONF_PATH).sample
- 	@if [ -f $(DESTDIR)$(NSLCD_CONF_PATH) ]; then \
- 	  echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \
- 	else \
-@@ -781,7 +782,7 @@
- 	  $(INSTALL_DATA) $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH); \
- 	fi
- uninstall-nslcd_conf:
--	-rm -f $(DESTDIR)$(NSLCD_CONF_PATH)
-+	-rm -f $(DESTDIR)$(NSLCD_CONF_PATH).sample
- 
- # fix permissions before distributing
- dist-hook:
diff --git a/net/nss-pam-ldapd/files/patch-nss__shadow.c b/net/nss-pam-ldapd/files/patch-nss__shadow.c
deleted file mode 100644
index 7ffbc189957d..000000000000
--- a/net/nss-pam-ldapd/files/patch-nss__shadow.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- nss/shadow.c.orig	2009-05-29 21:23:03.000000000 +0000
-+++ nss/shadow.c	2009-08-02 22:32:27.000000000 +0000
-@@ -22,6 +22,7 @@
- 
- #include "config.h"
- 
-+#ifdef HAVE_SHADOW_H
- #include <string.h>
- #include <nss.h>
- #include <errno.h>
-@@ -73,3 +74,6 @@
- {
-   NSS_ENDENT(spentfp);
- }
-+
-+#endif
-+
diff --git a/net/nss-pam-ldapd/files/patch-r1626 b/net/nss-pam-ldapd/files/patch-r1626
deleted file mode 100644
index 5fb07bf9ae40..000000000000
--- a/net/nss-pam-ldapd/files/patch-r1626
+++ /dev/null
@@ -1,50 +0,0 @@
-Modified: compat/ldap_compat.h
-==============================================================================
---- compat/ldap_compat.h	Wed Feb 29 22:44:31 2012	(r1625)
-+++ compat/ldap_compat.h	Mon Mar  5 22:53:54 2012	(r1626)
-@@ -62,4 +62,12 @@
- #define LDAP_SASL_QUIET 2U
- #endif /* not LDAP_SASL_QUIET */
- 
-+/* on some systems LDAP_OPT_DIAGNOSTIC_MESSAGE isn't there but
-+   LDAP_OPT_ERROR_STRING is */
-+#ifndef LDAP_OPT_DIAGNOSTIC_MESSAGE
-+#ifdef LDAP_OPT_ERROR_STRING
-+#define LDAP_OPT_DIAGNOSTIC_MESSAGE LDAP_OPT_ERROR_STRING
-+#endif /* LDAP_OPT_ERROR_STRING */
-+#endif /* not LDAP_OPT_DIAGNOSTIC_MESSAGE */
-+
- #endif /* COMPAT__LDAP_COMPAT_H */
-
-Modified: nslcd/myldap.c
-==============================================================================
---- nslcd/myldap.c	Wed Feb 29 22:44:31 2012	(r1625)
-+++ nslcd/myldap.c	Mon Mar  5 22:53:54 2012	(r1626)
-@@ -378,6 +378,7 @@
- static int do_bind(LDAP *ld,const char *binddn,const char *bindpw,const char *uri)
- {
-   int rc;
-+  char *msg=NULL;
- #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
- #ifndef HAVE_SASL_INTERACT_T
-   struct berval cred;
-@@ -392,9 +393,16 @@
-     rc=ldap_start_tls_s(ld,NULL,NULL);
-     if (rc!=LDAP_SUCCESS)
-     {
--      log_log(LOG_WARNING,"ldap_start_tls_s() failed: %s%s%s (uri=\"%s\")",
--                          ldap_err2string(rc),(errno==0)?"":": ",
--                          (errno==0)?"":strerror(errno),uri);
-+#ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE
-+      ldap_get_option(ld,LDAP_OPT_DIAGNOSTIC_MESSAGE,&msg);
-+#endif /* LDAP_OPT_DIAGNOSTIC_MESSAGE */
-+      log_log(LOG_WARNING,"ldap_start_tls_s() failed: %s%s%s%s%s (uri=\"%s\")",
-+                          ldap_err2string(rc),
-+                          (msg==NULL)?"":": ",(msg==NULL)?"":msg,
-+                          (errno==0)?"":": ",(errno==0)?"":strerror(errno),
-+                          uri);
-+      if (msg)
-+        ldap_memfree(msg);
-       return rc;
-     }
-   }
diff --git a/net/nss-pam-ldapd/files/patch-r1631 b/net/nss-pam-ldapd/files/patch-r1631
deleted file mode 100644
index c2013feabae9..000000000000
--- a/net/nss-pam-ldapd/files/patch-r1631
+++ /dev/null
@@ -1,21 +0,0 @@
-Modified: nslcd/common.h
-==============================================================================
---- nslcd/common.h	Sat Mar 10 21:31:58 2012	(r1630)
-+++ nslcd/common.h	Sat Mar 10 21:41:37 2012	(r1631)
-@@ -3,7 +3,7 @@
-    This file is part of the nss-pam-ldapd library.
- 
-    Copyright (C) 2006 West Consulting
--   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong
-+   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
- 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -25,6 +25,7 @@
- #define NSLCD__COMMON_H 1
- 
- #include <errno.h>
-+#include <limits.h>
- 
- #include "nslcd.h"
- #include "common/nslcd-prot.h"
diff --git a/net/nss-pam-ldapd/files/pkg-message.in b/net/nss-pam-ldapd/files/pkg-message.in
new file mode 100644
index 000000000000..6b5d5e7ea81e
--- /dev/null
+++ b/net/nss-pam-ldapd/files/pkg-message.in
@@ -0,0 +1,12 @@
+=====================================================================
+
+LDAP and nslcd daemon parameters should be set in %%CONFIG_FILE%%. When upgrading review %%CONFIG_FILE%%.sample for additional or changed parameters.
+
+%%NSS_MESSAGE%%
+
+To start nslcd add nslcd_enable="YES" to /etc/rc.conf and run:
+
+  # service nslcd start
+
+See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables.
+=====================================================================
\ No newline at end of file