svn commit: r554374 - in head/databases/xtrabackup: . files

[Alexey Dokuchaev]

Author: danfe
Date: Sat Nov  7 09:57:05 2020
New Revision: 554374
URL: https://svnweb.freebsd.org/changeset/ports/554374

Log:
  - Unbreak the build on recent -CURRENT
  - Register installation conflict with v8

Added:
  head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc   (contents, props changed)
  head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c   (contents, props changed)
  head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c   (contents, props changed)
Modified:
  head/databases/xtrabackup/Makefile

Modified: head/databases/xtrabackup/Makefile
==============================================================================
--- head/databases/xtrabackup/Makefile	Sat Nov  7 09:56:08 2020	(r554373)
+++ head/databases/xtrabackup/Makefile	Sat Nov  7 09:57:05 2020	(r554374)
@@ -28,6 +28,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgpg-error.so:security/libgpg-error
 RUN_DEPENDS=	qpress:archivers/qpress
 
+CONFLICTS_INSTALL=	${PORTNAME}8
+
 # autotool is in use for 5.1 builds
 USES=		alias autoreconf:build bison cmake:noninja compiler:c++11-lang \
 		cpe gettext libtool perl5 shebangfix

Added: head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc	Sat Nov  7 09:57:05 2020	(r554374)
@@ -0,0 +1,11 @@
+--- storage/innobase/fsp/fsp0fsp.cc.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/fsp/fsp0fsp.cc
+@@ -1289,7 +1289,7 @@ fsp_header_decode_encryption_info(
+ 
+ 	if (elen == MY_AES_BAD_DATA) {
+ 		my_free(master_key);
+-		return(NULL);
++		return(false);
+ 	}
+ 
+ 	/* Check checksum bytes. */

Added: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c	Sat Nov  7 09:57:05 2020	(r554374)
@@ -0,0 +1,11 @@
+--- storage/innobase/xtrabackup/src/ds_tmpfile.c.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/xtrabackup/src/ds_tmpfile.c
+@@ -55,7 +55,7 @@ datasink_t datasink_tmpfile = {
+ 	&tmpfile_deinit
+ };
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ 
+ static ds_ctxt_t *
+ tmpfile_init(const char *root)

Added: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c	Sat Nov  7 09:57:05 2020	(r554374)
@@ -0,0 +1,10 @@
+--- storage/innobase/xtrabackup/src/xbstream.c.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,6 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
+ 
+ static run_mode_t	opt_mode;
+ static char *		opt_directory = NULL;