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-Jun-2005 19:53:08
Branch: HEAD Handle: 2005061318530700
Modified files:
openpkg-src/mysql5 mysql5.patch mysql5.spec
Log:
upgrading package: mysql5 5.0.4 -> 5.0.6
Summary:
Revision Changes Path
1.3 +14 -14 openpkg-src/mysql5/mysql5.patch
1.4 +2 -2 openpkg-src/mysql5/mysql5.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql5/mysql5.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql5.patch
--- openpkg-src/mysql5/mysql5.patch 23 Apr 2005 18:05:38 -0000 1.2
+++ openpkg-src/mysql5/mysql5.patch 13 Jun 2005 17:53:07 -0000 1.3
@@ -1,7 +1,7 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-04-16 21:02:22 +0200
-+++ include/Makefile.in 2005-04-23 19:54:51 +0200
-@@ -337,14 +337,14 @@
+--- include/Makefile.in.orig 2005-05-26 15:27:57 +0200
++++ include/Makefile.in 2005-06-13 19:40:38 +0200
+@@ -341,14 +341,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,20 +20,20 @@
mysql_version.h.in my_handler.h my_time.h decimal.h
Index: mysys/default.c
---- mysys/default.c.orig 2005-04-16 21:01:45 +0200
-+++ mysys/default.c 2005-04-23 19:53:58 +0200
-@@ -806,7 +806,7 @@
- #elif defined(__NETWARE__)
- *ptr++= "sys:/etc/";
- #else
+--- mysys/default.c.orig 2005-05-26 15:26:56 +0200
++++ mysys/default.c 2005-06-13 19:41:19 +0200
+@@ -866,7 +866,7 @@
+ if ((env= getenv("ETC")))
+ *ptr++= env;
+ #endif
- *ptr++= "/etc/";
+ *ptr++= "@l_prefix@/etc/mysql/";
#endif
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-04-16 21:01:45 +0200
-+++ scripts/mysql_config.sh 2005-04-23 19:53:58 +0200
+--- scripts/mysql_config.sh.orig 2005-05-26 15:26:57 +0200
++++ scripts/mysql_config.sh 2005-06-13 19:40:38 +0200
@@ -85,11 +85,11 @@
# Create options
@@ -49,8 +49,8 @@
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-04-16 21:01:48
+0200
-+++ scripts/mysql_create_system_tables.sh 2005-04-23 19:53:58 +0200
+--- scripts/mysql_create_system_tables.sh.orig 2005-05-26 15:26:59
+0200
++++ scripts/mysql_create_system_tables.sh 2005-06-13 19:40:38 +0200
@@ -77,9 +77,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -61,7 +61,7 @@
fi
if test ! -f $mdata/host.frm
-@@ -164,17 +161,13 @@
+@@ -167,17 +164,13 @@
then
i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
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','Y','Y','Y','Y','Y','','','','',0,0,0,0);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql5/mysql5.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 mysql5.spec
--- openpkg-src/mysql5/mysql5.spec 23 Apr 2005 18:05:39 -0000 1.3
+++ openpkg-src/mysql5/mysql5.spec 13 Jun 2005 17:53:07 -0000 1.4
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 4
+%define V_minor 6
%define V_mysql %{V_major}.%{V_minor}-beta
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20050423
+Release: 20050613
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
