From: Kurt Zeilenga Date: Thu, 7 Jan 1999 18:36:30 +0000 (+0000) Subject: Update build environment: X-Git-Tag: OPENLDAP_REL_ENG_1_1_3~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fca08ddb7bd7f93a5c33b64bf364a21c7551b387;p=thirdparty%2Fopenldap.git Update build environment: import db2 patch fix --disable-slurpd fix make clean create $localstatedir update version file in preparation for release --- diff --git a/CHANGES b/CHANGES index b4138f01ca..03bbf33546 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,10 @@ Changes included in OpenLDAP 1.1.x Fixed slapd/strtok needs mutex bug Fixed salpd/tcpd DoS bug Build environment + Added DB2 patch information Fixed doc/man reinstall bug + Fixed make clean + Fixed --disable-slurpd Changes included in OpenLDAP 1.1.2 CVS Tag: OPENLDAP_REL_ENG_1_1_2 diff --git a/build/db.2.64.patch b/build/db.2.64.patch new file mode 100644 index 0000000000..d777593b7b --- /dev/null +++ b/build/db.2.64.patch @@ -0,0 +1,36 @@ +*** db/db.c.sleepy Sun Jan 3 20:02:51 1999 +--- db/db.c Sun Jan 3 20:28:25 1999 +*************** db_open(fname, type, flags, mode, dbenv, +*** 106,112 **** + DB_PGINFO pginfo; + HASHHDR *hashm; + size_t cachesize; +! ssize_t nr; + u_int32_t iopsize; + int fd, ftype, need_fileid, restore, ret, retry_cnt, swapped; + char *real_name, mbuf[512]; +--- 106,112 ---- + DB_PGINFO pginfo; + HASHHDR *hashm; + size_t cachesize; +! ssize_t nr = (ssize_t) 0; + u_int32_t iopsize; + int fd, ftype, need_fileid, restore, ret, retry_cnt, swapped; + char *real_name, mbuf[512]; +*************** open_retry: if (LF_ISSET(DB_CREATE)) { +*** 337,343 **** + if (nr != sizeof(mbuf)) { + if (nr != 0) { + __db_err(dbenv, +! "%s: unexpected file format", fname); + goto einval; + } + /* +--- 337,343 ---- + if (nr != sizeof(mbuf)) { + if (nr != 0) { + __db_err(dbenv, +! "%s: unexpected file format, %d bytes read", fname, nr); + goto einval; + } + /* diff --git a/build/db.2.64.patch.README b/build/db.2.64.patch.README new file mode 100644 index 0000000000..5417244953 --- /dev/null +++ b/build/db.2.64.patch.README @@ -0,0 +1,18 @@ + +A bug in Sleepycat´s Berkeley DB (version 2.3.16 up to 2.6.4 beta), +was detected, that caused failure during opening of database files +when running a threaded slapd on a linux box, kernel version 2.0.35, +gcc 2.7.2.1, linux threads via libpthreads.so.1.60.4. + +THE BUG OCCURS ONLY WHEN SLAPD IS RUN WITH THREADS ENABLED AND MAY +ONLY OCCUR ON THE PLATFORM SPECIFIED. + +SINCE THE CODE OF DB_OPEN() IS THE SAME IN VERSION 2.3.16 AND 2.6.4 +WITH REPECT TO THE BUG DETECTED, DB 2.3.16 SHOULD BE PATCHED AS WELL. + +Apply the supported patch at the root directory of Sleepycat´s code. +Since the bug was reported to Sleepycat, it may not appear in DB +versions, later than 2.6.4 beta. + +Jan 7 1999, /KSp (ksp@openldap.org) + diff --git a/build/lib.mk b/build/lib.mk index 842967089c..28c3df63d4 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -26,11 +26,11 @@ lint5: lint5-local FORCE clean-common: FORCE $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \ - $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \ + $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \ *.o *.lo a.out core version.c .libs/* depend-common: FORCE - $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) + $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS) lint-local: FORCE lint5-local: FORCE diff --git a/build/openldap.m4 b/build/openldap.m4 index 7ef07906e8..30b2873bd4 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -396,3 +396,51 @@ if test $ol_cv_dcl_sys_errlist = no ; then AC_MSG_RESULT($ol_cv_have_sys_errlist) fi ])dnl + +dnl ==================================================================== +dnl Early MIPS compilers (used in Ultrix 4.2) don't like +dnl "int x; int *volatile a = &x; *a = 0;" +dnl -- borrowed from PDKSH +AC_DEFUN(OL_C_VOLATILE, + [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile, + [AC_TRY_COMPILE([int x, y, z;], + [volatile int a; int * volatile b = x ? &y : &z; + /* Older MIPS compilers (eg., in Ultrix 4.2) don't like *b = 0 */ + *b = 0;], ol_cv_c_volatile=yes, ol_cv_c_volatile=no)]) + if test $ol_cv_c_volatile = yes; then + : + else + AC_DEFINE(volatile, ) + fi + ])dnl + +dnl ==================================================================== +dnl Define sig_atomic_t if not defined in signal.h +AC_DEFUN(OL_TYPE_SIG_ATOMIC_T, + [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t, + [AC_TRY_COMPILE([#include ], [sig_atomic_t atomic;], + ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)]) + if test $ol_cv_type_sig_atomic_t = no; then + AC_DEFINE(sig_atomic_t, int) + fi + ])dnl + +dnl ==================================================================== +dnl check no of arguments for ctime_r +AC_DEFUN(OL_FUNC_CTIME_R_NARGS, + [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs, + [AC_TRY_COMPILE([#include ], + [time_t ti; char *buffer; ctime_r(&ti,buffer,32);], + ol_cv_func_ctime_r_nargs=3, ol_cv_func_ctime_r_nargs=0) + if test $ol_cv_func_ctime_r_nargs = 0 ; then + AC_TRY_COMPILE([#include ], + [time_t ti; char *buffer; + ctime_r(&ti,buffer);], + ol_cv_func_ctime_r_nargs=2, ol_cv_func_ctime_r_nargs=0) + fi + ]) + if test $ol_cv_func_ctime_r_nargs -gt 1 ; then + AC_DEFINE_UNQUOTED(CTIME_R_NARGS, $ol_cv_func_ctime_r_nargs) + fi +])dnl + diff --git a/build/version b/build/version index 2a919a0e08..242e79953f 100644 --- a/build/version +++ b/build/version @@ -1 +1 @@ -1.1.2-Release +1.1.3-Release diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 059c8f2b18..5b0c6ed0d4 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -106,6 +106,7 @@ install-local-srv: install-slapd install-conf install-tools install-slapd: FORCE @-$(MKDIR) $(libexecdir) + @-$(MKDIR) $(localstatedir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir) CFFILES=slapd.conf slapd.at.conf slapd.oc.conf diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index a7db275d31..2e50c374b0 100644 --- a/servers/slurpd/Makefile.in +++ b/servers/slurpd/Makefile.in @@ -22,7 +22,7 @@ LDAP_LIBDIR= ../../libraries BUILD_OPT = "--enable-slurpd" BUILD_SRV = @BUILD_SLURPD@ -all-local: slurpd +all-local-srv: slurpd XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@