From 79f992ce54611d11a2f549ad654858adbba15da4 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Mon, 5 Aug 2024 19:05:18 +0300 Subject: [PATCH 1/2] RM-1365 PXB-8.4 --- .../innobase/xtrabackup/utils/debian/control | 14 +++++++------- ...kup-83.docs => percona-xtrabackup-84.docs} | 0 ....install => percona-xtrabackup-84.install} | 1 + ...> percona-xtrabackup-84.lintian-overrides} | 0 .../debian/percona-xtrabackup-test-83.install | 1 - .../debian/percona-xtrabackup-test-84.install | 1 + ...cona-xtrabackup-test-84.lintian-overrides} | 0 .../innobase/xtrabackup/utils/debian/rules | 16 ++++++++-------- .../utils/percona-xtrabackup-8.0_builder.sh | 19 +++++++++++++++++-- .../xtrabackup/utils/percona-xtrabackup.spec | 2 +- 10 files changed, 35 insertions(+), 19 deletions(-) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-83.docs => percona-xtrabackup-84.docs} (100%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-83.install => percona-xtrabackup-84.install} (92%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-83.lintian-overrides => percona-xtrabackup-84.lintian-overrides} (100%) delete mode 100644 storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.install create mode 100644 storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.install rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-test-83.lintian-overrides => percona-xtrabackup-test-84.lintian-overrides} (100%) diff --git a/storage/innobase/xtrabackup/utils/debian/control b/storage/innobase/xtrabackup/utils/debian/control index 49e942178c30..139212d967bd 100644 --- a/storage/innobase/xtrabackup/utils/debian/control +++ b/storage/innobase/xtrabackup/utils/debian/control @@ -1,4 +1,4 @@ -Source: percona-xtrabackup-83 +Source: percona-xtrabackup-84 Section: database Priority: extra Maintainer: Percona Development Team @@ -25,11 +25,11 @@ Build-Depends: automake, Standards-Version: 3.9.5 Homepage: http://www.percona.com/software/percona-xtrabackup -Package: percona-xtrabackup-83 +Package: percona-xtrabackup-84 Architecture: any Depends: libdbd-mysql-perl, libcurl4-openssl-dev, rsync, zstd, ${misc:Depends}, ${shlibs:Depends} Provides: xtrabackup -Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81, percona-xtrabackup-82 +Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81, percona-xtrabackup-82, percona-xtrabackup-83 Breaks: xtrabackup (<< 2.0.0~) Replaces: xtrabackup (<< 2.0.0~) Enhances: mysql-server @@ -39,17 +39,17 @@ Description: Open source backup tool for InnoDB and XtraDB InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB servers, and has many advanced features. -Package: percona-xtrabackup-dbg-83 +Package: percona-xtrabackup-dbg-84 Section: debug Architecture: any -Depends: percona-xtrabackup-83 (= ${binary:Version}), ${misc:Depends} +Depends: percona-xtrabackup-84 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for Percona XtraBackup Debug symbols for the binaries in percona-xtrabackup. Install this package if you need to run any of those with gdb. -Package: percona-xtrabackup-test-83 +Package: percona-xtrabackup-test-84 Architecture: any -Depends: mysql-client, percona-xtrabackup-83, ${misc:Depends} +Depends: mysql-client, percona-xtrabackup-84, ${misc:Depends} Description: Test suite for Percona XtraBackup Test suite for Percona XtraBackup. Install this package if you intend to run XtraBackup's test suite. diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.docs b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.docs similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.docs rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.docs diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.install similarity index 92% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.install rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.install index cd99f3fa60ab..7757393745f1 100644 --- a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.install +++ b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.install @@ -9,3 +9,4 @@ /usr/lib/private/libprotobuf.so.* /usr/lib/private/icudt73l/unames.icu /usr/lib/private/icudt73l/brkitr/* +/usr/lib/private/libabsl_* diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.lintian-overrides b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.lintian-overrides similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.lintian-overrides rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-84.lintian-overrides diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.install deleted file mode 100644 index e7fe24ba9a7b..000000000000 --- a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/percona-xtrabackup-test-83 diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.install new file mode 100644 index 000000000000..af38510ebd35 --- /dev/null +++ b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.install @@ -0,0 +1 @@ +/usr/share/percona-xtrabackup-test-84 diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.lintian-overrides b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.lintian-overrides similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-83.lintian-overrides rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.lintian-overrides diff --git a/storage/innobase/xtrabackup/utils/debian/rules b/storage/innobase/xtrabackup/utils/debian/rules index 4102b3d13f53..a9e7f217020f 100755 --- a/storage/innobase/xtrabackup/utils/debian/rules +++ b/storage/innobase/xtrabackup/utils/debian/rules @@ -24,14 +24,14 @@ override_dh_auto_configure: ifeq "$(DEB_DUMMY)" "" ( test -d $(builddirdebug) || mkdir $(builddirdebug) ) && cd $(builddirdebug) && \ cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-83 \ + -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-84 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled && \ cd .. ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-83 \ + -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-84 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled @@ -61,15 +61,15 @@ override_dh_auto_install: override_dh_install: dh_install - mkdir -p debian/percona-xtrabackup-83/usr/lib/private/ - mkdir -p debian/percona-xtrabackup-83/usr/bin/ - cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-83/usr/lib/private/ - cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-83/usr/bin/xtrabackup-debug - patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-83/usr/bin/xtrabackup-debug + mkdir -p debian/percona-xtrabackup-84/usr/lib/private/ + mkdir -p debian/percona-xtrabackup-84/usr/bin/ + cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-84/usr/lib/private/ + cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-84/usr/bin/xtrabackup-debug + patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-84/usr/bin/xtrabackup-debug @echo "RULES.$@" override_dh_strip: - dh_strip --dbg-package=percona-xtrabackup-dbg-83 + dh_strip --dbg-package=percona-xtrabackup-dbg-84 dh_strip -Xlibprotobuf-lite %: diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 5b44f347b389..de736415bd6b 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -30,6 +30,11 @@ append_arg_to_args () { args="$args "$(shell_quote_string "$1") } +switch_to_vault_repo() { + sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* + sed -i 's|#\s*baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +} + parse_arguments() { pick_args= if test "$1" = PICK-ARGS-FROM-ARGV @@ -236,6 +241,9 @@ install_deps() { CURPLACE=$(pwd) if [ "$OS" == "rpm" ] then + if [ $RHEL = 7 ]; then + switch_to_vault_repo + fi yum -y install git wget yum-utils curl yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm if [ x"$ARCH" = "xx86_64" ]; then @@ -261,7 +269,7 @@ install_deps() { else if [ x"$ARCH" = "xx86_64" ]; then yum-config-manager --enable powertools - wget --no-check-certificate https://downloads.percona.com/downloads/TESTING/issue-CUSTO83/procps-ng-devel-3.3.15-6.el8.x86_64.rpm + wget --no-check-certificate https://downloads.percona.com/downloads/packaging/procps-ng-devel-3.3.15-6.el8.x86_64.rpm yum -y install ./procps-ng-devel-3.3.15-6.el8.x86_64.rpm rm procps-ng-devel-3.3.15-6.el8.x86_64.rpm PKGLIST+=" libarchive" @@ -305,6 +313,9 @@ install_deps() { sleep 1 echo "waiting" done + if [ $RHEL = 7 ]; then + switch_to_vault_repo + fi until yum -y makecache; do yum clean all sleep 1 @@ -351,6 +362,10 @@ install_deps() { else PKGLIST+=" libprocps-dev" fi + if [ "${OS_NAME}" == "noble" ]; then + wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb + dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb + fi if [ "${OS_NAME}" == "bionic" ]; then PKGLIST+=" gcc-8 g++-8" fi @@ -539,7 +554,7 @@ build_source_deb(){ echo "DEB_RELEASE=${DEB_RELEASE}" >> ${CURDIR}/percona-xtrabackup-8.0.properties - NEWTAR=${NAME}-83_${VERSION}.orig.tar.gz + NEWTAR=${NAME}-84_${VERSION}.orig.tar.gz mv ${TARFILE} ${NEWTAR} tar xzf ${NEWTAR} diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec b/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec index 61ec96703a06..b06ca36ba317 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec @@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/xbcloud_osenv /usr/lib/private/libprotobuf* /usr/lib/private/icudt73l -%{_libdir}/xtrabackup/plugin/keyring_file.so +/usr/lib/private/libabsl_* %{_libdir}/xtrabackup/plugin/component_keyring_vault.so %{_libdir}/xtrabackup/plugin/component_keyring_file.so %{_libdir}/xtrabackup/plugin/component_keyring_kms.so From 45168313422a0fe7604f7894825c1bb8ea2c8a5a Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Mon, 5 Aug 2024 19:09:56 +0300 Subject: [PATCH 2/2] RM-1365 PXB-8.4 --- storage/innobase/xtrabackup/utils/debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/storage/innobase/xtrabackup/utils/debian/changelog b/storage/innobase/xtrabackup/utils/debian/changelog index 82cc4aaef513..9d7318617500 100644 --- a/storage/innobase/xtrabackup/utils/debian/changelog +++ b/storage/innobase/xtrabackup/utils/debian/changelog @@ -1,3 +1,8 @@ +percona-xtrabackup-84 (8.4) unstable; urgency=low + + * Packaging changes for version 8.4 + + -- Vadim Yalovets Fri, 01 Aug 2024 19:11:21 +0300 percona-xtrabackup-83 (8.3) unstable; urgency=low * Packaging changes for version 8.3