OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jul-2006 11:27:23
Branch: HEAD Handle: 2006070510272200
Modified files:
openpkg-src/mysql51 mysql51.patch mysql51.spec
Log:
upgrading package: mysql51 5.1.7 -> 5.1.11
Summary:
Revision Changes Path
1.2 +9 -26 openpkg-src/mysql51/mysql51.patch
1.2 +2 -2 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 11 Mar 2006 12:59:12 -0000 1.1
+++ openpkg-src/mysql51/mysql51.patch 5 Jul 2006 09:27:22 -0000 1.2
@@ -1,14 +1,14 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2006-02-27 22:26:47 +0100
-+++ include/Makefile.in 2006-03-11 13:38:18 +0100
-@@ -350,14 +350,14 @@
+--- include/Makefile.in.orig 2006-06-02 20:03:03 +0200
++++ include/Makefile.in 2006-07-05 11:12:33 +0200
+@@ -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 \
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)
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ noinst_HEADERS = config-win.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\
mysys_err.h my_base.h help_start.h help_end.h \
@@ -34,34 +34,17 @@
/* Define missing math constants. */
#ifndef M_PI
Index: mysys/default.c
---- mysys/default.c.orig 2006-02-27 22:24:56 +0100
-+++ mysys/default.c 2006-03-11 13:35:05 +0100
+--- mysys/default.c.orig 2006-06-02 20:00:52 +0200
++++ mysys/default.c 2006-07-05 10:45:08 +0200
@@ -1001,7 +1001,7 @@
- if ((env= getenv("ETC")))
- *ptr++= env;
- #endif
+ #elif defined(__NETWARE__)
+ *ptr++= "sys:/etc/";
+ #else
- *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 2006-02-27 22:24:57 +0100
-+++ scripts/mysql_config.sh 2006-03-11 13:35:05 +0100
-@@ -93,11 +93,11 @@
-
- # Create options
-
--libs="$ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
- libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"
- libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
-
--libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
-+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@
@openssl_libs@"
- libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
- cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
- include="-I$pkgincludedir"
Index: scripts/mysql_create_system_tables.sh
--- scripts/mysql_create_system_tables.sh.orig 2006-02-27 22:25:28
+0100
+++ scripts/mysql_create_system_tables.sh 2006-03-11 13:40:53 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 11 Mar 2006 12:59:12 -0000 1.1
+++ openpkg-src/mysql51/mysql51.spec 5 Jul 2006 09:27:22 -0000 1.2
@@ -24,7 +24,7 @@
# package version
%define V_major 5.1
-%define V_minor 7
+%define V_minor 11
%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: 20060311
+Release: 20060705
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
