aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-05-08 18:40:57 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2021-06-16 09:50:25 +0000
commit761f896d5f5e4d96aa491bac2d2b3124e0d02ea2 (patch)
tree2191e9f20fd9c87289b1545a9ac883dd26bcbc83
parent4805e2f0f54eb45e4be45f02b16980d183466af5 (diff)
downloadaports-761f896d5f5e4d96aa491bac2d2b3124e0d02ea2.tar.gz
aports-761f896d5f5e4d96aa491bac2d2b3124e0d02ea2.tar.bz2
aports-761f896d5f5e4d96aa491bac2d2b3124e0d02ea2.tar.xz
main/mariadb: security upgrade to 10.4.19
-rw-r--r--main/mariadb/APKBUILD9
-rw-r--r--main/mariadb/cmake-fix-control-flow-error.patch16
2 files changed, 5 insertions, 20 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 033ab12a6c..3957e3bd68 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -7,7 +7,7 @@
# Contributor: Jake Buchholz <tomalok@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
-pkgver=10.4.18
+pkgver=10.4.19
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
@@ -43,13 +43,15 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
$pkgname.initd
pcre.cmake.patch
ppc-remove-glibc-dep.patch
- cmake-fix-control-flow-error.patch
"
# dbug test fails under rootbld
#options="!check"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 10.4.19-r0:
+# - CVE-2021-2154
+# - CVE-2021-2166
# 10.4.18-r0:
# - CVE-2021-27928
# 10.4.17-r0:
@@ -465,9 +467,8 @@ _plugin_rocksdb() {
}
sha512sums="
-085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12 mariadb-10.4.18.tar.gz
+837bd4e46e2033d0e996c33125c50b98e141e4c31cf4753a4bd1a7bd1e6a25ebe2a0ea7c8061d29f3c635e24d8e4bf2bbca62ea3b0089bde6576c39ffc6f5e28 mariadb-10.4.19.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch
dbd0970ea34e8bc8510431b3dc78f90b68be6f84bd27909a88516a469c2d5b402cfa62c548d78bac1e3eb717bb1b361cc375a3a77321a497e16dfba883233949 ppc-remove-glibc-dep.patch
-17d06c9e5568b9eb23e852e68108515c47b6404f4b8d5ee940d8455f67b706ea535d6c27cd0d66fcab49fdefe4496ad7bb2b1ca9f6237f84d59d21a3b07a8399 cmake-fix-control-flow-error.patch
"
diff --git a/main/mariadb/cmake-fix-control-flow-error.patch b/main/mariadb/cmake-fix-control-flow-error.patch
deleted file mode 100644
index 5583b7555e..0000000000
--- a/main/mariadb/cmake-fix-control-flow-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: mistake in a cmake file results in a build error
-Upstream: yes
-URL: https://jira.mariadb.org/browse/CONCPP-79
-diff --git a/libmariadb/cmake/ConnectorName.cmake b/libmariadb/cmake/ConnectorName.cmake
-index b7bbbad8..357b8ac0 100644
---- a/libmariadb/cmake/ConnectorName.cmake
-+++ b/libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")