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: 05-May-2006 09:35:15
Branch: HEAD Handle: 2006050508351500
Modified files:
openpkg-src/mysql4 mysql4.patch mysql4.spec
Log:
upgrading package: mysql4 4.1.18 -> 4.1.19
Summary:
Revision Changes Path
1.6 +122 -124 openpkg-src/mysql4/mysql4.patch
1.19 +2 -2 openpkg-src/mysql4/mysql4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 mysql4.patch
--- openpkg-src/mysql4/mysql4.patch 11 Mar 2006 12:20:10 -0000 1.5
+++ openpkg-src/mysql4/mysql4.patch 5 May 2006 07:35:15 -0000 1.6
@@ -1,7 +1,40 @@
+Index: bdb/mutex/mut_fcntl.c
+--- bdb/mutex/mut_fcntl.c.orig 2006-04-29 07:35:50 +0200
++++ bdb/mutex/mut_fcntl.c 2006-05-05 09:12:56 +0200
+@@ -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 2006-04-29 07:35:50 +0200
++++ bdb/os/os_open.c 2006-05-05 09:12:56 +0200
+@@ -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
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-10-10 00:47:19 +0200
-+++ include/Makefile.in 2005-11-07 18:12:04 +0100
-@@ -330,14 +330,14 @@
+--- include/Makefile.in.orig 2006-04-29 07:36:28 +0200
++++ include/Makefile.in 2006-05-05 09:12:56 +0200
+@@ -342,14 +342,14 @@
errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
@@ -20,8 +53,8 @@
mysql_version.h.in my_handler.h my_time.h
Index: include/my_global.h
---- include/my_global.h.orig 2005-10-10 00:46:23 +0200
-+++ include/my_global.h 2005-11-07 18:12:04 +0100
+--- include/my_global.h.orig 2006-04-29 07:35:47 +0200
++++ include/my_global.h 2006-05-05 09:12:56 +0200
@@ -680,9 +680,8 @@
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
@@ -33,26 +66,93 @@
/*
Max size that must be added to a so that we know Size to make
-Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-10-10 00:46:25 +0200
-+++ scripts/mysql_config.sh 2005-11-07 18:12:04 +0100
-@@ -93,11 +93,11 @@
+Index: libmysql/Makefile.in
+--- libmysql/Makefile.in.orig 2006-04-29 07:36:29 +0200
++++ libmysql/Makefile.in 2006-05-05 09:12:56 +0200
+@@ -213,6 +213,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
- # Create options
+@@ -426,6 +427,7 @@
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ $(openssl_includes) @ZLIB_INCLUDES@
--libs="$ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: libmysql_r/Makefile.in
+--- libmysql_r/Makefile.in.orig 2006-04-29 07:36:30 +0200
++++ libmysql_r/Makefile.in 2006-05-05 09:12:56 +0200
+@@ -210,6 +210,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
+
+@@ -424,6 +425,7 @@
+ -I$(top_builddir)/include -I$(top_srcdir)/include \
+ $(openssl_includes) @ZLIB_INCLUDES@
+
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: mysys/Makefile.in
+--- mysys/Makefile.in.orig 2006-04-29 07:36:33 +0200
++++ mysys/Makefile.in 2006-05-05 09:12:56 +0200
+@@ -194,6 +194,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+@@ -405,6 +406,7 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: mysys/default.c
+--- mysys/default.c.orig 2006-04-29 07:35:48 +0200
++++ mysys/default.c 2006-05-05 09:12:56 +0200
+@@ -48,7 +48,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++ETCDIR,
+ #endif
+ #ifdef DATADIR
+ DATADIR,
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig 2006-04-29 07:35:49 +0200
++++ scripts/mysql_config.sh 2006-05-05 09:17:27 +0200
+@@ -98,9 +98,9 @@
+
+ # Create options
+ # We intentionally add a space to the beginning of lib strings, simplifies
replace later
+-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
++libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"
- libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
+-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
++libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
+ embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@
@WRAPLIBS@ @innodb_system_libs@"
--libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
-+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
- libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
- include="-I$pkgincludedir"
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2005-10-10 00:46:35
+0200
-+++ scripts/mysql_create_system_tables.sh 2005-11-07 18:12:04 +0100
+--- scripts/mysql_create_system_tables.sh.orig 2006-04-29 07:35:51
+0200
++++ scripts/mysql_create_system_tables.sh 2006-05-05 09:12:56 +0200
@@ -71,9 +71,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -84,9 +184,9 @@
i_u="$i_u
INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
Index: scripts/mysqld_safe.sh
---- scripts/mysqld_safe.sh.orig 2005-10-10 00:46:44 +0200
-+++ scripts/mysqld_safe.sh 2005-11-07 18:12:04 +0100
-@@ -121,7 +121,7 @@
+--- scripts/mysqld_safe.sh.orig 2006-04-29 07:35:53 +0200
++++ scripts/mysqld_safe.sh 2006-05-05 09:12:56 +0200
+@@ -150,7 +150,7 @@
# Next try where the source installs put it
elif test -d $MY_BASEDIR_VERSION/var/mysql
then
@@ -95,105 +195,3 @@
# Or just give up and use our compiled-in default
else
[EMAIL PROTECTED]@
-Index: mysys/Makefile.in
---- mysys/Makefile.in.orig 2005-10-10 00:47:23 +0200
-+++ mysys/Makefile.in 2005-11-10 11:50:57 +0100
-@@ -247,6 +247,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-@@ -452,6 +453,7 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: mysys/default.c
---- mysys/default.c.orig 2005-11-10 10:26:30 +0100
-+++ mysys/default.c 2005-11-10 11:53:32 +0100
-@@ -48,7 +48,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+ETCDIR,
- #endif
- #ifdef DATADIR
- DATADIR,
-Index: libmysql/Makefile.in
---- libmysql/Makefile.in.orig 2005-10-10 00:47:20 +0200
-+++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100
-@@ -213,6 +213,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-
-@@ -420,6 +421,7 @@
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: libmysql_r/Makefile.in
---- libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200
-+++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100
-@@ -211,6 +211,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-
-@@ -419,6 +420,7 @@
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- 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/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec 11 Mar 2006 12:20:10 -0000 1.18
+++ openpkg-src/mysql4/mysql4.spec 5 May 2006 07:35:15 -0000 1.19
@@ -24,7 +24,7 @@
# package version
%define V_major 4.1
-%define V_minor 18
+%define V_minor 19
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20060311
+Release: 20060505
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
