commit:     062bc067381f78340e1131e0ec26821f12ce7dd6
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jun 26 21:00:35 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 22:59:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062bc067

dev-db/percona-xtrabackup: bump to 2.4.20

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/percona-xtrabackup/Manifest                 |  1 +
 .../percona-xtrabackup-2.4.20-fix-gcc10.patch      | 26 +++++++++
 .../percona-xtrabackup-2.4.20.ebuild               | 67 ++++++++++++++++++++++
 3 files changed, 94 insertions(+)

diff --git a/dev-db/percona-xtrabackup/Manifest 
b/dev-db/percona-xtrabackup/Manifest
index c28ac1fe3a4..65b4fc69f84 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,4 +1,5 @@
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 
8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4
 SHA512 
05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
 DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 
4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407
 SHA512 
89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B 
fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444
 SHA512 
789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
+DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 
25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99
 SHA512 
bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
 DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 
0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6
 SHA512 
9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47

diff --git 
a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch 
b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
new file mode 100644
index 00000000000..8987082d1f9
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
@@ -0,0 +1,26 @@
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index 3801448b..83098498 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -625,7 +625,7 @@ struct system_variables global_system_variables;
+ struct system_variables max_system_variables;
+ struct system_status_var global_status_var;
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ MY_BITMAP temp_pool;
+ 
+ CHARSET_INFO *system_charset_info, *files_charset_info ;
+diff --git a/storage/innobase/xtrabackup/src/xbstream.c 
b/storage/innobase/xtrabackup/src/xbstream.c
+index 611f8c04..f0c57588 100644
+--- a/storage/innobase/xtrabackup/src/xbstream.c
++++ b/storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,7 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
++extern datasink_t datasink_buffer;
+ 
+ static run_mode_t     opt_mode;
+ static char *         opt_directory = NULL;

diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild 
b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
new file mode 100644
index 00000000000..f15f04741bf
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup";
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+       mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+       app-arch/lz4:0=
+       app-editors/vim-core
+       dev-libs/libaio
+       dev-libs/libedit
+       dev-libs/libev
+       dev-libs/libevent:0=
+       dev-libs/libgcrypt:0=
+       dev-libs/libgpg-error
+       dev-python/sphinx
+       net-misc/curl
+       sys-libs/zlib:="
+
+RDEPEND="
+       ${DEPEND}
+       !dev-db/percona-xtrabackup-bin
+       dev-perl/DBD-mysql"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+       "${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+       local mycmakeargs=(
+               -DBUILD_CONFIG=xtrabackup_release
+               -DBUILD_SHARED_LIBS=OFF
+               -DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+               -DWITH_EDITLINE=system
+               -DWITH_LIBEVENT=system
+               -DWITH_LZ4=system
+               -DWITH_SSL=bundled # uses yassl, which isn't packaged
+               -DWITH_ZLIB=system
+               -DWITH_PIC=ON
+       )
+
+       local CMAKE_BUILD_TYPE="Release"
+       cmake_src_configure
+}
+
+src_install() {
+       local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+       dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+       dosym xtrabackup /usr/bin/innobackupex
+
+       einstalldocs
+       doman "${p}"/doc/source/build/man/*
+}

Reply via email to