Date: Mon, 13 Aug 2018 16:52:40 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r477078 - in branches/2018Q3/databases/xtrabackup: . files Message-ID: <201808131652.w7DGqe6n044934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Aug 13 16:52:40 2018 New Revision: 477078 URL: https://svnweb.freebsd.org/changeset/ports/477078 Log: MFH: r477077 databases/xtrabackup: Update to 2.4.12 - Disable version check functionality which is an information disclosure vulnerability as it posts system information and hostnames to https://v.percona.com PR: 230417 Approved by: maintainer Differential Revision: https://reviews.freebsd.org/D16609 Added: branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt - copied unchanged from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc - copied unchanged from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc - copied unchanged from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc Deleted: branches/2018Q3/databases/xtrabackup/files/patch-sql-json_dom.h branches/2018Q3/databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc branches/2018Q3/databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc branches/2018Q3/databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc Modified: branches/2018Q3/databases/xtrabackup/Makefile branches/2018Q3/databases/xtrabackup/distinfo Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/databases/xtrabackup/Makefile ============================================================================== --- branches/2018Q3/databases/xtrabackup/Makefile Mon Aug 13 16:51:56 2018 (r477077) +++ branches/2018Q3/databases/xtrabackup/Makefile Mon Aug 13 16:52:40 2018 (r477078) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xtrabackup -DISTVERSION= 2.4.9 -PORTREVISION= 2 +DISTVERSION= 2.4.12 CATEGORIES= databases MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \ SF/boost/boost/1.59.0/:boost @@ -16,22 +15,20 @@ COMMENT= OpenSource version of InnoDB backup with supp LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_armv6= fails to compile: cannot combine with previous 'type-name' declaration specifier +BROKEN_armv7= fails to compile: cannot combine with previous 'type-name' declaration specifier +BROKEN_mips64= fails to compile: 'fpsetmask' was not declared in this scope +BROKEN_powerpc64= fails to link: ld: final link failed: Bad value + # quilt is required by build.sh BUILD_DEPENDS= bash:shells/bash \ - cmake:devel/cmake \ - xxd:editors/vim-console + cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libev.so:devel/libev \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql \ - qpress:archivers/qpress +RUN_DEPENDS= qpress:archivers/qpress -BROKEN_armv6= fails to compile: cannot combine with previous 'type-name' declaration specifier -BROKEN_armv7= fails to compile: cannot combine with previous 'type-name' declaration specifier -BROKEN_mips64= fails to compile: 'fpsetmask' was not declared in this scope -BROKEN_powerpc64= fails to link: ld: final link failed: Bad value - # autotool is in use for 5.1 builds USES= alias autoreconf:build bison cpe gettext cmake:noninja libtool perl5 shebangfix CPE_VENDOR= percona @@ -42,5 +39,9 @@ WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \ bin/xbcloud bin/xbcloud_osenv + +# Not sure why it's trying to install mysql client libraries now +post-install: + ${RM} -rf ${STAGEDIR}${LOCALBASE}/lib .include <bsd.port.mk> Modified: branches/2018Q3/databases/xtrabackup/distinfo ============================================================================== --- branches/2018Q3/databases/xtrabackup/distinfo Mon Aug 13 16:51:56 2018 (r477077) +++ branches/2018Q3/databases/xtrabackup/distinfo Mon Aug 13 16:52:40 2018 (r477078) @@ -1,5 +1,5 @@ -TIMESTAMP = 1521236900 -SHA256 (percona-xtrabackup-2.4.9.tar.gz) = 23c1e42ad4161b38edef126cf600e28779788a4d1736cadbb8e8f3dc219135a7 -SIZE (percona-xtrabackup-2.4.9.tar.gz) = 58001052 +TIMESTAMP = 1533575308 +SHA256 (percona-xtrabackup-2.4.12.tar.gz) = de02cfd5bde96ddbf50339ef3a4646004dde52239698df45c19ed3e8ee40738e +SIZE (percona-xtrabackup-2.4.12.tar.gz) = 57232309 SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SIZE (boost_1_59_0.tar.bz2) = 70389425 Copied: branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt (from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt Mon Aug 13 16:52:40 2018 (r477078, copy of r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_CMakeLists.txt) @@ -0,0 +1,31 @@ +--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig 2018-08-09 13:51:49 UTC ++++ storage/innobase/xtrabackup/src/CMakeLists.txt +@@ -28,13 +28,6 @@ FIND_GCRYPT() + MYSQL_CHECK_CURL() + FIND_EV() + +-# xxd is needed to embed version_check script +-FIND_PROGRAM(XXD_PATH xxd) +- +-IF(NOT XXD_PATH) +- MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.") +-ENDIF(NOT XXD_PATH) +- + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/storage/innobase/include +@@ -56,14 +49,6 @@ ADD_DEFINITIONS(${SSL_DEFINES}) + ######################################################################## + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h ) +- +-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h +- COMMAND ${XXD_PATH} --include version_check.pl +- ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +- +-ADD_CUSTOM_TARGET(GenVersionCheck +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h) + + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/plugin/keyring Copied: branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc (from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc Mon Aug 13 16:52:40 2018 (r477078, copy of r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_backup__copy.cc) @@ -0,0 +1,46 @@ +--- storage/innobase/xtrabackup/src/backup_copy.cc.orig 2018-08-09 14:07:34 UTC ++++ storage/innobase/xtrabackup/src/backup_copy.cc +@@ -53,7 +53,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA + #include <string> + #include <mysqld.h> + #include <my_default.h> +-#include <version_check_pl.h> + #include <sstream> + #include <algorithm> + #include "fil_cur.h" +@@ -2296,35 +2295,4 @@ decrypt_decompress() + sync_check_close(); + + return(ret); +-} +- +-void +-version_check() +-{ +- if (opt_password != NULL) { +- setenv("option_mysql_password", opt_password, 1); +- } +- if (opt_user != NULL) { +- setenv("option_mysql_user", opt_user, 1); +- } +- if (opt_host != NULL) { +- setenv("option_mysql_host", opt_host, 1); +- } +- if (opt_socket != NULL) { +- setenv("option_mysql_socket", opt_socket, 1); +- } +- if (opt_port != 0) { +- char port[20]; +- snprintf(port, sizeof(port), "%u", opt_port); +- setenv("option_mysql_port", port, 1); +- } +- +- FILE *pipe = popen("perl", "w"); +- if (pipe == NULL) { +- return; +- } +- +- fwrite((const char *) version_check_pl, version_check_pl_len, 1, pipe); +- +- pclose(pipe); + } Copied: branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc (from r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc Mon Aug 13 16:52:40 2018 (r477078, copy of r477077, head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xtrabackup.cc) @@ -0,0 +1,13 @@ +--- storage/innobase/xtrabackup/src/xtrabackup.cc.orig 2018-08-09 13:53:57 UTC ++++ storage/innobase/xtrabackup/src/xtrabackup.cc +@@ -8236,10 +8236,6 @@ xb_init() + + if (xtrabackup_backup) { + +- if (!opt_noversioncheck) { +- version_check(); +- } +- + if ((mysql_connection = xb_mysql_connect()) == NULL) { + return(false); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808131652.w7DGqe6n044934>