Version bump, also fixes CVE-2014-2029 / bug 501904

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 44 insertions, 9 deletions

diff --git a/dev-db/xtrabackup-bin/ChangeLog b/dev-db/xtrabackup-bin/ChangeLog
index 9702a31696d1..87e30c576a5e 100644
--- a/dev-db/xtrabackup-bin/ChangeLog
+++ b/dev-db/xtrabackup-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/xtrabackup-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/ChangeLog,v 1.4 2013/12/27 00:44:10 idl0r Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/ChangeLog,v 1.5 2014/02/21 21:10:43 idl0r Exp $
+
+*xtrabackup-bin-2.1.7 (21 Feb 2014)
+
+  21 Feb 2014; Christian Ruppert <idl0r@gentoo.org>
+  xtrabackup-bin-2.0.8.ebuild, -xtrabackup-bin-2.1.6.ebuild,
+  +xtrabackup-bin-2.1.7.ebuild,
+  +files/xtrabackup-bin-2.1.7-no-versioncheck.patch:
+  Version bump, also fixes CVE-2014-2029 / bug 501904
 
 *xtrabackup-bin-2.1.6 (27 Dec 2013)
 *xtrabackup-bin-2.0.8 (27 Dec 2013)
diff --git a/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch b/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch
new file mode 100644
index 000000000000..5460e439fdf3
--- /dev/null
+++ b/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/innobackupex b/bin/innobackupex
+index 1df8d91..9729b6c 100755
+--- a/bin/innobackupex
++++ b/bin/innobackupex
+@@ -142,7 +142,7 @@ my $option_rebuild_threads = 0;
+ 
+ my $option_debug_sleep_before_unlock = '';
+ 
+-my $option_version_check = '1';
++my $option_version_check = '0';
+ 
+ my $option_force_non_empty_dirs = '';
+ 
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild
index 6fe107e9bb63..47237c515e0b 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild,v 1.1 2013/12/27 00:44:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.0.8.ebuild,v 1.2 2014/02/21 21:10:43 idl0r Exp $
 
 EAPI=5
 
@@ -37,3 +37,7 @@ src_install() {
 	done
 	dosym /usr/bin/innobackupex /usr/bin/innobackupex-1.5.1
 }
+
+pkg_postinst() {
+	einfo "xtrabackup 2.0.x is for MySQL/MariaDB 5.1 and 5.5 only"
+}
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.6.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.7.ebuild
index dec0e6873360..1b6857984c4d 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.6.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.7.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.6.ebuild,v 1.1 2013/12/27 00:44:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.7.ebuild,v 1.1 2014/02/21 21:10:43 idl0r Exp $
 
 EAPI=5
 
 MY_PN="percona-${PN/-bin}"
-MY_PVR="${PV}-702"
+MY_PVR="${PV}-721"
 MY_P="${MY_PN}-${PV}"
 MY_PF="${MY_PN}-${MY_PVR}"
 
+inherit eutils
+
 DESCRIPTION="MySQL hot backup software that performs non-blocking backups for
 InnoDB and XtraDB databases"
 HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
@@ -18,8 +20,7 @@ SRC_URI="
 	)
 	x86? (
 		http://www.percona.com/downloads/XtraBackup/XtraBackup-${PV}/binary/Linux/i686/${MY_PF}-Linux-i686.tar.gz -> ${MY_P}-x86_32.tar.gz
-	)
-"
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,9 +38,18 @@ elif use x86; then
 	S="${WORKDIR}/${MY_P}-Linux-i686"
 fi
 
+src_prepare() {
+	# bug 501904 - CVE-2014-2029
+	epatch "${FILESDIR}/${P}-no-versioncheck.patch"
+}
+
 src_install() {
 	for bin in innobackupex xbcrypt xbstream xtrabackup xtrabackup_55 xtrabackup_56; do
 		dobin bin/${bin}
 	done
 	dosym /usr/bin/innobackupex /usr/bin/innobackupex-1.5.1
 }
+
+pkg_postinst() {
+	einfo "xtrabackup 2.1.x is for MySQL/MariaDB 5.5 and 5.6 only"
+}