New openldap client/server 2.3.7 Fix: Apply follow patch Reinstall openldap client and server How-To-Repeat: N/A
Responsible Changed From-To: freebsd-ports-bugs->vsevolod Over to maintainer
Sorry, fixed version ======================================================================= diff -ur openldap23-server.orig/Makefile openldap23-server/Makefile --- openldap23-server.orig/Makefile Fri Jul 22 16:33:34 2005 +++ openldap23-server/Makefile Mon Sep 5 22:53:15 2005 @@ -6,7 +6,7 @@ # PORTNAME= openldap -DISTVERSION= 2.3.4 +DISTVERSION= 2.3.7 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -40,7 +40,7 @@ BROKEN= "incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}" .endif -PORTREVISION_CLIENT= 1 +PORTREVISION_CLIENT= 0 PORTREVISION_SERVER= 0 .if defined(CLIENT_ONLY) @@ -69,9 +69,9 @@ OPENLDAP_PKGFILESUFX= .if defined(WITH_SASL) -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.0:${PORTSDIR}/net/openldap23-sasl-client +RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.1:${PORTSDIR}/net/openldap23-sasl-client .else -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.0:${PORTSDIR}/net/openldap23-client +RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.1:${PORTSDIR}/net/openldap23-client .endif .if ${PKGNAMESUFFIX} == "-sasl-server" @@ -246,7 +246,7 @@ BACK_HDB="@comment " BDBLIB= db3.3 .else -IGNORE= : WITH_BDB_VER must be 3, 4, 41 or 42 +IGNORE= : WITH_BDB_VER must be 3, 4, 41, 42 or 43 .endif LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER} diff -ur openldap23-server.orig/distinfo openldap23-server/distinfo --- openldap23-server.orig/distinfo Wed Jun 15 13:45:54 2005 +++ openldap23-server/distinfo Sun Sep 4 16:13:18 2005 @@ -1,2 +1,2 @@ -MD5 (openldap-2.3.4.tgz) = 6201b5c1c5e1bc3ba68c3bfeda9c8e48 -SIZE (openldap-2.3.4.tgz) = 3466292 +MD5 (openldap-2.3.7.tgz) = 36672e0cb632f8e7ff86d29e583ecabc +SIZE (openldap-2.3.7.tgz) = 3629524 diff -ur openldap23-server.orig/files/manpages openldap23-server/files/manpages --- openldap23-server.orig/files/manpages Wed Jun 15 13:45:54 2005 +++ openldap23-server/files/manpages Sun Sep 4 16:22:29 2005 @@ -188,7 +188,6 @@ slapo-accesslog.5 \ slapo-chain.5 \ slapo-dynlist.5 \ - slapo-glue.5 \ slapo-lastmod.5 \ slapo-pcache.5 \ slapo-ppolicy.5 \ diff -ur openldap23-server.orig/files/patch-configure openldap23-server/files/patch-configure --- openldap23-server.orig/files/patch-configure Thu May 5 07:53:44 2005 +++ openldap23-server/files/patch-configure Sun Sep 4 16:10:29 2005 @@ -1,20 +1,20 @@ ---- configure.orig Tue Jul 27 18:33:12 2004 -+++ configure Sat Aug 14 17:05:23 2004 -@@ -21782,7 +21782,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 +--- configure.orig Fri Sep 2 03:27:55 2005 ++++ configure Sun Sep 4 16:10:14 2005 +@@ -34922,7 +34922,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-liodbc $LIBS" -+LIBS="-liodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21788 "configure" - #include "confdefs.h" -@@ -21826,7 +21826,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 ++LIBS="-liodbc $LIBS $LTHREAD_LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34995,7 +34995,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" -+LIBS="-lodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21832 "configure" - #include "confdefs.h" ++LIBS="-lodbc $LIBS $LTHREAD_LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff -ur openldap23-server.orig/files/patch-servers::slapd::Makefile.in openldap23-server/files/patch-servers::slapd::Makefile.in --- openldap23-server.orig/files/patch-servers::slapd::Makefile.in Mon May 16 03:58:06 2005 +++ openldap23-server/files/patch-servers::slapd::Makefile.in Mon Sep 5 22:42:13 2005 @@ -1,6 +1,6 @@ ---- servers/slapd/Makefile.in.orig Fri May 6 20:42:50 2005 -+++ servers/slapd/Makefile.in Fri May 13 17:17:37 2005 -@@ -370,7 +370,6 @@ +--- servers/slapd/Makefile.in.orig Fri Sep 2 03:28:10 2005 ++++ servers/slapd/Makefile.in Mon Sep 5 22:41:18 2005 +@@ -372,7 +372,6 @@ install-slapd: FORCE -$(MKDIR) $(DESTDIR)$(libexecdir) @@ -8,7 +8,34 @@ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ slapd$(EXEEXT) $(DESTDIR)$(libexecdir) @for i in $(SUBDIRS); do \ -@@ -434,8 +433,6 @@ +@@ -403,16 +402,19 @@ + touch all-cffiles + + install-schema: FORCE +- @if test -d $(DESTDIR)$(schemadir) ; then \ +- echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \ +- mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \ +- fi +- $(MKDIR) $(DESTDIR)$(schemadir) +- @SD=$(DESTDIR)$(schemadir) ; \ +- files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \ ++ @-$(MKDIR) $(DESTDIR)$(schemadir) ++ @SD=$(DESTDIR)$(schemadir); \ ++ files=`cd $(srcdir)/schema ; echo README *.ldif` ; \ ++ for i in $$files ; do \ ++ echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ ++ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ ++ done ++ @SD=$(DESTDIR)$(schemadir); \ ++ files=`cd $(srcdir)/schema ; echo *.schema` ; \ + for i in $$files ; do \ + echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ + $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ ++ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \ + done + + install-conf: FORCE +@@ -429,8 +431,6 @@ install-db-config: FORCE @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data diff -ur openldap23-server.orig/files/patch-servers_slapd_overlays_Makefile.in openldap23-server/files/patch-servers_slapd_overlays_Makefile.in --- openldap23-server.orig/files/patch-servers_slapd_overlays_Makefile.in Wed Jun 15 13:45:54 2005 +++ openldap23-server/files/patch-servers_slapd_overlays_Makefile.in Sun Sep 4 16:15:30 2005 @@ -1,13 +1,12 @@ ---- servers/slapd/overlays/Makefile.in.orig Fri May 13 17:44:48 2005 -+++ servers/slapd/overlays/Makefile.in Fri May 13 17:46:31 2005 -@@ -28,6 +28,9 @@ - unique.c +--- servers/slapd/overlays/Makefile.in.orig Fri Sep 2 03:28:11 2005 ++++ servers/slapd/overlays/Makefile.in Sun Sep 4 16:11:22 2005 +@@ -30,6 +30,9 @@ + valsort.c OBJS = overlays.o \ @SLAPD_STATIC_OVERLAYS@ +LIBTOOL_OBJS = overlays.lo \ + glue.lo \ + version.lo - LDAP_INCDIR= ../../../include - LDAP_LIBDIR= ../../../libraries - + # Add here the objs that are needed by overlays, but do not make it + # into SLAPD_STATIC_OVERLAYS... diff -ur openldap23-server.orig/pkg-descr openldap23-server/pkg-descr --- openldap23-server.orig/pkg-descr Thu May 5 07:53:44 2005 +++ openldap23-server/pkg-descr Sun Sep 4 16:20:57 2005 @@ -7,6 +7,4 @@ * slurpd - a stand-alone LDAP replication server * LDIF tools - data conversion tools for use with slapd -This is an alpha release of OpenLDAP Software for evaluation purposes only. - WWW: http://www.OpenLDAP.org/ diff -ur openldap23-server.orig/pkg-descr.client openldap23-server/pkg-descr.client --- openldap23-server.orig/pkg-descr.client Thu May 5 07:53:44 2005 +++ openldap23-server/pkg-descr.client Sun Sep 4 16:21:16 2005 @@ -8,6 +8,4 @@ * LDAP tools - A collection of command line LDAP utilities * documentation - man pages for all components -This is an alpha release of OpenLDAP Software for evaluation purposes only. - WWW: http://www.OpenLDAP.org/ diff -ur openldap23-server.orig/pkg-message.client openldap23-server/pkg-message.client --- openldap23-server.orig/pkg-message.client Thu May 5 07:53:44 2005 +++ openldap23-server/pkg-message.client Sun Sep 4 16:21:12 2005 @@ -11,12 +11,3 @@ for more information. ************************************************************ - -############################################################ - - CAUTION: This is an alpha release, for evaluation only. - - Do not use in a production environment! - Please use OpenLDAP 2.2 instead. - -############################################################ diff -ur openldap23-server.orig/pkg-plist openldap23-server/pkg-plist --- openldap23-server.orig/pkg-plist Fri May 6 11:41:30 2005 +++ openldap23-server/pkg-plist Sun Sep 4 17:59:20 2005 @@ -2,6 +2,8 @@ @unexec %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true @unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true etc/openldap/schema/README +etc/openldap/schema/core.ldif +etc/openldap/schema/openldap.ldif @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi etc/openldap/slapd.conf.default @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf @@ -9,38 +11,38 @@ %%SLAPI%%lib/libslapi.a %%SLAPI%%lib/libslapi.so %%SLAPI%%lib/libslapi-2.3.so -%%SLAPI%%lib/libslapi-2.3.so.0 +%%SLAPI%%lib/libslapi-2.3.so.1 %%MODULES%%@exec mkdir -p %D/libexec/openldap %%BACK_BDB%%libexec/openldap/back_bdb.so %%BACK_BDB%%libexec/openldap/back_bdb-2.3.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.0 +%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.1 %%BACK_HDB%%libexec/openldap/back_hdb.so %%BACK_HDB%%libexec/openldap/back_hdb-2.3.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.0 +%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.1 %%BACKEND%%libexec/openldap/back_ldap.so %%BACKEND%%libexec/openldap/back_ldap-2.3.so -%%BACKEND%%libexec/openldap/back_ldap-2.3.so.0 +%%BACKEND%%libexec/openldap/back_ldap-2.3.so.1 %%BACKEND%%libexec/openldap/back_ldbm.so %%BACKEND%%libexec/openldap/back_ldbm-2.3.so -%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.0 +%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.1 %%BACKEND%%libexec/openldap/back_meta.so %%BACKEND%%libexec/openldap/back_meta-2.3.so -%%BACKEND%%libexec/openldap/back_meta-2.3.so.0 +%%BACKEND%%libexec/openldap/back_meta-2.3.so.1 %%BACKEND%%libexec/openldap/back_monitor.so %%BACKEND%%libexec/openldap/back_monitor-2.3.so -%%BACKEND%%libexec/openldap/back_monitor-2.3.so.0 +%%BACKEND%%libexec/openldap/back_monitor-2.3.so.1 %%BACKEND%%libexec/openldap/back_null.so %%BACKEND%%libexec/openldap/back_null-2.3.so -%%BACKEND%%libexec/openldap/back_null-2.3.so.0 +%%BACKEND%%libexec/openldap/back_null-2.3.so.1 %%BACK_PERL%%libexec/openldap/back_perl.so %%BACK_PERL%%libexec/openldap/back_perl-2.3.so -%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.0 +%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.1 %%BACK_SHELL%%libexec/openldap/back_shell.so %%BACK_SHELL%%libexec/openldap/back_shell-2.3.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.0 +%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.1 %%BACK_SQL%%libexec/openldap/back_sql.so %%BACK_SQL%%libexec/openldap/back_sql-2.3.so -%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.0 +%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1 libexec/slapd libexec/slurpd @unexec rmdir %D/libexec/openldap 2>/dev/null || true diff -ur openldap23-server.orig/pkg-plist.client openldap23-server/pkg-plist.client --- openldap23-server.orig/pkg-plist.client Wed Jun 15 13:45:54 2005 +++ openldap23-server/pkg-plist.client Sun Sep 4 16:54:08 2005 @@ -22,19 +22,15 @@ lib/liblber.a lib/liblber.so lib/liblber-2.3.so -lib/liblber-2.3.so.0 +lib/liblber-2.3.so.1 lib/libldap.a lib/libldap.so lib/libldap-2.3.so -lib/libldap-2.3.so.0 +lib/libldap-2.3.so.1 lib/libldap_r.a lib/libldap_r.so lib/libldap_r-2.3.so -lib/libldap_r-2.3.so.0 -lib/liblrewrite-2.3.so -lib/liblrewrite-2.3.so.0 -lib/liblrewrite.a -lib/liblrewrite.so +lib/libldap_r-2.3.so.1 @comment share/openldap/ucdata/case.dat @comment share/openldap/ucdata/cmbcl.dat @comment share/openldap/ucdata/comp.dat ======================================================================= --- Mk/bsd.port.mk.orig Mon Sep 5 22:46:01 2005 +++ Mk/bsd.port.mk Mon Sep 5 22:53:29 2005 @@ -1482,7 +1482,7 @@ .elif ${WANT_OPENLDAP_VER} == 21 LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21${_OPENLDAP_FLAVOUR}-client .elif ${WANT_OPENLDAP_VER} == 23 -LIB_DEPENDS+= ldap-2.3.0:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client +LIB_DEPENDS+= ldap-2.3.1:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client .else BROKEN= "unknown OpenLDAP version: ${WANT_OPENLDAP_VER}" .endif [ODiP] == Dmitry Grigorovich
State Changed From-To: open->closed Committed, thank you!