ports/129813: [PATCH] net/openldap-server: RC script assumes too much

[Ulrich Spoerlein]

>Number:         129813
>Category:       ports
>Synopsis:       [PATCH] net/openldap-server: RC script assumes too much
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 21 11:00:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD roadrunner.spoerlein.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Nov  8 20:43:48 CET
>Description:
With OpenLDAP 2.4 the slapd.conf configuration can be replaced by storing the
configuration inside the LDAP database itself. Bootstrap parameters are stored
under the directory slapd.d/. Thus, slapd.conf is no longer a strict
requirement and the start script should reflect this.

This removes some of the hand-holding the script does.

Port maintainer (delphij at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- openldap-server-2.4.11_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /tank/ncvs/ports/net/openldap24-server/Makefile,v
retrieving revision 1.161
diff -u -p -u -r1.161 Makefile
--- Makefile	30 Sep 2008 15:38:52 -0000	1.161
+++ Makefile	21 Dec 2008 10:48:44 -0000
@@ -39,7 +39,7 @@ BROKEN=			incompatible OpenLDAP version:
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	2
+PORTREVISION_SERVER=	3
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
Index: files/slapd.sh.in
===================================================================
RCS file: /tank/ncvs/ports/net/openldap24-server/files/slapd.sh.in,v
retrieving revision 1.8
diff -u -p -u -r1.8 slapd.sh.in
--- files/slapd.sh.in	30 Sep 2008 15:38:53 -0000	1.8
+++ files/slapd.sh.in	21 Dec 2008 10:48:44 -0000
@@ -32,15 +32,10 @@ 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"
 
 start_precmd=start_precmd
 start_postcmd=start_postcmd
 
-# extract user and group, adjust ownership of directories and database
-
-DATABASEDIR=`awk '$1 == "directory" {print $2}' "%%PREFIX%%/etc/openldap/slapd.conf"`
-
 start_precmd()
 {
   local slapd_ownername slapd_groupname
@@ -49,17 +44,7 @@ start_precmd()
   ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
     ;;
   *)
-    local DBDIR
-    for DBDIR in ${DATABASEDIR}; do
-       if [ ! -d "${DBDIR}" ]; then
-          mkdir -p "${DBDIR}"
-          cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
-       fi
-       chown -RL "$slapd_owner" "${DBDIR}"
-       chmod 700 "${DBDIR}"
-    done
     chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
-    chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
 
     slapd_ownername="${slapd_owner%:*}"
     slapd_groupname="${slapd_owner#*:}"
--- openldap-server-2.4.11_3.patch ends here ---

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