extra/mariadb to 10.5.11-1

extra/mariadb/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=10.5.10
+pkgver=10.5.11
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -23,13 +23,11 @@ validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Sign
 # https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/
 source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
         '0001-arch-specific.patch'
-        'c11_atomics.patch'
-        'revert-isb-assembly-instruction.patch')
-sha256sums=('a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb'
+        'c11_atomics.patch')
+sha256sums=('761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a'
             'SKIP'
             '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460'
-            '4c595f5a5eef2774518289576310c1cb1d86637e1e8a8af04c472721f7be0cbd'
-            'd125bde23b5b2b9b460baf5e43b4a76faac47d47f86d43973c8ca078262a13a7')
+            '4c595f5a5eef2774518289576310c1cb1d86637e1e8a8af04c472721f7be0cbd')
 
 prepare() {
   cd $pkgbase-$pkgver/
@@ -42,7 +40,6 @@ prepare() {
 
   if [[ $CARCH == arm || $CARCH == armv6h ]]; then
     patch -p1 -i ../c11_atomics.patch
-    patch -p1 -i ../revert-isb-assembly-instruction.patch
     echo "target_link_libraries(rocksdblib atomic)" >> storage/rocksdb/build_rocksdb.cmake
   fi
 }

extra/mariadb/revert-isb-assembly-instruction.patch

@@ -1,20 +0,0 @@
-Forwarded: No, but should be
-Subject: Revert upstream "MDEV-24630: MY_RELAX_CPU assembly instruction upgrade"
-Description:
- It was noticed that MariaDB 10.5.10 regressed and no longer built on armhf.
- For details see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988629
- Reverting the upstream commit
- https://github.com/MariaDB/server/commit/76d2846a71a155ee2861fd52e6635e35490a9dd1
- is likely to fix it and make armhf build again.
-
---- a/include/my_cpu.h
-+++ b/include/my_cpu.h
-@@ -84,7 +84,7 @@ static inline void MY_RELAX_CPU(void)
-   __ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
--  __asm__ __volatile__ ("isb":::"memory");
-+  __asm__ __volatile__ ("":::"memory");
- #else
-   int32 var, oldval = 0;
-   my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,