Index: head/databases/mysql-connector-c/Makefile =================================================================== --- head/databases/mysql-connector-c/Makefile (revision 435431) +++ head/databases/mysql-connector-c/Makefile (revision 435432) @@ -1,35 +1,34 @@ # Created by: gahr # $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 MAINTAINER= bofh@FreeBSD.org COMMENT= MySQL database connector for C LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake:outsource compiler:features mysql ssl CMAKE_ARGS+= -DOPENSSL_INCLUDE_DIR="${OPENSSLINC}" USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} .include .if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -march=i586 .endif .if ${SSL_DEFAULT} == base CMAKE_ARGS+= -DWITH_SSL="system" .else CMAKE_ARGS+= -DWITH_SSL="${OPENSSLBASE}" .endif .include Index: head/databases/mysql-connector-c/distinfo =================================================================== --- head/databases/mysql-connector-c/distinfo (revision 435431) +++ head/databases/mysql-connector-c/distinfo (revision 435432) @@ -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 Index: head/databases/mysql-connector-c/files/patch-vio_viossl.c =================================================================== --- head/databases/mysql-connector-c/files/patch-vio_viossl.c (revision 435431) +++ head/databases/mysql-connector-c/files/patch-vio_viossl.c (nonexistent) @@ -1,13 +0,0 @@ ---- vio/viossl.c.orig 2015-06-20 10:21:51 UTC -+++ vio/viossl.c -@@ -392,8 +392,10 @@ static int ssl_do(struct st_VioSSLFd *pt - SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); - SSL_set_fd(ssl, sd); - #ifndef HAVE_YASSL -+#ifdef SSL_OP_NO_COMPRESSION - SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); - #endif -+#endif - - /* - Since yaSSL does not support non-blocking send operations, use Property changes on: head/databases/mysql-connector-c/files/patch-vio_viossl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysql-connector-c/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql-connector-c/files/patch-CMakeLists.txt (revision 435431) +++ head/databases/mysql-connector-c/files/patch-CMakeLists.txt (revision 435432) @@ -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 Index: head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake (revision 435431) +++ head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake (revision 435432) @@ -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() Index: head/databases/mysql-connector-c/pkg-plist =================================================================== --- head/databases/mysql-connector-c/pkg-plist (revision 435431) +++ head/databases/mysql-connector-c/pkg-plist (revision 435432) @@ -1,67 +1,71 @@ 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 include/mysql-connector-c/errmsg.h include/mysql-connector-c/keycache.h include/mysql-connector-c/little_endian.h 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 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 include/mysql-connector-c/mysql/psi/mysql_idle.h include/mysql-connector-c/mysql/psi/mysql_mdl.h include/mysql-connector-c/mysql/psi/mysql_memory.h include/mysql-connector-c/mysql/psi/mysql_ps.h include/mysql-connector-c/mysql/psi/mysql_socket.h include/mysql-connector-c/mysql/psi/mysql_sp.h include/mysql-connector-c/mysql/psi/mysql_stage.h include/mysql-connector-c/mysql/psi/mysql_statement.h include/mysql-connector-c/mysql/psi/mysql_table.h include/mysql-connector-c/mysql/psi/mysql_thread.h include/mysql-connector-c/mysql/psi/mysql_transaction.h include/mysql-connector-c/mysql/psi/psi.h include/mysql-connector-c/mysql/psi/psi_base.h include/mysql-connector-c/mysql/psi/psi_memory.h include/mysql-connector-c/mysql/service_mysql_alloc.h include/mysql-connector-c/mysql/service_my_snprintf.h include/mysql-connector-c/mysql_com.h include/mysql-connector-c/mysql_com_server.h include/mysql-connector-c/mysql_embed.h include/mysql-connector-c/mysql_time.h include/mysql-connector-c/mysql_version.h include/mysql-connector-c/mysqld_ername.h include/mysql-connector-c/mysqld_error.h include/mysql-connector-c/sql_common.h 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