Date: Tue, 16 Feb 2016 23:53:10 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r409025 - in branches/2016Q1/misc/xdelta3: . files Message-ID: <201602162353.u1GNrAaf094766@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Tue Feb 16 23:53:09 2016 New Revision: 409025 URL: https://svnweb.freebsd.org/changeset/ports/409025 Log: MFH: r408964 - Update to 3.0.11 - Address CVE-2014-9765 PR: 207174 Submitted by: junovitch Approved by: ports-secteam (miwi) Added: branches/2016Q1/misc/xdelta3/files/patch-testing_regtest.cc - copied unchanged from r408964, head/misc/xdelta3/files/patch-testing_regtest.cc Deleted: branches/2016Q1/misc/xdelta3/files/patch-testing-regtest.cc.patch Modified: branches/2016Q1/misc/xdelta3/Makefile branches/2016Q1/misc/xdelta3/distinfo Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/misc/xdelta3/Makefile ============================================================================== --- branches/2016Q1/misc/xdelta3/Makefile Tue Feb 16 23:50:33 2016 (r409024) +++ branches/2016Q1/misc/xdelta3/Makefile Tue Feb 16 23:53:09 2016 (r409025) @@ -2,18 +2,25 @@ # $FreeBSD$ PORTNAME= xdelta -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.11 PORTEPOCH= 1 CATEGORIES?= misc devel -MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= 3 -DISTNAME= ${PORTNAME}3-${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Open-source binary diff, VCDIFF/RFC 3284 delta compression LICENSE= GPLv2 # (or later) +USES= autoreconf gmake + +USE_GITHUB= yes +GH_ACCOUNT= jmacd +GH_PROJECT= xdelta-devel +GH_TAGNAME= v3.0.11 + +WRKSRC= ${WRKDIR}/${PORTNAME}-devel-${PORTVERSION}/xdelta3 + GNU_CONFIGURE= yes PLIST_FILES= bin/xdelta3 man/man1/xdelta3.1.gz Modified: branches/2016Q1/misc/xdelta3/distinfo ============================================================================== --- branches/2016Q1/misc/xdelta3/distinfo Tue Feb 16 23:50:33 2016 (r409024) +++ branches/2016Q1/misc/xdelta3/distinfo Tue Feb 16 23:53:09 2016 (r409025) @@ -1,2 +1,2 @@ -SHA256 (xdelta3-3.0.7.tar.gz) = 97e56a019be7f6c8d7e974dfe501fcf55d7ac97fe42165a172ed8c6b0e96f219 -SIZE (xdelta3-3.0.7.tar.gz) = 481371 +SHA256 (jmacd-xdelta-devel-3.0.11-v3.0.11_GH0.tar.gz) = 0cd1ab3e53be8e57bc6335789ead8a6177b0a3524c931e6af2aa801b2c1736cc +SIZE (jmacd-xdelta-devel-3.0.11-v3.0.11_GH0.tar.gz) = 993860 Copied: branches/2016Q1/misc/xdelta3/files/patch-testing_regtest.cc (from r408964, head/misc/xdelta3/files/patch-testing_regtest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/misc/xdelta3/files/patch-testing_regtest.cc Tue Feb 16 23:53:09 2016 (r409025, copy of r408964, head/misc/xdelta3/files/patch-testing_regtest.cc) @@ -0,0 +1,11 @@ +--- testing/regtest.cc.orig 2016-02-15 23:07:07 UTC ++++ testing/regtest.cc +@@ -1006,7 +1006,7 @@ void FourWayMergeTest(const FileSpec &sp + ExtFile d01, d12, d23; + Options options; + options.encode_srcwin_maxsz = +- std::max(spec0.Size(), options.encode_srcwin_maxsz); ++ std::max((unsigned long long)spec0.Size(), (unsigned long long)options.encode_srcwin_maxsz); + + spec0.WriteTmpFile(&f0); + spec1.WriteTmpFile(&f1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602162353.u1GNrAaf094766>