rpms/percona-xtrabackup
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: rpms:master
Branches Tags
rpms:master
rpms:master-riscv64
rpms:f30
rpms:f28
rpms:f29
rpms:f27
rpms:f26
rpms:epel7
rpms:f24
rpms:f25
rpms:f21
rpms:f22
rpms:f23
..
compare: rpms:f22
Branches Tags
rpms:master-riscv64
rpms:master
rpms:f30
rpms:f28
rpms:f29
rpms:f27
rpms:f26
rpms:epel7
rpms:f24
rpms:f25
rpms:f21
rpms:f22
rpms:f23

No commits in common. "master" and "f22" have entirely different histories.
master ... f22

6 changed files with 14 additions and 239 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1 @@
/percona-xtrabackup-9033b0be333cf0629fcdc82ac1a9de6db6d3c205.tar.gz
/percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.tar.gz

135
percona-xtrabackup-2.3.6-explicit-shebangs.patch
View File

@ -1,135 +0,0 @@
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/dbug/tests-t.pl
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/dbug/tests-t.pl
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/dbug/tests-t.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
#
# A driver program to test DBUG features - runs tests (shell commands)
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/libevent/event_rpcgen.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/libevent/event_rpcgen.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/libevent/event_rpcgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
# All rights reserved.
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import itertools
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import breakdancer
from breakdancer import Condition, Effect, Action, Driver
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
@@ -48,7 +48,7 @@ The following script can be used to summ
tabulate-xtrabackup-stats.pl
- #!/usr/bin/env perl
+ #!/usr/bin/perl
use strict;
use warnings FATAL => 'all';
my $script_version = "0.1";
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import sys
if sys.platform == "win32":
import msvcrt, os
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import sys
print "test old mcdonald"
print "success old mcdonald"
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/subunit2junitxml
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/subunit2junitxml
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/subunit2junitxml
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# subunit: extensions to python unittest to get test results from subprocesses.
# Copyright (C) 2009 Robert Collins <robertc@robertcollins.net>
#
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/mysql-test/suite/opt_trace/validate_json.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/mysql-test/suite/opt_trace/validate_json.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/mysql-test/suite/opt_trace/validate_json.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/run.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/run.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
@@ -43,15 +43,15 @@ class TestDetectEncoding(testtools.TestC
"""
# With interpreter binary and using Emacs style file encoding comment:
self._check_encoding("latin-1", (
- "#!/usr/bin/python\n",
+ "#!/usr/bin/python2\n",
"# -*- coding: latin-1 -*-\n",
"import os, sys\n"))
self._check_encoding("iso-8859-15", (
- "#!/usr/bin/python\n",
+ "#!/usr/bin/python2\n",
"# -*- coding: iso-8859-15 -*-\n",
"import os, sys\n"))
self._check_encoding("ascii", (
- "#!/usr/bin/python\n",
+ "#!/usr/bin/python2\n",
"# -*- coding: ascii -*-\n",
"import os, sys\n"))
# Without interpreter line, using plain text:
@@ -112,7 +112,7 @@ class TestDetectEncoding(testtools.TestC
"# Or is it coding: iso-8859-2\n"),
possibly_invalid=True)
self._check_encoding("iso-8859-1", (
- "#!/usr/bin/python\n",
+ "#!/usr/bin/python2\n",
"# Is the coding: iso-8859-1\n",
"# Or is it coding: iso-8859-2\n"))
self._check_encoding("iso-8859-1", (

13
percona-xtrabackup-2.3.6-fix-fpermissive.patch
View File

@ -1,13 +0,0 @@
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/sql/sql_acl.cc
===================================================================
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/sql/sql_acl.cc
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/sql/sql_acl.cc
@@ -3014,7 +3014,7 @@ static int replace_user_table(THD *thd,
* An empty password is considered to be of mysql_native type.
*/
- if (combo->plugin.str == NULL || combo->plugin.str == '\0')
+ if (combo->plugin.str == NULL || *(combo->plugin.str) == '\0')
{
if (combo->uses_identified_by_password_clause)
{

11
percona-xtrabackup-gcc7-flags.patch
View File

@ -1,11 +0,0 @@
--- a/cmake/build_configurations/compiler_options.cmake 2016-11-25 04:05:53.000000000 -0500
+++ b/cmake/build_configurations/compiler_options.cmake 2017-02-17 12:20:04.708833670 -0500
@@ -34,7 +34,7 @@
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+ SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive")
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")

91
percona-xtrabackup.spec
View File

@ -1,4 +1,4 @@
%global commit 7686bfc6e5a5163f73e2adea38eac0da06c9898e
%global commit 9033b0be333cf0629fcdc82ac1a9de6db6d3c205
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%if 0
@ -7,18 +7,15 @@
%global MYSQL_VERSION_PATCH 41
%endif
%global pxbu_major_minor 23
%global pxbu_major_minor 22
Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
Name: percona-xtrabackup
Version: 2.3.6
Release: 15%{?dist}
Version: 2.2.9
Release: 3%{?dist}
License: GPLv2
URL: http://www.percona.com/software/percona-xtrabackup/
Source: https://github.com/percona/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Patch0: percona-xtrabackup-gcc7-flags.patch
Patch1: percona-xtrabackup-2.3.6-explicit-shebangs.patch
Patch2: percona-xtrabackup-2.3.6-fix-fpermissive.patch
Provides: xtrabackup >= 2.0.0
Provides: %{name}-%{pxbu_major_minor}
Obsoletes: xtrabackup < 2.0.0
@ -33,21 +30,16 @@ BuildRequires: libtool
BuildRequires: bison
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: perl-generators
BuildRequires: procps
BuildRequires: python3-sphinx
BuildRequires: libcurl-devel
BuildRequires: libev-devel
BuildRequires: vim-common
BuildRequires: python-sphinx
Requires: perl(DBD::mysql)
Requires: libcurl
Requires: libev
%description
Online backup for InnoDB/XtraDB in MySQL, MariaDB and Percona Server.
%package test
Summary: Test suite for Percona Xtrabackup
Group: Applications/Databases
Provides: %{name}-test-%{pxbu_major_minor}
Requires: %{name}
Requires: /usr/bin/mysql
@ -58,9 +50,6 @@ This package contains the test suite for Percona Xtrabackup
%prep
%setup -qn %{name}-%{commit}
%patch0 -p1
%patch1 -p1
%patch2 -p1
# fails build
# build for mariadb version
@ -78,25 +67,25 @@ EOF
sed -i "s/AM_CONFIG_HEADER/AM_CONFIG_HEADERS/g" libevent/configure.in
sed -i "s/AC_PROG_LIBTOOL/LT_INIT/g" libevent/configure.in
sed -i "s/AC_PROG_LIBTOOL/LT_INIT/g" storage/innobase/xtrabackup/src/libarchive/configure.ac
# GCC 7
sed -i "s/-Werror//g" storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt
%build
%cmake -DBUILD_CONFIG=xtrabackup_release && %make_build
cmake -DBUILD_CONFIG=xtrabackup_release && make -j4
%install
[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}
install -d %{buildroot}%{_mandir}/man1
# install binaries and configs
INNO_ROOT=storage/innobase/xtrabackup/src
INNO_ROOT=storage/innobase/xtrabackup
pushd .
cd $INNO_ROOT
install -p -m 755 innobackupex %{buildroot}%{_bindir}
cd src
install -p -m 755 xtrabackup %{buildroot}%{_bindir}
ln -sf xtrabackup %{buildroot}%{_bindir}/innobackupex
install -p -m 755 xbstream %{buildroot}%{_bindir}
install -p -m 755 xbcrypt %{buildroot}%{_bindir}
cd ..
@ -119,8 +108,7 @@ popd
%{_bindir}/xtrabackup
%{_bindir}/xbstream
%{_bindir}/xbcrypt
%doc README VERSION
%license COPYING
%doc COPYING README VERSION
%{_mandir}/man1/innobackupex.1.gz
%{_mandir}/man1/xtrabackup.1.gz
%{_mandir}/man1/xbstream.1.gz
@ -130,62 +118,9 @@ popd
# https://bugs.launchpad.net/percona-xtrabackup/+bug/1222777
%files -n percona-xtrabackup-test
%{_datadir}/percona-xtrabackup-test
%license COPYING
%doc COPYING
%changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 22 2019 Peter MacKinnon <pmackinn@redhat.com> - 2.3.6-14
- Fixes #1730231
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.3.6-12
- Rebuilt for libcrypt.so.2 (#1666033)
* Fri Jan 04 2019 Björn Esser <besser82@fedoraproject.org> - 2.3.6-11
- Add patch to use explicit shebangs, fixes FTBFS for Fedora 30
- Add patch to fix -fpermissive, fixes FTBFS for Fedora 30
- Apply proper buildflags
- Modernize spec-file
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.6-9
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.3.6-7
- Rebuilt for switch to libxcrypt
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Fri Feb 17 2017 Peter MacKinnon <pmackinn@redhat.com> - 2.3.6-3
- Adjustments for GCC 7
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Jan 18 2017 Peter MacKinnon <pmackinn@redhat.com> - 2.3.6-1
- Updated to 2.3.6
- Fixes CVE-2016-6225
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 3 2015 Peter MacKinnon <pmackinn@redhat.com> - 2.2.9-3
- Add an extra provides for version 2.2

2
sources
View File

@ -1 +1 @@
SHA512 (percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.tar.gz) = 5a51dcd48b87f39771216720fa408a2028d4baad6d61a249bc0af863472b9769f7f75078ad6fd53a91e1d4fe797f790a49b1b127155ef953ecbb21bf2fcb3056
3499ddd53fb915fe68a1e898d956521e percona-xtrabackup-9033b0be333cf0629fcdc82ac1a9de6db6d3c205.tar.gz