OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-Sep-2009 09:58:53
Branch: HEAD Handle: 2009091908585200
Modified files:
openpkg-src/mysql54 mysql54.patch mysql54.spec
Log:
upgrading package: mysql54 5.4.1 -> 5.4.2
Summary:
Revision Changes Path
1.2 +15 -15 openpkg-src/mysql54/mysql54.patch
1.3 +8 -2 openpkg-src/mysql54/mysql54.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql54/mysql54.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql54.patch
--- openpkg-src/mysql54/mysql54.patch 22 Apr 2009 18:19:15 -0000 1.1
+++ openpkg-src/mysql54/mysql54.patch 19 Sep 2009 07:58:52 -0000 1.2
@@ -1,7 +1,7 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2009-04-05 22:48:34 +0200
-+++ include/Makefile.in 2009-04-22 19:56:21 +0200
-@@ -393,15 +393,15 @@
+--- include/Makefile.in.orig 2009-08-26 12:20:03 +0200
++++ include/Makefile.in 2009-09-19 09:25:52 +0200
+@@ -403,15 +403,15 @@
decimal.h 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 \
@@ -21,9 +21,9 @@
my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: mysys/default.c
---- mysys/default.c.orig 2009-04-05 22:45:08 +0200
-+++ mysys/default.c 2009-04-22 19:54:46 +0200
-@@ -1086,8 +1086,7 @@
+--- mysys/default.c.orig 2009-08-26 12:11:09 +0200
++++ mysys/default.c 2009-09-19 09:25:52 +0200
+@@ -1123,8 +1123,7 @@
#else
@@ -32,10 +32,10 @@
+ errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
#if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR != "")
+ if (DEFAULT_SYSCONFDIR[0])
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2009-04-05 22:45:59 +0200
-+++ scripts/mysql_config.sh 2009-04-22 19:54:46 +0200
+--- scripts/mysql_config.sh.orig 2009-09-01 21:13:49 +0200
++++ scripts/mysql_config.sh 2009-09-19 09:29:12 +0200
@@ -104,9 +104,9 @@
# Create options
@@ -45,12 +45,12 @@
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-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@ "
- embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@
@WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+ embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@
@WRAPLIBS@ @openssl_libs@ "
if [ -r "$pkglibdir/libmygcc.a" ]; then
Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2009-04-05 22:45:59
+0200
-+++ scripts/mysql_system_tables_data.sql 2009-04-22 19:54:46 +0200
+--- scripts/mysql_system_tables_data.sql.orig 2009-08-26 12:11:13
+0200
++++ scripts/mysql_system_tables_data.sql 2009-09-19 09:25:52 +0200
@@ -11,8 +11,6 @@
-- Fill "db" table with default grants for anyone to
-- access database 'test' and 'test_%' if "db" table didn't exist
@@ -61,9 +61,9 @@
DROP TABLE tmp_db;
Index: sql/Makefile.in
---- sql/Makefile.in.orig 2009-04-05 22:48:39 +0200
-+++ sql/Makefile.in 2009-04-22 19:56:46 +0200
-@@ -561,7 +561,7 @@
+--- sql/Makefile.in.orig 2009-08-26 12:20:15 +0200
++++ sql/Makefile.in 2009-09-19 09:25:52 +0200
+@@ -571,7 +571,7 @@
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la \
$(am__append_2)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql54/mysql54.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql54.spec
--- openpkg-src/mysql54/mysql54.spec 26 Jun 2009 17:23:35 -0000 1.2
+++ openpkg-src/mysql54/mysql54.spec 19 Sep 2009 07:58:52 -0000 1.3
@@ -23,7 +23,7 @@
# package version
%define V_major 5.4
-%define V_minor 1
+%define V_minor 2
%define V_mysql %{V_major}.%{V_minor}-beta
%define V_opkg %{V_major}.%{V_minor}
%define V_jdbc 5.1.7
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20090626
+Release: 20090919
# package options
%option with_server yes
@@ -121,6 +121,12 @@
%{l_shtool} subst %{l_value -s -a} \
mysys/default.c
+ # fix shebang on supplemental Perl scripts
+ rm -f scripts/*.orig
+ %{l_shtool} subst \
+ -e 's;^#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
+ scripts/*
+
# determine additional configure options
case "%{l_platform -t}" in
*-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
