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: 12-Dec-2006 19:56:13
Branch: HEAD Handle: 2006121218561300
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.12 -> 5.1.14
Summary:
Revision Changes Path
1.5 +25 -25 openpkg-src/mysql51/mysql51.patch
1.17 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 3 Nov 2006 19:03:45 -0000 1.4
+++ openpkg-src/mysql51/mysql51.patch 12 Dec 2006 18:56:13 -0000 1.5
@@ -1,12 +1,12 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2006-10-26 14:03:01 +0200
-+++ include/Makefile.in 2006-11-03 09:00:25 +0100
-@@ -379,14 +379,14 @@
- errmsg.h my_global.h my_net.h my_alloc.h \
- my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+--- include/Makefile.in.orig 2006-12-06 18:06:46 +0100
++++ include/Makefile.in 2006-12-12 19:30:39 +0100
+@@ -393,14 +393,14 @@
+ errmsg.h my_global.h my_net.h \
+ my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-- mysql_time.h mysql/plugin.h $(BUILT_SOURCES)
-+ mysql_time.h mysql/plugin.h my_aes.h rijndael.h sha1.h
$(BUILT_SOURCES)
+- m_ctype.h mysql/plugin.h $(HEADERS_GEN)
++ m_ctype.h mysql/plugin.h rijndael.h sha1.h my_aes.h
$(HEADERS_GEN)
noinst_HEADERS = config-win.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \
@@ -20,8 +20,8 @@
mysql_version.h.in my_handler.h my_time.h decimal.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: include/my_global.h
---- include/my_global.h.orig 2006-10-26 14:01:59 +0200
-+++ include/my_global.h 2006-11-03 09:00:25 +0100
+--- include/my_global.h.orig 2006-12-06 18:05:38 +0100
++++ include/my_global.h 2006-12-12 18:46:44 +0100
@@ -844,9 +844,8 @@
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
@@ -34,8 +34,8 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2006-10-26 14:01:57 +0200
-+++ mysys/default.c 2006-11-03 09:00:25 +0100
+--- mysys/default.c.orig 2006-12-06 18:05:36 +0100
++++ mysys/default.c 2006-12-12 18:46:44 +0100
@@ -1011,7 +1011,7 @@
#elif defined(__NETWARE__)
*ptr++= "sys:/etc/";
@@ -46,8 +46,8 @@
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
*ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2006-10-26 14:01:56 +0200
-+++ scripts/mysql_config.sh 2006-11-03 09:00:25 +0100
+--- scripts/mysql_config.sh.orig 2006-12-06 18:05:26 +0100
++++ scripts/mysql_config.sh 2006-12-12 18:46:44 +0100
@@ -98,9 +98,9 @@
# Create options
@@ -61,8 +61,8 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2006-10-26 14:01:50
+0200
-+++ scripts/mysql_create_system_tables.sh 2006-11-03 09:00:25 +0100
+--- scripts/mysql_create_system_tables.sh.orig 2006-12-06 18:05:24
+0100
++++ scripts/mysql_create_system_tables.sh 2006-12-12 18:46:44 +0100
@@ -81,9 +81,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -94,14 +94,14 @@
i_u="$i_u
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','Y','Y','Y','','','','',0,0,0);"
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2006-10-26 14:03:10 +0200
-+++ sql/Makefile.in 2006-11-03 09:02:32 +0100
-@@ -490,7 +490,7 @@
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/regex/libregex.a \
-- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-+ $(top_builddir)/strings/libmystrings.a
-
- mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(LDADD)
+--- sql/Makefile.in.orig 2006-12-06 18:06:54 +0100
++++ sql/Makefile.in 2006-12-12 19:31:27 +0100
+@@ -503,7 +503,7 @@
+ $(top_builddir)/strings/libmystrings.a
+
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
++LDADD = $(SUPPORTING_LIBS)
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
+ @pstack_libs@ \
+ @mysql_plugin_libs@ \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 12 Nov 2006 14:25:09 -0000 1.16
+++ openpkg-src/mysql51/mysql51.spec 12 Dec 2006 18:56:13 -0000 1.17
@@ -24,7 +24,7 @@
# package version
%define V_major 5.1
-%define V_minor 12
+%define V_minor 14
%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: 20061112
+Release: 20061212
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]