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: 13-Nov-2005 18:38:37
Branch: OPENPKG_2_5_SOLID Handle: 2005111317383700
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/mysql mysql.patch mysql.spec
Log:
take over Berkeley-DB patches from 'db' package and remove an obsolete
substitution in %build
Summary:
Revision Changes Path
1.18.2.3 +33 -0 openpkg-src/mysql/mysql.patch
1.130.2.4 +1 -5 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.18.2.2 -r1.18.2.3 mysql.patch
--- openpkg-src/mysql/mysql.patch 10 Nov 2005 14:40:50 -0000 1.18.2.2
+++ openpkg-src/mysql/mysql.patch 13 Nov 2005 17:38:37 -0000 1.18.2.3
@@ -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.130.2.3 -r1.130.2.4 mysql.spec
--- openpkg-src/mysql/mysql.spec 10 Nov 2005 14:40:50 -0000
1.130.2.3
+++ openpkg-src/mysql/mysql.spec 13 Nov 2005 17:38:37 -0000
1.130.2.4
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 2.5.2
+Release: 2.5.3
# package options
%option with_server yes
@@ -90,10 +90,6 @@
%patch -p0
%build
- # patch file search path
- %{l_shtool} subst %{l_value -s -a} \
- mysys/default.c
-
# determine additional configure options
case "%{l_platform -t}" in
*-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
