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: 10-Jan-2007 19:53:52
Branch: HEAD Handle: 2007011018535200
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
upgrade to 5.0.33 and no longer install my_aes.h as I think it is no
longer required (although I'm not 100% sure)
Summary:
Revision Changes Path
1.25 +9 -30 openpkg-src/mysql/mysql.patch
1.162 +2 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.24 -r1.25 mysql.patch
--- openpkg-src/mysql/mysql.patch 10 Oct 2006 06:03:52 -0000 1.24
+++ openpkg-src/mysql/mysql.patch 10 Jan 2007 18:53:52 -0000 1.25
@@ -1,28 +1,7 @@
-Index: include/Makefile.in
---- include/Makefile.in.orig 2006-10-04 13:25:40 +0200
-+++ include/Makefile.in 2006-10-10 07:46:47 +0200
-@@ -360,14 +360,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)
-
- noinst_HEADERS = config-win.h config-os2.h config-netware.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 \
-+ 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 \
- my_user.h my_libwrap.h
Index: include/my_global.h
---- include/my_global.h.orig 2006-10-04 13:24:43 +0200
-+++ include/my_global.h 2006-10-10 07:46:47 +0200
-@@ -739,9 +739,8 @@
+--- include/my_global.h.orig 2007-01-09 13:51:49 +0100
++++ include/my_global.h 2007-01-10 08:49:00 +0100
+@@ -777,9 +777,8 @@
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
@@ -34,8 +13,8 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2006-10-04 13:24:24 +0200
-+++ mysys/default.c 2006-10-10 07:46:47 +0200
+--- mysys/default.c.orig 2007-01-09 13:51:38 +0100
++++ mysys/default.c 2007-01-10 08:49:00 +0100
@@ -1007,7 +1007,7 @@
if ((env= getenv("ETC")))
*ptr++= env;
@@ -46,8 +25,8 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2006-10-04 13:24:22 +0200
-+++ scripts/mysql_config.sh 2006-10-10 07:48:36 +0200
+--- scripts/mysql_config.sh.orig 2007-01-09 13:51:28 +0100
++++ scripts/mysql_config.sh 2007-01-10 08:49:00 +0100
@@ -98,9 +98,9 @@
# Create options
@@ -61,8 +40,8 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2006-10-04 13:24:11
+0200
-+++ scripts/mysql_create_system_tables.sh 2006-10-10 07:46:47 +0200
+--- scripts/mysql_create_system_tables.sh.orig 2007-01-09 13:51:08
+0100
++++ scripts/mysql_create_system_tables.sh 2007-01-10 08:49:00 +0100
@@ -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.161 -r1.162 mysql.spec
--- openpkg-src/mysql/mysql.spec 1 Jan 2007 17:40:00 -0000 1.161
+++ openpkg-src/mysql/mysql.spec 10 Jan 2007 18:53:52 -0000 1.162
@@ -24,7 +24,7 @@
# package version
%define V_major 5.0
-%define V_minor 27
+%define V_minor 33
%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: 20070110
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
