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: 21-Nov-2005 21:52:45 Branch: HEAD Handle: 2005112120524500 Modified files: openpkg-src/mysql5 mysql5.patch mysql5.spec Log: upgrading package: mysql5 5.0.15 -> 5.0.16 Summary: Revision Changes Path 1.5 +29 -29 openpkg-src/mysql5/mysql5.patch 1.13 +2 -2 openpkg-src/mysql5/mysql5.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/mysql5/mysql5.patch ============================================================================ $ cvs diff -u -r1.4 -r1.5 mysql5.patch --- openpkg-src/mysql5/mysql5.patch 11 Oct 2005 07:09:50 -0000 1.4 +++ openpkg-src/mysql5/mysql5.patch 21 Nov 2005 20:52:45 -0000 1.5 @@ -1,12 +1,12 @@ Index: include/Makefile.in ---- 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 @@ +--- 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 @@ 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 \ heap.h my_bitmap.h\ @@ -14,27 +14,15 @@ 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 \ ++ 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 -Index: mysys/default.c ---- 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: include/my_global.h ---- include/my_global.h.orig 2005-08-17 19:06:28.000000000 +0200 -+++ include/my_global.h 2005-10-07 22:58:45.677758340 +0200 -@@ -676,9 +676,8 @@ +--- 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 @@ #define FLT_MAX ((float)3.40282346638528860e+38) #endif @@ -43,12 +31,24 @@ #define isinf(X) 0 -#endif - /* - Max size that must be added to a so that we know Size to make + /* 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 +@@ -1001,7 +1001,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-05-26 15:26:57 +0200 -+++ scripts/mysql_config.sh 2005-06-13 19:40:38 +0200 -@@ -85,11 +85,11 @@ +--- 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 @@ -63,8 +63,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-05-26 15:26:59 +0200 -+++ scripts/mysql_create_system_tables.sh 2005-06-13 19:40:38 +0200 +--- 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 @@ -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.12 -r1.13 mysql5.spec --- openpkg-src/mysql5/mysql5.spec 25 Oct 2005 06:49:58 -0000 1.12 +++ openpkg-src/mysql5/mysql5.spec 21 Nov 2005 20:52:45 -0000 1.13 @@ -24,7 +24,7 @@ # package version %define V_major 5.0 -%define V_minor 15 +%define V_minor 16 %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: 20051025 +Release: 20051121 # package options %option with_server yes @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org