extra/mariadb to 10.1.37-1

This commit is contained in:
Kevin Mihelich 2018-11-09 00:08:59 +00:00
parent bd70d65799
commit c5fd157334
2 changed files with 16 additions and 3 deletions

View file

@ -1,3 +1,16 @@
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index 24e18600402..6fac749fd13 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -182,7 +182,7 @@ MACRO (MYSQL_CHECK_SSL)
HAVE_SHA512_DIGEST_LENGTH)
SET(CMAKE_REQUIRED_INCLUDES)
IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND
- OPENSSL_MAJOR_VERSION STRLESS "101" AND
+ OPENSSL_MAJOR_VERSION STRLESS "102" AND
CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH)
SET(SSL_SOURCES "")
diff --git a/include/ssl_compat.h b/include/ssl_compat.h diff --git a/include/ssl_compat.h b/include/ssl_compat.h
new file mode 100644 new file mode 100644
index 0000000..b0e3ed4 index 0000000..b0e3ed4

View file

@ -7,7 +7,7 @@
pkgbase=mariadb pkgbase=mariadb
pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
pkgver=10.1.36 pkgver=10.1.37
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
license=('GPL') license=('GPL')
@ -18,9 +18,9 @@ validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Sign
source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc} source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
'0001-openssl-1-1-0.patch' '0001-openssl-1-1-0.patch'
'atomic.patch') 'atomic.patch')
sha256sums=('ad742e8cf02b9294259cc8b0c888f7ba2e105e76554e4183603d275bcd91aa58' sha256sums=('8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46'
'SKIP' 'SKIP'
'229d556748119757f36be1e9956834be28db0f5a35cdacce53f6c640784fca77' 'fe26d22f0150e7460daa83d71d35735b3031cfc97e99bfbb8d6d74c11a28ccea'
'2ddfe7dc5eae905ed77d7438d6869f9bb26684945c2f82cc19f84926b1cb849f') '2ddfe7dc5eae905ed77d7438d6869f9bb26684945c2f82cc19f84926b1cb849f')
prepare() { prepare() {