Merge branch 'master' into epel7

.gitignore

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

percona-xtrabackup.spec

@@ -1,4 +1,4 @@
-%global commit 9033b0be333cf0629fcdc82ac1a9de6db6d3c205
+%global commit 7686bfc6e5a5163f73e2adea38eac0da06c9898e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %if 0
@@ -7,12 +7,12 @@
 %global MYSQL_VERSION_PATCH 41
 %endif
 
-%global pxbu_major_minor 22
+%global pxbu_major_minor 23
 
 Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
 Name: percona-xtrabackup
-Version: 2.2.9
-Release: 4%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: GPLv2
 URL: http://www.percona.com/software/percona-xtrabackup/
 Source: https://github.com/percona/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
@@ -30,9 +30,15 @@ BuildRequires: libtool
 BuildRequires: bison
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
+BuildRequires: perl-generators
 BuildRequires: procps
 BuildRequires: python-sphinx
+BuildRequires: libcurl-devel
+BuildRequires: libev-devel
+BuildRequires: vim-common
 Requires: perl(DBD::mysql)
+Requires: libcurl
+Requires: libev
 
 %description
 Online backup for InnoDB/XtraDB in MySQL, MariaDB and Percona Server.
@@ -78,14 +84,13 @@ install -d %{buildroot}%{_datadir}
 install -d %{buildroot}%{_mandir}/man1
 # install binaries and configs
 
-INNO_ROOT=storage/innobase/xtrabackup
+INNO_ROOT=storage/innobase/xtrabackup/src
 
 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 ..
@@ -121,6 +126,10 @@ popd
 %doc COPYING
 
 %changelog
+* Wed Jan 18 2017 Peter MacKinnon <pmackinn@redhat.com> - 2.3.6-1
+- Updated to 2.3.6
+- Fixes CVE-2016-6225
+
 * Wed Mar 9 2016 Peter MacKinnon <pmackinn@redhat.com> - 2.2.9-4
 - Rebuild to add ppc64le arch
 

sources

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