diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-02-23 15:21:28 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-26 13:36:07 +0000 |
| commit | db4faf47a0faa7d1d15fe4e9f673538e0d6d2586 (patch) | |
| tree | 33cea7cc7369f0aa93535663c705ad8c8ae18e8e | |
| parent | 5a35683ae4d77345cf3d43f524ac790600b5adca (diff) | |
| download | aports-db4faf47a0faa7d1d15fe4e9f673538e0d6d2586.tar.bz2 aports-db4faf47a0faa7d1d15fe4e9f673538e0d6d2586.tar.xz | |
main/mariadb: security upgrade to 10.1.38
CVE-2019-2537, CVE-2019-2529
Remove (unneeded) libressl patch and upstreamed patch
| -rw-r--r-- | main/mariadb/APKBUILD | 15 | ||||
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 33 | ||||
| -rw-r--r-- | main/mariadb/libressl.patch | 11 |
3 files changed, 7 insertions, 52 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 15cedf9f77..7d75d68a56 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -4,10 +4,10 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.1.37 +pkgver=10.1.38 pkgrel=0 pkgdesc="A fast SQL database server" -url="http://www.mariadb.org" +url="https://www.mariadb.org" pkgusers="mysql" pkggroups="mysql" arch="all" @@ -19,12 +19,13 @@ makedepends="cmake libressl-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 ppc-remove-glibc-dep.patch - libressl.patch " # secfixes: +# 10.1.38-r0: +# - CVE-2019-2537 +# - CVE-2019-2529 # 10.1.37-r0: # - CVE-2016-9843 # - CVE-2018-2755 @@ -255,8 +256,6 @@ mysql() { _compat mysql mariadb; } _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } -sha512sums="b7c35cd67ad265ce2e3a4db20a2ae2b78745db96dc70a211f027a39b6dbb3dc900991c2ee1021ee6a97d12489c3e2a70252e2adf348a458af38b99c3de5a4f25 mariadb-10.1.37.tar.gz +sha512sums="184582f3a902a989ba3d9c4d21288c014c8b469adbbb4cbabc621c5006022cef29baed8c1140ed4476b124da83b76dfa414295ed0c3374be826e75aca953a77b mariadb-10.1.38.tar.gz 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd -f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch -a352661d19becae717c16ac67a0e47ed93787653851a75d27e7764133b31dc02e18c38dbbce6d3138e4db08da616dfc75a0141865cd042cef669d6afe4463127 ppc-remove-glibc-dep.patch -61d26c0253adb94328e5c49b14a379a775f85adbc70f7ad9ef2c68c3b8a9710bb98500e24b91693ecad5b2e8b6757b76390f984b586458f462d28d2d5ab1fc03 libressl.patch" +a352661d19becae717c16ac67a0e47ed93787653851a75d27e7764133b31dc02e18c38dbbce6d3138e4db08da616dfc75a0141865cd042cef669d6afe4463127 ppc-remove-glibc-dep.patch" diff --git a/main/mariadb/fix-mysql-install-db-path.patch b/main/mariadb/fix-mysql-install-db-path.patch deleted file mode 100644 index f1409aba74..0000000000 --- a/main/mariadb/fix-mysql-install-db-path.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -175,23 +175,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 ".") -- 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}) -- SET(localstatedir ${prefix}/data) --ELSE() -- SET(prefix "${CMAKE_INSTALL_PREFIX}") -- SET(bindir ${INSTALL_BINDIRABS}) -- SET(sbindir ${INSTALL_SBINDIRABS}) -- SET(scriptdir ${INSTALL_BINDIRABS}) -- SET(libexecdir ${INSTALL_SBINDIRABS}) -- SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) -- SET(localstatedir ${MYSQL_DATADIR}) --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}) -+SET(localstatedir ${MYSQL_DATADIR}) - - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh diff --git a/main/mariadb/libressl.patch b/main/mariadb/libressl.patch deleted file mode 100644 index 68c05b5b40..0000000000 --- a/main/mariadb/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru mysql.old/cmake/ssl.cmake mysql/cmake/ssl.cmake ---- mysql.old/cmake/ssl.cmake 2018-10-31 22:54:02.000000000 +0100 -+++ mysql/cmake/ssl.cmake 2019-01-10 13:13:34.884030256 +0100 -@@ -182,7 +182,6 @@ - HAVE_SHA512_DIGEST_LENGTH) - SET(CMAKE_REQUIRED_INCLUDES) - IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND -- OPENSSL_MAJOR_VERSION STRLESS "101" AND - CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) - - SET(SSL_SOURCES "") |