Date: Fri, 1 Feb 2013 20:42:30 +0200 (EET) From: Alexandr Kovalenko <never@nevermind.kiev.ua> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/175767: [MAINTAINER] Update databases/mariadb55-* to 5.5.29 Message-ID: <201302011842.r11IgUb8028691@naia.nevermind.kiev.ua> Resent-Message-ID: <201302011850.r11Io1GO064193@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175767
>Category: ports
>Synopsis: [MAINTAINER] Update databases/mariadb55-* to 5.5.29
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 01 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Alexandr Kovalenko
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
Nevermind Ltd.
>Environment:
System: FreeBSD 9.1-STABLE FreeBSD 9.1-STABLE #0 r245742
>Description:
Update MariaDB 5.5 ports to latest release - 5.5.29.
Fixes security issues.
>How-To-Repeat:
N/A
>Fix:
Apply patch attached.
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index 494f4e2..82d2cd9 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,18 +1,12 @@
---- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
-+++ CMakeLists.txt 2012-12-23 01:47:47.000000000 +0200
-@@ -298,34 +298,13 @@
- ADD_SUBDIRECTORY(regex)
- ADD_SUBDIRECTORY(mysys)
- ADD_SUBDIRECTORY(libmysql)
--ADD_SUBDIRECTORY(client)
+--- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200
++++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200
+@@ -303,28 +303,8 @@
ADD_SUBDIRECTORY(extra)
-+
-+ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(libservices)
--ADD_SUBDIRECTORY(scripts)
+ ADD_SUBDIRECTORY(scripts)
-ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(support-files)
--
+
-IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
@@ -29,17 +23,13 @@
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
+- ADD_SUBDIRECTORY(packaging/rpm-uln)
-ENDIF()
-
--IF(UNIX)
-- ADD_SUBDIRECTORY(man)
--ENDIF()
-+ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(man)
-
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
-@@ -360,6 +339,7 @@
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+ ENDIF()
+@@ -362,6 +342,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
@@ -47,7 +37,7 @@
INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
COMPONENT Readme
-@@ -370,6 +350,7 @@
+@@ -372,6 +353,7 @@
IF(UNIX)
INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
ENDIF()
diff --git a/databases/mariadb55-client/pkg-plist b/databases/mariadb55-client/pkg-plist
index 0724b12..a24d9ff 100644
--- a/databases/mariadb55-client/pkg-plist
+++ b/databases/mariadb55-client/pkg-plist
@@ -51,6 +51,7 @@ include/mysql/psi/mysql_file.h
include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/service_debug_sync.h
+include/mysql/service_kill_statement.h
include/mysql/service_my_snprintf.h
include/mysql/service_progress_report.h
include/mysql/service_thd_alloc.h
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 5d61557..edf30ed 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD: head/databases/mariadb55-server/Makefile 309955 2013-01-05 11:30:51Z flo $
PORTNAME?= mariadb
-PORTVERSION= 5.5.28a
+PORTVERSION= 5.5.29
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo
index 5d3647a..a6254c8 100644
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.28a.tar.gz) = 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968
-SIZE (mariadb-5.5.28a.tar.gz) = 27844298
+SHA256 (mariadb-5.5.29.tar.gz) = b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74
+SIZE (mariadb-5.5.29.tar.gz) = 27935253
diff --git a/databases/mariadb55-server/pkg-plist b/databases/mariadb55-server/pkg-plist
index d273e97..15cc586 100644
--- a/databases/mariadb55-server/pkg-plist
+++ b/databases/mariadb55-server/pkg-plist
@@ -109,6 +109,7 @@ libexec/mysqld
%%DATADIR%%/my-small.cnf
%%DATADIR%%/mysql-log-rotate
%%DATADIR%%/mysql.server
+%%DATADIR%%/mysql_performance_tables.sql
%%DATADIR%%/mysql_system_tables.sql
%%DATADIR%%/mysql_system_tables_data.sql
%%DATADIR%%/mysql_test_data_timezone.sql
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302011842.r11IgUb8028691>