Update to 5.6.15-rel63.0

This commit is contained in:
Florian Smeets 2013-12-19 20:02:37 +00:00
parent 6c878021aa
commit d70827a7b0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=336954
4 changed files with 15 additions and 23 deletions

View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
+++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100
@@ -378,31 +378,11 @@
--- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000
+++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000
@@ -458,33 +458,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@ -28,6 +28,8 @@
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-uln)
- ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-fedora)
-ENDIF()
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
@ -37,7 +39,7 @@
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
@@ -439,7 +419,6 @@
@@ -521,18 +499,17 @@
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
@ -45,9 +47,8 @@
# Create a single package with "make package"
# (see http://public.kitware.com/Bug/view.php?id=11452)
@@ -447,11 +426,11 @@
SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
INCLUDE(CPack)
IF(UNIX)
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
ENDIF()
@ -58,8 +59,10 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -477,3 +456,4 @@
@@ -558,5 +535,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)

View File

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME?= percona
DISTVERSION= 5.6.14-rel62.0
DISTVERSION= 5.6.15-rel63.0
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/release-${DISTVERSION:S/rel//}/483/source/
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
PKGNAMESUFFIX?= 56-server
DISTNAME= Percona-Server-5.6.14-rel62.0
DISTNAME= Percona-Server-5.6.15-rel63.0
MAINTAINER= flo@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)

View File

@ -1,2 +1,2 @@
SHA256 (Percona-Server-5.6.14-rel62.0.tar.gz) = 69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280
SIZE (Percona-Server-5.6.14-rel62.0.tar.gz) = 33386914
SHA256 (Percona-Server-5.6.15-rel63.0.tar.gz) = 0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc
SIZE (Percona-Server-5.6.15-rel63.0.tar.gz) = 33371236

View File

@ -1,11 +0,0 @@
--- sql/mysqld.cc.orig 2013-06-03 00:02:34.000000000 +0200
+++ sql/mysqld.cc 2013-06-06 00:57:21.510741832 +0200
@@ -6422,7 +6422,7 @@
#ifdef HAVE_LIBWRAP
{
- if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
+ if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock))
{
struct request_info req;
signal(SIGCHLD, SIG_DFL);