This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0

3 files changed, 15 insertions, 5 deletions

diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index f68cb8869011..83d1fd38876e 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -206,6 +206,7 @@ MAN5+=	ldap.conf.5 \
 	slapd-perl.5 \
 	slapd-relay.5 \
 	slapd-shell.5 \
+	slapd-sock.5 \
 	slapd-sql.5 \
 	slapd.access.5 \
 	slapd.backends.5 \
diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure
index 4198340d07c7..a2df6201ed60 100644
--- a/net/openldap24-server/files/patch-configure
+++ b/net/openldap24-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Sep  2 03:27:55 2005
-+++ configure	Sun Sep  4 16:10:14 2005
-@@ -34922,7 +34922,7 @@
+--- configure.orig	2008-02-11 15:36:45.000000000 -0800
++++ configure	2008-02-19 14:03:01.410279419 -0800
+@@ -31928,7 +31928,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34995,7 +34995,7 @@
+@@ -32004,7 +32004,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,3 +18,12 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -32263,7 +32263,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-#include <unicode/utypes.h>
++#include <unicode/utypes.h-disabled>
+ 
+ int
+ main ()
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in
index a9771a54f910..341fcaee28d9 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.sh.in
@@ -43,7 +43,7 @@ start_precmd()
 {
   local slapd_ownername slapd_groupname
 
-  case x"$slapd_owner" in
+  case "$slapd_owner" in
   ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
     ;;
   *)