From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 13 09:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AAAD0294 for ; Tue, 13 Aug 2013 09:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88E31256E for ; Tue, 13 Aug 2013 09:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7D901L7066629 for ; Tue, 13 Aug 2013 09:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7D901YI066628; Tue, 13 Aug 2013 09:00:01 GMT (envelope-from gnats) Resent-Date: Tue, 13 Aug 2013 09:00:01 GMT Resent-Message-Id: <201308130900.r7D901YI066628@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Samorukov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2003EF0A for ; Tue, 13 Aug 2013 08:51:34 +0000 (UTC) (envelope-from root@os2.ru) Received: from s1.sdv.com.ua (s1.sdv.com.ua [IPv6:2a01:d0:81f8::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D177B24ED for ; Tue, 13 Aug 2013 08:51:33 +0000 (UTC) Received: from [2001:470:6f:26:e2cb:4eff:fe95:23c4] (helo=os2.ru) by s1.sdv.com.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1V9AK2-000Dev-Gf; Tue, 13 Aug 2013 11:51:25 +0300 Received: from root by os2.ru with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1V99O8-000JWV-12; Tue, 13 Aug 2013 09:51:32 +0200 Message-Id: Date: Tue, 13 Aug 2013 09:51:32 +0200 From: Alex Samorukov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/181255: [PATCH] databases/xtrabackup: update to 2.1.4 Cc: aleksandr.kuzminsky@percona.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Aug 2013 09:00:01 -0000 >Number: 181255 >Category: ports >Synopsis: [PATCH] databases/xtrabackup: update to 2.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 13 09:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Alex Samorukov >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: NetArt Group >Environment: System: FreeBSD bsd.home 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #11 r244411: Wed Dec 19 01:24:50 CET >Description: - Update to 2.1.4 - Remove references to MySQL download because now everything is inside tarball - Add run dependency for qpress, used in with --decompress option Port maintainer (aleksandr.kuzminsky@percona.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- xtrabackup-2.1.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/xtrabackup/Makefile /root/src/redports/databases/xtrabackup/Makefile --- /usr/ports/databases/xtrabackup/Makefile 2013-07-05 16:31:43.000000000 +0200 +++ /root/src/redports/databases/xtrabackup/Makefile 2013-08-13 09:48:55.218355102 +0200 @@ -2,19 +2,11 @@ # $FreeBSD: databases/xtrabackup/Makefile 322330 2013-07-05 14:31:43Z wg $ PORTNAME= xtrabackup -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.1.4 CATEGORIES= databases -MASTER_SITES= http://downloads.skysql.com/archives/%SUBDIR%/:mysql51,mysql55,mysql56 \ - http://downloads.mysql.com/archives/%SUBDIR%/:mysql51,mysql55,mysql56 \ - http://www.percona.com/downloads/%SUBDIR%/:xtrabackup,percsrc51,percsrc55 \ - http://samm.kiev.ua/percona/:percsrc51,percsrc55 +MASTER_SITES= http://www.percona.com/downloads/%SUBDIR%/ DISTNAME= percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -DISTFILES= mysql-${MYSQL51_SRCVER}.tar.gz:mysql51 mysql-${MYSQL55_SRCVER}.tar.gz:mysql55 \ - mysql-${MYSQL56_SRCVER}.tar.gz:mysql56 \ - percona-xtrabackup-${PORTVERSION}.tar.gz:xtrabackup \ - Percona-Server-5.1.59-13.0-patches.tar.gz:percsrc51 \ - Percona-Server-5.5.16-22.0-patches.tar.gz:percsrc55 +DISTFILES= percona-xtrabackup-${PORTVERSION}.tar.gz EXTRACT_ONLY= percona-xtrabackup-${PORTVERSION}.tar.gz MAINTAINER= aleksandr.kuzminsky@percona.com @@ -28,7 +20,8 @@ bison:${PORTSDIR}/devel/bison LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ gpg-error:${PORTSDIR}/security/libgpg-error -RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ + qpress:${PORTSDIR}/archivers/qpress # autotool is in use for 5.1 builds MAKE_JOBS_SAFE= yes @@ -38,25 +31,13 @@ # MySQL 5.5 using CMAKE USES= cmake iconv gettext -MASTER_SITE_SUBDIR= mysql-5.1/:mysql51 mysql-5.5/:mysql55 mysql-5.6/:mysql56 \ - XtraBackup/XtraBackup-${PORTVERSION}/source/:xtrabackup \ - Percona-Server-5.1/Percona-Server-5.1.59-13.0/source/:percsrc51 \ - Percona-Server-5.5/Percona-Server-5.5.16-22.0/source/:percsrc55 - -# port needs MySQL sources to build -MYSQL51_SRCVER= 5.1.59 -MYSQL55_SRCVER= 5.5.16 -MYSQL56_SRCVER= 5.6.10 +MASTER_SITE_SUBDIR= XtraBackup/XtraBackup-${PORTVERSION}/source/ PLIST_FILES= bin/xtrabackup bin/xtrabackup_55 bin/xtrabackup_56 bin/xbstream \ bin/innobackupex bin/xbcrypt pre-build: - ${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz \ - ${DISTDIR}/mysql-${MYSQL51_SRCVER}.tar.gz ${DISTDIR}/mysql-${MYSQL55_SRCVER}.tar.gz \ - ${DISTDIR}/mysql-${MYSQL56_SRCVER}.tar.gz \ - ${DISTDIR}/Percona-Server-5.1.59-13.0-patches.tar.gz \ - ${DISTDIR}/Percona-Server-5.5.16-22.0-patches.tar.gz ${WRKSRC} + ${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC} do-build: cd ${WRKSRC} && ./utils/build.sh xtradb55 diff -ruN --exclude=CVS /usr/ports/databases/xtrabackup/distinfo /root/src/redports/databases/xtrabackup/distinfo --- /usr/ports/databases/xtrabackup/distinfo 2013-07-04 19:57:17.000000000 +0200 +++ /root/src/redports/databases/xtrabackup/distinfo 2013-08-13 09:30:47.735333768 +0200 @@ -1,12 +1,2 @@ -SHA256 (mysql-5.1.59.tar.gz) = f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7 -SIZE (mysql-5.1.59.tar.gz) = 24325443 -SHA256 (mysql-5.5.16.tar.gz) = 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70 -SIZE (mysql-5.5.16.tar.gz) = 23816508 -SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 -SIZE (mysql-5.6.10.tar.gz) = 35174149 -SHA256 (percona-xtrabackup-2.1.3.tar.gz) = 10c089ac0ad90ac9fc868a36577ba02c6f6b4a488dac716fc4ecb81c107a21d8 -SIZE (percona-xtrabackup-2.1.3.tar.gz) = 11267387 -SHA256 (Percona-Server-5.1.59-13.0-patches.tar.gz) = 76f9398d1637c9cfc1b64e35cd272b70ddc71cfb6f00abd2fe6e62918fa920b5 -SIZE (Percona-Server-5.1.59-13.0-patches.tar.gz) = 1203994 -SHA256 (Percona-Server-5.5.16-22.0-patches.tar.gz) = 30d14443027cbcef4266385adfeb385af62cf5551ca044ae83539673497be4be -SIZE (Percona-Server-5.5.16-22.0-patches.tar.gz) = 1141266 +SHA256 (percona-xtrabackup-2.1.4.tar.gz) = bb0d99915458635d4f852f89412417edb7928755f76ec5a9219e67af8eadada7 +SIZE (percona-xtrabackup-2.1.4.tar.gz) = 137107631 diff -ruN --exclude=CVS /usr/ports/databases/xtrabackup/files/patch-build.sh /root/src/redports/databases/xtrabackup/files/patch-build.sh --- /usr/ports/databases/xtrabackup/files/patch-build.sh 2013-07-04 19:57:17.000000000 +0200 +++ /root/src/redports/databases/xtrabackup/files/patch-build.sh 2013-08-13 09:01:37.000000000 +0200 @@ -1,6 +1,6 @@ ---- utils/build.sh 2013-05-22 19:00:32.000000000 +0200 -+++ utils/build.sh 2013-07-02 21:36:25.534672963 +0200 -@@ -281,6 +281,7 @@ +--- 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" @@ -8,38 +8,3 @@ build_all $type ;; -@@ -316,9 +317,14 @@ - bzr revert - bzr pull --overwrite - else -- bzr branch -r tag:Percona-Server-$PS_51_VERSION \ -- lp:percona-server/5.1 $branch_dir -+ #bzr branch -r tag:Percona-Server-$PS_51_VERSION \ -+ # lp:percona-server/5.1 $branch_dir -+ tar -xvzf Percona-Server-${PS_51_VERSION}-patches.tar.gz -+ ln -sf Percona-Server-${PS_51_VERSION}-patches $branch_dir -+ ln mysql-${MYSQL_51_VERSION}.tar.gz $branch_dir - cd $branch_dir -+ #fix for cmake, from https://bugs.launchpad.net/percona-xtradb/+bug/666223 -+ sed -i .orig 's/inline void _increment_page_get_statistics/void _increment_page_get_statistics/' patches/innodb_extend_slow.patch - fi - - $MAKE_CMD main -@@ -370,9 +376,15 @@ - bzr revert - bzr pull --overwrite - else -- bzr branch -r tag:Percona-Server-$PS_55_VERSION \ -- lp:percona-server $branch_dir -+# bzr branch -r tag:Percona-Server-$PS_55_VERSION \ -+# lp:percona-server $branch_dir -+ tar -xvzf Percona-Server-${PS_55_VERSION}-patches.tar.gz -+ ln -sf Percona-Server-${PS_55_VERSION}-patches $branch_dir -+ ln mysql-5.5.16.tar.gz $branch_dir - cd $branch_dir -+ #fix for cmake, from https://bugs.launchpad.net/percona-xtradb/+bug/666223 -+ sed -i .orig 's/inline void _increment_page_get_statistics/void _increment_page_get_statistics/' patches/innodb_extend_slow.patch -+ - fi - - $MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main --- xtrabackup-2.1.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: