diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-02-01 22:42:55 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-02-01 22:42:55 +0000 |
| commit | c7fd019365e66aa62e34b5a696bd7157ad290b25 (patch) | |
| tree | fef3b08e017486d36278f504083d09476caeb09c /databases | |
| parent | Valyria Tear is an attempt at creating a free (as meant in the Gnu (diff) | |
- update databases/mariadb-server to 5.3.12 [1]
- update databases/mariadb55-server 5.5.29 [2]
PR: ports/175764 [1]
PR: ports/175767 [2]
Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer) [1]
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua> (maintainer) [2]
Security: 8c773d7f-6cbb-11e2-b242-c8600054b392
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mariadb-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mariadb55-client/files/patch-CMakeLists.txt | 32 | ||||
| -rw-r--r-- | databases/mariadb55-client/pkg-plist | 1 | ||||
| -rw-r--r-- | databases/mariadb55-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mariadb55-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mariadb55-server/pkg-plist | 1 |
7 files changed, 19 insertions, 28 deletions
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index e655ca65ed3a..86629fdc743c 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb -PORTVERSION= 5.3.11 -PORTREVISION?= 0 +PORTVERSION= 5.3.12 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo index 08a72b9efda6..c097964e7ca2 100644 --- a/databases/mariadb-server/distinfo +++ b/databases/mariadb-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.3.11.tar.gz) = 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a -SIZE (mariadb-5.3.11.tar.gz) = 26865690 +SHA256 (mariadb-5.3.12.tar.gz) = 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c +SIZE (mariadb-5.3.12.tar.gz) = 26880808
\ No newline at end of file diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index 494f4e27e520..82d2cd9c3421 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 0724b120407b..a24d9ff55618 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 f26af2205e70..8f89da6deec4 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ 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 5d3647a2ada1..a6254c8b9b60 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 d273e979147f..15cc58680200 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 |