From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 17 13:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D617B11 for ; Sat, 17 May 2014 13:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 0500D2EFB for ; Sat, 17 May 2014 13:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HD00CP094258 for ; Sat, 17 May 2014 13:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4HD00MF094256; Sat, 17 May 2014 13:00:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 May 2014 13:00:00 GMT Resent-Message-Id: <201405171300.s4HD00MF094256@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexandr Kovalenko Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 297689AF for ; Sat, 17 May 2014 12:52:27 +0000 (UTC) Received: from naia.nevermind.kiev.ua (naia.nevermind.kiev.ua [109.106.1.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "naia.nevermind.kiev.ua", Issuer "naia.nevermind.kiev.ua" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 627732EB6 for ; Sat, 17 May 2014 12:52:25 +0000 (UTC) Received: from naia.nevermind.kiev.ua (localhost [127.0.0.1]) by naia.nevermind.kiev.ua (8.14.8/8.14.8) with ESMTP id s4HCjbt8087172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sat, 17 May 2014 15:45:37 +0300 (EEST) (envelope-from never@naia.nevermind.kiev.ua) Received: (from never@localhost) by naia.nevermind.kiev.ua (8.14.8/8.14.8/Submit) id s4HCjbqR087171; Sat, 17 May 2014 15:45:37 +0300 (EEST) (envelope-from never) Message-Id: <201405171245.s4HCjbqR087171@naia.nevermind.kiev.ua> Date: Sat, 17 May 2014 15:45:37 +0300 (EEST) From: Alexandr Kovalenko Reply-To: Alexandr Kovalenko To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/189887: [MAINTAINER UPDATE] databases/mariadb55-{client, server}: update to 5.5.37 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 13:00:01 -0000 >Number: 189887 >Category: ports >Synopsis: [MAINTAINER UPDATE] databases/mariadb55-{client,server}: update to 5.5.37 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 17 13:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Alexandr Kovalenko >Release: FreeBSD 10.0-STABLE amd64 >Organization: Nevermind Ltd. >Environment: System: FreeBSD 10.0-STABLE #0 r266161 amd64 >Description: Update MariaDB 5.5 client and server to version 5.5.37, which fixed several security vulnerabilities and bugs. >How-To-Repeat: N/A >Fix: diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index 161956b..a91e998 100644 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300 -+++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300 -@@ -306,28 +306,8 @@ +--- CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300 ++++ CMakeLists.txt 2014-05-16 18:56:55.000000000 +0300 +@@ -395,29 +395,8 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) @@ -24,12 +24,13 @@ - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-uln) +- ADD_SUBDIRECTORY(packaging/rpm-oel) -ENDIF() - IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -339,7 +319,6 @@ +@@ -429,7 +408,6 @@ ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -37,7 +38,7 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -366,6 +345,7 @@ +@@ -462,6 +440,7 @@ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -45,7 +46,7 @@ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER COMPONENT Readme) INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -373,6 +353,7 @@ +@@ -469,6 +448,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() diff --git a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp index ff6354e..214edfd 100644 --- a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -1,10 +1,10 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2012-12-17 03:41:47.000000000 +0200 -+++ extra/yassl/taocrypt/src/integer.cpp 2012-12-17 03:42:47.000000000 +0200 -@@ -73,7 +73,7 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 ++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 +@@ -75,7 +75,7 @@ CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( size_type n, const void *) { -- if (n > max_size()) +- if (n > this->max_size()) + if (n > AlignedAllocator::max_size()) return 0; if (n == 0) diff --git a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt index d8b26b4..cf8b85b 100644 --- a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ scripts/CMakeLists.txt 2012-12-22 23:26:51.000000000 +0200 -@@ -71,6 +71,7 @@ +--- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300 ++++ scripts/CMakeLists.txt 2014-05-16 19:02:48.000000000 +0300 +@@ -72,6 +72,7 @@ ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -79,6 +80,7 @@ +@@ -81,6 +82,7 @@ ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -138,6 +140,7 @@ +@@ -140,6 +142,7 @@ SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -174,6 +177,7 @@ +@@ -180,6 +183,7 @@ DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -198,6 +202,7 @@ +@@ -204,6 +208,7 @@ SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,24 +40,24 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -209,6 +214,7 @@ +@@ -219,6 +224,7 @@ COMPONENT Server ) ENDIF() +ENDIF() - SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -260,6 +266,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(sysconfdir ${prefix}) +@@ -276,6 +282,8 @@ + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) + ENDIF() + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -315,18 +323,8 @@ +@@ -334,18 +342,8 @@ SET(BIN_SCRIPTS msql2mysql mysql_config diff --git a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh index a17b750..5271d52 100644 --- a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh +++ b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh @@ -1,13 +1,13 @@ ---- scripts/mysql_config.sh.orig 2013-09-20 01:34:23.000000000 +0300 -+++ scripts/mysql_config.sh 2013-10-15 21:23:34.000000000 +0300 +--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 ++++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 @@ -108,8 +108,11 @@ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " +libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " +libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " if [ -r "$pkglibdir/libmygcc.a" ]; then diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 198fde5..3341185 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,18 +1,18 @@ # $FreeBSD: head/databases/mariadb55-server/Makefile 346927 2014-03-03 16:23:58Z feld $ PORTNAME?= mariadb -PORTVERSION= 5.5.35 +PORTVERSION= 5.5.37 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ +MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ + http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/ PKGNAMESUFFIX?= 55-server MAINTAINER= never@nevermind.kiev.ua diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index 0f40530..b4c5ce1 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.5.35.tar.gz) = b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e -SIZE (mariadb-5.5.35.tar.gz) = 45723697 +SHA256 (mariadb-5.5.37.tar.gz) = a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c +SIZE (mariadb-5.5.37.tar.gz) = 46078042 diff --git a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp index e94bf77..214edfd 100644 --- a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp @@ -1,10 +1,10 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200 -+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200 -@@ -73,7 +73,7 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 ++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 +@@ -75,7 +75,7 @@ CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( size_type n, const void *) { -- if (n > max_size()) +- if (n > this->max_size()) + if (n > AlignedAllocator::max_size()) return 0; if (n == 0) diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt index f4d2544..18be6bf 100644 --- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-02-11 20:20:18.571491184 -0600 -+++ libmysql/CMakeLists.txt 2014-02-11 20:23:27.474449535 -0600 -@@ -329,7 +329,7 @@ +--- libmysql/CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300 ++++ libmysql/CMakeLists.txt 2014-05-16 19:33:07.000000000 +0300 +@@ -377,7 +377,7 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -9,7 +9,7 @@ # Visual Studio users need debug static library for debug projects INSTALL_DEBUG_SYMBOLS(clientlib) -@@ -338,6 +338,7 @@ +@@ -386,6 +386,7 @@ INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() @@ -17,20 +17,22 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -352,9 +353,11 @@ +@@ -400,11 +401,13 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -401,3 +404,4 @@ +@@ -448,3 +451,4 @@ ENDFOREACH() ENDIF() ENDIF() diff --git a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt index d816e14..8e89386 100644 --- a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt @@ -1,16 +1,16 @@ ---- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ scripts/CMakeLists.txt 2012-12-23 02:54:04.000000000 +0200 -@@ -260,6 +260,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) +--- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300 ++++ scripts/CMakeLists.txt 2014-05-16 19:36:34.000000000 +0300 +@@ -276,6 +276,8 @@ + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) + ENDIF() + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -313,16 +315,11 @@ - ELSE() +@@ -332,16 +334,11 @@ + ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) # On Unix, most of the files end up in the bin directory SET(BIN_SCRIPTS - msql2mysql diff --git a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh b/databases/mariadb55-server/files/patch-scripts_mysql_config.sh index a17b750..5271d52 100644 --- a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh +++ b/databases/mariadb55-server/files/patch-scripts_mysql_config.sh @@ -1,13 +1,13 @@ ---- scripts/mysql_config.sh.orig 2013-09-20 01:34:23.000000000 +0300 -+++ scripts/mysql_config.sh 2013-10-15 21:23:34.000000000 +0300 +--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 ++++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 @@ -108,8 +108,11 @@ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " +libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " +libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " if [ -r "$pkglibdir/libmygcc.a" ]; then diff --git a/databases/mariadb55-server/pkg-plist b/databases/mariadb55-server/pkg-plist index 08bb488..1ca476b 100644 --- a/databases/mariadb55-server/pkg-plist +++ b/databases/mariadb55-server/pkg-plist @@ -58,6 +58,7 @@ lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/server_audit.so lib/mysql/plugin/sphinx.so lib/mysql/plugin/sql_errlog.so libexec/mysqld >Release-Note: >Audit-Trail: >Unformatted: