update to 2.2.15

- new switch WITH_DYNAMIC_BACKENDS
- WITH_ODBC has to be specified, even when WITH_ODBC_TYPE is set
- 5.x users: when you need to start the daemon early, build with
  WITH_RCORDER=yes to put the start script into /etc/rc.d

4 files changed, 52 insertions, 86 deletions

diff --git a/net/openldap24-server/files/patch-build::ltmain.sh b/net/openldap24-server/files/patch-build::ltmain.sh
deleted file mode 100644
index 515dd96d8756..000000000000
--- a/net/openldap24-server/files/patch-build::ltmain.sh
+++ /dev/null
@@ -1,46 +0,0 @@
---- build/ltmain.sh.orig	Thu Jan  1 19:16:25 2004
-+++ build/ltmain.sh	Sun Mar 28 14:58:06 2004
-@@ -1076,7 +1076,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1088,6 +1088,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -4296,10 +4302,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure
index cf5cf042eb50..38e7c135ab71 100644
--- a/net/openldap24-server/files/patch-configure
+++ b/net/openldap24-server/files/patch-configure
@@ -1,20 +1,29 @@
---- configure.orig	Wed May  5 11:55:48 2004
-+++ configure	Wed May  5 11:56:33 2004
-@@ -20220,7 +20220,7 @@
+--- configure.orig	Tue Jul 27 18:33:12 2004
++++ configure	Sat Aug 14 17:05:23 2004
+@@ -19497,7 +19497,7 @@
+ 
+ 
+ 	if test $ol_cv_bdb_compat = yes ; then
+-		ol_enable_bdb=yes
++		ol_enable_bdb=${ol_enable_bdb-yes}
+ 	elif test $ol_enable_bdb = yes ; then
+ 		{ echo "configure: error: BDB: BerkeleyDB version incompatible" 1>&2; exit 1; }
+ 	else
+@@ -20349,7 +20349,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liodbc  $LIBS"
 +LIBS="-liodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 20226 "configure"
+ #line 20355 "configure"
  #include "confdefs.h"
-@@ -20264,7 +20264,7 @@
+@@ -20393,7 +20393,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lodbc  $LIBS"
 +LIBS="-lodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 20270 "configure"
+ #line 20399 "configure"
  #include "confdefs.h"
diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh
index fb77d4374fd0..6c6066220aec 100644
--- a/net/openldap24-server/files/slapd.sh
+++ b/net/openldap24-server/files/slapd.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: slapd
 # REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
+# BEFORE: securelevel
 # KEYWORD: FreeBSD shutdown
 
 #
@@ -24,15 +24,15 @@
 #slapd_owner="DEFAULT"
 #
 
-. %%RC_SUBR%%
+. "%%RC_SUBR%%"
 
-name=slapd
+name="slapd"
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/libexec/slapd
-pidfile=%%LDAP_RUN_DIR%%/slapd.pid
-required_dirs=%%LDAP_RUN_DIR%%
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
+command="%%PREFIX%%/libexec/slapd"
+pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
+required_dirs="%%LDAP_RUN_DIR%%"
+required_files="%%PREFIX%%/etc/openldap/slapd.conf"
 
 start_precmd=start_precmd
 start_postcmd=start_postcmd
@@ -41,10 +41,12 @@ start_postcmd=start_postcmd
 
 start_precmd()
 {
+  local slapd_ownername slapd_groupname
+
   case x"$slapd_owner" in
-  x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
+  ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
     ;;
-  x*)
+  *)
     chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
     chown -RL "$slapd_owner" "%%DATABASEDIR%%"
     chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
@@ -66,38 +68,39 @@ start_precmd()
 
 start_postcmd()
 {
+  local socket seconds
+
   for socket in $slapd_sockets; do
     for seconds in 1 2 3 4 5; do
       [ -e "$socket" ] && break
       sleep 1
     done
     if [ -S "$socket" ]; then
-      case x"$slapd_owner" in
-      x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
+      case "$slapd_owner" in
+      ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
         ;;
-      x*)
+      *)
         chown "$slapd_owner" "$socket"
         ;;
       esac
       chmod "$slapd_sockets_mode" "$socket"
+    else
+      warn "slapd: Can't find socket $socket"
     fi
   done
 }
 
-# set defaults
-
-[ -z "$slapd_enable" ]       && slapd_enable=NO
-[ -z "$slapd_flags" ]        && slapd_flags=
-
-[ -z "$slapd_owner" ]        && slapd_owner=ldap:ldap
-[ -z "$slapd_sockets" ]      && slapd_sockets=
-[ -z "$slapd_sockets_mode" ] && slapd_sockets_mode=666
-
+# read settings, set defaults
 load_rc_config $name
-
-if [ -n "$slapd_args" ]; then
+: ${slapd_enable="NO"}
+if [ -n "${slapd_args+set}" ]; then
   warn "slapd_args is deprecated, use slapd_flags"
-  slapd_flags="$slapd_args"
+  : ${slapd_flags="$slapd_args"}
+else
+  : ${slapd_flags=""}
 fi
+: ${slapd_owner="ldap:ldap"}
+: ${slapd_sockets=""}
+: ${slapd_sockets_mode="666"}
 
 run_rc_command "$1"
diff --git a/net/openldap24-server/files/slurpd.sh b/net/openldap24-server/files/slurpd.sh
index 558f58c1f592..79021305b400 100644
--- a/net/openldap24-server/files/slurpd.sh
+++ b/net/openldap24-server/files/slurpd.sh
@@ -15,22 +15,22 @@
 # See slurpd(8) for more flags
 #
 
-. %%RC_SUBR%%
+. "%%RC_SUBR%%"
 
-name=slurpd
+name="slurpd"
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/libexec/slurpd
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-[ -z "$slurpd_enable" ] && slurpd_enable="NO"
-[ -z "$slurpd_flags" ]  && slurpd_flags=
+command="%%PREFIX%%/libexec/slurpd"
+required_files="%%PREFIX%%/etc/openldap/slapd.conf"
 
+# read settings, set defaults
 load_rc_config $name
-
-if [ -n "$slurpd_args" ]; then
+: ${slurpd_enable="NO"}
+if [ -n "${slurpd_args+set}" ]; then
   warn "slurpd_args is deprecated, use slurpd_flags"
-  slurpd_flags="$slurpd_args"
+  : ${slurpd_flags="$slurpd_args"}
+else
+  : ${slurpd_flags=""}
 fi
 
 run_rc_command "$1"