Attachment 149583 Details for Bug 195164 – patch to update

[patch] patch to update

xtrabackup.diff (text/plain), 6.15 KB, created by Kurt Jaeger on 2014-11-19 11:47:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2014-11-19 11:47:37 UTC

Size: 6.15 KB

patch

obsolete

>diff -r -u -N databases/xtrabackup/Makefile /usr/home/pi/myp/databases/xtrabackup/Makefile
>--- databases/xtrabackup/Makefile	2014-09-18 21:25:06.000000000 +0200
>+++ /usr/home/pi/myp/databases/xtrabackup/Makefile	2014-11-19 12:31:20.000000000 +0100
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/databases/xtrabackup/Makefile 368423 2014-09-18 07:30:24Z tijl $
> 
> PORTNAME=	xtrabackup
>-PORTVERSION=	2.1.7
>-PORTREVISION=	1
>+PORTVERSION=	2.2.6
> CATEGORIES=	databases
>-MASTER_SITES=	http://www.percona.com/downloads/XtraBackup/XtraBackup-${PORTVERSION}/source/
>+MASTER_SITES=	http://www.percona.com/redir/downloads/XtraBackup/LATEST/source/tarball/
> DISTNAME=	percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
> DISTFILES=	percona-xtrabackup-${PORTVERSION}.tar.gz
> EXTRACT_ONLY=	percona-xtrabackup-${PORTVERSION}.tar.gz
>@@ -18,7 +17,6 @@
> # quilt is required by build.sh
> BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
> 		cmake:${PORTSDIR}/devel/cmake \
>-		quilt:${PORTSDIR}/devel/quilt \
> 		bison:${PORTSDIR}/devel/bison
> LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
> 		libgpg-error.so:${PORTSDIR}/security/libgpg-error
>@@ -26,28 +24,11 @@
> 		qpress:${PORTSDIR}/archivers/qpress
> 
> # autotool is in use for 5.1 builds
>-USES=		autoreconf:build gettext gmake iconv libtool perl5
>+USES=		autoreconf:build gettext cmake iconv libtool perl5
> 
>-PLIST_FILES=	bin/xtrabackup bin/xtrabackup_55 bin/xtrabackup_56 bin/xbstream \
>-		bin/innobackupex bin/xbcrypt
>+PLIST_FILES=	bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt
> 
> pre-build:
> 	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC}
> 
>-do-build:
>-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb55)
>-	${CP} ${WRKSRC}/src/xtrabackup_55 ${WRKSRC}
>-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh innodb56)
>-	${CP} ${WRKSRC}/src/xtrabackup_56 ${WRKSRC}
>-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb)
>-	${CP} ${WRKSRC}/src/xtrabackup ${WRKSRC}
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_55 ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_56 ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/xbstream ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/xbcrypt ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${WRKSRC}/innobackupex ${STAGEDIR}${PREFIX}/bin
>-
> .include <bsd.port.mk>
>diff -r -u -N databases/xtrabackup/distinfo /usr/home/pi/myp/databases/xtrabackup/distinfo
>--- databases/xtrabackup/distinfo	2014-02-18 23:12:12.000000000 +0100
>+++ /usr/home/pi/myp/databases/xtrabackup/distinfo	2014-11-19 09:11:44.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (percona-xtrabackup-2.1.7.tar.gz) = b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587
>-SIZE (percona-xtrabackup-2.1.7.tar.gz) = 131538555
>+SHA256 (percona-xtrabackup-2.2.6.tar.gz) = c5f42fbc406195e6de306b23a86f2d18283d3e086b9c1f4e8722635fd55e0b1d
>+SIZE (percona-xtrabackup-2.2.6.tar.gz) = 34656899
>diff -r -u -N databases/xtrabackup/files/patch-build.sh /usr/home/pi/myp/databases/xtrabackup/files/patch-build.sh
>--- databases/xtrabackup/files/patch-build.sh	2014-01-22 23:21:56.000000000 +0100
>+++ /usr/home/pi/myp/databases/xtrabackup/files/patch-build.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- utils/build.sh	2013-08-01 15:26:37.000000000 +0200
>-+++ utils/build.sh	2013-08-13 08:52:57.520334456 +0200
>-@@ -289,6 +289,7 @@
>-                 -DWITH_EXTRA_CHARSETS=all \
>-                 -DWITH_EMBEDDED_SERVER=1 \
>-                 -DENABLE_DTRACE=OFF $extra_config_55plus"
>-+        export LIBS=-lcrypt
>-         build_all $type
>-         ;;
>- 
>diff -r -u -N databases/xtrabackup/files/patch-cmake-install_layout.cmake /usr/home/pi/myp/databases/xtrabackup/files/patch-cmake-install_layout.cmake
>--- databases/xtrabackup/files/patch-cmake-install_layout.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/databases/xtrabackup/files/patch-cmake-install_layout.cmake	2014-11-19 12:38:35.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- cmake/install_layout.cmake.orig	2014-11-19 12:37:46.000000000 +0100
>++++ cmake/install_layout.cmake	2014-11-19 12:38:08.000000000 +0100
>+@@ -114,7 +114,7 @@
>+ #
>+ SET(INSTALL_SHAREDIR_STANDALONE         "share")
>+ SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
>+-SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
>++# SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
>+ SET(INSTALL_SQLBENCHDIR_STANDALONE      ".")
>+ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
>+ #
>diff -r -u -N databases/xtrabackup/files/patch-include-my_global.h /usr/home/pi/myp/databases/xtrabackup/files/patch-include-my_global.h
>--- databases/xtrabackup/files/patch-include-my_global.h	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/databases/xtrabackup/files/patch-include-my_global.h	2014-11-19 12:35:04.000000000 +0100
>@@ -0,0 +1,12 @@
>+--- include/my_global.h.orig	2014-11-19 12:34:01.000000000 +0100
>++++ include/my_global.h	2014-11-19 12:34:39.000000000 +0100
>+@@ -333,9 +333,6 @@
>+ #ifdef HAVE_FCNTL_H
>+ #include <fcntl.h>
>+ #endif
>+-#ifdef HAVE_SYS_TIMEB_H
>+-#include <sys/timeb.h>				/* Avoid warnings on SCO */
>+-#endif
>+ #if TIME_WITH_SYS_TIME
>+ # include <sys/time.h>
>+ # include <time.h>
>diff -r -u -N databases/xtrabackup/files/patch-innodb56.patch /usr/home/pi/myp/databases/xtrabackup/files/patch-innodb56.patch
>--- databases/xtrabackup/files/patch-innodb56.patch	2014-02-18 23:12:12.000000000 +0100
>+++ /usr/home/pi/myp/databases/xtrabackup/files/patch-innodb56.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>---- patches/innodb56.patch	2014-01-23 15:59:36.000000000 +0100
>-+++ patches/innodb56.patch	2014-02-18 10:50:05.000000000 +0100
>-@@ -2687,3 +2687,14 @@
>-  /*********************************************************************//**
>-  Wrapper around MySQL's copy_and_convert function.
>-  @return	number of bytes copied to 'to' */
>-+--- a/extra/yassl/taocrypt/include/misc.hpp
>-++++ b/extra/yassl/taocrypt/include/misc.hpp
>-+@@ -124,7 +124,7 @@
>-+ 
>-+ 
>-+ // no gas on these systems ?, disable for now
>-+-#if defined(__sun__) || defined (__APPLE__)
>-++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
>-+     #define TAOCRYPT_DISABLE_X86ASM
>-+ #endif
>-+

Actions: View | Diff

Attachments on bug 195164: 149583