From owner-svn-ports-head@freebsd.org Sat Nov 7 09:57:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C425C2EAB24; Sat, 7 Nov 2020 09:57:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSt2p5C9Sz4bw9; Sat, 7 Nov 2020 09:57:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A39254AB7; Sat, 7 Nov 2020 09:57:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A79v637034649; Sat, 7 Nov 2020 09:57:06 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A79v55m034646; Sat, 7 Nov 2020 09:57:05 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202011070957.0A79v55m034646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 7 Nov 2020 09:57:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554374 - in head/databases/xtrabackup: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/databases/xtrabackup: . files X-SVN-Commit-Revision: 554374 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2020 09:57:06 -0000 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;