Commit f33b0f2c authored by Łukasz Jendrysik's avatar Łukasz Jendrysik Committed by Leonardo Arena

main/mariadb: security upgrade to 10.1.11. Fixes #5047 (Multiple CVEs)

CVE-2016-0546
CVE-2016-0505
CVE-2016-0596
CVE-2016-0597
CVE-2016-0616
CVE-2016-0598
CVE-2016-0600
CVE-2016-0606
CVE-2016-0608
CVE-2016-0609
CVE-2016-2047: MDEV-9212
Signed-off-by: default avatarLeonardo Arena <rnalrd@alpinelinux.org>
(cherry picked from commit 3d14ab30)
parent 13c92a8e
......@@ -3,8 +3,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
pkgver=10.1.9
pkgrel=2
pkgver=10.1.11
pkgrel=0
pkgdesc="A fast SQL database server"
url="http://www.mariadb.org"
pkgusers="mysql"
......@@ -18,7 +18,6 @@ makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev
install="$pkgname.pre-install"
source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
$pkgname.initd
fix-mysql-install-db-path.patch
musl-fix-inttype.patch
0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch
"
......@@ -180,18 +179,15 @@ mysql() { _compat mysql mariadb; }
_compat_client() { _compat mysql-client mariadb-client; }
_compat_bench() { _compat mysql-bench mariadb-client; }
md5sums="71d0e2408a671e1125c1310ce657f688 mariadb-10.1.9.tar.gz
md5sums="c199608ae4282f16007dc8c270ff2439 mariadb-10.1.11.tar.gz
2cf887d864e05947f5b831bd7ca06b74 mariadb.initd
bcaee4dbbf77f4432ecd9796714be75b fix-mysql-install-db-path.patch
14adb188bde2359d94a5d661ab793cee musl-fix-inttype.patch
b32eed97ab575140685eeae4a56205a2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch"
sha256sums="8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 mariadb-10.1.9.tar.gz
sha256sums="cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce mariadb-10.1.11.tar.gz
49bab0ec69432d5c56c53ff83488bfa5eb2859bc95a12e8fc7f12d1f0403f0c6 mariadb.initd
52e3827529b53c02a9ba263bd395bde773d2666853b252a131e824bb256f36d5 fix-mysql-install-db-path.patch
2a66efddb9c5e8076da3d9c602bbfb9413917ab4b5d1015459f550da8ac10c87 musl-fix-inttype.patch
2253fa4b0470d4bcfb183967f7658f04867a31b3ce1ffbe22926a52bf595c616 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch"
sha512sums="0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 mariadb-10.1.9.tar.gz
sha512sums="5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b mariadb-10.1.11.tar.gz
53d28d688fc9b45684f8368971c01424e5388d39dfaad8b2c432c54d5fabadf2388786303e92c5ca734cb95b4618863c23f7be2a618efc97854536c3a9dc1240 mariadb.initd
4aca6e42f4dec9d7122388b1d1bc40762a4677a1beafcf448b900d443a2f778a8fd52bc7f1b5c9697e0ad13473e6d01eb29607a40de195ac07857cd4dfc2a1fe fix-mysql-install-db-path.patch
17ee255222ec9d7601554e607586ac1d0a0b818a4547e30a2739e7163df0439357b011f6848fbff4d28e93830256165a29ce8b20f25256d493d4605f253061ef musl-fix-inttype.patch
ff1390b4718cfa6cd02947a82a404ea51483678a5cb52651c3b9d243dbc17c3b37df1013aeab618fa1077f930e75ac104168d7853880b0e2e95a32a9bcd5a2f2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch"
--- a/scripts/CMakeLists.txt.orig
+++ b/scripts/CMakeLists.txt
@@ -180,22 +180,13 @@
# i.e. makes access relative the current directory. This matches
# the documentation, so better not change this.
-IF(INSTALL_LAYOUT MATCHES "STANDALONE")
- SET(prefix ".")
-ELSE()
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
-ENDIF()
-
+SET(prefix "${CMAKE_INSTALL_PREFIX}")
SET(bindir ${prefix}/${INSTALL_BINDIR})
SET(sbindir ${prefix}/${INSTALL_SBINDIR})
SET(scriptdir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
-IF(INSTALL_LAYOUT MATCHES "STANDALONE")
- SET(localstatedir ${prefix}/data)
-ELSE()
- SET(localstatedir ${MYSQL_DATADIR})
-ENDIF()
+SET(localstatedir ${MYSQL_DATADIR})
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment