head 1.13; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.7 OPENPKG_E1_FP:1.7 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.7 OPENPKG_2_STABLE_20060622:1.7 OPENPKG_2_STABLE:1.7.0.2 OPENPKG_2_STABLE_BP:1.7 OPENPKG_2_5_RELEASE:1.6 OPENPKG_2_5_SOLID:1.6.0.6 OPENPKG_2_5_SOLID_BP:1.6 OPENPKG_2_4_RELEASE:1.6 OPENPKG_2_4_SOLID:1.6.0.4 OPENPKG_2_4_SOLID_BP:1.6 OPENPKG_CW_FP:1.6 OPENPKG_2_3_RELEASE:1.6 OPENPKG_2_3_SOLID:1.6.0.2 OPENPKG_2_3_SOLID_BP:1.6 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.4 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.2 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3; locks; strict; comment @# @; 1.13 date 2008.05.26.20.40.12; author rse; state Exp; branches; next 1.12; commitid BZFwJEqmGYv23w4t; 1.12 date 2008.01.18.13.59.25; author rse; state Exp; branches; next 1.11; commitid 8QtA3CHwWpoDYTNs; 1.11 date 2008.01.18.06.57.48; author rse; state Exp; branches; next 1.10; commitid nREaW0LJj7kYDRNs; 1.10 date 2007.10.11.08.49.20; author rse; state Exp; branches; next 1.9; commitid HGel3uBXUi4yr9Bs; 1.9 date 2007.08.24.21.24.08; author rse; state Exp; branches; next 1.8; commitid MruuDmOAn3t9a3vs; 1.8 date 2007.07.24.20.12.21; author rse; state Exp; branches; next 1.7; commitid cwfwJy9QZXbjL3rs; 1.7 date 2005.11.20.09.42.37; author rse; state Exp; branches; next 1.6; commitid VL6EM7cBgAmWUtar; 1.6 date 2004.11.13.14.53.28; author rse; state Exp; branches; next 1.5; 1.5 date 2004.04.29.09.37.58; author rse; state Exp; branches; next 1.4; 1.4 date 2004.04.26.08.59.43; author rse; state Exp; branches; next 1.3; 1.3 date 2003.12.05.09.31.32; author rse; state Exp; branches; next 1.2; 1.2 date 2003.11.27.09.25.11; author rse; state Exp; branches; next 1.1; 1.1 date 2003.09.15.19.12.23; author rse; state Exp; branches; next ; desc @@ 1.13 log @upgrading package: db 4.6.21.1 -> 4.7.25.0 @ text @Index: mutex/mut_fcntl.c --- mutex/mut_fcntl.c.orig 2008-01-08 21:58:43 +0100 +++ mutex/mut_fcntl.c 2008-05-26 22:36:45 +0200 @@@@ -84,7 +84,7 @@@@ /* Acquire an exclusive kernel lock. */ k_lock.l_type = F_WRLCK; - if (fcntl(env->lockfhp->fd, F_SETLKW, &k_lock)) + if (fcntl(env->lockfhp->fd, F_SETLKW, &k_lock) == -1) goto err; /* If the resource is still available, it's ours. */ @@@@ -97,7 +97,7 @@@@ /* Release the kernel lock. */ k_lock.l_type = F_UNLCK; - if (fcntl(env->lockfhp->fd, F_SETLK, &k_lock)) + if (fcntl(env->lockfhp->fd, F_SETLK, &k_lock) == -1) goto err; /* Index: os/os_open.c --- os/os_open.c.orig 2008-03-26 05:11:35 +0100 +++ os/os_open.c 2008-05-26 22:36:05 +0200 @@@@ -67,7 +67,7 @@@@ if (LF_ISSET(DB_OSO_EXCL)) oflags |= O_EXCL; -#ifdef HAVE_O_DIRECT +#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__) if (LF_ISSET(DB_OSO_DIRECT)) oflags |= O_DIRECT; #endif @ 1.12 log @remove incorrect patch @ text @d2 3 a4 3 --- mutex/mut_fcntl.c.orig 2007-05-17 17:15:45 +0200 +++ mutex/mut_fcntl.c 2008-01-18 07:56:25 +0100 @@@@ -79,7 +79,7 @@@@ d8 2 a9 2 - if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1) d13 1 a13 1 @@@@ -93,7 +93,7 @@@@ d17 2 a18 2 - if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1) d23 3 a25 3 --- os/os_open.c.orig 2007-05-17 17:15:46 +0200 +++ os/os_open.c 2008-01-18 07:56:25 +0100 @@@@ -65,7 +65,7 @@@@ @ 1.11 log @apply a bugfix for QNX from rpm5.org for consistency reasons @ text @a21 12 Index: os/os_handle.c --- os/os_handle.c.orig 2007-05-17 17:15:46 +0200 +++ os/os_handle.c 2008-01-18 07:56:25 +0100 @@@@ -52,7 +52,7 @@@@ #ifdef HAVE_QNX if (LF_ISSET(DB_OSO_REGION)) { if ((ret = - __os_qnx_region_open(dbenv, name, oflags, mode, fhp)) != 0) + __os_qnx_region_open(dbenv, name, flags, mode, fhp)) != 0) goto err; goto done; } @ 1.10 log @upgrading package: db 4.6.19.0 -> 4.6.21.0 @ text @d3 1 a3 1 +++ mutex/mut_fcntl.c 2007-10-11 10:47:14 +0200 d22 12 d36 1 a36 1 +++ os/os_open.c 2007-10-11 10:47:14 +0200 @ 1.9 log @regen patch @ text @d3 1 a3 1 +++ mutex/mut_fcntl.c 2007-08-24 23:23:15 +0200 d24 1 a24 1 +++ os/os_open.c 2007-08-24 23:23:15 +0200 @ 1.8 log @upgrading package: db 4.5.20.2 -> 4.6.18.0 @ text @d3 1 a3 1 +++ mutex/mut_fcntl.c 2007-07-24 22:09:39 +0200 d24 1 a24 1 +++ os/os_open.c 2007-07-24 22:09:39 +0200 @ 1.7 log @upgrading package: db 4.3.29.0 -> 4.4.16.0 @ text @d2 3 a4 3 --- mutex/mut_fcntl.c.orig 2005-11-01 15:49:05 +0100 +++ mutex/mut_fcntl.c 2005-11-20 09:49:05 +0100 @@@@ -88,7 +88,7 @@@@ d13 1 a13 1 @@@@ -102,7 +102,7 @@@@ d23 3 a25 3 --- os/os_open.c.orig 2005-10-31 19:24:50 +0100 +++ os/os_open.c 2005-11-20 09:48:27 +0100 @@@@ -119,7 +119,7 @@@@ @ 1.6 log @Upgrade from DB 4.2 to 4.3 @ text @d2 3 a4 3 --- mutex/mut_fcntl.c.orig 2004-01-28 04:36:18 +0100 +++ mutex/mut_fcntl.c 2004-11-11 20:04:31 +0100 @@@@ -99,7 +99,7 @@@@ d10 1 a10 1 return (__os_get_errno()); d13 1 a13 1 @@@@ -110,7 +110,7 @@@@ d19 1 a19 1 return (__os_get_errno()); d23 3 a25 3 --- os/os_open.c.orig 2004-09-28 18:46:57 +0200 +++ os/os_open.c 2004-11-11 20:04:31 +0100 @@@@ -121,7 +121,7 @@@@ @ 1.5 log @replace Tru64 hack with a more general solution which removed the Pthread API dependency at all by using UNIX/fcntl as the default and for speed optimization reasons try to use assembly code on some architectures @ text @d2 3 a4 3 --- mutex/mut_fcntl.c.orig 2003-05-05 21:55:03.000000000 +0200 +++ mutex/mut_fcntl.c 2003-12-05 10:28:14.000000000 +0100 @@@@ -100,7 +100,7 @@@@ d13 1 a13 1 @@@@ -111,7 +111,7 @@@@ d23 5 a27 5 --- os/os_open.c.orig 2003-09-10 02:27:29.000000000 +0200 +++ os/os_open.c 2003-12-05 10:28:14.000000000 +0100 @@@@ -141,7 +141,7 @@@@ if (LF_ISSET(DB_OSO_TRUNC)) oflags |= O_TRUNC; @ 1.4 log @include patch for Tru64 5.1 @ text @a33 12 Index: dist/configure --- dist/configure.orig 2003-12-03 22:10:02.000000000 +0100 +++ dist/configure 2004-04-26 10:58:16.000000000 +0200 @@@@ -3504,7 +3504,7 @@@@ CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" LIBS="$LIBS -lsocket -lsvipc";; -osf*) CPPFLAGS="$CPPFLAGS -pthread";; +osf*) CPPFLAGS="$CPPFLAGS -pthread"; LDFLAGS="$LDFLAGS -pthread";; *qnx*) cat >>confdefs.h <<\_ACEOF #define HAVE_QNX 1 _ACEOF @ 1.3 log @upgrading package: db 4.2.50.0 -> 4.2.52.0 @ text @d34 12 @ 1.2 log @upgrading package: db 4.1.25.1 -> 4.2.50.0 @ text @a0 7 +--------------------------------------------------------------------------- | Bugfix: POSIX/SUSv3 clearly expresses that fcntl(2) returns "value | other than -1" on success, so check for equality to -1 instead of | non-equality to 0. In practice this does not harm on most platforms, | because they fortunately (by conincidence and common practice) | return 0. +--------------------------------------------------------------------------- d2 3 a4 3 --- mutex/mut_fcntl.c 18 Jan 2003 14:05:03 -0000 1.1.1.5 +++ mutex/mut_fcntl.c 15 Sep 2003 13:37:58 -0000 @@@@ -101,7 +101,7 @@@@ d13 1 a13 1 @@@@ -112,7 +112,7 @@@@ a21 13 +--------------------------------------------------------------------------- | The O_DIRECT feature is fully broken under at least Linux 2.2 and | 2.4. It is sometimes accepted by open(2) without error and later | causes a write(2) to fail with EINVAL -- all depending on the | underlying filesystem (usually works on tmpfs and fails on ext3). | Sometimes it also causes open(2) to fail with EINVAL. In general, | it does especially no "graceful degradation" and so is useless for | use mostly all platforms except for those where we know it works | (currently FreeBSD only). Interestingly, RPM works on RedHat, just | because RedHat's "kernel" package contains a patch which masks out | O_DIRECT usage... ;-) +--------------------------------------------------------------------------- d23 3 a25 3 --- os/os_open.c 18 Jan 2003 14:05:03 -0000 1.1.1.5 +++ os/os_open.c 15 Sep 2003 18:12:23 -0000 @@@@ -93,7 +93,7 @@@@ a33 15 +--------------------------------------------------------------------------- | The api_java documentation is not part of the standard distribution. +--------------------------------------------------------------------------- Index: dist/Makefile.in --- dist/Makefile.in.orig 2003-10-16 21:21:02.000000000 +0200 +++ dist/Makefile.in 2003-11-27 10:10:36.000000000 +0100 @@@@ -846,7 +846,7 @@@@ done) DOCLIST=\ - api_c api_cxx api_java api_tcl images index.html java ref \ + api_c api_cxx api_tcl images index.html java ref \ reftoc.html sleepycat utility install_docs: @@echo "Installing documentation: $(DESTDIR)$(docdir) ..." @ 1.1 log @include the two patches I've assembling for RPM here, too @ text @d54 15 @