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: 16-Feb-2005 21:25:18
Branch: HEAD Handle: 2005021620251800
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
upgrading package: mysql 4.1.9 -> 4.1.10
Summary:
Revision Changes Path
1.15 +27 -24 openpkg-src/mysql/mysql.patch
1.118 +2 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 mysql.patch
--- openpkg-src/mysql/mysql.patch 20 Jan 2005 13:44:39 -0000 1.14
+++ openpkg-src/mysql/mysql.patch 16 Feb 2005 20:25:18 -0000 1.15
@@ -1,18 +1,7 @@
---- mysys/default.c.orig 2004-06-27 23:56:50 +0200
-+++ mysys/default.c 2004-07-01 19:20:13 +0200
-@@ -48,7 +48,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+"@l_prefix@/etc/mysql/",
- #endif
- #ifdef DATADIR
- DATADIR,
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-01-11 23:06:33 +0100
-+++ include/Makefile.in 2005-01-15 09:36:06 +0100
-@@ -325,14 +325,14 @@
+--- include/Makefile.in.orig 2005-02-12 21:38:02 +0100
++++ include/Makefile.in 2005-02-16 20:05:41 +0100
+@@ -328,14 +328,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 \
@@ -30,24 +19,38 @@
thr_lock.h t_ctype.h violite.h md5.h \
mysql_version.h.in my_handler.h my_time.h
+Index: mysys/default.c
+--- mysys/default.c.orig 2005-02-12 21:37:31 +0100
++++ mysys/default.c 2005-02-16 20:05:41 +0100
+@@ -48,7 +48,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-01-11 23:06:00 +0100
-+++ scripts/mysql_config.sh 2005-01-15 09:38:51 +0100
-@@ -86,9 +86,9 @@
+--- scripts/mysql_config.sh.orig 2005-02-12 21:37:31 +0100
++++ scripts/mysql_config.sh 2005-02-16 20:05:41 +0100
+@@ -85,11 +85,11 @@
# Create options
--libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
-+libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs"
+-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 @LIBS@ @ZLIB_LIBS@
@openssl_libs@"
-+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @LIBS@ @ZLIB_LIBS@
@openssl_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-01-11 23:06:03
+0100
-+++ scripts/mysql_create_system_tables.sh 2005-01-15 09:36:06 +0100
+--- scripts/mysql_create_system_tables.sh.orig 2005-02-14 11:40:14
+0100
++++ scripts/mysql_create_system_tables.sh 2005-02-16 20:05:41 +0100
@@ -71,9 +71,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -77,4 +80,4 @@
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
else
i_u="$i_u
- INSERT INTO user VALUES
('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+ 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);"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.117 -r1.118 mysql.spec
--- openpkg-src/mysql/mysql.spec 31 Jan 2005 12:35:58 -0000 1.117
+++ openpkg-src/mysql/mysql.spec 16 Feb 2005 20:25:18 -0000 1.118
@@ -25,7 +25,7 @@
# package version
%define V_major 4.1
-%define V_minor 9
+%define V_minor 10
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20050131
+Release: 20050216
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
