Date: Tuesday, April 5, 2011 @ 05:37:46 Author: andrea Revision: 118056
upgpkg: mysql 5.5.11-1 upstream release; remove amarok patches Modified: mysql/trunk/PKGBUILD Deleted: mysql/trunk/fix-embedded-crash.patch mysql/trunk/fix-mysql-home.patch --------------------------+ PKGBUILD | 18 +++++------------- fix-embedded-crash.patch | 19 ------------------- fix-mysql-home.patch | 16 ---------------- 3 files changed, 5 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-05 07:55:00 UTC (rev 118055) +++ PKGBUILD 2011-04-05 09:37:46 UTC (rev 118056) @@ -5,8 +5,8 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.10 -pkgrel=2 +pkgver=5.5.11 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.mysql.com/" @@ -14,20 +14,12 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' - 'my.cnf' - 'fix-mysql-home.patch' - 'fix-embedded-crash.patch') -md5sums=('ee604aff531ff85abeb10cf332c1355a' + 'my.cnf') +md5sums=('befa4e0d0aa95be6c8f6f143ae3b0641' '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6' - '56fe8b724ca7ae73b9f96cdf4cca1220' - 'b2b7ed0289a6d8cce17a68512c0286cc') + '1c949c0dbea5206af0db14942d9927b6') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/fix-mysql-home.patch - patch -Np1 -i ${srcdir}/fix-embedded-crash.patch - cd "${srcdir}" mkdir build cd build Deleted: fix-embedded-crash.patch =================================================================== --- fix-embedded-crash.patch 2011-04-05 07:55:00 UTC (rev 118055) +++ fix-embedded-crash.patch 2011-04-05 09:37:46 UTC (rev 118056) @@ -1,19 +0,0 @@ -Fix crash in embedded mysql library when mysql_library_init() is invoked -with argc = 0, as is supposed to be a supported thing to do. -Patch from upstream bug #57931. - - -diff -Naur mysql-5.5.8.orig/libmysqld/lib_sql.cc mysql-5.5.8/libmysqld/lib_sql.cc ---- mysql-5.5.8.orig/libmysqld/lib_sql.cc 2010-12-03 12:58:26.000000000 -0500 -+++ mysql-5.5.8/libmysqld/lib_sql.cc 2011-01-12 23:10:55.837471629 -0500 -@@ -510,8 +510,8 @@ - return 1; - defaults_argc= *argcp; - defaults_argv= *argvp; -- remaining_argc= argc; -- remaining_argv= argv; -+ remaining_argc= *argcp; -+ remaining_argv= *argvp; - - /* Must be initialized early for comparison of options name */ - system_charset_info= &my_charset_utf8_general_ci; Deleted: fix-mysql-home.patch =================================================================== --- fix-mysql-home.patch 2011-04-05 07:55:00 UTC (rev 118055) +++ fix-mysql-home.patch 2011-04-05 09:37:46 UTC (rev 118056) @@ -1,16 +0,0 @@ -mysql 5.5's new cmake-based build scripts forgot about defining -DEFAULT_HOME_ENV. Upstream at http://bugs.mysql.com/bug.php?id=59280 - - -diff -Naur mysql-5.5.8.orig/mysys/CMakeLists.txt mysql-5.5.8/mysys/CMakeLists.txt ---- mysql-5.5.8.orig/mysys/CMakeLists.txt 2010-12-03 12:58:26.000000000 -0500 -+++ mysql-5.5.8/mysys/CMakeLists.txt 2011-01-13 11:58:42.583471734 -0500 -@@ -69,6 +69,8 @@ - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_port.c) - ENDIF() - -+ADD_DEFINITIONS( -DDEFAULT_HOME_ENV=MYSQL_HOME) -+ - ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) - TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT})