pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc Update databases/openldap to version 2.2.13, the l...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a0bb10069538
branches: trunk
changeset: 478457:a0bb10069538
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Jul 24 03:32:24 2004 +0000
description:
Update databases/openldap to version 2.2.13, the latest stable release.
Major changes from version 2.1.30 include:
* "LDAP Sync"-based lightweight replication
* Proxy Cache Support
* Hierarchical Backend
* NS-SLAPI Support
* Backend Layering
* Access Control extensions including dynamic group support
* LDAPv3 extensions:
- ACID extensions
- Cancel Operation
- Content Synchronization Operation
- DIT Content Rules
- Duplicate Entry Extension
- Simple Paged Results Extension
- Proxy Authorization Extension
diffstat:
databases/openldap/Makefile | 111 +++++++++++++++--------------------
databases/openldap/Makefile.options | 71 +++++++++++++++++++++++
databases/openldap/PLIST | 74 +++++++++++++++++++++--
databases/openldap/distinfo | 19 ++---
databases/openldap/files/slapd.sh | 5 +-
databases/openldap/files/slurpd.sh | 5 +-
databases/openldap/patches/patch-aa | 13 ----
databases/openldap/patches/patch-ac | 11 +-
databases/openldap/patches/patch-ad | 16 ++--
databases/openldap/patches/patch-af | 8 +-
databases/openldap/patches/patch-ag | 15 +---
databases/openldap/patches/patch-ah | 6 +-
databases/openldap/patches/patch-ai | 6 +-
doc/CHANGES | 3 +-
14 files changed, 225 insertions(+), 138 deletions(-)
diffs (truncated from 640 to 300 lines):
diff -r 5a19836c69f2 -r a0bb10069538 databases/openldap/Makefile
--- a/databases/openldap/Makefile Sat Jul 24 02:53:53 2004 +0000
+++ b/databases/openldap/Makefile Sat Jul 24 03:32:24 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2004/07/23 23:51:21 jlam Exp $
+# $NetBSD: Makefile,v 1.79 2004/07/24 03:32:24 jlam Exp $
-DISTNAME= openldap-2.1.30
+DISTNAME= openldap-2.2.13
SVR4_PKGNAME= oldap
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -14,84 +14,70 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_BUILDLINK3= YES
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_BUILDLINK3= yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
TEST_TARGET= test
-USE_DB185= YES
-
-PKG_SYSCONFSUBDIR= openldap
+OPENLDAP_ETCDIR= ${PKG_SYSCONFDIR}/openldap
+OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap
+OPENLDAP_VARDIR= ${VARBASE}/openldap
+FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
-# Unfortunately, --enable-phonetic cannot be disabled by runtime
-# configuration.
-#
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --localstatedir=/var/openldap
-CONFIGURE_ARGS+= --enable-dynamic # link servers against shared libs
-CONFIGURE_ARGS+= --enable-bdb
-CONFIGURE_ARGS+= --enable-crypt
-CONFIGURE_ARGS+= --enable-dnssrv
-CONFIGURE_ARGS+= --enable-ldap
-CONFIGURE_ARGS+= --enable-ldbm
-CONFIGURE_ARGS+= --enable-passwd
-CONFIGURE_ARGS+= --enable-wrappers
-CONFIGURE_ARGS+= --with-tls=openssl
-CONFIGURE_ARGS+= --without-readline
-
-BUILD_DEFS+= USE_SASL USE_SASL2
+.include "../../mk/bsd.prefs.mk"
+.include "Makefile.options"
CPPFLAGS.Darwin+= -DBIND_8_COMPAT
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR}
+CONFIGURE_ARGS+= --enable-dynamic # link servers against shared libs
+CONFIGURE_ARGS+= --with-tls=openssl
-.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-. include "../../security/cyrus-sasl2/buildlink3.mk"
-CONFIGURE_ARGS+= --with-cyrus-sasl
-CONFIGURE_ARGS+= --enable-spasswd
-.elif defined(USE_SASL) && (${USE_SASL} == "YES")
-. include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-cyrus-sasl
+# SLAPD options
+CONFIGURE_ARGS+= --enable-crypt
+.if !empty(_OPENLDAP_OPTIONS:Msasl)
CONFIGURE_ARGS+= --enable-spasswd
.endif
+CONFIGURE_ARGS+= --enable-wrappers
-.if defined(KERBEROS)
-. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ENV+= ol_with_kerberos=yes
-CONFIGURE_ENV+= ol_enable_kpasswd=yes
-CONFIGURE_ARGS+= --with-kerberos
-CONFIGURE_ARGS+= --enable-kpasswd
-.else
-CONFIGURE_ARGS+= --without-kerberos
-.endif
+SLAPD_BACKEND_MODULES= bdb:static dnnsrv hdb ldap ldbm meta \
+ monitor:static null passwd shell
+.for _mod_ in ${SLAPD_BACKEND_MODULES}
+. if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+CONFIGURE_ARGS+= --enable-${_mod_:C/\:.*//}${_mod_:N*\:static:C/.*/=mod/}
+. else
+CONFIGURE_ARGS+= --enable-${_mod_:C/\:.*//}
+. endif
+.endfor
+.undef _mod_
+OPENLDAP_FILEPERMS= ${ROOT_USER} ${ROOT_GROUP} 0600
+OPENLDAP_DIRPERMS= ${ROOT_USER} ${ROOT_GROUP} 0700
+
+USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/openldap
-MAKE_DIRS= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/schema
-OWN_DIRS= /var/openldap
-OWN_DIRS_PERMS= /var/openldap/openldap-data ${ROOT_USER} ${ROOT_GROUP} 0700
-OWN_DIRS_PERMS= /var/openldap/openldap-ldbm ${ROOT_USER} ${ROOT_GROUP} 0700
-OWN_DIRS_PERMS+= /var/openldap/openldap-slurp ${ROOT_USER} ${ROOT_GROUP} 0700
+MAKE_DIRS= ${OPENLDAP_ETCDIR} ${OPENLDAP_ETCDIR}/schema
+OWN_DIRS= ${OPENLDAP_VARDIR} ${OPENLDAP_VARDIR}/run
+OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${OPENLDAP_DIRPERMS}
+OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-ldbm ${OPENLDAP_DIRPERMS}
+OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/openldap-slurp ${OPENLDAP_DIRPERMS}
-CNFS= ldap.conf
-CNFS_PERMS= slapd.conf
-SUPPS= schema/corba.schema schema/core.schema \
+CNFS= ldap.conf \
+ schema/corba.schema schema/core.schema \
schema/java.schema schema/inetorgperson.schema \
schema/cosine.schema schema/misc.schema \
schema/nis.schema schema/openldap.schema
+CNFS_PERMS= slapd.conf
CONF_FILES= # empty
CONF_FILES_PERMS= # empty
-SUPPORT_FILES= # empty
.for FILE in ${CNFS}
-CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES+= ${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE}
.endfor
.for FILE in ${CNFS_PERMS}
-CONF_FILES_PERMS+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} \
- ${ROOT_USER} ${ROOT_GROUP} 0600
-.endfor
-.for FILE in ${SUPPS}
-SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES_PERMS+= ${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE} \
+ ${OPENLDAP_FILEPERMS}
.endfor
RCD_SCRIPTS= slapd
@@ -109,6 +95,7 @@
OPENLDAP_PTHREAD_OPTS?= require
PTHREAD_OPTS+= ${OPENLDAP_PTHREAD_OPTS}
+.include "../../devel/libtool/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
@@ -127,11 +114,7 @@
PLIST_SUBST+= SLURPD_COMMENT="@comment "
.endif
-post-install:
- ${_ULIMIT_CMD}cd ${WRKSRC}/libraries/libldap; \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-conf sysconfdir=${EGDIR}
- ${_ULIMIT_CMD}cd ${WRKSRC}/servers/slapd; \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-conf sysconfdir=${EGDIR}; \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-schema sysconfdir=${EGDIR}
+MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 5a19836c69f2 -r a0bb10069538 databases/openldap/Makefile.options
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/Makefile.options Sat Jul 24 03:32:24 2004 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile.options,v 1.1 2004/07/24 03:32:24 jlam Exp $
+#
+# OPENLDAP_ALL_OPTIONS lists all of the currently-supported optional modules
+# that *may* be built.
+#
+# OPENLDAP_OPTIONS is a list of the modules that *will* be built.
+#
+OPENLDAP_ALL_OPTIONS= dynamic sasl slp
+
+.if defined(USE_SASL) || defined(USE_SASL2) || defined(KERBEROS)
+. if !defined(OPENLDAP_OPTIONS)
+. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+OPENLDAP_OPTIONS+= sasl
+. endif
+. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
+OPENLDAP_OPTIONS+= sasl
+. endif
+. if defined(KERBEROS)
+OPENLDAP_OPTIONS+= sasl
+. endif
+. endif
+.endif
+
+OPENLDAP_OPTIONS?= # empty
+BUILD_DEFS+= OPENLDAP_OPTIONS
+
+_OPENLDAP_OPTIONS= # empty
+.for _opt_ in ${OPENLDAP_OPTIONS}
+. if empty(_OPENLDAP_OPTIONS:M${_opt_})
+. if !empty(OPENLDAP_ALL_OPTIONS:M${_opt_})
+_OPENLDAP_OPTIONS+= ${_opt_}
+. else
+PKG_FAIL_REASON+= "\"${_opt_}\" is not a supported Mutt build option."
+. endif
+. endif
+.endfor
+
+###
+### Whether to build with dynamically-loadable backend modules. If not
+### specified, then link the backend modules statically into slapd.
+###
+.if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+CONFIGURE_ARGS+= --enable-modules
+PLIST_SUBST+= DYNAMIC_MOD=
+.else
+PLIST_SUBST+= DYNAMIC_MOD="@comment "
+.endif
+
+###
+### SASL authentication
+###
+.if !empty(_OPENLDAP_OPTIONS:Msasl)
+. if !defined(USE_SASL2) && !defined(USE_SASL)
+. include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
+. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+. include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
+. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
+. include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
+. endif
+.endif
+
+###
+### SLP (Service Locator Protocol)
+###
+.if !empty(_OPENLDAP_OPTIONS:Mslp)
+. include "../../net/openslp/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-slp
+.endif
diff -r 5a19836c69f2 -r a0bb10069538 databases/openldap/PLIST
--- a/databases/openldap/PLIST Sat Jul 24 02:53:53 2004 +0000
+++ b/databases/openldap/PLIST Sat Jul 24 03:32:24 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.17 2004/07/24 03:32:24 jlam Exp $
bin/ldapadd
bin/ldapcompare
bin/ldapdelete
@@ -14,21 +14,62 @@
include/ldap_features.h
include/ldap_schema.h
include/ldap_utf8.h
+include/slapi-plugin.h
+lib/liblber-2.2.so.7.6
+lib/liblber-2.2.so.7
lib/liblber.a
lib/liblber.la
lib/liblber.so
-lib/liblber.so.2
-lib/liblber.so.2.130
+lib/libldap-2.2.so.7.6
+lib/libldap-2.2.so.7
lib/libldap.a
lib/libldap.la
lib/libldap.so
-lib/libldap.so.2
-lib/libldap.so.2.130
+lib/libldap_r-2.2.so.7.6
+lib/libldap_r-2.2.so.7
lib/libldap_r.a
lib/libldap_r.la
lib/libldap_r.so
-lib/libldap_r.so.2
-lib/libldap_r.so.2.130
+${DYNAMIC_MOD}lib/openldap/back_hdb-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_hdb-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_hdb.a
+${DYNAMIC_MOD}lib/openldap/back_hdb.la
+${DYNAMIC_MOD}lib/openldap/back_hdb.so
+${DYNAMIC_MOD}lib/openldap/back_ldap-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_ldap-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_ldap.a
+${DYNAMIC_MOD}lib/openldap/back_ldap.la
+${DYNAMIC_MOD}lib/openldap/back_ldap.so
+${DYNAMIC_MOD}lib/openldap/back_ldbm-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_ldbm-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_ldbm.a
+${DYNAMIC_MOD}lib/openldap/back_ldbm.la
+${DYNAMIC_MOD}lib/openldap/back_ldbm.so
+${DYNAMIC_MOD}lib/openldap/back_meta-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_meta-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_meta.a
+${DYNAMIC_MOD}lib/openldap/back_meta.la
+${DYNAMIC_MOD}lib/openldap/back_meta.so
+${DYNAMIC_MOD}lib/openldap/back_monitor-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_monitor-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_monitor.a
+${DYNAMIC_MOD}lib/openldap/back_monitor.la
+${DYNAMIC_MOD}lib/openldap/back_monitor.so
+${DYNAMIC_MOD}lib/openldap/back_null-2.2.so.7
+${DYNAMIC_MOD}lib/openldap/back_null-2.2.so.7.6
+${DYNAMIC_MOD}lib/openldap/back_null.a
+${DYNAMIC_MOD}lib/openldap/back_null.la
Home |
Main Index |
Thread Index |
Old Index