diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile index df8fdd21f488..81f5489f1b4f 100644 --- a/databases/mariadb-connector-c/Makefile +++ b/databases/mariadb-connector-c/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb -PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTVERSION= 2.3.2 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb-connector-c/distinfo b/databases/mariadb-connector-c/distinfo index c780224c0a28..42eb2ce8132a 100644 --- a/databases/mariadb-connector-c/distinfo +++ b/databases/mariadb-connector-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484488531 -SHA256 (mariadb-connector-c-2.3.1-src.tar.gz) = 6ab7e1477ae1484939675a3b499f98148980a0bd340d15d22df00a5c6656c633 -SIZE (mariadb-connector-c-2.3.1-src.tar.gz) = 536755 +TIMESTAMP = 1492184849 +SHA256 (mariadb-connector-c-2.3.2-src.tar.gz) = 4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a +SIZE (mariadb-connector-c-2.3.2-src.tar.gz) = 538172 diff --git a/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c b/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c index 0eca2f708e8b..e9231dc863e2 100644 --- a/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c +++ b/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c @@ -1,25 +1,16 @@ ---- libmariadb/ma_secure.c.orig 2016-08-03 15:39:12 UTC +--- libmariadb/ma_secure.c.orig 2017-01-17 09:53:54 UTC +++ libmariadb/ma_secure.c -@@ -74,7 +74,7 @@ static void my_SSL_error(MYSQL *mysql) - Crypto call back functions will be - set during ssl_initialization - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - #if (OPENSSL_VERSION_NUMBER < 0x10000000) - static unsigned long my_cb_threadid(void) - { @@ -149,11 +149,11 @@ int my_ssl_start(MYSQL *mysql) pthread_mutex_lock(&LOCK_ssl_config); if (!my_ssl_initialized) { -#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) if (ssl_crypto_init()) goto end; #endif -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); #else SSL_library_init();