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: 23-Apr-2005 20:05:39
Branch: HEAD Handle: 2005042319053801
Modified files:
openpkg-src/mysql5 mysql5.patch mysql5.spec
Log:
upgrading package: mysql5 5.0.3 -> 5.0.4
Summary:
Revision Changes Path
1.2 +13 -13 openpkg-src/mysql5/mysql5.patch
1.3 +2 -2 openpkg-src/mysql5/mysql5.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql5/mysql5.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql5.patch
--- openpkg-src/mysql5/mysql5.patch 30 Mar 2005 11:28:10 -0000 1.1
+++ openpkg-src/mysql5/mysql5.patch 23 Apr 2005 18:05:38 -0000 1.2
@@ -1,28 +1,28 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-03-22 20:27:14 +0100
-+++ include/Makefile.in 2005-03-30 13:05:51 +0200
-@@ -344,14 +344,14 @@
+--- 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 @@
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 \
- mysql_time.h $(BUILT_SOURCES)
-+ mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
++ mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- nisam.h heap.h merge.h my_bitmap.h\
+ heap.h my_bitmap.h\
myisam.h myisampack.h myisammrg.h ft_global.h\
mysys_err.h my_base.h help_start.h help_end.h \
- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
- my_aes.h my_tree.h hash.h thr_alarm.h \
-+ my_nosys.h my_alarm.h queues.h sha1.h \
++ 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 \
mysql_version.h.in my_handler.h my_time.h decimal.h
Index: mysys/default.c
---- mysys/default.c.orig 2005-03-22 20:26:24 +0100
-+++ mysys/default.c 2005-03-30 11:08:47 +0200
-@@ -702,7 +702,7 @@
+--- 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
@@ -32,8 +32,8 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-03-22 20:26:24 +0100
-+++ scripts/mysql_config.sh 2005-03-30 11:03:17 +0200
+--- scripts/mysql_config.sh.orig 2005-04-16 21:01:45 +0200
++++ scripts/mysql_config.sh 2005-04-23 19:53:58 +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-03-22 20:26:34
+0100
-+++ scripts/mysql_create_system_tables.sh 2005-03-30 13:10:09 +0200
+--- 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
@@ -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/mysql5/mysql5.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql5.spec
--- openpkg-src/mysql5/mysql5.spec 30 Mar 2005 18:00:12 -0000 1.2
+++ openpkg-src/mysql5/mysql5.spec 23 Apr 2005 18:05:39 -0000 1.3
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 3
+%define V_minor 4
%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: 20050330
+Release: 20050423
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]