ports/185889: [PATCH] databases/percona55-server: update to 5.5.35

Sun Jan 19 18:20:00 UTC 2014

>Number:         185889
>Category:       ports
>Synopsis:       [PATCH] databases/percona55-server: update to 5.5.35
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 19 18:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Jim Ohlstein
>Release:        FreeBSD 10.0-PRERELEASE amd64
>Organization:
JLK Hosting
>Environment:
System: FreeBSD selenium.jlkhosting.com 10.0-PRERELEASE FreeBSD 10.0-PRERELEASE #0 r260431: Tue Jan  7 21:59:51
>Description:
	-upgrade to 5.5.35.33.0
	-edited two patch files so they would apply cleanly
	-minor Makefile edits so portlint won't throw "Fatal" errors

Port maintainer (flo at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- percona55-server-5.5.35.33.0.patch begins here ---
diff -ruN /usr/ports/databases/percona55-server/Makefile ./Makefile
--- /usr/ports/databases/percona55-server/Makefile	2013-12-21 08:59:06.941424022 -0500
+++ ./Makefile	2014-01-19 12:51:20.663123243 -0500
@@ -1,13 +1,13 @@
 # $FreeBSD: head/databases/percona55-server/Makefile 337107 2013-12-21 00:25:08Z flo $
 
 PORTNAME?=	percona
-DISTVERSION=	5.5.34-32.0
-DISTNAME=	Percona-Server-5.5.34-rel32.0
+DISTVERSION=	5.5.35-33.0
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/
 MASTER_SITE_SUBDIR=	MySQL-5.5
 PKGNAMESUFFIX?=	55-server
+DISTNAME=	Percona-Server-5.5.35-rel33.0
 
 MAINTAINER=	flo at FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff -ruN /usr/ports/databases/percona55-server/distinfo ./distinfo
--- /usr/ports/databases/percona55-server/distinfo	2013-12-17 22:26:42.973126949 -0500
+++ ./distinfo	2014-01-19 12:53:15.539111427 -0500
@@ -1,2 +1,2 @@
-SHA256 (Percona-Server-5.5.34-rel32.0.tar.gz) = 775931aba537dea4fcd4ff6d37f2f30ce24921c79cef17f0c9c595222f95a741
-SIZE (Percona-Server-5.5.34-rel32.0.tar.gz) = 22579884
+SHA256 (Percona-Server-5.5.35-rel33.0.tar.gz) = ffa9335fc6ee204b13c5d6ebe32709f2b5bc930665e8000db1864555a02049b8
+SIZE (Percona-Server-5.5.35-rel33.0.tar.gz) = 22465700
diff -ruN /usr/ports/databases/percona55-server/files/patch-libmysql_CMakeLists.txt ./files/patch-libmysql_CMakeLists.txt
--- /usr/ports/databases/percona55-server/files/patch-libmysql_CMakeLists.txt	2013-12-17 22:26:42.986127005 -0500
+++ ./files/patch-libmysql_CMakeLists.txt	2014-01-19 12:15:46.933266142 -0500
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ libmysql/CMakeLists.txt	2010-12-23 22:01:37.000000000 +0100
-@@ -153,13 +153,14 @@
+--- libmysql/CMakeLists.txt.orig	2014-01-19 11:47:44.423382348 -0500
++++ libmysql/CMakeLists.txt	2014-01-19 12:08:16.021297429 -0500
+@@ -165,7 +165,7 @@
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -8,15 +8,16 @@
 +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_SYMBOLS(clientlib)
+@@ -174,6 +174,7 @@
+  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
  ENDIF()
  
 +IF(FALSE)
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -174,9 +175,11 @@
+@@ -188,9 +189,11 @@
    ENDMACRO()
    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
  ENDIF()
@@ -25,11 +26,11 @@
  IF(NOT DISABLE_SHARED)
 -  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
 +  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
++  IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -223,3 +226,4 @@
+@@ -240,3 +243,4 @@
      ENDFOREACH()
    ENDIF()
  ENDIF()
diff -ruN /usr/ports/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc ./files/patch-storage__innobase__handler__i_s.cc
--- /usr/ports/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc	2013-12-17 22:26:43.001126934 -0500
+++ ./files/patch-storage__innobase__handler__i_s.cc	2014-01-19 12:23:36.827776774 -0500
@@ -1,20 +1,23 @@
---- storage/innobase/handler/i_s.cc.orig	2013-08-27 16:58:46.000000000 +0200
-+++ storage/innobase/handler/i_s.cc	2013-09-30 19:31:59.983048770 +0200
-@@ -48,14 +48,18 @@
- #include "btr0types.h"
+--- storage/innobase/handler/i_s.cc.orig	2013-12-02 01:43:24.000000000 -0500
++++ storage/innobase/handler/i_s.cc	2014-01-19 12:21:24.113243651 -0500
+@@ -49,17 +49,21 @@
  #include "buf0buddy.h"
  #include "buf0buf.h"
-+#include "buf0lru.h"
+ #include "buf0lru.h"
 +#include "dict0load.h"
++#include "buf0lru.h"
  #include "ibuf0ibuf.h"
  #include "dict0mem.h"
  #include "dict0types.h"
  #include "dict0boot.h"
+ #include "dict0load.h"
  #include "ha_prototypes.h"
 +#include "srv0srv.h"
  #include "srv0start.h"
+ #include "srv0srv.h"
  #include "trx0i_s.h"
  #include "trx0rseg.h"
+ #include "trx0trx.h"
 +#include "trx0trx.h"
  #include "trx0undo.h"
  #include "log0online.h"
--- percona55-server-5.5.35.33.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:
