main/mariadb: upgrade to 10.1.18

2 files changed, 7 insertions, 55 deletions

diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 732992a795..796a9559ea 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
-pkgver=10.1.17
+pkgver=10.1.18
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mariadb.org"
@@ -20,7 +20,6 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
         $pkgname.initd
         fix-mysql-install-db-path.patch
         fix-ucontext-check.patch
-        fix-arm-build.patch
         "
 
 subpackages="$pkgname-doc $pkgname-dev $pkgname-common
@@ -181,18 +180,15 @@ mysql() { _compat mysql mariadb; }
 _compat_client() { _compat mysql-client mariadb-client; }
 _compat_bench() { _compat mysql-bench mariadb-client; }
 
-md5sums="036aca95257cb2948dd100605ec6d5a1  mariadb-10.1.17.tar.gz
+md5sums="173b88ab54bdd1fc51483b6b26bef849  mariadb-10.1.18.tar.gz
 195f8bf24dfdbc5aa7ccd969a1b1283f  mariadb.initd
 b233fb7015a9659f5b825cd8010d2b52  fix-mysql-install-db-path.patch
-96b7247f919bf4e1de13a9d0ce7ef515  fix-ucontext-check.patch
-36b281b8c9539a82827b19d77feb9706  fix-arm-build.patch"
-sha256sums="4ca45ac5e34418761868115ebc8c068d511fed08e283b2cac52559d63ba4aab5  mariadb-10.1.17.tar.gz
+96b7247f919bf4e1de13a9d0ce7ef515  fix-ucontext-check.patch"
+sha256sums="d7336907e9ff44496d6453f92526b25bd253638a64a051ca879f953499873b73  mariadb-10.1.18.tar.gz
 c37aa7c150c07a3ac478a6fd1b478b425c17ac412f9ba4f49b8a635edb6ed542  mariadb.initd
 0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904  fix-mysql-install-db-path.patch
-3d9a12bf04fcf215567b6a395fe83fb6528602baf4283d42181bd73f93b5f538  fix-ucontext-check.patch
-0109e28095d890ddac66a1ca303d47211aeab68d6a80f7e579227781fed59a7f  fix-arm-build.patch"
-sha512sums="900f019ec7544e315c98aea3647988f6ec257822b116c8a986851db678dd0bf71018dde1d0c90adeaa713af12348344ffc54c292a64869d9565f3f906599396d  mariadb-10.1.17.tar.gz
+3d9a12bf04fcf215567b6a395fe83fb6528602baf4283d42181bd73f93b5f538  fix-ucontext-check.patch"
+sha512sums="6cb9d8ae0832323eef940ee7de59ec10d23ec691c0c6af577cac2ba280ecd6300a01ec5442cb7cf3a2a3b0cd9a973d4057aa92bcc71bc914e1e18b14ad7b6a8a  mariadb-10.1.18.tar.gz
 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f  mariadb.initd
 f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1  fix-mysql-install-db-path.patch
-82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf  fix-ucontext-check.patch
-bddf3e7aa72d3f5f775801aeba4347306843f8a5f21c0a16d0075b24fe1f6d2013f196c95ff067e39d26736d9713afea28b5261766c0daa634cb914cf00edd57  fix-arm-build.patch"
+82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf  fix-ucontext-check.patch"
diff --git a/main/mariadb/fix-arm-build.patch b/main/mariadb/fix-arm-build.patch
deleted file mode 100644
index ef6a48ce1b..0000000000
--- a/main/mariadb/fix-arm-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f81f985f37ccdcf04aa9707fe994a0c87f67b1a8 Mon Sep 17 00:00:00 2001
-From: Sergei Golubchik <serg@mariadb.org>
-Date: Mon, 29 Aug 2016 11:53:33 +0200
-Subject: [PATCH] fix conpilation on OpenBSD
-
----
- sql/signal_handler.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
-index fd6f62f..c3f2584 100644
---- a/sql/signal_handler.cc
-+++ b/sql/signal_handler.cc
-@@ -64,13 +64,13 @@ extern "C" sig_handler handle_fatal_signal(int sig)
-   struct tm tm;
- #ifdef HAVE_STACKTRACE
-   THD *thd;
--#endif
-   /*
-      This flag remembers if the query pointer was found invalid.
-      We will try and print the query at the end of the signal handler, in case
-      we're wrong.
-   */
-   bool print_invalid_query_pointer= false;
-+#endif
- 
-   if (segfaulted)
-   {
-@@ -265,6 +265,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
-       "\"mlockall\" bugs.\n");
-   }
- 
-+#ifdef HAVE_STACKTRACE
-   if (print_invalid_query_pointer)
-   {
-     my_safe_printf_stderr(
-@@ -274,6 +275,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
-     my_write_stderr(thd->query(), MY_MIN(65536U, thd->query_length()));
-     my_safe_printf_stderr("\n\n");
-   }
-+#endif
- 
- #ifdef HAVE_WRITE_CORE
-   if (test_flags & TEST_CORE_ON_SIGNAL)