Merge pull request #1594 from adivinho/release-8.4.0-1

RM-1365 PXB-8.4

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 <[email protected]>  Fri, 01 Aug 2024 19:11:21 +0300
 percona-xtrabackup-83 (8.3) unstable; urgency=low
 
   * Packaging changes for version 8.3

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 <[email protected]>
@@ -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.

storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-83.install → 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_*

storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-84.install

@@ -0,0 +1 @@
+/usr/share/percona-xtrabackup-test-84

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
 
 %:

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}

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