svn commit: r440094 - in head/databases: mariadb101-client mariadb101-client/files mariadb101-server mariadb101-server/files
Bernard Spil
brnrd at FreeBSD.org
Thu May 4 06:46:28 UTC 2017
Author: brnrd
Date: Thu May 4 06:46:26 2017
New Revision: 440094
URL: https://svnweb.freebsd.org/changeset/ports/440094
Log:
databases/mariadb101-server: Update to 10.1.23
- Security and bugfix update to 10.1.23
- Add upstream patch for InnoDB crash
- Update CMakeLists.txt patch
- Remove MDEV-12261 patch (included upstream)
- Fix plist issues
PR: 219045
Submitted by: Dani <i.dani at outlook.com>
MFH: 2017Q2
Security: d9e01c35-2531-11e7-b291-b499baebfeaf
Added:
head/databases/mariadb101-server/files/patch-MDEV-12281 (contents, props changed)
Deleted:
head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261
Modified:
head/databases/mariadb101-client/files/patch-CMakeLists.txt
head/databases/mariadb101-client/pkg-plist
head/databases/mariadb101-server/Makefile
head/databases/mariadb101-server/distinfo
head/databases/mariadb101-server/files/patch-CMakeLists.txt
head/databases/mariadb101-server/pkg-plist
Modified: head/databases/mariadb101-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-CMakeLists.txt Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-client/files/patch-CMakeLists.txt Thu May 4 06:46:26 2017 (r440094)
@@ -1,22 +1,23 @@
---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC
+--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
+++ CMakeLists.txt
-@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql)
+@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
-ADD_SUBDIRECTORY(sql/share)
++#ADD_SUBDIRECTORY(sql/share)
IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(tests)
-@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
- # MDEV-6526 these files are not installed anymore
-@@ -470,6 +470,7 @@ IF(UNIX)
+
+@@ -476,6 +477,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
Modified: head/databases/mariadb101-client/pkg-plist
==============================================================================
--- head/databases/mariadb101-client/pkg-plist Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-client/pkg-plist Thu May 4 06:46:26 2017 (r440094)
@@ -71,6 +71,8 @@ include/mysql/service_encryption_scheme.
include/mysql/service_kill_statement.h
include/mysql/service_logger.h
include/mysql/service_md5.h
+include/mysql/service_my_crypt.h
+include/mysql/service_my_print_error.h
include/mysql/service_my_snprintf.h
include/mysql/service_progress_report.h
include/mysql/service_sha1.h
Modified: head/databases/mariadb101-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-server/Makefile Thu May 4 06:46:26 2017 (r440094)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.22
-PORTREVISION?= 2
+PORTVERSION= 10.1.23
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
Modified: head/databases/mariadb101-server/distinfo
==============================================================================
--- head/databases/mariadb101-server/distinfo Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-server/distinfo Thu May 4 06:46:26 2017 (r440094)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489523834
-SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce
-SIZE (mariadb-10.1.22.tar.gz) = 61542321
+TIMESTAMP = 1493839895
+SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf
+SIZE (mariadb-10.1.23.tar.gz) = 61772244
Modified: head/databases/mariadb101-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-server/files/patch-CMakeLists.txt Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-server/files/patch-CMakeLists.txt Thu May 4 06:46:26 2017 (r440094)
@@ -1,16 +1,14 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC
+--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
+++ CMakeLists.txt
-@@ -460,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
- # MDEV-6526 these files are not installed anymore
-@@ -470,6 +471,7 @@ IF(UNIX)
+
+@@ -476,6 +477,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
Added: head/databases/mariadb101-server/files/patch-MDEV-12281
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-MDEV-12281 Thu May 4 06:46:26 2017 (r440094)
@@ -0,0 +1,15 @@
+--- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200
++++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200
+@@ -1168,10 +1168,10 @@
+ leaf-level delete marks because delete marks on
+ non-leaf level do not make sense. */
+
+- if (level == 0 && srv_stats_include_delete_marked? 0:
++ if (level == 0 && (srv_stats_include_delete_marked ? 0:
+ rec_get_deleted_flag(
+ rec,
+- page_is_comp(btr_pcur_get_page(&pcur)))) {
++ page_is_comp(btr_pcur_get_page(&pcur))))) {
+
+ if (rec_is_last_on_page
+ && !prev_rec_is_copied
Modified: head/databases/mariadb101-server/pkg-plist
==============================================================================
--- head/databases/mariadb101-server/pkg-plist Thu May 4 05:27:37 2017 (r440093)
+++ head/databases/mariadb101-server/pkg-plist Thu May 4 06:46:26 2017 (r440094)
@@ -4,6 +4,8 @@ bin/aria_ftdump
bin/aria_pack
bin/aria_read_log
bin/innochecksum
+bin/mariabackup
+bin/mbstream
bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
@@ -37,6 +39,7 @@ bin/resolveip
%%TOKUDB%%bin/tokuft_logprint
%%TOKUDB%%bin/tokuftdump
bin/wsrep_sst_common
+bin/wsrep_sst_mariabackup
bin/wsrep_sst_mysqldump
bin/wsrep_sst_rsync
bin/wsrep_sst_xtrabackup
@@ -150,7 +153,10 @@ man/man1/aria_dump_log.1.gz
man/man1/aria_ftdump.1.gz
man/man1/aria_pack.1.gz
man/man1/aria_read_log.1.gz
+man/man1/galera_new_cluster.1.gz
+man/man1/galera_recovery.1.gz
man/man1/innochecksum.1.gz
+man/man1/mariadb-service-convert.1.gz
man/man1/my_print_defaults.1.gz
man/man1/myisam_ftdump.1.gz
man/man1/myisamchk.1.gz
@@ -168,6 +174,7 @@ man/man1/mysql_zap.1.gz
man/man1/mysqlbug.1.gz
man/man1/mysqld_multi.1.gz
man/man1/mysqld_safe.1.gz
+man/man1/mysqld_safe_helper.1.gz
man/man1/mysqldumpslow.1.gz
man/man1/mysqlhotcopy.1.gz
man/man1/mysqltest.1.gz
@@ -175,6 +182,13 @@ man/man1/perror.1.gz
man/man1/replace.1.gz
man/man1/resolve_stack_dump.1.gz
man/man1/resolveip.1.gz
+%%TOKUDB%%man/man1/tokuft_logdump.1.gz
+%%TOKUDB%%man/man1/tokuftdump.1.gz
+man/man1/wsrep_sst_common.1.gz
+man/man1/wsrep_sst_mysqldump.1.gz
+man/man1/wsrep_sst_rsync.1.gz
+man/man1/wsrep_sst_xtrabackup-v2.1.gz
+man/man1/wsrep_sst_xtrabackup.1.gz
man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
More information about the svn-ports-head
mailing list