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: 27-Nov-2006 18:25:28
Branch: HEAD Handle: 2006112717252800
Modified files:
openpkg-src/mysql4 mysql4.patch mysql4.spec
Log:
upgrading package: mysql4 4.1.21 -> 4.1.22
Summary:
Revision Changes Path
1.7 +32 -32 openpkg-src/mysql4/mysql4.patch
1.29 +2 -2 openpkg-src/mysql4/mysql4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 mysql4.patch
--- openpkg-src/mysql4/mysql4.patch 5 May 2006 07:35:15 -0000 1.6
+++ openpkg-src/mysql4/mysql4.patch 27 Nov 2006 17:25:28 -0000 1.7
@@ -1,6 +1,6 @@
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
+--- bdb/mutex/mut_fcntl.c.orig 2006-11-03 03:15:45 +0100
++++ bdb/mutex/mut_fcntl.c 2006-11-27 18:12:12 +0100
@@ -101,7 +101,7 @@
/* Acquire an exclusive kernel lock. */
@@ -20,8 +20,8 @@
/*
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
+--- bdb/os/os_open.c.orig 2006-11-03 03:17:24 +0100
++++ bdb/os/os_open.c 2006-11-27 18:12:12 +0100
@@ -93,7 +93,7 @@
if (LF_ISSET(DB_OSO_TRUNC))
oflags |= O_TRUNC;
@@ -32,9 +32,9 @@
oflags |= O_DIRECT;
#endif
Index: include/Makefile.in
---- 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 @@
+--- include/Makefile.in.orig 2006-11-03 03:18:30 +0100
++++ include/Makefile.in 2006-11-27 18:12:12 +0100
+@@ -343,14 +343,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 \
@@ -53,9 +53,9 @@
mysql_version.h.in my_handler.h my_time.h
Index: include/my_global.h
---- 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 @@
+--- include/my_global.h.orig 2006-11-03 03:17:10 +0100
++++ include/my_global.h 2006-11-27 18:12:12 +0100
+@@ -718,9 +718,8 @@
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
@@ -67,8 +67,8 @@
/*
Max size that must be added to a so that we know Size to make
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
+--- libmysql/Makefile.in.orig 2006-11-03 03:18:31 +0100
++++ libmysql/Makefile.in 2006-11-27 18:12:12 +0100
@@ -213,6 +213,7 @@
DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
@@ -77,7 +77,7 @@
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-@@ -426,6 +427,7 @@
+@@ -427,6 +428,7 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
@@ -86,8 +86,8 @@
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
+--- libmysql_r/Makefile.in.orig 2006-11-03 03:18:32 +0100
++++ libmysql_r/Makefile.in 2006-11-27 18:12:12 +0100
@@ -210,6 +210,7 @@
DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
@@ -96,7 +96,7 @@
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-@@ -424,6 +425,7 @@
+@@ -425,6 +426,7 @@
-I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
@@ -105,8 +105,8 @@
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
+--- mysys/Makefile.in.orig 2006-11-03 03:18:37 +0100
++++ mysys/Makefile.in 2006-11-27 18:12:12 +0100
@@ -194,6 +194,7 @@
DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
@@ -115,7 +115,7 @@
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-@@ -405,6 +406,7 @@
+@@ -406,6 +407,7 @@
vio_dir = @vio_dir@
vio_libs = @vio_libs@
zlib_dir = @zlib_dir@
@@ -124,8 +124,8 @@
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
+--- mysys/default.c.orig 2006-11-03 03:16:23 +0100
++++ mysys/default.c 2006-11-27 18:12:12 +0100
@@ -48,7 +48,7 @@
#elif defined(__NETWARE__)
"sys:/etc/",
@@ -136,23 +136,23 @@
#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
+--- scripts/mysql_config.sh.orig 2006-11-03 03:16:02 +0100
++++ scripts/mysql_config.sh 2006-11-27 18:15:41 +0100
@@ -98,9 +98,9 @@
# Create options
- # We intentionally add a space to the beginning of lib strings, simplifies
replace later
+ # We intentionally add a space to the beginning and end 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_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="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+-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@ "
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_create_system_tables.sh
---- 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
+--- scripts/mysql_create_system_tables.sh.orig 2006-11-03 03:15:41
+0100
++++ scripts/mysql_create_system_tables.sh 2006-11-27 18:12:12 +0100
@@ -71,9 +71,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -184,8 +184,8 @@
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 2006-04-29 07:35:53 +0200
-+++ scripts/mysqld_safe.sh 2006-05-05 09:12:56 +0200
+--- scripts/mysqld_safe.sh.orig 2006-11-03 03:15:43 +0100
++++ scripts/mysqld_safe.sh 2006-11-27 18:12:12 +0100
@@ -150,7 +150,7 @@
# Next try where the source installs put it
elif test -d $MY_BASEDIR_VERSION/var/mysql
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec 12 Nov 2006 14:25:08 -0000 1.28
+++ openpkg-src/mysql4/mysql4.spec 27 Nov 2006 17:25:28 -0000 1.29
@@ -24,7 +24,7 @@
# package version
%define V_major 4.1
-%define V_minor 21
+%define V_minor 22
%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: 20061112
+Release: 20061127
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
