Hello community, here is the log from the commit of package xtrabackup for openSUSE:Factory checked in at 2015-11-12 19:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtrabackup (Old) and /work/SRC/openSUSE:Factory/.xtrabackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtrabackup" Changes: -------- --- /work/SRC/openSUSE:Factory/xtrabackup/xtrabackup.changes 2015-10-24 12:43:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtrabackup.new/xtrabackup.changes 2015-11-12 19:40:29.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Oct 28 09:12:32 UTC 2015 - [email protected] + +- Percona XtraBackup 2.3.2, a feature release: + * New utility xbcloud: + + for up/downloading xbstream archives from/to cloud storage. + + reads settings from [xbcloud] section in {/etc/,.}my.cnf + * Backwards compatibility: + + The innobackupex script was rewritten in C and is a symlink + for xtrabackup. 2.2 command syntax is supported but + deprecated. Syntax for new features added to xtrabackup only. + + Options: --lock-wait-query-type, --lock-wait-threshold and + --lock-wait-timeout have been renamed to innobackupex + --ftwrl-wait-query-type, --ftwrl-wait-threshold and + --ftwrl-wait-timeout respectively. + * command line options changed to follow MySQL guidelines + * xtrabackup now also copies MyISAM tables and supports every + feature of innobackupex + * xtrabackup now supports --datadir + * Various bug fixes and improvements +- drop percona-xtrabackup-2.2.x-disable-default-version-check.patch +- add percona-xtrabackup-2.3.2-disable-version-check.patch to + remove feature completely +- unbundle the jsnm library, + adding percona-xtrabackup-2.3.2-unbundle-jsnm.patch + +------------------------------------------------------------------- Old: ---- percona-xtrabackup-2.2.13-nodoc.tar.xz percona-xtrabackup-2.2.x-disable-default-version-check.patch New: ---- percona-xtrabackup-2.3.2-disable-version-check.patch percona-xtrabackup-2.3.2-nodoc.tar.xz percona-xtrabackup-2.3.2-unbundle-jsnm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrabackup.spec ++++++ --- /var/tmp/diff_new_pack.G9N0NG/_old 2015-11-12 19:40:31.000000000 +0100 +++ /var/tmp/diff_new_pack.G9N0NG/_new 2015-11-12 19:40:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: xtrabackup -Version: 2.2.13 +Version: 2.3.2 Release: 0 Summary: Online backup for MySQL / InnoDB License: GPL-2.0 @@ -28,15 +28,19 @@ Source: percona-xtrabackup-%{version}-nodoc.tar.xz Source4: xtrabackup-nodoc.sh Patch1: percona-xtrabackup-2.2.x-srv_buf_size.patch -Patch2: percona-xtrabackup-2.2.x-disable-default-version-check.patch Patch3: percona-xtrabackup-2.2.9-nodoc.patch +Patch4: percona-xtrabackup-2.3.2-disable-version-check.patch +Patch5: percona-xtrabackup-2.3.2-unbundle-jsnm.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: cmake >= 2.6.3 BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: jsmn-devel BuildRequires: libaio-devel +BuildRequires: libcurl-devel +BuildRequires: libev-devel BuildRequires: libgcrypt-devel BuildRequires: libtool BuildRequires: ncurses-devel @@ -49,18 +53,6 @@ BuildRequires: zlib-devel # Requires: mysql -Requires: perl(DBD::mysql) -Requires: perl(File::Basename) -Requires: perl(File::Copy) -Requires: perl(File::Find) -Requires: perl(File::Spec) -Requires: perl(File::Temp) -Requires: perl(FileHandle) -Requires: perl(Getopt::Long) -Requires: perl(Pod::Usage) -Requires: perl(Time::HiRes) -Requires: perl(strict) -# some runtime perl requirements for innobackupex Requires: rsync Recommends: qpress # This is to ease migration from Percona's generic packages @@ -87,27 +79,28 @@ # refuse to build from source tarballs with documentation due to license %{__find} -maxdepth 1 -type d -iname "doc*" -print && exit 1 %{__find} storage/innobase/xtrabackup -maxdepth 1 -type d -iname "doc*" -print && exit 1 + +rm -rf storage/innobase/xtrabackup/src/jsmn + %patch1 -p1 -%patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build -set -ue -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags} -fno-exceptions" -export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{version}\\\"" -export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{version}\\\"" - -# FIXME: you should use %%cmake macros -cmake . \ +%cmake \ + -DCMAKE_C_FLAGS:STRING="%{optflags} -DXTRABACKUP_VERSION=\\\"%{version}\\\" -DDBUG_OFF" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags} -DXTRABACKUP_VERSION=\\\"%{version}\\\" -DDBUG_OFF" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ -DBUILD_CONFIG=xtrabackup_release \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%cmake_install %files %defattr(-,root,root,-) @@ -115,6 +108,8 @@ %{_bindir}/xtrabackup %{_bindir}/xbstream %{_bindir}/xbcrypt +%{_bindir}/xbcloud +%{_bindir}/xbcloud_osenv %doc COPYING %files test ++++++ percona-xtrabackup-2.3.2-disable-version-check.patch ++++++ Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.cc =================================================================== --- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/backup_copy.cc +++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.cc @@ -48,7 +48,6 @@ Place, Suite 330, Boston, MA 02111-1307 #include <set> #include <string> #include <mysqld.h> -#include <version_check_pl.h> #include <sstream> #include "fil_cur.h" #include "xtrabackup.h" @@ -1866,6 +1865,7 @@ decrypt_decompress() return(ret); } +/* void version_check() { @@ -1896,3 +1896,4 @@ version_check() pclose(pipe); } +*/ Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.h =================================================================== --- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/backup_copy.h +++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.h @@ -37,8 +37,10 @@ bool copy_back(); bool decrypt_decompress(); +/* void version_check(); +*/ bool is_path_separator(char); bool Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/xtrabackup.cc =================================================================== --- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/xtrabackup.cc +++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/xtrabackup.cc @@ -6688,7 +6688,7 @@ xb_init() if (xtrabackup_backup) { if (!opt_noversioncheck) { - version_check(); + // version_check(); } if ((mysql_connection = xb_mysql_connect()) == NULL) { Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt =================================================================== --- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/CMakeLists.txt +++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt @@ -43,11 +43,6 @@ INCLUDE_DIRECTORIES( CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h ) -EXECUTE_PROCESS(COMMAND xxd --include version_check.pl - ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - - MYSQL_ADD_EXECUTABLE(xtrabackup xtrabackup.cc innobackupex.cc ++++++ percona-xtrabackup-2.2.13-nodoc.tar.xz -> percona-xtrabackup-2.3.2-nodoc.tar.xz ++++++ /work/SRC/openSUSE:Factory/xtrabackup/percona-xtrabackup-2.2.13-nodoc.tar.xz /work/SRC/openSUSE:Factory/.xtrabackup.new/percona-xtrabackup-2.3.2-nodoc.tar.xz differ: char 26, line 1 ++++++ percona-xtrabackup-2.3.2-unbundle-jsnm.patch ++++++ Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt =================================================================== --- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/CMakeLists.txt +++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt @@ -18,7 +18,6 @@ INCLUDE(curl) INCLUDE(libev) ADD_SUBDIRECTORY(libarchive) -ADD_SUBDIRECTORY(jsmn) FIND_GCRYPT() FIND_CURL()
