From nobody Tue Feb 04 20:44:38 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ynb2Z6T1Bz5mR8D; Tue, 04 Feb 2025 20:44:38 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ynb2Z6Frnz3T6K; Tue, 04 Feb 2025 20:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738701878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HeDoAt1lx4HZUsDc5Y0pX+CXj0Qz+Jt68jrfuP84FsQ=; b=HzLZcRz67kI017kKv7i2tkl4DAjUFvwEOlqeL8gJlGzSIjN9yqwDhqwODGxfx/MTDR5eJu H9HjRRljSThh8hIMIlV93xgJtv3rh7XjNb7LPtJFhobTjee2XACRreOG0KFViynRGcmKe5 hdATl7m1Xv44LtfErWRMFYQDPTEz5kopPIUbvNJB6Gcz7KAhLtfaHqt+B8LNghlWioYjk6 5aZx9nT1YLrs96V9rBS4qdLD0gFTBQdsNsl7/FLW6t/WJWVH2YJmLRGcnqS3sCqa43z7Dg qhmwph6isa91hINjXKdjG80NziwzXhpUx4khstoL3o7JHZ19HE2SQ6LF01Fpfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738701878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HeDoAt1lx4HZUsDc5Y0pX+CXj0Qz+Jt68jrfuP84FsQ=; b=OK6j2TIXpEO1xlHtyq9LIkNIxeyVBHW2iK6oXJjCkhDUI9eqmUE6Xsc34Et38tMKZWsGNQ JCsONpsNUotqCqs/biPLYbKIzx2nskQjuR6FZ+OuY3euH91yQMzIZQjXGCRmVyNPr60g2L lV8iFS6D4meaZrQt5AnJnPtyWakKHcELVPoUfBMKIvnRRgqwzyJBFvXsNRSCo0ti8xliGS jsz/Nz9BAy1Q8lhUBVnJUiNf1zWiuJe3apnSGhzuCLXcyqAj64pzZLsolgBLApemR9V54c JpXudFiwAZJF68UxpT+4dorsoycvtoNH6N0aIVSZd2mL7aRTx6EMQ/nJGQAKkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738701878; a=rsa-sha256; cv=none; b=w0kcseeUChTzqF5o38ESAtHEeN8Ea/wbyHgBEO3UmFbx/d14jjYrNL+D7Y1KIIjnXg+qK3 MrtPKszILsCFapxIcr94kjwFvomxOxzzvKtvtNgsjVKpI1MEgLSbo33KS/GxUlgaasHr/x SF8pmDVk1E4hb/eAABqLfaSZEONKijXtiA3nzPRxbl2Cg1kDoyi/J3hE8YWxIUW+joEo1Y luzo0JaSD8LSVbwRDyiH30Z61UJrJLmuFgY0CGTZpEqGu/UND/caqGHbM0QYa3BYdubzqB kWXvZmi8LFUL1AEWiVOTAIwD39XB2YcnTV/e+uXK7cTHW32MwTB+TAm2uoW9vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ynb2Z5qbFz6d9; Tue, 04 Feb 2025 20:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 514KicRA081845; Tue, 4 Feb 2025 20:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514KicYV081842; Tue, 4 Feb 2025 20:44:38 GMT (envelope-from git) Date: Tue, 4 Feb 2025 20:44:38 GMT Message-Id: <202502042044.514KicYV081842@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 4cfd98084d10 - main - databases/xtrabackup81: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cfd98084d103bb51a00587a824a9364bec272ad Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cfd98084d103bb51a00587a824a9364bec272ad commit 4cfd98084d103bb51a00587a824a9364bec272ad Author: Rene Ladan AuthorDate: 2025-02-04 20:44:31 +0000 Commit: Rene Ladan CommitDate: 2025-02-04 20:44:31 +0000 databases/xtrabackup81: Remove expired port 2025-01-31 databases/xtrabackup81: Unsupported upstream, consider migrating to databases/xtrabackup84 --- MOVED | 1 + databases/Makefile | 1 - databases/xtrabackup81/Makefile | 94 ---------------------- databases/xtrabackup81/distinfo | 5 -- databases/xtrabackup81/files/patch-CMakeLists.txt | 22 ----- .../files/patch-cmake-install_layout.cmake | 11 --- .../files/patch-cmake_os_FreeBSD.cmake | 23 ------ databases/xtrabackup81/files/patch-file_utils | 20 ----- databases/xtrabackup81/files/patch-llvm-15 | 28 ------- databases/xtrabackup81/files/patch-procps | 28 ------- databases/xtrabackup81/files/patch-protobuf | 10 --- .../files/patch-sql_auth_sql__authorization.cc | 13 --- .../patch-storage_innobase_xtrabackup_src_utils.cc | 59 -------------- ...h-storage_innobase_xtrabackup_xbcloud__osenv.sh | 15 ---- ..._temptable_include_temptable_lock__free__type.h | 17 ---- databases/xtrabackup81/pkg-descr | 4 - databases/xtrabackup81/pkg-plist | 10 --- 17 files changed, 1 insertion(+), 360 deletions(-) diff --git a/MOVED b/MOVED index c990096823a1..fbb0b60ae972 100644 --- a/MOVED +++ b/MOVED @@ -4126,3 +4126,4 @@ databases/mysql90-server|databases/mysql91-server|2025-02-04|Has expired: MySQL textproc/docproj-legacy|textproc/docproj|2025-02-04|Has expired: Old version of documentation set devel/kore||2025-02-04|Has expired: Unmaintained in tree for years and broken for months www/searx||2025-02-04|Has expired: Upstream repo archived Sep 7 2023 +databases/xtrabackup81|databases/xtrabackup84|2025-02-04|Has expired: Unsupported upstream, consider migrating to databases/xtrabackup84 diff --git a/databases/Makefile b/databases/Makefile index 3ba32c10a4f3..48707caa7b45 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1108,7 +1108,6 @@ SUBDIR += xls2txt SUBDIR += xrootd SUBDIR += xtrabackup80 - SUBDIR += xtrabackup81 SUBDIR += xtrabackup84 SUBDIR += zodb diff --git a/databases/xtrabackup81/Makefile b/databases/xtrabackup81/Makefile deleted file mode 100644 index 09f0a250fbf5..000000000000 --- a/databases/xtrabackup81/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -PORTNAME= xtrabackup81 -PORTVERSION= 8.1.0 -DISTVERSIONSUFFIX= -1 -PORTREVISION= 5 -CATEGORIES= databases -MASTER_SITES= https://downloads.percona.com/downloads/Percona-XtraBackup-innovative-release/Percona-XtraBackup-8.1.0-1/source/tarball/:percona \ - SF/boost/boost/${BOOST_VERSION}:boost -DISTFILES= ${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \ - boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost - -MAINTAINER= eugene@zhegan.in -COMMENT= Open-source backup tool for InnoDB and XtraDB -WWW= https://www.percona.com/doc/percona-xtrabackup/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN= Fails to build, error: integer value -1 is outside the valid range of values [0, 3] for the enumeration type -DEPRECATED= Unsupported upstream, consider migrating to databases/xtrabackup84 -EXPIRATION_DATE=2025-01-31 - -BUILD_DEPENDS= 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 \ - libicudata.so:devel/icu \ - libprotobuf-lite.so:devel/protobuf \ - libunwind.so:devel/libunwind \ - libzstd.so:archivers/zstd -RUN_DEPENDS= qpress:archivers/qpress - -USES= bison cmake compiler:c++14-lang cpe pkgconfig ssl -CPE_VENDOR= percona -CMAKE_ARGS= -DBUILD_CONFIG:STRING=xtrabackup_release \ - -DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \ - -DWITH_VERSION_CHECK=false - -.for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD -CMAKE_ARGS+= -DWITH_${component}:STRING=system -.endfor - -CONFLICTS_INSTALL= ${PORTNAME:C/.$//}* - -# Bundle last supported Boost release -BOOST_VERSION= 1.77.0 -BOOST_VERSION_UNDER= ${BOOST_VERSION:C/\./_/g} - -CMAKE_ARGS+= -DWITH_BOOST=${WRKDIR}/boost_${BOOST_VERSION_UNDER} - -# Build fails without NDEBUG, so force it -CFLAGS+= -DNDEBUG -CXXFLAGS+= -DNDEBUG - -DVERSION= ${PORTVERSION}${DISTVERSIONSUFFIX} -PPORTNAME= percona-xtrabackup -WRKSRC= ${WRKDIR}/${PPORTNAME}-${DVERSION} - -.include - -# Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator -# which is broken on i386 due to different size of types and causes a -# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error -.if ${ARCH} == i386 -CXXFLAGS+= -malign-double -.endif - -KEEP_EXTRA= lz4 robin-hood-hashing zlib - -post-patch: -.for d in storage/innobase/xtrabackup/src sql/protobuf - ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt -.endfor -.if ${COMPILER_TYPE} == clang - @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ - ${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp -.endif - -pre-configure: -.for dir in ${KEEP_EXTRA} - @${MV} ${WRKSRC}/extra/${dir} ${WRKDIR} -.endfor - @${RM} -r ${WRKSRC}/extra/* -.for dir in ${KEEP_EXTRA} - @${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra -.endfor - -post-stage: - @${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man - @${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug - -.include diff --git a/databases/xtrabackup81/distinfo b/databases/xtrabackup81/distinfo deleted file mode 100644 index aa6d91e59545..000000000000 --- a/databases/xtrabackup81/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1711999595 -SHA256 (percona-xtrabackup-8.1.0-1.tar.gz) = e058d18e2a80838940aa8f80a095413d994f5a4e8ff5c16228fd9382bb826fe6 -SIZE (percona-xtrabackup-8.1.0-1.tar.gz) = 446978094 -SHA256 (boost_1_77_0.tar.gz) = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131 -SIZE (boost_1_77_0.tar.gz) = 130620992 diff --git a/databases/xtrabackup81/files/patch-CMakeLists.txt b/databases/xtrabackup81/files/patch-CMakeLists.txt deleted file mode 100644 index 8152347c2ee0..000000000000 --- a/databases/xtrabackup81/files/patch-CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2023-10-19 12:05:28 UTC -+++ CMakeLists.txt -@@ -2094,8 +2094,6 @@ IF(WITH_PROTOBUF STREQUAL "bundled" OR WITH_FIDO STREQ - ENDIF() - ENDIF() - --ADD_SUBDIRECTORY(extra/libkmip) -- - # - # Setup maintainer mode options by the end. Platform checks are - # not run with the warning options as to not perturb fragile checks -@@ -2345,10 +2343,6 @@ ENDIF() - - IF(ENABLE_GCOV) - INCLUDE(fastcov) --ENDIF() -- --IF(UNIX) -- ADD_SUBDIRECTORY(man) - ENDIF() - - IF(LINUX AND NOT WITHOUT_SERVER) diff --git a/databases/xtrabackup81/files/patch-cmake-install_layout.cmake b/databases/xtrabackup81/files/patch-cmake-install_layout.cmake deleted file mode 100644 index f5916ece2f0b..000000000000 --- a/databases/xtrabackup81/files/patch-cmake-install_layout.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/install_layout.cmake.orig 2023-10-19 12:05:28 UTC -+++ cmake/install_layout.cmake -@@ -159,7 +159,7 @@ SET(INSTALL_INFODIR_STANDALONE "docs") - # - SET(INSTALL_SHAREDIR_STANDALONE "share") - SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") --SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test") -+# SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test") - SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files") - # - SET(INSTALL_MYSQLDATADIR_STANDALONE "data") diff --git a/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake b/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 55947a14f6c3..000000000000 --- a/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,23 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2023-10-19 12:05:28 UTC -+++ cmake/os/FreeBSD.cmake -@@ -48,6 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1) - MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required") - ENDIF() -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") - ENDIF() diff --git a/databases/xtrabackup81/files/patch-file_utils b/databases/xtrabackup81/files/patch-file_utils deleted file mode 100644 index a23aa72136d4..000000000000 --- a/databases/xtrabackup81/files/patch-file_utils +++ /dev/null @@ -1,20 +0,0 @@ ---- storage/innobase/xtrabackup/src/file_utils.cc.orig 2023-11-24 17:33:10.000000000 +0700 -+++ storage/innobase/xtrabackup/src/file_utils.cc 2024-02-17 00:40:45.193255000 +0700 -@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos - - #include "file_utils.h" - #include --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined (__FreeBSD__) - #include - #else - #include -@@ -391,7 +391,7 @@ File open_fifo_for_read_with_timeout(const char *path, - } - - /* File was open, lets check its open on the other side */ --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - struct timespec tm = {timeout, 0}; - int kqueue_fd = kqueue(); - if (kqueue_fd < 0) { diff --git a/databases/xtrabackup81/files/patch-llvm-15 b/databases/xtrabackup81/files/patch-llvm-15 deleted file mode 100644 index 0017d73b5902..000000000000 --- a/databases/xtrabackup81/files/patch-llvm-15 +++ /dev/null @@ -1,28 +0,0 @@ ---- storage/innobase/include/ddl0impl.h.orig 2023-10-19 12:05:28 UTC -+++ storage/innobase/include/ddl0impl.h -@@ -118,14 +118,6 @@ struct Fetch_sequence : public Context::FTS::Sequence - - /** Physical row context. */ - struct Row { -- /** Constructor. */ -- Row() = default; -- -- Row(const Row &) = default; -- -- /** Destructor. */ -- ~Row() = default; -- - Row &operator=(const Row &) = default; - - /** Build a row from a raw record. ---- unittest/gunit/mysys_my_rdtsc-t.cc.orig 2023-10-19 12:05:28 UTC -+++ unittest/gunit/mysys_my_rdtsc-t.cc -@@ -145,7 +145,7 @@ TEST_F(RDTimeStampCounter, TestNanosecond) { - ulonglong t1 = my_timer_nanoseconds(); - ulonglong t2; - int i; -- int backward = 0; -+ int backward [[maybe_unused]] = 0; - int nonzero = 0; - - for (i = 0; i < LOOP_COUNT; i++) { diff --git a/databases/xtrabackup81/files/patch-procps b/databases/xtrabackup81/files/patch-procps deleted file mode 100644 index 733821dd7c65..000000000000 --- a/databases/xtrabackup81/files/patch-procps +++ /dev/null @@ -1,28 +0,0 @@ ---- storage/innobase/xtrabackup/src/CMakeLists.txt.orig 2023-11-24 13:33:10.000000000 +0300 -+++ storage/innobase/xtrabackup/src/CMakeLists.txt 2024-02-16 15:38:03.294091000 +0300 -@@ -20,8 +20,9 @@ - - INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - -+INCLUDE_DIRECTORIES(%%PREFIX%%/include) -+ - FIND_GCRYPT() --FIND_PROCPS() - - CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG) - -@@ -134,14 +135,6 @@ - ext::icu - crc - ) -- --IF(NOT APPLE) -- IF(PROCPS_VERSION EQUAL 4) -- TARGET_LINK_LIBRARIES(xtrabackup proc2) -- ELSE() -- TARGET_LINK_LIBRARIES(xtrabackup procps) -- ENDIF() --ENDIF() - - # We depend on protobuf because of the mysqlx plugin and replication. - IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR) diff --git a/databases/xtrabackup81/files/patch-protobuf b/databases/xtrabackup81/files/patch-protobuf deleted file mode 100644 index f1bd482d944a..000000000000 --- a/databases/xtrabackup81/files/patch-protobuf +++ /dev/null @@ -1,10 +0,0 @@ ---- sql/protobuf/CMakeLists.txt.orig 2023-11-24 17:33:10.000000000 +0700 -+++ sql/protobuf/CMakeLists.txt 2024-02-17 02:13:42.264307000 +0700 -@@ -21,6 +21,7 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - INCLUDE(${CMAKE_SOURCE_DIR}/cmake/protobuf.cmake) -+INCLUDE_DIRECTORIES(%%PREFIX%%/include) - - SET(PROTOBUF_LITE_LIB_NAME rpl_protobuf_lite) - diff --git a/databases/xtrabackup81/files/patch-sql_auth_sql__authorization.cc b/databases/xtrabackup81/files/patch-sql_auth_sql__authorization.cc deleted file mode 100644 index 95b8518d0a9a..000000000000 --- a/databases/xtrabackup81/files/patch-sql_auth_sql__authorization.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- sql/auth/sql_authorization.cc.orig 2023-10-19 12:05:28 UTC -+++ sql/auth/sql_authorization.cc -@@ -7437,6 +7437,10 @@ bool operator==(const Role_id &a, const std::string &b - return tmp == b; - } - -+bool operator==(const Role_id &a, const LEX_CSTRING &b) { -+ return a == to_string(b); -+} -+ - bool operator==(const std::pair &a, const std::string &b) { - return a.first == b; - } diff --git a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc deleted file mode 100644 index dbc84f05a7e1..000000000000 --- a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc +++ /dev/null @@ -1,59 +0,0 @@ ---- storage/innobase/xtrabackup/src/utils.cc.orig 2023-10-19 12:05:28 UTC -+++ storage/innobase/xtrabackup/src/utils.cc -@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos - - #ifdef __APPLE__ - #include -+#endif -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include - #else - #ifdef HAVE_PROCPS_V3 -@@ -113,12 +115,14 @@ unsigned long get_version_number(std::string version_s - return major * 10000 + minor * 100 + version; - } - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - unsigned long host_total_memory() { - unsigned long total_mem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE); - return total_mem; - } -+#endif - -+#ifdef __APPLE__ - unsigned long host_free_memory() { - unsigned long total_mem = host_total_memory(); - int64_t used_mem; -@@ -139,6 +143,31 @@ unsigned long host_free_memory() { - return total_mem - (unsigned long)used_mem; - } - return 0; -+} -+#elif defined(__FreeBSD__) -+unsigned long host_free_memory() { -+ static int mib_free[2] = { -1, 0 }; -+ static int mib_inactive[2] = { -1, 0 }; -+ size_t miblen = sizeof(mib_free) / sizeof(mib_free[0]); -+ uint32_t free_pages, inactive_pages; -+ size_t sz = sizeof(free_pages); -+ -+ free_pages = inactive_pages = 0; -+ -+ if (mib_free[0] < 0 && -+ sysctlnametomib("vm.stats.vm.v_free_count", mib_free, &miblen) < 0) -+ mib_free[0] = 0; -+ if (mib_inactive[0] < 0 && -+ sysctlnametomib("vm.stats.vm.v_inactive_count", mib_inactive, &miblen) < 0) -+ mib_inactive[0] = 0; -+ -+ if (mib_free[0] && -+ sysctl(mib_free, 2, &free_pages, &sz, NULL, 0) < 0) -+ free_pages = 0; /* should not happen */ -+ if (mib_inactive[0] && sysctl(mib_inactive, 2, &inactive_pages, &sz, NULL, 0) < 0) -+ inactive_pages = 0; /* should not happen, too */ -+ -+ return (free_pages + inactive_pages) * sysconf(_SC_PAGESIZE); - } - #else - unsigned long host_total_memory() { diff --git a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh deleted file mode 100644 index 37b1e45afc66..000000000000 --- a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- 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} - diff --git a/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h b/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h deleted file mode 100644 index f6664e3afa74..000000000000 --- a/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h +++ /dev/null @@ -1,17 +0,0 @@ ---- storage/temptable/include/temptable/lock_free_type.h.orig 2023-10-19 12:05:28 UTC -+++ storage/temptable/include/temptable/lock_free_type.h -@@ -32,6 +32,14 @@ Lock-free type (selection) implementation. */ - #include "my_config.h" - #include "storage/temptable/include/temptable/constants.h" - -+#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) -+/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86 -+ * https://llvm.org/bugs/show_bug.cgi?id=19355 -+ */ -+#undef ATOMIC_LLONG_LOCK_FREE -+#define ATOMIC_LLONG_LOCK_FREE 2 -+#endif -+ - namespace temptable { - - /** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1 diff --git a/databases/xtrabackup81/pkg-descr b/databases/xtrabackup81/pkg-descr deleted file mode 100644 index da1655f57769..000000000000 --- a/databases/xtrabackup81/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -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. diff --git a/databases/xtrabackup81/pkg-plist b/databases/xtrabackup81/pkg-plist deleted file mode 100644 index 40cde5419101..000000000000 --- a/databases/xtrabackup81/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -bin/xbcloud -bin/xbcloud_osenv -bin/xbcrypt -bin/xbstream -bin/xtrabackup -lib/libmysqlservices.a -lib/plugin/component_keyring_file.so -lib/plugin/component_keyring_kms.so -lib/plugin/keyring_file.so -lib/plugin/component_keyring_vault.so