From owner-svn-ports-head@freebsd.org Sat Oct 10 23:17:59 2015 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 C7DAE9D24DE; Sat, 10 Oct 2015 23:17:59 +0000 (UTC) (envelope-from flo@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 A326483D; Sat, 10 Oct 2015 23:17:59 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ANHwO4083439; Sat, 10 Oct 2015 23:17:58 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ANHwBm083431; Sat, 10 Oct 2015 23:17:58 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201510102317.t9ANHwBm083431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Sat, 10 Oct 2015 23:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399074 - in head/databases: percona56-client percona56-client/files percona56-server percona56-server/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.20 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, 10 Oct 2015 23:17:59 -0000 Author: flo Date: Sat Oct 10 23:17:57 2015 New Revision: 399074 URL: https://svnweb.freebsd.org/changeset/ports/399074 Log: Update to 5.6.26.74.0 PR: 203148 Submitted by: Thomas Babut Added: head/databases/percona56-client/files/patch-vio_viosocket.c (contents, props changed) head/databases/percona56-server/files/patch-sql_mysqld.cc (contents, props changed) head/databases/percona56-server/files/patch-vio_viosocket.c (contents, props changed) Modified: head/databases/percona56-client/Makefile head/databases/percona56-client/files/patch-CMakeLists.txt head/databases/percona56-server/Makefile head/databases/percona56-server/distinfo head/databases/percona56-server/pkg-plist Modified: head/databases/percona56-client/Makefile ============================================================================== --- head/databases/percona56-client/Makefile Sat Oct 10 23:15:20 2015 (r399073) +++ head/databases/percona56-client/Makefile Sat Oct 10 23:17:57 2015 (r399074) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION= 2 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/percona56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-CMakeLists.txt Sat Oct 10 23:15:20 2015 (r399073) +++ head/databases/percona56-client/files/patch-CMakeLists.txt Sat Oct 10 23:17:57 2015 (r399074) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 -+++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 -@@ -468,40 +468,17 @@ +--- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 ++++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 +@@ -471,41 +471,17 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -37,12 +37,13 @@ - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-fedora) - ADD_SUBDIRECTORY(packaging/rpm-sles) +- ADD_SUBDIRECTORY(packaging/rpm-docker) -ENDIF() - INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -568,18 +546,17 @@ +@@ -542,18 +518,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -62,7 +63,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -605,5 +582,6 @@ +@@ -579,6 +554,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() Added: head/databases/percona56-client/files/patch-vio_viosocket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-vio_viosocket.c Sat Oct 10 23:17:57 2015 (r399074) @@ -0,0 +1,13 @@ +--- vio/viosocket.c.orig 2015-07-08 07:38:39 UTC ++++ vio/viosocket.c +@@ -33,6 +33,10 @@ + static void (*before_io_wait)(void)= 0; + static void (*after_io_wait)(void)= 0; + ++#ifdef __FreeBSD__ ++#define s6_addr32 __u6_addr.__u6_addr32 ++#endif ++ + /* Wait callback macros (both performance schema and threadpool */ + #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \ + do \ Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Sat Oct 10 23:15:20 2015 (r399073) +++ head/databases/percona56-server/Makefile Sat Oct 10 23:17:57 2015 (r399074) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.24-72.2 +DISTVERSION= 5.6.26-74.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ Modified: head/databases/percona56-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Sat Oct 10 23:15:20 2015 (r399073) +++ head/databases/percona56-server/distinfo Sat Oct 10 23:17:57 2015 (r399074) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.24-72.2.tar.gz) = 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de -SIZE (percona-server-5.6.24-72.2.tar.gz) = 34099689 +SHA256 (percona-server-5.6.26-74.0.tar.gz) = 9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608 +SIZE (percona-server-5.6.26-74.0.tar.gz) = 54819177 Added: head/databases/percona56-server/files/patch-sql_mysqld.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-sql_mysqld.cc Sat Oct 10 23:17:57 2015 (r399074) @@ -0,0 +1,19 @@ +--- sql/mysqld.cc.orig 2015-07-25 17:06:21 UTC ++++ sql/mysqld.cc +@@ -2117,6 +2117,16 @@ + #ifndef EMBEDDED_LIBRARY + + /* Initialise proxy protocol. */ ++ ++/* At least OpenBSD and NexentaCore do not ++* define s6_addr32 for user land settings. ++*/ ++#if !defined s6_addr32 && defined __sun__ ++# define s6_addr32 _S6_un._S6_u32 ++#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ ) ++# define s6_addr32 __u6_addr.__u6_addr32 ++#endif /* !defined s6_addr32 */ ++ + static void set_proxy() + { + const char *p; Added: head/databases/percona56-server/files/patch-vio_viosocket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-vio_viosocket.c Sat Oct 10 23:17:57 2015 (r399074) @@ -0,0 +1,13 @@ +--- vio/viosocket.c.orig 2015-07-08 07:38:39 UTC ++++ vio/viosocket.c +@@ -33,6 +33,10 @@ + static void (*before_io_wait)(void)= 0; + static void (*after_io_wait)(void)= 0; + ++#ifdef __FreeBSD__ ++#define s6_addr32 __u6_addr.__u6_addr32 ++#endif ++ + /* Wait callback macros (both performance schema and threadpool */ + #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \ + do \ Modified: head/databases/percona56-server/pkg-plist ============================================================================== --- head/databases/percona56-server/pkg-plist Sat Oct 10 23:15:20 2015 (r399073) +++ head/databases/percona56-server/pkg-plist Sat Oct 10 23:17:57 2015 (r399074) @@ -139,6 +139,9 @@ man/man8/mysqld.8.gz %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/tests/suite/query_response_time/basic.result %%DATADIR%%/tests/suite/query_response_time/basic.test +%%DATADIR%%/tests/suite/query_response_time/bug1453277-master.opt +%%DATADIR%%/tests/suite/query_response_time/bug1453277.result +%%DATADIR%%/tests/suite/query_response_time/bug1453277.test %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result