mroonga 11.00-1

3 files changed, 58 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f225fb9dca16..6b618a1d66bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mroonga
 	pkgdesc = Fast fulltext search on MySQL(MariaDB bundled Mroonga package).
-	pkgver = 10.11
+	pkgver = 11.00
 	pkgrel = 1
 	url = http://mroonga.org/
 	arch = i686
@@ -28,9 +28,9 @@ pkgbase = mroonga
 	optdepends = cutter-test_framework
 	optdepends = ruby
 	optdepends = snowball-c
-	provides = mysql-clients=10.4.17
-	provides = mysql=10.4.17
-	provides = libmysqlclient=10.4.17
+	provides = mysql-clients=10.4.18
+	provides = mysql=10.4.18
+	provides = libmysqlclient=10.4.18
 	conflicts = libmariadbclient
 	conflicts = mariadb-clients
 	conflicts = mytop
@@ -38,21 +38,24 @@ pkgbase = mroonga
 	conflicts = mysql
 	conflicts = libmysqlclient
 	conflicts = mysql-clients
-	source = http://packages.groonga.org/source/mroonga/mroonga-10.11.tar.gz
-	source = https://downloads.mariadb.org/f/mariadb-10.4.17/source/mariadb-10.4.17.tar.gz
+	source = http://packages.groonga.org/source/mroonga/mroonga-11.00.tar.gz
+	source = https://downloads.mariadb.org/f/mariadb-10.4.18/source/mariadb-10.4.18.tar.gz
 	source = mariadb.service
 	source = mariadb-post.sh
 	source = mariadb-tmpfile.conf
-	sha1sums = 5052c5b15c0732ce81e59020c698f3c10f3c58f9
-	sha1sums = 49d8ec417ce3e38836dad891f61e72493bb59f3b
+	source = 0001-Enable-to-build-with-latest-MariaDB.patch
+	sha1sums = 08116a6e846012cb607b454549235dee5a6254c8
+	sha1sums = 82454d8f04c8728ba9df3cefd25747da7dfc25bb
 	sha1sums = 4bc34244fc4b578c155c8cd569d952a97a476f10
 	sha1sums = 206e9f7ba5357027becc2491e0987442f684d63e
 	sha1sums = c2a86c745002923234f9d6d79b3b462d5ab55e8d
-	sha256sums = 00427a67f9d50179f6604fa6c583bdf4dabe22dd69852ea788d2a9402fbd9469
-	sha256sums = a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e
+	sha1sums = 9c50d0da8fff4665c295530946e43b6be0d93fe5
+	sha256sums = 5f0359285dc87d7293c3158d6055c71578c7914a849065d570e4fb74cb7c1114
+	sha256sums = 330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e
 	sha256sums = 2c60dfdc866078a8402d6e18d538e6a1deaa70e1b2410bee5eb209a314d7daa7
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
+	sha256sums = a3fb0136defbfcc90619ef94fd1e17725ea4cde9e166de5e25d7f070a2348920
 
 pkgname = mroonga
 	install = mariadb.install
diff --git a/0001-Enable-to-build-with-latest-MariaDB.patch b/0001-Enable-to-build-with-latest-MariaDB.patch
new file mode 100644
index 000000000000..6f740650c57e
--- /dev/null
+++ b/0001-Enable-to-build-with-latest-MariaDB.patch
@@ -0,0 +1,30 @@
+From 3adc5bbe51d1671a7fbfb4a29df85281697168e0 Mon Sep 17 00:00:00 2001
+From: Tomohiro KATO <tomop@teamgedoh.net>
+Date: Thu, 25 Feb 2021 15:46:49 +0900
+Subject: [PATCH] Enable to build with latest MariaDB (#394)
+
+GitHub: fix #392.
+
+"restore_auto_increment" require one argument since mariadb-server 10.3.28, 10.4.18, and 10.5.9.
+See: https://github.com/MariaDB/server/commit/75e7132fca1c4634d4aa8d18d386c55932a5e1b6
+---
+ ha_mroonga.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp
+index b9fe2cd07..de2ba5950 100644
+--- a/storage/mroonga/ha_mroonga.hpp
++++ b/storage/mroonga/ha_mroonga.hpp
+@@ -387,7 +387,11 @@ typedef uint mrn_alter_table_flags;
+    ((MYSQL_VERSION_ID >= 100320 && MYSQL_VERSION_ID < 100400) || \
+     (MYSQL_VERSION_ID >= 100410))
+ #  define MRN_HANDLER_RESTORE_AUTO_INCREMENT_OVERRIDE mrn_override
+-#  define MRN_HANDLER_HAVE_RESTORE_AUTO_INCREMENT_NO_ARGUMENT
++#  if ((MYSQL_VERSION_ID >= 100320 && MYSQL_VERSION_ID < 100328) || \
++       (MYSQL_VERSION_ID >= 100410 && MYSQL_VERSION_ID < 100418) || \
++       (MYSQL_VERSION_ID >= 100500 && MYSQL_VERSION_ID < 100509))
++#    define MRN_HANDLER_HAVE_RESTORE_AUTO_INCREMENT_NO_ARGUMENT
++#  endif
+ #  define MRN_HANDLER_RELEASE_AUTO_INCREMENT_OVERRIDE mrn_override
+ #else
+ #  define MRN_HANDLER_RESTORE_AUTO_INCREMENT_OVERRIDE
diff --git a/PKGBUILD b/PKGBUILD
index f2b0bb979e9f..4bf436249d86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Hiroshi Hatake <cosmo0920.wp[at]gmail.com>
 
 pkgname=mroonga
-pkgver=10.11
+pkgver=11.00
 pkgrel=1
 pkgdesc="Fast fulltext search on MySQL(MariaDB bundled Mroonga package)."
-mariadbver=10.4.17
+mariadbver=10.4.18
 MYSQL_VERSION=mariadb-${mariadbver}
 arch=('i686' 'x86_64')
 url="http://mroonga.org/"
@@ -14,7 +14,8 @@ source=(http://packages.groonga.org/source/mroonga/mroonga-$pkgver.tar.gz
         https://downloads.mariadb.org/f/${MYSQL_VERSION}/source/${MYSQL_VERSION}.tar.gz
         mariadb.service
         mariadb-post.sh
-        mariadb-tmpfile.conf)
+        mariadb-tmpfile.conf
+        0001-Enable-to-build-with-latest-MariaDB.patch)
 makedepends=('cmake' 'openssl' 'systemd' 'zlib' 'zstd' 'libaio' 'libxml2' 'pcre' 'jemalloc' 'lz4' 'boost' 'snappy')
 conflicts=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb' 'mysql' 'libmysqlclient' 'mysql-clients')
 depends=('perl' 'inetutils' 'libaio' 'libxml2' 'pcre' 'groonga' 'groonga-normalizer-mysql')
@@ -26,6 +27,9 @@ prepare() {
     cd $srcdir
     mkdir -p $srcdir/mariadb-$mariadbver/storage/mroonga
     mv $srcdir/mroonga-${pkgver}/* $srcdir/mariadb-$mariadbver/storage/mroonga
+
+    (cd $srcdir/mariadb-$mariadbver
+    patch -p1 < $srcdir/0001-Enable-to-build-with-latest-MariaDB.patch)
 }
 
 build() {
@@ -110,13 +114,15 @@ package() {
     install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
     install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
 }
-sha1sums=('5052c5b15c0732ce81e59020c698f3c10f3c58f9'
-          '49d8ec417ce3e38836dad891f61e72493bb59f3b'
+sha1sums=('08116a6e846012cb607b454549235dee5a6254c8'
+          '82454d8f04c8728ba9df3cefd25747da7dfc25bb'
           '4bc34244fc4b578c155c8cd569d952a97a476f10'
           '206e9f7ba5357027becc2491e0987442f684d63e'
-          'c2a86c745002923234f9d6d79b3b462d5ab55e8d')
-sha256sums=('00427a67f9d50179f6604fa6c583bdf4dabe22dd69852ea788d2a9402fbd9469'
-            'a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e'
+          'c2a86c745002923234f9d6d79b3b462d5ab55e8d'
+          '9c50d0da8fff4665c295530946e43b6be0d93fe5')
+sha256sums=('5f0359285dc87d7293c3158d6055c71578c7914a849065d570e4fb74cb7c1114'
+            '330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e'
             '2c60dfdc866078a8402d6e18d538e6a1deaa70e1b2410bee5eb209a314d7daa7'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
-            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
+            'a3fb0136defbfcc90619ef94fd1e17725ea4cde9e166de5e25d7f070a2348920')