diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-02-23 15:17:02 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-26 13:03:53 +0000 |
| commit | 4259d6cb13908d3f1592a1d600e9a9e8bab6b325 (patch) | |
| tree | b4a35fd4660e40348da054e741882dce085ecc57 | |
| parent | 6f9fbc5a2c32e7acdf068c12e48e4506de1ecc35 (diff) | |
| download | aports-4259d6cb13908d3f1592a1d600e9a9e8bab6b325.tar.bz2 aports-4259d6cb13908d3f1592a1d600e9a9e8bab6b325.tar.xz | |
main/mariadb: security upgrade to 10.2.22
| -rw-r--r-- | main/mariadb/APKBUILD | 15 | ||||
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 37 |
2 files changed, 8 insertions, 44 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 3bb0d9c37d..4cbf6c998f 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -5,10 +5,10 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.2.19 -pkgrel=1 +pkgver=10.2.22 +pkgrel=0 pkgdesc="A fast SQL database server" -url="http://www.mariadb.org" +url="https://www.mariadb.org" pkgusers="mysql" pkggroups="mysql" arch="all" @@ -24,9 +24,8 @@ subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedde $pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-server-utils:_server_utils mysql mysql-client:_compat_client mysql-bench:_compat_bench" -source="http://archive.mariadb.org/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz +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 pcre.cmake.patch " @@ -35,6 +34,9 @@ source="http://archive.mariadb.org/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 10.2.22.r0: +# - CVE-2019-2510 +# - CVE-2019-2537 # 10.2.19-r0: # - CVE-2016-9843 # - CVE-2018-3058 @@ -326,8 +328,7 @@ _server_utils() { "$subpkgdir"/usr/bin/ } -sha512sums="7bfd65687c923d50b04d598fccea60a23a3fafc3e57b803b2a06c2f25ae68bd25206e18bd71af4797492792d821f4be05cef19e8075080b82b539afdd8af9f46 mariadb-10.2.19.tar.gz +sha512sums="cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 mariadb-10.2.22.tar.gz 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd -eb9ccb38b0de5da1d9cb81e7d8abfff27e514752105dc8805aef30f78320e5bcdbf043ab967d86945c1a5cd4773a994d46c0b0ed92b3e7a9fc4dd63e00389370 fix-mysql-install-db-path.patch 81d2a95bfbce35fab6e1780f4201320e5621f470591020d707801dcf31f5fad3cb5d7b781a186b2914c6559a8fdc8f13e31e7cdde0af360ad56cedf80e491bc0 ppc-remove-glibc-dep.patch 70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.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 ca179862ab..0000000000 --- a/main/mariadb/fix-mysql-install-db-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 7aa89c68..ce77be49 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -169,25 +169,13 @@ ENDIF(UNIX) - # 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(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) -- 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(pkgplugindir ${INSTALL_PLUGINDIRABS}) -- 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}) - - SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") - SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") |