Commit 5010327a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-cluster

parents 24fd4cc8 7c2e9c7a
......@@ -30,10 +30,10 @@ md5sum = 6f3417691c7a27090f36e7cf4d94b36e
recipe = slapos.recipe.cmmi
depends =
${gdbm:version}
version = 2.4.7
version = 2.4.9
revision = 1
url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 170d7fb6fe5f28b87d1878020a9ab94e
md5sum = 2ef4e65353497606b24fa9bb3e5a3c40
configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--disable-static
......
......@@ -12,8 +12,8 @@ parts =
[freetype]
recipe = slapos.recipe.cmmi
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.bz2
md5sum = 10e8f4d6a019b124088d18bc26123a25
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
depends =
${libpng:so_version}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
......@@ -13,8 +13,8 @@ parts =
[lcms2]
recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz
md5sum = 396d106600251441ff195fcaa277d10b
url = http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.6.tar.gz
md5sum = f4c08d38ceade4a664ebff7228910a33
depends =
${libpng:so_version}
${libtiff:version}
......
......@@ -28,6 +28,6 @@ md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
[libpng]
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.6.9.tar.xz
md5sum = 14e037c5c9f1db16844760285ad5c2d6
url = http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz
md5sum = 5f414b20f683b1d96b163c89e3eff768
so_version = 16
......@@ -23,8 +23,8 @@ environment =
[librsvg]
recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.1.tar.xz
md5sum = a31eb5d66c3fe94d888a6b17a287ea42
url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
depends =
${libpng:so_version}
pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
......
......@@ -19,10 +19,10 @@ parts =
[mariadb]
recipe = slapos.recipe.cmmi
version = 10.0.8
revision = 2
version = 10.0.9
revision = 1
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
md5sum = 2b925d0beae8101f1f3f98102da91bf7
md5sum = 36363eaaeace9e81a64ac94d9d53bffe
# compile directory is required to build mysql plugins.
keep-compile-dir = true
patch-options = -p0
......@@ -58,6 +58,9 @@ environment =
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-4.00.tar.gz
md5sum = f54c44c1ab0a98bea9f6ea6c4a8b2787
patch-options = -p1
patches =
${:_profile_base_location_}/mroonga-4.00-mariadb-10.0.9.patch#1ad028d2d5701eecc7cb5b40b78abdc0
configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config
......
commit e2d340aa5eff721eaff24003a3d04eb01f0aaa3c
Author: Kouhei Sutou <kou@clear-code.com>
Date: Sat Mar 15 17:47:08 2014 +0900
mariadb: support MariaDB 10.0.9
Redmine: fixes #2387
We drop MariaDB 10.0.0 - 10.0.8 support. You should use the latest
MariaDB for 10.0 series.
Reported by Kazuhiko Shiozaki. Thanks!!!
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 496deed..3310a16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,13 @@ else()
set_mysql_config_value("--version" MYSQL_VERSION)
endif()
+if((${MYSQL_VERSION} VERSION_GREATER "10.0.0") AND
+ (${MYSQL_VERSION} VERSION_LESS "10.0.9"))
+ message(FATAL_ERROR
+ "Mroonga doesn't supports MariaDB 10.0.0-10.0.8: <${MYSQL_VERSION}>")
+ return()
+endif()
+
if(MRN_GROONGA_BUNDLED)
set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include")
set(GROONGA_LIBRARY_DIRS "${MRN_BUNDLED_GROONGA_DIR}/lib")
diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
index 4dd878b..7312dd7 100644
--- a/mrn_mysql_compat.h
+++ b/mrn_mysql_compat.h
@@ -105,12 +105,11 @@
# define MRN_ITEM_HAVE_ITEM_NAME
#endif
-#if MYSQL_VERSION_ID >= 50500 && \
- !(defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004)
+#if MYSQL_VERSION_ID >= 50500 && MYSQL_VERSION_ID < 50700
# define MRN_HAVE_TABLE_DEF_CACHE
#endif
-#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004
+#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100009
# define MRN_HAVE_TDC_ACQUIRE_SHARE
#endif
diff --git a/mrn_table.cpp b/mrn_table.cpp
index 7a7d4c2..79e1c83 100644
--- a/mrn_table.cpp
+++ b/mrn_table.cpp
@@ -1,7 +1,7 @@
/* -*- c-basic-offset: 2 -*- */
/*
Copyright(C) 2011-2013 Kentoku SHIBA
- Copyright(C) 2011-2013 Kouhei Sutou <kou@clear-code.com>
+ Copyright(C) 2011-2014 Kouhei Sutou <kou@clear-code.com>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -970,7 +970,9 @@ TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error)
hash_value);
#elif defined(MRN_HAVE_TDC_ACQUIRE_SHARE)
share = tdc_acquire_share(thd, table_list->db, table_list->table_name, key,
- key_length, GTS_TABLE, NULL);
+ key_length,
+ table_list->mdl_request.key.tc_hash_value(),
+ GTS_TABLE, NULL);
#else
share = get_table_share(thd, table_list, key, key_length, 0, error);
#endif
......@@ -131,9 +131,9 @@ itsdangerous = 0.23
lxml = 3.3.3
meld3 = 0.6.10
netaddr = 0.7.10
prettytable = 0.7.2
prettytable = 0.7.3
pyparsing = 2.0.1
six = 1.5.2
six = 1.6.1
slapos.core = 1.0.3
slapos.libnetworkcache = 0.13.4
slapos.recipe.cmmi = 0.2
......@@ -150,7 +150,7 @@ cliff = 1.5.2
# Required by:
# slapos.core==1.0.3
netifaces = 0.8
netifaces = 0.8-1
# Required by:
# slapos.core==1.0.3
......
......@@ -348,6 +348,8 @@ environment =
recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.7/src/everything/libXt-1.1.3.tar.bz2
md5sum = a6f137ae100e74ebe3b71eb4a38c40b3
configure-options =
--disable-static
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
......@@ -424,6 +426,8 @@ environment =
recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
md5sum = 52efa81b7f26c8eda13510a2fba98eea
configure-options =
--disable-static
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
......
......@@ -613,7 +613,7 @@ Pygments = 1.6
argparse = 1.2.1
coverage = 3.7.1
lxml = 3.3.3
mr.developer = 1.28
mr.developer = 1.30
setuptools = 2.2
# huBarcode 1.0.0 has an issue with importing PIL.
......@@ -645,9 +645,9 @@ slapos.core = 1.0.3
SOAPpy = 0.12.0nxd001
# CMF 2.3 is not yet supported.
Products.CMFCalendar = 2.2.2
Products.CMFCalendar = 2.2.3
Products.CMFCore = 2.2.8
Products.CMFDefault = 2.2.3
Products.CMFDefault = 2.2.4
Products.CMFTopic = 2.2.1
Products.CMFUid = 2.2.1
......@@ -690,7 +690,7 @@ chardet = 2.2.1
cliff = 1.5.2
cmd2 = 0.6.7
csp-eventlet = 0.7.0
ecdsa = 0.10
ecdsa = 0.11
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.36
......@@ -721,7 +721,7 @@ minitage.recipe.egg = 1.107
netaddr = 0.7.10
netifaces = 0.8-1
ordereddict = 1.1
paramiko = 1.12.2
paramiko = 1.13.0
plone.recipe.command = 1.1
ply = 3.4
polib = 1.0.4
......@@ -738,7 +738,7 @@ qrcode = 4.0.4
requests = 2.2.1
restkit = 4.2.2
rtjp-eventlet = 0.3.2
six = 1.5.2
six = 1.6.1
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment