From owner-svn-ports-all@freebsd.org Fri Apr 14 16:50:20 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4554AD3E7F1; Fri, 14 Apr 2017 16:50:20 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 075F3EE0; Fri, 14 Apr 2017 16:50:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3EGoJLQ026760; Fri, 14 Apr 2017 16:50:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3EGoIOX026757; Fri, 14 Apr 2017 16:50:18 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201704141650.v3EGoIOX026757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 14 Apr 2017 16:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438528 - in head/databases/mariadb-connector-c: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2017 16:50:20 -0000 Author: brnrd Date: Fri Apr 14 16:50:18 2017 New Revision: 438528 URL: https://svnweb.freebsd.org/changeset/ports/438528 Log: databases/mariadb-connector-c: Update to 2.3.2 - Update to 2.3.2 - Fix build with LibreSSL Modified: head/databases/mariadb-connector-c/Makefile head/databases/mariadb-connector-c/distinfo head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c Modified: head/databases/mariadb-connector-c/Makefile ============================================================================== --- head/databases/mariadb-connector-c/Makefile Fri Apr 14 16:31:02 2017 (r438527) +++ head/databases/mariadb-connector-c/Makefile Fri Apr 14 16:50:18 2017 (r438528) @@ -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}/ \ Modified: head/databases/mariadb-connector-c/distinfo ============================================================================== --- head/databases/mariadb-connector-c/distinfo Fri Apr 14 16:31:02 2017 (r438527) +++ head/databases/mariadb-connector-c/distinfo Fri Apr 14 16:50:18 2017 (r438528) @@ -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 Modified: head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c ============================================================================== --- head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c Fri Apr 14 16:31:02 2017 (r438527) +++ head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c Fri Apr 14 16:50:18 2017 (r438528) @@ -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();