git » mariadb.git » commit fdd10e4

new upstream release

author Christian Hesse
2018-11-02 09:24:57 UTC
committer Christian Hesse
2018-11-02 09:24:57 UTC
parent 8f8635ab178dfb6c3f994ad6673006bac26d0ea7

new upstream release

0001-openssl-1-1-0.patch +13 -0
PKGBUILD +3 -3

diff --git a/0001-openssl-1-1-0.patch b/0001-openssl-1-1-0.patch
index 9c7ffbf..0335f4f 100644
--- a/0001-openssl-1-1-0.patch
+++ b/0001-openssl-1-1-0.patch
@@ -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
 new file mode 100644
 index 0000000..b0e3ed4
diff --git a/PKGBUILD b/PKGBUILD
index f9c8ed8..6087b8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.1.36
+pkgver=10.1.37
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -13,9 +13,9 @@ makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' 'lz4' 'lzo'
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
 source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
         '0001-openssl-1-1-0.patch')
-sha256sums=('ad742e8cf02b9294259cc8b0c888f7ba2e105e76554e4183603d275bcd91aa58'
+sha256sums=('8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46'
             'SKIP'
-            '229d556748119757f36be1e9956834be28db0f5a35cdacce53f6c640784fca77')
+            'fe26d22f0150e7460daa83d71d35735b3031cfc97e99bfbb8d6d74c11a28ccea')
 
 prepare() {
   cd $pkgbase-$pkgver/