- Update to 3.0.11

- Address CVE-2014-9765

PR:		207174
Submitted by:	junovitch
MFH:		2016Q1
This commit is contained in:
Danilo Egea Gondolfo 2016-02-15 23:49:11 +00:00
parent ed601505eb
commit b8f0971377
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408964
3 changed files with 16 additions and 9 deletions

View file

@ -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+
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

View file

@ -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

View file

@ -1,9 +1,9 @@
--- ../../xdelta3-3.0.7/testing/regtest.cc 2013-05-13 04:54:35.000000000 +0000
+++ testing/regtest.cc 2013-05-20 02:32:05.243969745 +0000
@@ -761,7 +761,7 @@
--- 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 =
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);