main/mariadb: upgrade to 10.5.5

main/mariadb/APKBUILD

@@ -7,8 +7,8 @@
 # Contributor: Jake Buchholz <tomalok@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
-pkgver=10.4.13
-pkgrel=1
+pkgver=10.5.5
+pkgrel=0
 pkgdesc="A fast SQL database server"
 url="https://www.mariadb.org/"
 pkgusers="mysql"
@@ -19,7 +19,7 @@ depends="$pkgname-common"
 _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey"
 depends_dev="openssl-dev zlib-dev mariadb-connector-c-dev"
 makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev
-	libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers linux-pam-dev
+	libxml2-dev ncurses-dev pcre2-dev readline-dev xz-dev linux-headers linux-pam-dev
 	$_mytopdeps"
 install="$pkgname.pre-install $pkgname-common.post-upgrade"
 subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedded_dev
@@ -39,12 +39,9 @@ esac
 
 source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
 	$pkgname.initd
-	pcre.cmake.patch
 	ppc-remove-glibc-dep.patch
 	disable-failing-test.patch
 	"
-# dbug test fails under rootbld
-#options="!check"
 
 # secfixes:
 #   10.4.13-r0:
@@ -449,8 +446,7 @@ _plugin_rocksdb() {
 		"$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so
 }
 
-sha512sums="68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566  mariadb-10.4.13.tar.gz
+sha512sums="09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45  mariadb-10.5.5.tar.gz
 c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c  mariadb.initd
-70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63  pcre.cmake.patch
 e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd  ppc-remove-glibc-dep.patch
 0f5f2147e80b21abe65ccdee72b7d820ea1459112802e44f63d00d9247704d6a5562fce146a255e02f7367bc5d81cffe4e7c39758d533bf5ec9a6544a2a25738  disable-failing-test.patch"

main/mariadb/pcre.cmake.patch

---- a/cmake/pcre.cmake
-+++ b/cmake/pcre.cmake
-@@ -8,11 +8,7 @@
-     CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
-     IF(NOT CMAKE_CROSSCOMPILING)
-       SET(CMAKE_REQUIRED_LIBRARIES "pcre")
--      CHECK_C_SOURCE_RUNS("
--        #include <pcre.h>
--        int main() {
--        return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256;
--        }"  PCRE_STACK_SIZE_OK)
-+      SET(PCRE_STACK_SIZE_OK TRUE)
-       SET(CMAKE_REQUIRED_LIBRARIES)
-     ENDIF()
-   ENDIF()