OpenLDAP updated to version 2.4.9.

Please review, test and commit. Thanks!

Dongsheng Song
Index: Makefile
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile    15 Feb 2008 12:34:20 -0000      1.83
+++ Makefile    13 May 2008 03:13:47 -0000
@@ -1,18 +1,19 @@
-# $OpenBSD: Makefile,v 1.82 2008/02/13 09:45:54 landry Exp $
+# $OpenBSD: Makefile,v 1.83 2008/02/15 12:34:20 sthen Exp $
 
 COMMENT-main=  Open source LDAP software (client)
 COMMENT-server=        Open source LDAP software (server)
 
-DISTNAME=              openldap-2.3.39
+DISTNAME=              openldap-2.4.9
 FULLPKGNAME-main=      ${DISTNAME:S/-/-client-/}
-PKGNAME-server=                ${DISTNAME:S/-/-server-/}p0
+PKGNAME-server=                ${DISTNAME:S/-/-server-/}
+
+SHARED_LIBS += lber                 2.4.0
+SHARED_LIBS += ldap                 2.4.0
+SHARED_LIBS += ldap_r               2.4.0
+SHARED_LIBS += lber-2.4             2.4.0
+SHARED_LIBS += ldap-2.4             2.4.0
+SHARED_LIBS += ldap_r-2.4           2.4.0
 
-SHARED_LIBS += lber                 9.1      # .2.15
-SHARED_LIBS += ldap                 9.1      # .2.15
-SHARED_LIBS += ldap_r               9.1      # .2.15
-SHARED_LIBS += lber-2.3             9.1      # .2.15
-SHARED_LIBS += ldap-2.3             9.1      # .2.15
-SHARED_LIBS += ldap_r-2.3           9.1      # .2.15
 CATEGORIES=    databases net
 
 HOMEPAGE=      http://www.openldap.org/
@@ -21,7 +22,7 @@ MAINTAINER=     Marc Balmer <[EMAIL PROTECTED]
 
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
-PERMIT_DISTFILES_CDROM=        Yes 
+PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=               c crypto ssl asn1 com_err gssapi krb5
 
@@ -37,55 +38,49 @@ EXTRACT_SUFX=               .tgz
 SEPARATE_BUILD=                concurrent
 CONFIGURE_STYLE=       gnu
 
-CONFIGURE_ARGS+=       ${CONFIGURE_SHARED} \
+# SLAPD Options and Optional Features
+CONFIGURE_ARGS+= \
                        --localstatedir="/var" \
-                       --enable-ipv6
-
-# slapd options
-CONFIGURE_ARGS+=       --enable-slapd \
+                       --enable-slapd \
+                       --enable-wrappers \
+                       --enable-ipv6 \
                        --enable-cleartext \
                        --enable-crypt \
                        --enable-rewrite \
-                       --enable-wrappers \
-                       --with-cyrus-sasl \
                        --enable-spasswd
 
-# slapd modules
-CONFIGURE_ARGS+=       --enable-dnssrv \
+# Backend Options
+CONFIGURE_ARGS+= \
+                       --enable-bdb \
+                       --enable-dnssrv \
+                       --enable-hdb \
                        --enable-ldap \
-                       --enable-ldbm \
                        --enable-meta \
                        --enable-monitor \
                        --enable-null \
                        --enable-passwd \
                        --enable-perl \
+                       --enable-relay \
                        --enable-shell
 
-# slurpd modules
-CONFIGURE_ARGS+=        --enable-slurpd
+# Optional Packages
+CONFIGURE_ARGS+= \
+                       --with-cyrus-sasl \
+                       --with-tls
 
 MODGNU_CONFIG_GUESS_DIRS=      ${WRKSRC} ${WRKSRC}/build
 
 REGRESS_TARGET=        test
 
-FLAVORS=       bdb
-FLAVOR?=
-
 MULTI_PACKAGES=        -main -server
 
 LIB_DEPENDS+=          sasl2::security/cyrus-sasl2
 CPPFLAGS+=             -I${LOCALBASE}/include/sasl
 
-.if ${FLAVOR:L:Mbdb}
-BROKEN=                        OpenLDAP 2.3 is incompatible with Berkeley DB 
4.6
-CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
 LIB_DEPENDS+=          lib/db4/db.>=4:db-4.*:databases/db/v4
 CPPFLAGS+=             -I${LOCALBASE}/include/db4
 LDFLAGS+=              -L${LOCALBASE}/lib/db4
 LIBS+=                 -ldb
-.else
-CONFIGURE_ARGS+=       --disable-bdb --disable-hdb
-.endif
 
 CONFIGURE_ENV+=                CPPFLAGS="${CPPFLAGS}" \
                        LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
@@ -99,14 +94,6 @@ USE_LIBTOOL= Yes
 pre-build:
        @cd ${WRKBUILD}; ${MAKE_PROGRAM} depend
 
-pre-configure:
-       perl -pi -e 's,KRB5_LIBS=,KRB5_LIBS="-lgssapi -lkrb5 -lasn1 \
-               -lcom_err",g' ${WRKSRC}/configure
-.if ${FLAVOR} != "bdb"
-       perl -pi -e 's,database bdb,database    ldbm,' \
-               ${WRKSRC}/servers/slapd/slapd.conf
-.endif
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openldap
        ${INSTALL_DATA} ${DESTDIR}${SYSCONFDIR}/openldap/*.conf \
@@ -117,6 +104,6 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/servers/slapd/DB_CONFIG \
                ${PREFIX}/share/examples/openldap
        @rm -r ${DESTDIR}${SYSCONFDIR}/openldap
-       @rm -r ${DESTDIR}/var/openldap-data ${DESTDIR}/var/openldap-slurp
+       @rm -r ${DESTDIR}/var/openldap-data
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo    9 Jan 2008 11:06:08 -0000       1.29
+++ distinfo    13 May 2008 02:43:22 -0000
@@ -1,5 +1,5 @@
-MD5 (openldap-2.3.39.tgz) = 4/7ClTyUj2mQzNw6979/GA==
-RMD160 (openldap-2.3.39.tgz) = zW9lLcaHhsp9K58bLTieIuwX46A=
-SHA1 (openldap-2.3.39.tgz) = 6H5gsSafUddT2I35tRdFpmcwpdQ=
-SHA256 (openldap-2.3.39.tgz) = D8VDG5ylpcOeJ2B2aBEtjpUzqmhGMIclFoLB0ftgtVs=
-SIZE (openldap-2.3.39.tgz) = 3807707
+MD5 (openldap-2.4.9.tgz) = HQyJE7RnGy4uZu1Ua06bvw==
+RMD160 (openldap-2.4.9.tgz) = vW+aTPDTbH3vTuAC8qK0Raih5xE=
+SHA1 (openldap-2.4.9.tgz) = fGPYVS/Zfi4uIDEO+MdeAgKmJO4=
+SHA256 (openldap-2.4.9.tgz) = gYkCIhWdlGuljIO6lOLS03x5kqYxNRBid7rw6xOgU7k=
+SIZE (openldap-2.4.9.tgz) = 4440456
Index: patches/patch-Makefile_in
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   7 Nov 2005 15:59:08 -0000       1.2
+++ patches/patch-Makefile_in   1 Apr 2008 16:49:41 -0000
@@ -1,13 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2003/12/26 10:44:10 jakob Exp $
---- Makefile.in.orig   Mon Aug 29 21:04:23 2005
-+++ Makefile.in        Tue Oct 18 14:29:09 2005
-@@ -36,3 +36,9 @@ distclean: veryclean FORCE
+$OpenBSD$
+--- Makefile.in.orig   Wed Mar 12 13:35:25 2008
++++ Makefile.in        Wed Mar 12 13:36:33 2008
+@@ -36,3 +36,6 @@ distclean: veryclean FORCE
  check: test
  test: FORCE
        cd tests; make test
-+
-+test-ldbm: FORCE
-+      cd tests; make ldbm
 +
 +test-bdb: FORCE
 +      cd tests; make bdb
Index: patches/patch-build_top_mk
===================================================================
RCS file: patches/patch-build_top_mk
diff -N patches/patch-build_top_mk
--- patches/patch-build_top_mk  14 Jan 2008 21:01:11 -0000      1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-build_top_mk,v 1.4 2006/06/19 08:22:35 bernd Exp $
---- build/top.mk.orig  Wed Jan  3 00:42:47 2007
-+++ build/top.mk       Mon Jan 14 11:55:23 2008
-@@ -121,7 +121,7 @@ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
-       $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
- 
- LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
--LTFINISH = $(LIBTOOL) --mode=finish
-+LTFINISH = true 
- 
- # Misc UNIX commands used in build environment
- AR = @AR@
Index: patches/patch-configure
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure     14 Jan 2008 21:01:11 -0000      1.4
+++ patches/patch-configure     1 Apr 2008 16:49:43 -0000
@@ -1,26 +1,16 @@
-$OpenBSD: patch-configure,v 1.3 2006/06/19 08:22:35 bernd Exp $
---- configure.orig     Mon Oct  8 18:38:57 2007
-+++ configure  Mon Jan 14 11:56:10 2008
-@@ -9502,7 +9502,6 @@ openbsd*)
-     *)                         need_version=no  ;;
-   esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     case $host_os in
-@@ -35855,8 +35854,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- #     define DB_VERSION_MINOR 0
- #endif
+$OpenBSD$
+--- configure.orig     Wed Mar 12 12:04:38 2008
++++ configure  Wed Mar 12 12:06:29 2008
+@@ -3814,7 +3814,7 @@ SLAPD_SQL_LIBS=
+ SLAPD_SQL_INCLUDES=
  
--/* require 4.2-4.5 */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 
6)
-+/* require 4.2-4.6 */
-+#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 
7)
-       __db_version_compat
- #endif
- 
-@@ -37236,6 +37235,7 @@ cat confdefs.h >>conftest.$ac_ext
+ KRB4_LIBS=
+-KRB5_LIBS=
++KRB5_LIBS="-lgssapi -lkrb5 -lasn1 -lcom_err"
+ SASL_LIBS=
+ TLS_LIBS=
+ MODULES_LIBS=
+@@ -31514,6 +31514,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
Index: patches/patch-servers_slapd_slapd_conf
===================================================================
RCS file: 
/var/cvs/OpenBSD/ports/databases/openldap/patches/patch-servers_slapd_slapd_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-servers_slapd_slapd_conf
--- patches/patch-servers_slapd_slapd_conf      13 Feb 2008 09:45:54 -0000      
1.1
+++ patches/patch-servers_slapd_slapd_conf      1 Apr 2008 16:49:45 -0000
@@ -1,6 +1,6 @@
 $OpenBSD$
---- servers/slapd/slapd.conf.orig      Tue Feb 12 09:23:24 2008
-+++ servers/slapd/slapd.conf   Tue Feb 12 09:24:11 2008
+--- servers/slapd/slapd.conf.orig      Wed Mar 12 13:38:51 2008
++++ servers/slapd/slapd.conf   Wed Mar 12 13:39:34 2008
 @@ -10,8 +10,8 @@ include              %SYSCONFDIR%/schema/core.schema
  # service AND an understanding of referrals.
  #referral     ldap://root.openldap.org
Index: pkg/DESCR-main
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-main
--- pkg/DESCR-main      25 Nov 2006 16:50:24 -0000      1.1
+++ pkg/DESCR-main      1 Apr 2008 16:49:47 -0000
@@ -9,3 +9,10 @@ is distributed under a Perl-style "Artis
 
 This is the client portion of OpenLDAP, it provides the client binaries,
 libraries and headers.
+
+This package includes the following major components:
+
+ * -lldap - a LDAP client library
+ * -llber - a lightweight BER/DER encoding/decoding library
+ * LDAP tools - A collection of command line LDAP utilities
+ * documentation - man pages for all components
Index: pkg/DESCR-server
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/DESCR-server,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR-server
--- pkg/DESCR-server    7 Nov 2005 15:59:08 -0000       1.3
+++ pkg/DESCR-server    1 Apr 2008 16:49:49 -0000
@@ -10,5 +10,9 @@ is distributed under a Perl-style "Artis
 This is the server portion of OpenLDAP, it provides the server as well as
 various administrative binaries.
 
-Flavors:
-       bdb     enable the bdb and hdb backends
+This package includes the following major components:
+
+ * slapd - a stand-alone LDAP directory server
+ * LDIF tools - data conversion tools for use with slapd
+
+This is the latest stable release of OpenLDAP Software for general use.
Index: pkg/MESSAGE-server
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/MESSAGE-server,v
retrieving revision 1.1
diff -u -p -r1.1 MESSAGE-server
--- pkg/MESSAGE-server  13 Feb 2008 09:45:54 -0000      1.1
+++ pkg/MESSAGE-server  1 Apr 2008 16:49:51 -0000
@@ -1,5 +1,5 @@
-To start slapd, configure it in ${SYSCONFDIR}/openldap/slapd.conf then add
-the following line to /etc/rc.conf.local:
+To start slapd, configure it in ${SYSCONFDIR}/openldap/slapd.conf then
+add the following line to /etc/rc.conf.local:
 
 slapd_flags="-u _openldap"
 
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/PFRAG.shared-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.shared-main
--- pkg/PFRAG.shared-main       25 Nov 2006 16:50:24 -0000      1.1
+++ pkg/PFRAG.shared-main       13 May 2008 03:13:47 -0000
@@ -1,7 +1,7 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.30 2005/12/29 14:00:36 bernd Exp $
[EMAIL PROTECTED] lib/liblber-2.3.so.${LIBlber-2.3_VERSION}
[EMAIL PROTECTED] $OpenBSD$
 @lib lib/liblber.so.${LIBlber_VERSION}
[EMAIL PROTECTED] lib/libldap-2.3.so.${LIBldap-2.3_VERSION}
 @lib lib/libldap.so.${LIBldap_VERSION}
[EMAIL PROTECTED] lib/libldap_r-2.3.so.${LIBldap_r-2.3_VERSION}
 @lib lib/libldap_r.so.${LIBldap_r_VERSION}
[EMAIL PROTECTED] lib/liblber-2.4.so.${LIBlber-2.4_VERSION}
[EMAIL PROTECTED] lib/libldap-2.4.so.${LIBldap-2.4_VERSION}
[EMAIL PROTECTED] lib/libldap_r-2.4.so.${LIBldap_r-2.4_VERSION}
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main      13 Jan 2007 13:37:33 -0000      1.2
+++ pkg/PLIST-main      1 Apr 2008 16:49:55 -0000
@@ -1,8 +1,9 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.1 2006/11/25 16:50:24 espie Exp $
[EMAIL PROTECTED] $OpenBSD$
 @pkgpath ${BASE_PKGPATH}
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
+bin/ldapexop
 bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
@@ -68,6 +69,7 @@ lib/libldap_r.la
 @man man/man3/lber-decode.3
 @man man/man3/lber-encode.3
 @man man/man3/lber-memory.3
[EMAIL PROTECTED] man/man3/lber-sockbuf.3
 @man man/man3/lber-types.3
 @man man/man3/ld_errno.3
 @man man/man3/ldap.3
@@ -86,6 +88,13 @@ lib/libldap_r.la
 @man man/man3/ldap_compare_ext.3
 @man man/man3/ldap_compare_ext_s.3
 @man man/man3/ldap_compare_s.3
[EMAIL PROTECTED] man/man3/ldap_control_create.3
[EMAIL PROTECTED] man/man3/ldap_control_dup.3
[EMAIL PROTECTED] man/man3/ldap_control_find.3
[EMAIL PROTECTED] man/man3/ldap_control_free.3
[EMAIL PROTECTED] man/man3/ldap_controls.3
[EMAIL PROTECTED] man/man3/ldap_controls_dup.3
[EMAIL PROTECTED] man/man3/ldap_controls_free.3
 @man man/man3/ldap_count_entries.3
 @man man/man3/ldap_count_messages.3
 @man man/man3/ldap_count_references.3
@@ -105,19 +114,30 @@ lib/libldap_r.la
 @man man/man3/ldap_error.3
 @man man/man3/ldap_explode_dn.3
 @man man/man3/ldap_explode_rdn.3
[EMAIL PROTECTED] man/man3/ldap_extended_operation.3
[EMAIL PROTECTED] man/man3/ldap_extended_operation_s.3
 @man man/man3/ldap_first_attribute.3
 @man man/man3/ldap_first_entry.3
 @man man/man3/ldap_first_message.3
 @man man/man3/ldap_first_reference.3
 @man man/man3/ldap_free_urldesc.3
 @man man/man3/ldap_get_dn.3
[EMAIL PROTECTED] man/man3/ldap_get_option.3
 @man man/man3/ldap_get_values.3
 @man man/man3/ldap_get_values_len.3
 @man man/man3/ldap_init.3
[EMAIL PROTECTED] man/man3/ldap_initialize.3
[EMAIL PROTECTED] man/man3/ldap_install_tls.3
 @man man/man3/ldap_is_ldap_url.3
 @man man/man3/ldap_matchingrule2name.3
 @man man/man3/ldap_matchingrule2str.3
 @man man/man3/ldap_matchingrule_free.3
[EMAIL PROTECTED] man/man3/ldap_memalloc.3
[EMAIL PROTECTED] man/man3/ldap_memcalloc.3
[EMAIL PROTECTED] man/man3/ldap_memfree.3
[EMAIL PROTECTED] man/man3/ldap_memory.3
[EMAIL PROTECTED] man/man3/ldap_memrealloc.3
[EMAIL PROTECTED] man/man3/ldap_memvfree.3
 @man man/man3/ldap_modify.3
 @man man/man3/ldap_modify_ext.3
 @man man/man3/ldap_modify_ext_s.3
@@ -142,7 +162,11 @@ lib/libldap_r.la
 @man man/man3/ldap_parse_reference.3
 @man man/man3/ldap_parse_result.3
 @man man/man3/ldap_parse_sasl_bind_result.3
[EMAIL PROTECTED] man/man3/ldap_parse_sort_control.3
[EMAIL PROTECTED] man/man3/ldap_parse_vlv_control.3
 @man man/man3/ldap_perror.3
[EMAIL PROTECTED] man/man3/ldap_rename.3
[EMAIL PROTECTED] man/man3/ldap_rename_s.3
 @man man/man3/ldap_result.3
 @man man/man3/ldap_result2error.3
 @man man/man3/ldap_sasl_bind.3
@@ -154,20 +178,28 @@ lib/libldap_r.la
 @man man/man3/ldap_search_ext_s.3
 @man man/man3/ldap_search_s.3
 @man man/man3/ldap_search_st.3
[EMAIL PROTECTED] man/man3/ldap_set_option.3
[EMAIL PROTECTED] man/man3/ldap_set_rebind_proc.3
 @man man/man3/ldap_simple_bind.3
 @man man/man3/ldap_simple_bind_s.3
 @man man/man3/ldap_sort.3
 @man man/man3/ldap_sort_entries.3
 @man man/man3/ldap_sort_strcasecmp.3
 @man man/man3/ldap_sort_values.3
[EMAIL PROTECTED] man/man3/ldap_start_tls.3
[EMAIL PROTECTED] man/man3/ldap_start_tls_s.3
 @man man/man3/ldap_str2attributetype.3
 @man man/man3/ldap_str2dn.3
 @man man/man3/ldap_str2matchingrule.3
 @man man/man3/ldap_str2objectclass.3
 @man man/man3/ldap_str2syntax.3
[EMAIL PROTECTED] man/man3/ldap_strdup.3
[EMAIL PROTECTED] man/man3/ldap_sync.3
 @man man/man3/ldap_syntax2name.3
 @man man/man3/ldap_syntax2str.3
 @man man/man3/ldap_syntax_free.3
[EMAIL PROTECTED] man/man3/ldap_tls.3
[EMAIL PROTECTED] man/man3/ldap_tls_inplace.3
 @man man/man3/ldap_unbind.3
 @man man/man3/ldap_unbind_ext.3
 @man man/man3/ldap_unbind_ext_s.3
@@ -178,22 +210,11 @@ lib/libldap_r.la
 @man man/man3/ldap_value_free_len.3
 @man man/man5/ldap.conf.5
 @man man/man5/ldif.5
[EMAIL PROTECTED] man/man5/slapo-accesslog.5
[EMAIL PROTECTED] man/man5/slapo-auditlog.5
[EMAIL PROTECTED] man/man5/slapo-chain.5
[EMAIL PROTECTED] man/man5/slapo-dynlist.5
[EMAIL PROTECTED] man/man5/slapo-lastmod.5
[EMAIL PROTECTED] man/man5/slapo-pcache.5
[EMAIL PROTECTED] man/man5/slapo-ppolicy.5
[EMAIL PROTECTED] man/man5/slapo-refint.5
[EMAIL PROTECTED] man/man5/slapo-retcode.5
[EMAIL PROTECTED] man/man5/slapo-rwm.5
[EMAIL PROTECTED] man/man5/slapo-syncprov.5
[EMAIL PROTECTED] man/man5/slapo-translucent.5
[EMAIL PROTECTED] man/man5/slapo-unique.5
[EMAIL PROTECTED] man/man5/slapo-valsort.5
 share/examples/openldap/
 @sample ${SYSCONFDIR}/openldap/
 share/examples/openldap/ldap.conf
 @sample ${SYSCONFDIR}/openldap/ldap.conf
 %%SHARED%%
+share/examples/openldap/schema/collective.schema
+share/examples/openldap/schema/duaconf.schema
+share/examples/openldap/schema/nadf.schema
Index: pkg/PLIST-server
===================================================================
RCS file: /var/cvs/OpenBSD/ports/databases/openldap/pkg/PLIST-server,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-server
--- pkg/PLIST-server    13 Feb 2008 09:45:54 -0000      1.16
+++ pkg/PLIST-server    1 Apr 2008 16:49:57 -0000
@@ -1,10 +1,9 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-server,v 1.15 2007/01/23 12:57:32 mbalmer Exp 
$
[EMAIL PROTECTED] openldap-client->=2.3.11,<=2.3.11p3
[EMAIL PROTECTED] $OpenBSD$
 @newgroup _openldap:544
 @newuser _openldap:544:_openldap:daemon:OpenLDAP 
Account:/nonexistent:/sbin/nologin
 libexec/slapd
-libexec/slurpd
 @man man/man5/slapd-bdb.5
[EMAIL PROTECTED] man/man5/slapd-config.5
 @man man/man5/slapd-dnssrv.5
 @man man/man5/slapd-hdb.5
 @man man/man5/slapd-ldap.5
@@ -17,12 +16,30 @@ libexec/slurpd
 @man man/man5/slapd-perl.5
 @man man/man5/slapd-relay.5
 @man man/man5/slapd-shell.5
[EMAIL PROTECTED] man/man5/slapd-sock.5
 @man man/man5/slapd-sql.5
[EMAIL PROTECTED] man/man5/slapd-tcl.5
 @man man/man5/slapd.access.5
[EMAIL PROTECTED] man/man5/slapd.backends.5
 @man man/man5/slapd.conf.5
[EMAIL PROTECTED] man/man5/slapd.overlays.5
 @man man/man5/slapd.plugin.5
[EMAIL PROTECTED] man/man5/slapd.replog.5
[EMAIL PROTECTED] man/man5/slapo-accesslog.5
[EMAIL PROTECTED] man/man5/slapo-auditlog.5
[EMAIL PROTECTED] man/man5/slapo-chain.5
[EMAIL PROTECTED] man/man5/slapo-constraint.5
[EMAIL PROTECTED] man/man5/slapo-dds.5
[EMAIL PROTECTED] man/man5/slapo-dyngroup.5
[EMAIL PROTECTED] man/man5/slapo-dynlist.5
[EMAIL PROTECTED] man/man5/slapo-memberof.5
[EMAIL PROTECTED] man/man5/slapo-pcache.5
[EMAIL PROTECTED] man/man5/slapo-ppolicy.5
[EMAIL PROTECTED] man/man5/slapo-refint.5
[EMAIL PROTECTED] man/man5/slapo-retcode.5
[EMAIL PROTECTED] man/man5/slapo-rwm.5
[EMAIL PROTECTED] man/man5/slapo-syncprov.5
[EMAIL PROTECTED] man/man5/slapo-translucent.5
[EMAIL PROTECTED] man/man5/slapo-unique.5
[EMAIL PROTECTED] man/man5/slapo-valsort.5
 @man man/man8/slapacl.8
 @man man/man8/slapadd.8
 @man man/man8/slapauth.8
@@ -32,7 +49,6 @@ libexec/slurpd
 @man man/man8/slapindex.8
 @man man/man8/slappasswd.8
 @man man/man8/slaptest.8
[EMAIL PROTECTED] man/man8/slurpd.8
 sbin/slapacl
 sbin/slapadd
 sbin/slapauth
@@ -41,6 +57,14 @@ sbin/slapdn
 sbin/slapindex
 sbin/slappasswd
 sbin/slaptest
[EMAIL PROTECTED] 700
[EMAIL PROTECTED] _openldap
[EMAIL PROTECTED] _openldap
+share/examples/openldap/DB_CONFIG
[EMAIL PROTECTED] /var/openldap-data/DB_CONFIG
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
 share/examples/openldap/schema/
 @sample ${SYSCONFDIR}/openldap/schema/
 share/examples/openldap/schema/corba.schema
@@ -69,6 +93,3 @@ share/examples/openldap/slapd.conf
 @owner _openldap
 @group _openldap
 @sample /var/openldap-data/
[EMAIL PROTECTED] /var/openldap-slurp/
-share/examples/openldap/DB_CONFIG
[EMAIL PROTECTED] /var/openldap-data/DB_CONFIG

Attachment: signature.asc
Description: Digital Signature

Reply via email to