aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2019-06-18 04:44:23 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-19 09:42:27 +0000
commit99a038b6d828fe7045ef6d1e3f3d9bb38b73a8a2 (patch)
treeb5a841a386ccf1387df96f4c525c2200b36e5658
parent302f2d8536696ca4a8afd5f42b135b7acbdd07e7 (diff)
downloadalpine_aports-99a038b6d828fe7045ef6d1e3f3d9bb38b73a8a2.tar.bz2
alpine_aports-99a038b6d828fe7045ef6d1e3f3d9bb38b73a8a2.tar.xz
alpine_aports-99a038b6d828fe7045ef6d1e3f3d9bb38b73a8a2.zip
main/mariadb: upgrade to 10.3.16
-rw-r--r--main/mariadb/APKBUILD8
-rw-r--r--main/mariadb/fix-c11-atomics-check.patch4
2 files changed, 6 insertions, 6 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 0c2cf7884a..f85689df8d 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -6,10 +6,10 @@
6# Contributor: Marcel Haazen <marcel@haazen.xyz> 6# Contributor: Marcel Haazen <marcel@haazen.xyz>
7# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 7# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
8pkgname=mariadb 8pkgname=mariadb
9pkgver=10.3.15 9pkgver=10.3.16
10pkgrel=0 10pkgrel=0
11pkgdesc="A fast SQL database server" 11pkgdesc="A fast SQL database server"
12url="https://www.mariadb.org" 12url="https://www.mariadb.org/"
13pkgusers="mysql" 13pkgusers="mysql"
14pkggroups="mysql" 14pkggroups="mysql"
15arch="all" 15arch="all"
@@ -425,8 +425,8 @@ _plugin_rocksdb() {
425 "$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so 425 "$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so
426} 426}
427 427
428sha512sums="35332ac32cba27fef1b4ddd2209236853f4309756fd121fbdbd2b6be0651e817cedc80e276b89ccfa4bc76760811434fab45a4d380d0ebd500c7d9bd7377fe93 mariadb-10.3.15.tar.gz 428sha512sums="b22a8c8fa0265f88962432ade71c3f0ec554f7d38042def832cfcb50f3aa1dd77a715c76706ffeae679b95438529b06e98b73b7e219f9c645980802027ec022f mariadb-10.3.16.tar.gz
429c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd 429c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
430b4469f2f0299e71c09b65c91373f2d72b7fe9a9cd58ad24737a78a8097473b29c32b7267e173a2dfe1158f2f7d40a7fb02fb1b35caeda44d16ae3b9e2602a75f fix-c11-atomics-check.patch 430f81a29d5ad9e426c0d960966bf57f1c17ca2a44149e885c9561935205d0db35829bcf40c6224f05a9e46252894e51eb24d66645a6f323d3d6f70f3d5285e6d40 fix-c11-atomics-check.patch
431e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch 431e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch
43270da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch" 43270da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch"
diff --git a/main/mariadb/fix-c11-atomics-check.patch b/main/mariadb/fix-c11-atomics-check.patch
index f98c0a20fd..899b756a52 100644
--- a/main/mariadb/fix-c11-atomics-check.patch
+++ b/main/mariadb/fix-c11-atomics-check.patch
@@ -45,10 +45,10 @@
45 SET(HAVE_valgrind 1) 45 SET(HAVE_valgrind 1)
46--- a/mysys/CMakeLists.txt 46--- a/mysys/CMakeLists.txt
47+++ b/mysys/CMakeLists.txt 47+++ b/mysys/CMakeLists.txt
48@@ -74,7 +74,7 @@ 48@@ -75,7 +75,7 @@
49 49
50 ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) 50 ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
51 TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY} 51 TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
52- ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) 52- ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
53+ ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBATOMIC} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) 53+ ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBATOMIC} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
54 DTRACE_INSTRUMENT(mysys) 54 DTRACE_INSTRUMENT(mysys)