OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Nov-2005 13:46:29 Branch: HEAD Handle: 2005111112462800 Modified files: openpkg-src/mysql mysql.patch mysql.spec Log: apply Berkeley-DB patches from 'db' package to MySQL's local copy, too Summary: Revision Changes Path 1.21 +33 -0 openpkg-src/mysql/mysql.patch 1.135 +1 -1 openpkg-src/mysql/mysql.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.patch ============================================================================ $ cvs diff -u -r1.20 -r1.21 mysql.patch --- openpkg-src/mysql/mysql.patch 10 Nov 2005 11:23:47 -0000 1.20 +++ openpkg-src/mysql/mysql.patch 11 Nov 2005 12:46:28 -0000 1.21 @@ -164,3 +164,36 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) +Index: bdb/mutex/mut_fcntl.c +--- bdb/mutex/mut_fcntl.c.orig 2005-10-10 00:46:27 +0200 ++++ bdb/mutex/mut_fcntl.c 2005-11-11 13:44:07 +0100 +@@ -101,7 +101,7 @@ + + /* Acquire an exclusive kernel lock. */ + k_lock.l_type = F_WRLCK; +- if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock)) ++ if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1) + return (__os_get_errno()); + + /* If the resource is still available, it's ours. */ +@@ -112,7 +112,7 @@ + + /* Release the kernel lock. */ + k_lock.l_type = F_UNLCK; +- if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock)) ++ if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1) + return (__os_get_errno()); + + /* +Index: bdb/os/os_open.c +--- bdb/os/os_open.c.orig 2005-10-10 00:46:27 +0200 ++++ bdb/os/os_open.c 2005-11-11 13:44:07 +0100 +@@ -93,7 +93,7 @@ + if (LF_ISSET(DB_OSO_TRUNC)) + oflags |= O_TRUNC; + +-#ifdef HAVE_O_DIRECT ++#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__) + if (LF_ISSET(DB_OSO_DIRECT)) + oflags |= O_DIRECT; + #endif @@ . patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.spec ============================================================================ $ cvs diff -u -r1.134 -r1.135 mysql.spec --- openpkg-src/mysql/mysql.spec 10 Nov 2005 11:23:47 -0000 1.134 +++ openpkg-src/mysql/mysql.spec 11 Nov 2005 12:46:28 -0000 1.135 @@ -39,7 +39,7 @@ Group: Database License: GPL Version: %{V_opkg} -Release: 20051110 +Release: 20051111 # package options %option with_server yes @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org