[arch-commits] Commit in mariadb/trunk (PKGBUILD)

Christian Hesse eworm at archlinux.org
Fri Feb 24 13:15:48 UTC 2017


    Date: Friday, February 24, 2017 @ 13:15:47
  Author: eworm
Revision: 289481

upgpkg: mariadb 10.1.21-2

use bundled SSL library until proper support for openssl 1.1.0
is available

Modified:
  mariadb/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-24 09:53:21 UTC (rev 289480)
+++ PKGBUILD	2017-02-24 13:15:47 UTC (rev 289481)
@@ -6,11 +6,11 @@
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.1.21
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc'
+makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'pcre' 'jemalloc'
              'lz4' 'boost' 'libevent' 'systemd')
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key at mariadb.org>
 source=(https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz{,.asc}
@@ -21,6 +21,12 @@
             '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() {
   # Changes to the upstream unit files:
   #  * remove the alias from unit files, we install symlinks in package function
@@ -59,7 +65,7 @@
     -DWITH_SYSTEMD=yes \
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
+    -DWITH_SSL=bundled \
     -DWITH_PCRE=system \
     -DWITH_LIBWRAP=OFF \
     -DWITH_JEMALLOC=ON \



More information about the arch-commits mailing list