svn commit: r554316 - in head/databases: . xtrabackup8 xtrabackup8/files
Alexey Dokuchaev
danfe at FreeBSD.org
Fri Nov 6 20:37:48 UTC 2020
Author: danfe
Date: Fri Nov 6 20:37:46 2020
New Revision: 554316
URL: https://svnweb.freebsd.org/changeset/ports/554316
Log:
Split `databases/xtrabackup8', based on 8.x versions, which is intended
to be used against `databases/mysql80-server', which versions 2.4.x are
incompatible with.
PR: 250744
Added:
head/databases/xtrabackup8/
- copied from r554308, head/databases/xtrabackup/
head/databases/xtrabackup8/files/patch-sql_binlog.cc (contents, props changed)
head/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh (contents, props changed)
head/databases/xtrabackup8/pkg-plist (contents, props changed)
Deleted:
head/databases/xtrabackup8/files/patch-storage-myisam-mi_dynrec.c
Modified:
head/databases/Makefile
head/databases/xtrabackup8/Makefile
head/databases/xtrabackup8/distinfo
head/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake
head/databases/xtrabackup8/pkg-descr
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Fri Nov 6 20:34:34 2020 (r554315)
+++ head/databases/Makefile Fri Nov 6 20:37:46 2020 (r554316)
@@ -1033,6 +1033,7 @@
SUBDIR += xapian-core12
SUBDIR += xrootd
SUBDIR += xtrabackup
+ SUBDIR += xtrabackup8
SUBDIR += zabbix3-libzbxpgsql
.include <bsd.port.subdir.mk>
Modified: head/databases/xtrabackup8/Makefile
==============================================================================
--- head/databases/xtrabackup/Makefile Fri Nov 6 18:22:47 2020 (r554308)
+++ head/databases/xtrabackup8/Makefile Fri Nov 6 20:37:46 2020 (r554316)
@@ -2,47 +2,49 @@
# $FreeBSD$
PORTNAME= xtrabackup
-DISTVERSION= 2.4.20
+PORTVERSION= 8.0.14
CATEGORIES= databases
-MASTER_SITES= https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
- https://ftp.osuosl.org/pub/blfs/conglomeration/boost/:boost SF/boost/boost/1.59.0/:boost
-DISTFILES= percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \
- boost_1_59_0.tar.bz2:boost
+MASTER_SITES= https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/ \
+ https://github.com/percona/percona-xtrabackup/archive/
+PKGNAMESUFFIX= 8
+DISTNAME= percona-${PORTNAME}-${PORTVERSION}
-MAINTAINER= samm at FreeBSD.org
-COMMENT= OpenSource version of InnoDB backup with support of Percona extensions
+MAINTAINER= eugene at zhegan.in
+COMMENT= Open-source backup tool for InnoDB and XtraDB
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE
-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
-
-# quilt is required by build.sh
-BUILD_DEPENDS= bash:shells/bash \
- cmake:devel/cmake
+BUILD_DEPENDS= xxd:editors/vim-console \
+ boost-libs>=1.72.0:devel/boost-libs \
+ protobuf>=3.0:devel/protobuf \
+ rapidjson>=1.1.0:devel/rapidjson \
+ libevent>=2.1:devel/libevent
LIB_DEPENDS= libcurl.so:ftp/curl \
libev.so:devel/libev \
libgcrypt.so:security/libgcrypt \
- libgpg-error.so:security/libgpg-error
+ libgpg-error.so:security/libgpg-error \
+ libicudata.so:devel/icu \
+ libunwind.so:devel/libunwind \
+ libzstd.so:archivers/zstd
RUN_DEPENDS= qpress:archivers/qpress
-# autotool is in use for 5.1 builds
-USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \
- cpe gettext libtool perl5 shebangfix
-USE_CXXSTD= c++11
+USES= bison cmake compiler:c++14-lang cpe pkgconfig ssl
CPE_VENDOR= percona
-SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh
-CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF
+CMAKE_ARGS= -DBUILD_CONFIG:STRING=xtrabackup_release
+.for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
+CMAKE_ARGS+= -DWITH_${component}:STRING=system
+.endfor
-WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
+post-patch:
+# Delete bundled components so we won't accidentally use them, except LZ4
+# which cannot be removed just yet
+ @${MV} ${WRKSRC}/extra/lz4 ${WRKSRC}
+ @${RM} -r ${WRKSRC}/extra/*
+ @${MV} ${WRKSRC}/lz4 ${WRKSRC}/extra
-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
+post-stage:
+ @${RM} -r ${STAGEDIR}${PREFIX}/docs \
+ ${STAGEDIR}${PREFIX}/lib/plugin/debug
.include <bsd.port.mk>
Modified: head/databases/xtrabackup8/distinfo
==============================================================================
--- head/databases/xtrabackup/distinfo Fri Nov 6 18:22:47 2020 (r554308)
+++ head/databases/xtrabackup8/distinfo Fri Nov 6 20:37:46 2020 (r554316)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1590443927
-SHA256 (percona-xtrabackup-2.4.20.tar.gz) = 4b751f104de7757dfb9bd83f8f045a17dc9f96325dcf4fb6a3d4b8cd5e499b2d
-SIZE (percona-xtrabackup-2.4.20.tar.gz) = 59782001
-SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
-SIZE (boost_1_59_0.tar.bz2) = 70389425
+TIMESTAMP = 1598684487
+SHA256 (percona-xtrabackup-8.0.14.tar.gz) = db8d6d2c6a6b016bf24b4942582ebdbd55c09253ccc78daa6911217bd5a73d5d
+SIZE (percona-xtrabackup-8.0.14.tar.gz) = 285621091
Modified: head/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake
==============================================================================
--- head/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake Fri Nov 6 18:22:47 2020 (r554308)
+++ head/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake Fri Nov 6 20:37:46 2020 (r554316)
@@ -21,11 +21,3 @@
ELSE()
MESSAGE(FATAL_ERROR "Unsupported compiler!")
ENDIF()
-@@ -44,4 +58,6 @@ ENDIF()
- # Should not be needed any more, but kept for easy resurrection if needed
- # #Legacy option, maybe not needed anymore , taken as is from autotools build
- # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+# ADD_DEFINITIONS(-D_GNU_SOURCE)
-+
Added: head/databases/xtrabackup8/files/patch-sql_binlog.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/xtrabackup8/files/patch-sql_binlog.cc Fri Nov 6 20:37:46 2020 (r554316)
@@ -0,0 +1,24 @@
+--- sql/binlog.cc.orig 2020-08-28 21:02:32 UTC
++++ sql/binlog.cc
+@@ -9163,8 +9163,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(
+
+ char *missing_gtids = NULL;
+ char *slave_executed_gtids = NULL;
+- gtid_missing.to_string(&missing_gtids, NULL);
+- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
++ gtid_missing.to_string(&missing_gtids, false);
++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
+
+ /*
+ Log the information about the missing purged GTIDs to the error log.
+@@ -9217,8 +9217,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(
+ Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
+ gtid_missing.add_gtid_set(slave_executed_gtid_set);
+ gtid_missing.remove_gtid_set(previous_gtid_set);
+- gtid_missing.to_string(&missing_gtids, NULL);
+- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
++ gtid_missing.to_string(&missing_gtids, false);
++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
+
+ String tmp_uuid;
+
Added: head/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh Fri Nov 6 20:37:46 2020 (r554316)
@@ -0,0 +1,15 @@
+--- storage/innobase/xtrabackup/xbcloud_osenv.sh.orig 2020-08-28 21:02:32 UTC
++++ storage/innobase/xtrabackup/xbcloud_osenv.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Copyright (C) 2015 Percona LLC and/or its affiliates.
+ # This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+@@ -105,5 +105,5 @@ fi
+
+ # do it
+ # shellcheck disable=SC2086,SC2048
+-${XBCLOUD_BIN} $* ${XBCLOUD_OS_ENV}
++${XBCLOUD_BIN} "$@" ${XBCLOUD_OS_ENV}
+
Modified: head/databases/xtrabackup8/pkg-descr
==============================================================================
--- head/databases/xtrabackup/pkg-descr Fri Nov 6 18:22:47 2020 (r554308)
+++ head/databases/xtrabackup8/pkg-descr Fri Nov 6 20:37:46 2020 (r554316)
@@ -1,6 +1,6 @@
-Percona XtraBackup is OpenSource online (non-blockable) backup solution for
-InnoDB and XtraDB engines. It can back up data from InnoDB, XtraDB, and MyISAM
-tables on unmodified MySQL 5.1, 5.5 and 5.6 servers, as well as Percona Server
-with XtraDB.
+Percona XtraBackup is an open-source hot backup utility for MySQL that
+doesn't lock your database during the backup. It can back up data from
+InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
+servers, and has many advanced features.
WWW: https://www.percona.com/doc/percona-xtrabackup/
Added: head/databases/xtrabackup8/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/xtrabackup8/pkg-plist Fri Nov 6 20:37:46 2020 (r554316)
@@ -0,0 +1,47 @@
+bin/xbcloud
+bin/xbcloud_osenv
+bin/xbcrypt
+bin/xbstream
+bin/xtrabackup
+lib/libmysqlservices.a
+lib/plugin/keyring_file.so
+lib/plugin/keyring_vault.so
+man/man1/comp_err.1.gz
+man/man1/ibd2sdi.1.gz
+man/man1/innochecksum.1.gz
+man/man1/lz4_decompress.1.gz
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_config_editor.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_ssl_rsa_setup.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlman.1.gz
+man/man1/mysqlpump.1.gz
+man/man1/mysqlrouter.1.gz
+man/man1/mysqlrouter_keyring.1.gz
+man/man1/mysqlrouter_passwd.1.gz
+man/man1/mysqlrouter_plugin_info.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+man/man1/perror.1.gz
+man/man1/zlib_decompress.1.gz
+man/man8/mysqld.8.gz
+man/man8/ndb_mgmd.8.gz
+man/man8/ndbd.8.gz
+man/man8/ndbmtd.8.gz
More information about the svn-ports-head
mailing list