extra/mariadb to 10.1.23-2

extra/mariadb/PKGBUILD

@@ -9,34 +9,35 @@ pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.1.23
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'pcre' 'jemalloc'
+makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc'
              'lz4' 'boost' 'libevent' 'systemd')
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
-source=(https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz{,.asc}
-        mariadb-sysusers.conf
-        mariadb-tmpfile.conf)
+source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
+        '0001-openssl-1-1-0.patch'
+        'mariadb-sysusers.conf'
+        'mariadb-tmpfile.conf')
 sha256sums=('54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf'
             'SKIP'
+            'f337505ce421aea82693ab95372ce93fde3ea0351e0b6b78c26c9e1154df174c'
             'e1a22777c65854041f16fc0a2db3218d17b4d7e7ec7ab7a77cf49c71277c1515'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
-# This ships with bundled SSL library until proper support for openssl 1.1.0
-# is available.
-# TODO: Switch back to system openssl
-#   -> add 'openssl' to dependencies
-#   -> switch to '-DWITH_SSL=system' in cmake command
-
 prepare() {
+  cd $pkgbase-$_pkgver/
+
   # Changes to the upstream unit files:
   #  * remove the alias from unit files, we install symlinks in package function
   #  * enable PrivateTmp for a little bit more security
   sed -i -e '/^Alias/d' \
     -e '/^PrivateTmp/c PrivateTmp=true' \
-    $pkgbase-$_pkgver/support-files/mariadb{,@}.service.in
+    support-files/mariadb{,@}.service.in
+
+  # openssl 1.1.0
+  patch -Np1 < "${srcdir}"/0001-openssl-1-1-0.patch
 }
 
 build() {
@@ -68,7 +69,7 @@ build() {
     -DWITH_SYSTEMD=yes \
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
-    -DWITH_SSL=bundled \
+    -DWITH_SSL=system \
     -DWITH_PCRE=system \
     -DWITH_LIBWRAP=OFF \
     -DWITH_JEMALLOC=ON \