cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.6.26.74.0

Browse Source 
PR:		203148
Submitted by:	Thomas Babut <tbabut@mobileobjects.de>
This commit is contained in:
Florian Smeets 2015-10-10 23:17:57 +00:00
parent cdc7bf65ea
commit 33578b458e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=399074
8 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
databases/percona56-client/Makefile
View File

@ -2,7 +2,6 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= percona PORTNAME= percona
PORTREVISION= 2
PKGNAMESUFFIX= 56-client PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)

11
databases/percona56-client/files/patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 --- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200
+++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 +++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200
@@ -468,40 +468,17 @@ @@ -471,41 +471,17 @@
ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
@ -37,12 +37,13 @@
- ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-fedora) - ADD_SUBDIRECTORY(packaging/rpm-fedora)
- ADD_SUBDIRECTORY(packaging/rpm-sles) - ADD_SUBDIRECTORY(packaging/rpm-sles)
- ADD_SUBDIRECTORY(packaging/rpm-docker)
-ENDIF() -ENDIF()
- -
INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake) INCLUDE(cmake/tags.cmake)
@@ -568,18 +546,17 @@ @@ -542,18 +518,17 @@
SET(CPACK_GENERATOR "TGZ") SET(CPACK_GENERATOR "TGZ")
ENDIF() ENDIF()
ADD_SUBDIRECTORY(packaging/WiX) ADD_SUBDIRECTORY(packaging/WiX)
@ -62,7 +63,7 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM") IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR} DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -605,5 +582,6 @@ @@ -579,6 +554,7 @@
PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE
) )
ENDIF() ENDIF()

13
databases/percona56-client/files/patch-vio_viosocket.c Normal file
View File

@ -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 \

2
databases/percona56-server/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= percona PORTNAME?= percona
DISTVERSION= 5.6.24-72.2 DISTVERSION= 5.6.26-74.0
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/

4
databases/percona56-server/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (percona-server-5.6.24-72.2.tar.gz) = 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de SHA256 (percona-server-5.6.26-74.0.tar.gz) = 9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608
SIZE (percona-server-5.6.24-72.2.tar.gz) = 34099689 SIZE (percona-server-5.6.26-74.0.tar.gz) = 54819177

19
databases/percona56-server/files/patch-sql_mysqld.cc Normal file
View File

@ -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;

13
databases/percona56-server/files/patch-vio_viosocket.c Normal file
View File

@ -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 \

3
databases/percona56-server/pkg-plist
View File

@ -139,6 +139,9 @@ man/man8/mysqld.8.gz
%%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/tests/suite/query_response_time/basic.result %%DATADIR%%/tests/suite/query_response_time/basic.result
%%DATADIR%%/tests/suite/query_response_time/basic.test %%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-begin.inc
%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc
%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result