From owner-svn-ports-head@freebsd.org Sat Mar 4 22:19:35 2017 Return-Path: Delivered-To: svn-ports-head@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 2F22BCF98AC; Sat, 4 Mar 2017 22:19:35 +0000 (UTC) (envelope-from bofh@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 09A201690; Sat, 4 Mar 2017 22:19:34 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24MJYU5000825; Sat, 4 Mar 2017 22:19:34 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24MJXTv000819; Sat, 4 Mar 2017 22:19:33 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201703042219.v24MJXTv000819@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sat, 4 Mar 2017 22:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435432 - in head/databases/mysql-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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 22:19:35 -0000 Author: bofh Date: Sat Mar 4 22:19:33 2017 New Revision: 435432 URL: https://svnweb.freebsd.org/changeset/ports/435432 Log: databases/mysql-connector-c: Update version 6.1.6=>6.1.9 Deleted: head/databases/mysql-connector-c/files/patch-vio_viossl.c Modified: head/databases/mysql-connector-c/Makefile head/databases/mysql-connector-c/distinfo head/databases/mysql-connector-c/files/patch-CMakeLists.txt head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake head/databases/mysql-connector-c/pkg-plist Modified: head/databases/mysql-connector-c/Makefile ============================================================================== --- head/databases/mysql-connector-c/Makefile Sat Mar 4 22:19:25 2017 (r435431) +++ head/databases/mysql-connector-c/Makefile Sat Mar 4 22:19:33 2017 (r435432) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mysql-connector-c -PORTVERSION= 6.1.6 -PORTREVISION= 1 +PORTVERSION= 6.1.9 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C DISTNAME= ${PORTNAME}-${PORTVERSION}-src Modified: head/databases/mysql-connector-c/distinfo ============================================================================== --- head/databases/mysql-connector-c/distinfo Sat Mar 4 22:19:25 2017 (r435431) +++ head/databases/mysql-connector-c/distinfo Sat Mar 4 22:19:33 2017 (r435432) @@ -1,2 +1,3 @@ -SHA256 (mysql-connector-c-6.1.6-src.tar.gz) = 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 -SIZE (mysql-connector-c-6.1.6-src.tar.gz) = 3475044 +TIMESTAMP = 1488661538 +SHA256 (mysql-connector-c-6.1.9-src.tar.gz) = 4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b +SIZE (mysql-connector-c-6.1.9-src.tar.gz) = 3494748 Modified: head/databases/mysql-connector-c/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql-connector-c/files/patch-CMakeLists.txt Sat Mar 4 22:19:25 2017 (r435431) +++ head/databases/mysql-connector-c/files/patch-CMakeLists.txt Sat Mar 4 22:19:33 2017 (r435432) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2015-02-25 21:09:49 UTC +--- CMakeLists.txt.orig 2017-03-04 21:11:15 UTC +++ CMakeLists.txt -@@ -541,7 +541,7 @@ ADD_SUBDIRECTORY(packaging/WiX) +@@ -562,7 +562,7 @@ ADD_SUBDIRECTORY(packaging/WiX) # # RPM installs documentation directly from the source tree # -IF(NOT INSTALL_LAYOUT MATCHES "RPM") +IF(NOT INSTALL_LAYOUT MATCHES "RPM" AND 0) - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} + INSTALL(FILES COPYING LICENSE.mysql + DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme Modified: head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake Sat Mar 4 22:19:25 2017 (r435431) +++ head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake Sat Mar 4 22:19:33 2017 (r435432) @@ -1,24 +1,21 @@ ---- cmake/ssl.cmake.orig 2015-02-25 21:09:49 UTC +--- cmake/ssl.cmake.orig 2017-03-04 21:14:36 UTC +++ cmake/ssl.cmake -@@ -166,17 +166,19 @@ MACRO (MYSQL_CHECK_SSL) +@@ -166,7 +166,7 @@ MACRO (MYSQL_CHECK_SSL) # Encoded as MNNFFPPS: major minor fix patch status FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_NUMBER -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + REGEX "define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) STRING(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" - ) - -+ # LibreSSL is allowed too +@@ -176,7 +176,8 @@ MACRO (MYSQL_CHECK_SSL) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" + (OPENSSL_MAJOR_VERSION STREQUAL "1" OR -+ OPENSSL_MAJOR_VERSION STREQUAL "2") ++ OPENSSL_MAJOR_VERSION STREQUAL "2") ) SET(OPENSSL_FOUND TRUE) ELSE() Modified: head/databases/mysql-connector-c/pkg-plist ============================================================================== --- head/databases/mysql-connector-c/pkg-plist Sat Mar 4 22:19:25 2017 (r435431) +++ head/databases/mysql-connector-c/pkg-plist Sat Mar 4 22:19:33 2017 (r435432) @@ -2,6 +2,7 @@ bin/mysql-connector-c/my_print_defaults bin/mysql-connector-c/mysql_config bin/mysql-connector-c/perror include/mysql-connector-c/big_endian.h +include/mysql-connector-c/binary_log_types.h include/mysql-connector-c/byte_order_generic.h include/mysql-connector-c/byte_order_generic_x86.h include/mysql-connector-c/decimal.h @@ -12,6 +13,7 @@ include/mysql-connector-c/m_ctype.h include/mysql-connector-c/m_string.h include/mysql-connector-c/my_alloc.h include/mysql-connector-c/my_byteorder.h +include/mysql-connector-c/my_command.h include/mysql-connector-c/my_compiler.h include/mysql-connector-c/my_config.h include/mysql-connector-c/my_dbug.h @@ -19,14 +21,16 @@ include/mysql-connector-c/my_dir.h include/mysql-connector-c/my_getopt.h include/mysql-connector-c/my_global.h include/mysql-connector-c/my_list.h -include/mysql-connector-c/my_pthread.h include/mysql-connector-c/my_sys.h +include/mysql-connector-c/my_thread.h +include/mysql-connector-c/my_thread_local.h include/mysql-connector-c/my_xml.h include/mysql-connector-c/mysql.h include/mysql-connector-c/mysql/client_authentication.h include/mysql-connector-c/mysql/client_plugin.h include/mysql-connector-c/mysql/client_plugin.h.pp include/mysql-connector-c/mysql/get_password.h +include/mysql-connector-c/mysql/mysql_lex_string.h include/mysql-connector-c/mysql/plugin_auth_common.h include/mysql-connector-c/mysql/plugin_trace.h include/mysql-connector-c/mysql/psi/mysql_file.h @@ -58,10 +62,10 @@ include/mysql-connector-c/sql_state.h include/mysql-connector-c/sslopt-case.h include/mysql-connector-c/sslopt-longopts.h include/mysql-connector-c/sslopt-vars.h +include/mysql-connector-c/thr_cond.h +include/mysql-connector-c/thr_mutex.h +include/mysql-connector-c/thr_rwlock.h include/mysql-connector-c/typelib.h lib/mysql-connector-c/libmysqlclient.a lib/mysql-connector-c/libmysqlclient.so lib/mysql-connector-c/libmysqlclient.so.18 -lib/mysql-connector-c/libmysqlclient_r.a -lib/mysql-connector-c/libmysqlclient_r.so -lib/mysql-connector-c/libmysqlclient_r.so.18