diff options
| -rw-r--r-- | main/mariadb/APKBUILD | 41 | ||||
| -rw-r--r-- | main/mariadb/fix-ucontext-check.patch | 19 | ||||
| -rw-r--r-- | main/mariadb/libressl.patch | 11 |
3 files changed, 47 insertions, 24 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index d732892326..15cedf9f77 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.1.32 +pkgver=10.1.37 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" @@ -20,11 +20,42 @@ 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 - fix-ucontext-check.patch ppc-remove-glibc-dep.patch + libressl.patch " # secfixes: +# 10.1.37-r0: +# - CVE-2016-9843 +# - CVE-2018-2755 +# - CVE-2018-2761 +# - CVE-2018-2766 +# - CVE-2018-2767 +# - CVE-2018-2771 +# - CVE-2018-2781 +# - CVE-2018-2782 +# - CVE-2018-2784 +# - CVE-2018-2787 +# - CVE-2018-2813 +# - CVE-2018-2817 +# - CVE-2018-2819 +# - CVE-2018-3058 +# - CVE-2018-3060 +# - CVE-2018-3063 +# - CVE-2018-3064 +# - CVE-2018-3066 +# - CVE-2018-3081 +# - CVE-2018-3143 +# - CVE-2018-3156 +# - CVE-2018-3162 +# - CVE-2018-3173 +# - CVE-2018-3174 +# - CVE-2018-3185 +# - CVE-2018-3200 +# - CVE-2018-3251 +# - CVE-2018-3277 +# - CVE-2018-3282 +# - CVE-2018-3284 # 10.1.32-r0: # - CVE-2017-10268 # - CVE-2017-10378 @@ -224,8 +255,8 @@ mysql() { _compat mysql mariadb; } _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } -sha512sums="fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a mariadb-10.1.32.tar.gz +sha512sums="b7c35cd67ad265ce2e3a4db20a2ae2b78745db96dc70a211f027a39b6dbb3dc900991c2ee1021ee6a97d12489c3e2a70252e2adf348a458af38b99c3de5a4f25 mariadb-10.1.37.tar.gz 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch -82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf fix-ucontext-check.patch -a352661d19becae717c16ac67a0e47ed93787653851a75d27e7764133b31dc02e18c38dbbce6d3138e4db08da616dfc75a0141865cd042cef669d6afe4463127 ppc-remove-glibc-dep.patch" +a352661d19becae717c16ac67a0e47ed93787653851a75d27e7764133b31dc02e18c38dbbce6d3138e4db08da616dfc75a0141865cd042cef669d6afe4463127 ppc-remove-glibc-dep.patch +61d26c0253adb94328e5c49b14a379a775f85adbc70f7ad9ef2c68c3b8a9710bb98500e24b91693ecad5b2e8b6757b76390f984b586458f462d28d2d5ab1fc03 libressl.patch" diff --git a/main/mariadb/fix-ucontext-check.patch b/main/mariadb/fix-ucontext-check.patch deleted file mode 100644 index 1e1d58ff36..0000000000 --- a/main/mariadb/fix-ucontext-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru mariadb-10.1.12.orig/configure.cmake mariadb-10.1.12/configure.cmake ---- mariadb-10.1.12.orig/configure.cmake 2016-02-24 16:25:21.000000000 +0200 -+++ mariadb-10.1.12/configure.cmake 2016-03-08 21:11:52.767533395 +0200 -@@ -1087,9 +1087,12 @@ - CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_INO) - CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h" STRUCT_DIRENT_HAS_D_NAMLEN) - SET(SPRINTF_RETURNS_INT 1) --CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) --IF(NOT HAVE_UCONTEXT_H) -- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) -+CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) -+IF(NOT HAVE_UCONTEXT_HEADER) -+ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) -+ENDIF() -+IF(HAVE_UCONTEXT_HEADER) -+ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) - ENDIF() - - CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) diff --git a/main/mariadb/libressl.patch b/main/mariadb/libressl.patch new file mode 100644 index 0000000000..68c05b5b40 --- /dev/null +++ b/main/mariadb/libressl.patch @@ -0,0 +1,11 @@ +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 "") |