mariadb: update to 10.5.10.

void-linux · May 11, 2021 · d8be75a · d8be75a
1 parent cd60f45
commit d8be75a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 222 deletions.
diff --git a/common/shlibs b/common/shlibs
@@ -3983,8 +3983,8 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
-libmariadb.so.3 libmariadbclient-10.5.9_1
-libmariadbd.so.19 libmariadbclient-10.5.9_1
+libmariadb.so.3 libmariadbclient-10.5.10_1
+libmariadbd.so.19 libmariadbclient-10.5.10_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
 libbasu.so.0 basu-0.2.0_1
 libXcomp.so.3 nx-libs-3.5.99.24_1

diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -20,7 +20,7 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
 
 --- configure.cmake
 +++ configure.cmake
-@@ -862,7 +862,25 @@ int main()
+@@ -865,7 +865,25 @@ int main()
    long long int *ptr= &var;
    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
  }"
@@ -49,7 +49,7 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
    SET(HAVE_valgrind 1)
 --- mysys/CMakeLists.txt
 +++ mysys/CMakeLists.txt
-@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+@@ -168,6 +168,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
   ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
  DTRACE_INSTRUMENT(mysys)
 

diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
@@ -1,6 +1,6 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.5.9
+version=10.5.10
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -27,23 +27,14 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
 homepage="https://mariadb.com"
 distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
-checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
+checksum=a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 make_dirs="/var/lib/mysql 0700 mysql mysql"
 
-post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
-			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
-			;;
-	esac
-}
-
 do_check() {
 	cd build
 	if [ "$XBPS_CHECK_PKGS" = full ]; then