Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Leo
aports
Commits
c03ce583
Commit
c03ce583
authored
May 08, 2021
by
J0WI
Committed by
Natanael Copa
Jun 16, 2021
Browse files
main/mariadb: security upgrade to 10.3.29
parent
b38ed8ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
main/mariadb/APKBUILD
View file @
c03ce583
...
...
@@ -6,7 +6,7 @@
# Contributor: Marcel Haazen <marcel@haazen.xyz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
mariadb
pkgver
=
10.3.2
8
pkgver
=
10.3.2
9
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
=
"
f
6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20
mariadb-10.3.2
8
.tar.gz
f
e868cde5ac3536ff5bbf34f235253c79e897e61bb34f7fdaca8fa8fcdb83e4a19c615beab27d3fdb5daee64ac0c8f36ec7e8089a9422c8540f7e92b1999a769
mariadb-10.3.2
9
.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch
70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch
17d06c9e5568b9eb23e852e68108515c47b6404f4b8d5ee940d8455f67b706ea535d6c27cd0d66fcab49fdefe4496ad7bb2b1ca9f6237f84d59d21a3b07a8399 cmake-fix-control-flow-error.patch
"
main/mariadb/cmake-fix-control-flow-error.patch
deleted
100644 → 0
View file @
b38ed8ff
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}")
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment