From 2aed0bb956a31c4dd1d3ad8c3bb8da2fd2848fc9 Mon Sep 17 00:00:00 2001
From: Peter MacKinnon <pmackinn@redhat.com>
Date: Wed, 18 Jan 2017 16:34:15 -0500
Subject: [PATCH] - Updated to 2.3.6 - Fixes CVE-2016-6225

---
 .gitignore              |  1 +
 percona-xtrabackup.spec | 22 +++++++++++++++-------
 sources                 |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64510ff..a03afdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /percona-xtrabackup-9033b0be333cf0629fcdc82ac1a9de6db6d3c205.tar.gz
+/percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.tar.gz
diff --git a/percona-xtrabackup.spec b/percona-xtrabackup.spec
index 9ebee2b..23200a8 100644
--- a/percona-xtrabackup.spec
+++ b/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
@@ -33,7 +33,12 @@ 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.
@@ -79,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 ..
@@ -122,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
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 85cf807..2a4a6c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3499ddd53fb915fe68a1e898d956521e  percona-xtrabackup-9033b0be333cf0629fcdc82ac1a9de6db6d3c205.tar.gz
+SHA512 (percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.tar.gz) = 5a51dcd48b87f39771216720fa408a2028d4baad6d61a249bc0af863472b9769f7f75078ad6fd53a91e1d4fe797f790a49b1b127155ef953ecbb21bf2fcb3056