aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-05-08 18:44:37 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2021-06-16 09:51:21 +0000
commitc03ce583a6db07345ecf8786ec2e9b0aadf1d8ac (patch)
tree7316e3f689e58fa5c6199e99260192b91fcb3c85
parentb38ed8ffe07e44b0a3f6a4f93e154a6feb83f8ad (diff)
downloadaports-c03ce583a6db07345ecf8786ec2e9b0aadf1d8ac.tar.gz
aports-c03ce583a6db07345ecf8786ec2e9b0aadf1d8ac.tar.bz2
aports-c03ce583a6db07345ecf8786ec2e9b0aadf1d8ac.tar.xz
main/mariadb: security upgrade to 10.3.29
-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 77e7f77d6c..e77bcaa498 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -6,7 +6,7 @@
# Contributor: Marcel Haazen <marcel@haazen.xyz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
-pkgver=10.3.28
+pkgver=10.3.29
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
@@ -42,13 +42,15 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
$pkgname.initd
ppc-remove-glibc-dep.patch
pcre.cmake.patch
- cmake-fix-control-flow-error.patch
"
# dbug test fails under rootbld
#options="!check"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 10.3.29-r0:
+# - CVE-2021-2154
+# - CVE-2021-2166
# 10.3.28-r0:
# - CVE-2021-27928
# 10.3.27-r0:
@@ -451,9 +453,8 @@ _plugin_rocksdb() {
}
sha512sums="
-f6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20 mariadb-10.3.28.tar.gz
+fe868cde5ac3536ff5bbf34f235253c79e897e61bb34f7fdaca8fa8fcdb83e4a19c615beab27d3fdb5daee64ac0c8f36ec7e8089a9422c8540f7e92b1999a769 mariadb-10.3.29.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch
70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.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}")