diff options
| author | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2005-09-15 11:47:24 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2005-09-15 11:47:24 +0000 |
| commit | fb8e66e8ac03a107f6cfd23033238b640c92d55a (patch) | |
| tree | 299fb309d8ed397244293d38e6e61e03f9bf0d95 /net/openldap23-server/files | |
| parent | 7bd4a780beba5758f321dd0adb431d1d4cba297b (diff) | |
| download | ports-fb8e66e8ac03a107f6cfd23033238b640c92d55a.tar.gz ports-fb8e66e8ac03a107f6cfd23033238b640c92d55a.zip | |
Update to 2.3.7 [1]
Add RWM overlay support [2]
Convert to OPTIONS
Remove openldap23-sasl-server as it is no longer required as separated port.
PR: 85709 [1], 84966 [2]
Submitted by: Dmitry A Grigorovich <odip@bionet.nsc.ru> [1]
Pawel Wieleba <P.Wieleba@iem.pw.edu.pl> [2]
Notes
Notes:
svn path=/head/; revision=142807
Diffstat (limited to 'net/openldap23-server/files')
4 files changed, 54 insertions, 29 deletions
diff --git a/net/openldap23-server/files/manpages b/net/openldap23-server/files/manpages index 41b04970fee7..5b79501c094e 100644 --- a/net/openldap23-server/files/manpages +++ b/net/openldap23-server/files/manpages @@ -188,7 +188,6 @@ MAN5+= ldap.conf.5 \ slapo-accesslog.5 \ slapo-chain.5 \ slapo-dynlist.5 \ - slapo-glue.5 \ slapo-lastmod.5 \ slapo-pcache.5 \ slapo-ppolicy.5 \ @@ -196,7 +195,9 @@ MAN5+= ldap.conf.5 \ slapo-rwm.5 \ slapo-syncprov.5 \ slapo-translucent.5 \ - slapo-unique.5 + slapo-unique.5 \ + slapo-auditlog.5 \ + slapo-retcode.5 MLINKS+= \ slapd-bdb.5 slapd-hdb.5 diff --git a/net/openldap23-server/files/patch-configure b/net/openldap23-server/files/patch-configure index 7e4fa565bb17..4198340d07c7 100644 --- a/net/openldap23-server/files/patch-configure +++ b/net/openldap23-server/files/patch-configure @@ -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 --git a/net/openldap23-server/files/patch-servers::slapd::Makefile.in b/net/openldap23-server/files/patch-servers::slapd::Makefile.in index 6dcf0d47f6ad..50cec0cf4511 100644 --- a/net/openldap23-server/files/patch-servers::slapd::Makefile.in +++ b/net/openldap23-server/files/patch-servers::slapd::Makefile.in @@ -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 00:28:10 2005 ++++ servers/slapd/Makefile.in Sun Sep 4 17:34:37 2005 +@@ -372,7 +372,6 @@ install-slapd: FORCE -$(MKDIR) $(DESTDIR)$(libexecdir) @@ -8,7 +8,32 @@ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ slapd$(EXEEXT) $(DESTDIR)$(libexecdir) @for i in $(SUBDIRS); do \ -@@ -434,8 +433,6 @@ +@@ -403,16 +402,18 @@ + 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) ++ @-$(MKDIR) $(DESTDIR)$(schemadir) + @SD=$(DESTDIR)$(schemadir) ; \ +- files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \ ++ 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 ; \ ++ 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 +430,6 @@ install-db-config: FORCE @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data diff --git a/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in b/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in index a23e4b2feaa4..67062675dbeb 100644 --- a/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in +++ b/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in @@ -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... |