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: 12-Apr-2006 20:53:47
Branch: HEAD Handle: 2006041219534600
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
upgrading package: mysql 5.0.19 -> 5.0.20
Summary:
Revision Changes Path
1.23 +23 -25 openpkg-src/mysql/mysql.patch
1.142 +2 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 mysql.patch
--- openpkg-src/mysql/mysql.patch 11 Mar 2006 12:20:57 -0000 1.22
+++ openpkg-src/mysql/mysql.patch 12 Apr 2006 18:53:46 -0000 1.23
@@ -1,7 +1,7 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-11-15 01:14:00 +0100
-+++ include/Makefile.in 2005-11-21 21:19:28 +0100
-@@ -349,14 +349,14 @@
+--- include/Makefile.in.orig 2006-03-31 19:12:20 +0200
++++ include/Makefile.in 2006-04-12 20:31:33 +0200
+@@ -352,14 +352,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 \
@@ -17,12 +17,12 @@
+ my_nosys.h my_alarm.h queues.h \
+ my_tree.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h md5.h base64.h \
- mysql_version.h.in my_handler.h my_time.h decimal.h
-
+ mysql_version.h.in my_handler.h my_time.h decimal.h \
+ my_user.h
Index: include/my_global.h
---- include/my_global.h.orig 2005-11-15 01:12:30 +0100
-+++ include/my_global.h 2005-11-21 21:18:29 +0100
-@@ -721,9 +721,8 @@
+--- include/my_global.h.orig 2006-03-31 19:10:26 +0200
++++ include/my_global.h 2006-04-12 20:31:33 +0200
+@@ -737,9 +737,8 @@
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
@@ -34,8 +34,8 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2005-11-15 01:12:32 +0100
-+++ mysys/default.c 2005-11-21 21:18:29 +0100
+--- mysys/default.c.orig 2006-03-31 19:10:28 +0200
++++ mysys/default.c 2006-04-12 20:31:33 +0200
@@ -1001,7 +1001,7 @@
if ((env= getenv("ETC")))
*ptr++= env;
@@ -46,25 +46,23 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-11-15 01:12:33 +0100
-+++ scripts/mysql_config.sh 2005-11-21 21:18:29 +0100
-@@ -93,11 +93,11 @@
-
- # Create options
-
--libs="$ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
+--- scripts/mysql_config.sh.orig 2006-03-31 19:10:28 +0200
++++ scripts/mysql_config.sh 2006-04-12 20:34:45 +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-11-15 01:12:45
+0100
-+++ scripts/mysql_create_system_tables.sh 2005-11-21 21:18:29 +0100
+--- scripts/mysql_create_system_tables.sh.orig 2006-03-31 19:10:40
+0200
++++ scripts/mysql_create_system_tables.sh 2006-04-12 20:31:33 +0200
@@ -77,9 +77,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.141 -r1.142 mysql.spec
--- openpkg-src/mysql/mysql.spec 20 Mar 2006 21:46:53 -0000 1.141
+++ openpkg-src/mysql/mysql.spec 12 Apr 2006 18:53:46 -0000 1.142
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 19
+%define V_minor 20
%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: 20060320
+Release: 20060412
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
