[pkgsrc/trunk]: pkgsrc/doc Update databases/openldap to 2.1.25 (latest stable...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/doc Update databases/openldap to 2.1.25 (latest stable...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:32:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3dc94023ffd
branches:  trunk
changeset: 468481:a3dc94023ffd
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 14 11:31:50 2004 +0000

description:
Update databases/openldap to 2.1.25 (latest stable release as of
20031217.  Changes from version 2.1.22 include many bug fixes including
memory leaks, adding lutil_passwd extensions, and adding config file
keywords to control the replication daemon.

diffstat:

 databases/openldap/Makefile         |  42 ++++++++++++++++--------------------
 databases/openldap/PLIST            |   9 ++++---
 databases/openldap/PLIST.slurpd     |   2 -
 databases/openldap/distinfo         |   8 +++---
 databases/openldap/files/slapd.sh   |  10 ++------
 databases/openldap/files/slurpd.sh  |  27 +++++++++++++++++++++++
 databases/openldap/patches/patch-ae |   6 ++--
 doc/CHANGES                         |   3 +-
 8 files changed, 63 insertions(+), 44 deletions(-)

diffs (233 lines):

diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/Makefile
--- a/databases/openldap/Makefile       Sat Feb 14 11:28:28 2004 +0000
+++ b/databases/openldap/Makefile       Sat Feb 14 11:31:50 2004 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2004/01/21 14:08:24 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.67 2004/02/14 11:31:50 jlam Exp $
 
-DISTNAME=              openldap-2.1.22
-PKGREVISION=           3
+DISTNAME=              openldap-2.1.25
 SVR4_PKGNAME=          oldap
 CATEGORIES=            databases
 MASTER_SITES=          ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -18,10 +16,10 @@
 
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
+GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
-GNU_CONFIGURE=         YES
-
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
+PTHREAD_OPTS+=         require
 
 TEST_TARGET=           test
 
@@ -32,14 +30,15 @@
 #
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --localstatedir=/var/openldap
+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
-CONFIGURE_ARGS+=       --enable-ldbm
-CONFIGURE_ARGS+=       --enable-crypt
 
 BUILD_DEFS+=           USE_SASL USE_SASL2
 
@@ -90,7 +89,18 @@
 .for FILE in ${SUPPS}
 SUPPORT_FILES+=                ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .endfor
-RCD_SCRIPTS=           slapd
+RCD_SCRIPTS=           slapd slurpd
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+=       --with-threads
+.elif ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+=       --with-threads=pth
+.endif
 
 post-install:
        ${_ULIMIT_CMD}cd ${WRKSRC}/libraries/libldap;                   \
@@ -99,18 +109,4 @@
        ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-conf sysconfdir=${EGDIR}; \
        ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-schema sysconfdir=${EGDIR}
 
-.include "../../databases/db4/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
-CONFIGURE_ARGS+=       --with-threads
-PLIST_SRC=             ${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
-.else
-# --without-threads is recommended with back-shell
-#
-CONFIGURE_ARGS+=       --without-threads --enable-shell
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/PLIST
--- a/databases/openldap/PLIST  Sat Feb 14 11:28:28 2004 +0000
+++ b/databases/openldap/PLIST  Sat Feb 14 11:31:50 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/01/09 22:48:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/02/14 11:31:50 jlam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -19,18 +19,19 @@
 lib/liblber.la
 lib/liblber.so
 lib/liblber.so.2
-lib/liblber.so.2.122
+lib/liblber.so.2.124
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap.so.2
-lib/libldap.so.2.122
+lib/libldap.so.2.124
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
 lib/libldap_r.so.2
-lib/libldap_r.so.2.122
+lib/libldap_r.so.2.124
 libexec/slapd
+libexec/slurpd
 man/man1/ldapadd.1
 man/man1/ldapcompare.1
 man/man1/ldapdelete.1
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/PLIST.slurpd
--- a/databases/openldap/PLIST.slurpd   Sat Feb 14 11:28:28 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.slurpd,v 1.1 2002/01/31 05:06:55 jlam Exp $
-libexec/slurpd
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/distinfo
--- a/databases/openldap/distinfo       Sat Feb 14 11:28:28 2004 +0000
+++ b/databases/openldap/distinfo       Sat Feb 14 11:31:50 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2004/01/09 22:48:16 jlam Exp $
+$NetBSD: distinfo,v 1.22 2004/02/14 11:31:50 jlam Exp $
 
-SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
-Size (openldap-2.1.22.tgz) = 2033763 bytes
+SHA1 (openldap-2.1.25.tgz) = 802ad52c0540bf58fbe797fd64804ff0920159d4
+Size (openldap-2.1.25.tgz) = 2038669 bytes
 SHA1 (patch-aa) = 0f7f0ad7e11a16d084955f5125db12a5e53bafec
 SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
 SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546
-SHA1 (patch-ae) = 89c22ffe19651cacdf7a25b492dab46c7637da4d
+SHA1 (patch-ae) = 75f5cb64c78c007f3439ad384b21c5a6ea5e9e3d
 SHA1 (patch-af) = 74edff185f7d5222416023801084c069d08ec057
 SHA1 (patch-ag) = 822efbcc01dfd4b6181c25390761f534aaeb4315
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/files/slapd.sh
--- a/databases/openldap/files/slapd.sh Sat Feb 14 11:28:28 2004 +0000
+++ b/databases/openldap/files/slapd.sh Sat Feb 14 11:31:50 2004 +0000
@@ -1,26 +1,22 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slapd.sh,v 1.4 2002/09/20 02:01:55 grant Exp $
+# $NetBSD: slapd.sh,v 1.5 2004/02/14 11:31:50 jlam Exp $
 #
 # OpenLDAP standalone LDAP daemon
 #
 # PROVIDE: slapd
 # REQUIRE: DAEMON
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
 fi
 
 name="slapd"
 rcvar=${name}
 command="@PREFIX@/libexec/${name}"
-pidfile="/var/openldap/slapd.pid"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
-extra_commands="reload"
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
        run_rc_command "$1"
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/files/slurpd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/files/slurpd.sh        Sat Feb 14 11:31:50 2004 +0000
@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: slurpd.sh,v 1.1 2004/02/14 11:31:50 jlam Exp $
+#
+# OpenLDAP LDAP database replication daemon
+#
+# PROVIDE: slurpd
+# REQUIRE: slapd
+
+if [ -f /etc/rc.subr ]; then
+       . /etc/rc.subr
+fi
+
+name="slurpd"
+rcvar=${name}
+command="@PREFIX@/libexec/${name}"
+required_files="@PKG_SYSCONFDIR@/slapd.conf"
+required_vars="slapd"
+
+if [ -f /etc/rc.subr ]; then
+       load_rc_config $name
+       eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
+       run_rc_command "$1"
+else
+       @ECHO@ -n " ${name}"
+       ${command} ${slurpd_flags} ${command_args}
+fi
diff -r 296e474b1312 -r a3dc94023ffd databases/openldap/patches/patch-ae
--- a/databases/openldap/patches/patch-ae       Sat Feb 14 11:28:28 2004 +0000
+++ b/databases/openldap/patches/patch-ae       Sat Feb 14 11:31:50 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/12/04 14:48:17 agc Exp $
+$NetBSD: patch-ae,v 1.2 2004/02/14 11:31:50 jlam Exp $
 
---- servers/slapd/back-bdb/init.c.orig 2003-11-17 21:31:19.000000000 +0100
+--- servers/slapd/back-bdb/init.c.orig Sat Nov 29 04:59:10 2003
 +++ servers/slapd/back-bdb/init.c
-@@ -460,17 +460,19 @@ bdb_db_close( BackendDB *be )
+@@ -461,17 +461,19 @@ bdb_db_close( BackendDB *be )
        bdb_cache_release_all (&bdb->bi_cache);
  
  #ifdef SLAP_IDL_CACHE
diff -r 296e474b1312 -r a3dc94023ffd doc/CHANGES
--- a/doc/CHANGES       Sat Feb 14 11:28:28 2004 +0000
+++ b/doc/CHANGES       Sat Feb 14 11:31:50 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4822 2004/02/14 03:16:59 jlam Exp $
+$NetBSD: CHANGES,v 1.4823 2004/02/14 11:31:56 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -823,3 +823,4 @@
        Added atasm-1.04 [minskim 2004-02-13]
        Updated ns-remote to 1.9nb1 [grant 2004-02-14]
        Updated cyrus-sasl2 to 2.1.17 [jlam 2004-02-14]
+       Updated openldap to 2.1.25 [jlam 2004-02-14]
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/gcc3 Update dependence on "gcc3-c++" package and ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of "gcc3" package to version 3.3.2nb2.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/gcc3 Update dependence on "gcc3-c++" package and ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of "gcc3" package to version 3.3.2nb2.
Indexes:
Home | Main Index | Thread Index | Old Index