From owner-svn-ports-branches@freebsd.org Sun Jul 17 12:10:35 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D080BB9BD9B; Sun, 17 Jul 2016 12:10:35 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8980D1B60; Sun, 17 Jul 2016 12:10:35 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6HCAYKJ089895; Sun, 17 Jul 2016 12:10:34 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6HCAYlJ089893; Sun, 17 Jul 2016 12:10:34 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201607171210.u6HCAYlJ089893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Sun, 17 Jul 2016 12:10:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418665 - branches/2016Q3/x11-fonts/webfonts X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jul 2016 12:10:35 -0000 Author: olgeni Date: Sun Jul 17 12:10:34 2016 New Revision: 418665 URL: https://svnweb.freebsd.org/changeset/ports/418665 Log: MFH: r418662 Update MASTER_SITES for extra fonts since the old one has disappeared. PR: 211169 Submitted by: Carsten Larsen Approved by: ports-secteam (blanket) Modified: branches/2016Q3/x11-fonts/webfonts/Makefile branches/2016Q3/x11-fonts/webfonts/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/x11-fonts/webfonts/Makefile ============================================================================== --- branches/2016Q3/x11-fonts/webfonts/Makefile Sun Jul 17 11:28:46 2016 (r418664) +++ branches/2016Q3/x11-fonts/webfonts/Makefile Sun Jul 17 12:10:34 2016 (r418665) @@ -3,11 +3,11 @@ PORTNAME= webfonts PORTVERSION= 0.30 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-fonts MASTER_SITES= SF/corefonts/the%20fonts/final:group1 \ ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ - http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/:group2 + SF/corefonts/OldFiles/:group2 DISTFILES= andale32.exe:group1 arial32.exe:group1 arialb32.exe:group1 \ comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \ impact32.exe:group1 times32.exe:group1 trebuc32.exe:group1 \ @@ -31,7 +31,7 @@ OPTIONS_DEFINE= EXTRAFONTS OPTIONS_SUB= yes EXTRAFONTS_DESC= Fonts licensed under MS Windows license -EXTRAFONTS_DISTFILES= ielpkth.cab:group2 +EXTRAFONTS_DISTFILES= IELPKTH.CAB:group2 SUB_FILES= pkg-message Modified: branches/2016Q3/x11-fonts/webfonts/distinfo ============================================================================== --- branches/2016Q3/x11-fonts/webfonts/distinfo Sun Jul 17 11:28:46 2016 (r418664) +++ branches/2016Q3/x11-fonts/webfonts/distinfo Sun Jul 17 12:10:34 2016 (r418665) @@ -1,3 +1,4 @@ +TIMESTAMP = 1468745172 SHA256 (webfonts/andale32.exe) = 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 SIZE (webfonts/andale32.exe) = 198384 SHA256 (webfonts/arial32.exe) = 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 @@ -20,5 +21,5 @@ SHA256 (webfonts/verdan32.exe) = c1cb612 SIZE (webfonts/verdan32.exe) = 351992 SHA256 (webfonts/webdin32.exe) = 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a SIZE (webfonts/webdin32.exe) = 185072 -SHA256 (webfonts/ielpkth.cab) = c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a -SIZE (webfonts/ielpkth.cab) = 411248 +SHA256 (webfonts/IELPKTH.CAB) = c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a +SIZE (webfonts/IELPKTH.CAB) = 411248 From owner-svn-ports-branches@freebsd.org Sun Jul 17 17:19:34 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B9C5B9CAAE; Sun, 17 Jul 2016 17:19:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AB431C15; Sun, 17 Jul 2016 17:19:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6HHJXpc004814; Sun, 17 Jul 2016 17:19:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6HHJXFX004813; Sun, 17 Jul 2016 17:19:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201607171719.u6HHJXFX004813@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 17 Jul 2016 17:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418672 - branches/2016Q3/multimedia/vapoursynth X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jul 2016 17:19:34 -0000 Author: jbeich Date: Sun Jul 17 17:19:33 2016 New Revision: 418672 URL: https://svnweb.freebsd.org/changeset/ports/418672 Log: MFH: r418462 multimedia/vapoursynth: unbreak after r417413 https://lists.freebsd.org/pipermail/freebsd-ports/2016-June/103724.html Reported by: pkg-fallout Approved by: ports-secteam bustage blanket Modified: branches/2016Q3/multimedia/vapoursynth/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/multimedia/vapoursynth/Makefile ============================================================================== --- branches/2016Q3/multimedia/vapoursynth/Makefile Sun Jul 17 16:48:19 2016 (r418671) +++ branches/2016Q3/multimedia/vapoursynth/Makefile Sun Jul 17 17:19:33 2016 (r418672) @@ -24,6 +24,13 @@ OPTIONS_DEFINE= DEBUG DOCS FRAME_GUARD OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS} OPTIONS_SUB= yes +# XXX After r417413 poudriere requires textproc/py-sphinx being built +# with the same python version as USES=python here but it's currently +# not possible due to https://github.com/freebsd/poudriere/issues/259 +.if defined(PACKAGE_BUILDING) +OPTIONS_EXCLUDE=DOCS +.endif + OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD From owner-svn-ports-branches@freebsd.org Sun Jul 17 22:13:11 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90CBBB9BDE2; Sun, 17 Jul 2016 22:13:11 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FB5718BE; Sun, 17 Jul 2016 22:13:11 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6HMDAo0015702; Sun, 17 Jul 2016 22:13:10 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6HMD8DH015685; Sun, 17 Jul 2016 22:13:08 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201607172213.u6HMD8DH015685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 17 Jul 2016 22:13:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418680 - in branches/2016Q3/devel: p4 p4api p4d p4ftpd p4p X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jul 2016 22:13:11 -0000 Author: gordon Date: Sun Jul 17 22:13:08 2016 New Revision: 418680 URL: https://svnweb.freebsd.org/changeset/ports/418680 Log: MFH: r418066 r418163 r418190 r418655 Update Perforce related ports to 2016.1. PR: 210358 Reported by: brd Approved by: mat (mentor, previous version) Approved by: ports-secteam (junovitch) Deleted: branches/2016Q3/devel/p4/distinfo.freebsd70x86 branches/2016Q3/devel/p4/distinfo.freebsd70x86_64 branches/2016Q3/devel/p4api/distinfo.freebsd70x86 branches/2016Q3/devel/p4api/distinfo.freebsd70x86_64 branches/2016Q3/devel/p4d/distinfo.freebsd70x86 branches/2016Q3/devel/p4d/distinfo.freebsd70x86_64 branches/2016Q3/devel/p4ftpd/distinfo.freebsd70x86 branches/2016Q3/devel/p4ftpd/distinfo.freebsd70x86_64 branches/2016Q3/devel/p4p/distinfo.freebsd70x86 branches/2016Q3/devel/p4p/distinfo.freebsd70x86_64 Modified: branches/2016Q3/devel/p4/Makefile branches/2016Q3/devel/p4/Makefile.inc branches/2016Q3/devel/p4/distinfo.freebsd100x86 branches/2016Q3/devel/p4/distinfo.freebsd100x86_64 branches/2016Q3/devel/p4api/Makefile branches/2016Q3/devel/p4api/distinfo.freebsd100x86 branches/2016Q3/devel/p4api/distinfo.freebsd100x86_64 branches/2016Q3/devel/p4api/pkg-plist branches/2016Q3/devel/p4d/Makefile branches/2016Q3/devel/p4d/distinfo.freebsd100x86 branches/2016Q3/devel/p4d/distinfo.freebsd100x86_64 branches/2016Q3/devel/p4ftpd/Makefile branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86 branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86_64 branches/2016Q3/devel/p4p/Makefile branches/2016Q3/devel/p4p/distinfo.freebsd100x86 branches/2016Q3/devel/p4p/distinfo.freebsd100x86_64 Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/p4/Makefile ============================================================================== --- branches/2016Q3/devel/p4/Makefile Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4/Makefile Sun Jul 17 22:13:08 2016 (r418680) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q3/devel/p4/Makefile.inc ============================================================================== --- branches/2016Q3/devel/p4/Makefile.inc Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4/Makefile.inc Sun Jul 17 22:13:08 2016 (r418680) @@ -7,14 +7,14 @@ ONLY_FOR_ARCHS?= amd64 i386 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86_64 . else -PLATFORM= freebsd70x86_64 +IGNORE= unsupported OS release, sorry . endif .elif ${ARCH} == i386 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86 . else -PLATFORM= freebsd70x86 +IGNORE= unsupported OS release, sorry . endif .else Modified: branches/2016Q3/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 4a6c85571f06b4ff9477dcb5258b3ba652e4e167566f04932ea54e53df23d9c9 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 2537872 +TIMESTAMP = 1468601506 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4) = 135720e2ae526f6340c8278897bca2aaa2d9f539a8d2625235f362658712d2fb +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4) = 3072840 Modified: branches/2016Q3/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 9dedcaf430156679fc6d76c766f6db61434f3bad1ebce274a0397c8cc4c646e0 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 2795184 +TIMESTAMP = 1468601502 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4) = 71894b9b8bdd5627640e4756ef4474d26ea6217f708334eeb31a06ad1d884bcb +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4) = 3334728 Modified: branches/2016Q3/devel/p4api/Makefile ============================================================================== --- branches/2016Q3/devel/p4api/Makefile Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4api/Makefile Sun Jul 17 22:13:08 2016 (r418680) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= p4api -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \ ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf Modified: branches/2016Q3/devel/p4api/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q3/devel/p4api/distinfo.freebsd100x86 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4api/distinfo.freebsd100x86 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,4 +1,5 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = f070bf6501854316a81787dd125f4bbf349c1cd51ed6bd975b03da75d68b7c7b -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = 1434822 -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 1623596 +TIMESTAMP = 1468601594 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4api.tgz) = 66d9c5e8362c4bd475c2ea4058c1a3197c1e17505b4ec56b1b31a27c6bbed11b +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4api.tgz) = 3901043 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4api.pdf) = 601bc053b9b5316b71981449df76b32b9ca318a99752d3d5f46b46327bdc67b8 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4api.pdf) = 1908708 Modified: branches/2016Q3/devel/p4api/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q3/devel/p4api/distinfo.freebsd100x86_64 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4api/distinfo.freebsd100x86_64 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,4 +1,5 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = dcacdee2067848406e9a985ee7bce40910b91e285db5123ad1f1d45bf784fe4c -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = 1470120 -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 1623596 +TIMESTAMP = 1468601587 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.tgz) = 36047b7db9cff24dc1dbbcd12a005915bb1c12fd3147b304c9c64b51498fe0c4 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.tgz) = 4165577 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.pdf) = 601bc053b9b5316b71981449df76b32b9ca318a99752d3d5f46b46327bdc67b8 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.pdf) = 1908708 Modified: branches/2016Q3/devel/p4api/pkg-plist ============================================================================== --- branches/2016Q3/devel/p4api/pkg-plist Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4api/pkg-plist Sun Jul 17 22:13:08 2016 (r418680) @@ -9,6 +9,7 @@ include/perforce/clientuser.h include/perforce/datetime.h include/perforce/debug.h include/perforce/diff.h +include/perforce/diffmerge.h include/perforce/echoctl.h include/perforce/enviro.h include/perforce/error.h @@ -22,6 +23,8 @@ include/perforce/ident.h include/perforce/ignore.h include/perforce/keepalive.h include/perforce/macfile.h +include/perforce/macutil.h +include/perforce/mangle.h include/perforce/mapapi.h include/perforce/md5.h include/perforce/msgclient.h @@ -40,6 +43,7 @@ include/perforce/options.h include/perforce/p4tags.h include/perforce/pathsys.h include/perforce/runcmd.h +include/perforce/serverhelperapi.h include/perforce/signaler.h include/perforce/spec.h include/perforce/stdhdrs.h @@ -64,3 +68,4 @@ lib/perforce/libsupp.a %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clientuser.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4api.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4dvcsapi.cc Modified: branches/2016Q3/devel/p4d/Makefile ============================================================================== --- branches/2016Q3/devel/p4d/Makefile Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4d/Makefile Sun Jul 17 22:13:08 2016 (r418680) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q3/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q3/devel/p4d/distinfo.freebsd100x86 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4d/distinfo.freebsd100x86 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = db23a2c1ac3514a61a362aa08dc632695080a91d324504cd4f27fb662e3af1fe -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = 5208536 +TIMESTAMP = 1468601645 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4d) = 4e230f2d1b9c27ad7a0cd09ee064ee372aff021addf5b1df51528ad005dfb781 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4d) = 5758152 Modified: branches/2016Q3/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q3/devel/p4d/distinfo.freebsd100x86_64 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4d/distinfo.freebsd100x86_64 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 04b96019640a0934fe92ea0e3e699a8dd724278486168d3bda18051e06411e3d -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 5361008 +TIMESTAMP = 1468601641 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4d) = 2d699bd51b0e461fc1a4726aaac9e9896ae85b78e7e8cefcbc138d6e15260f96 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4d) = 5892472 Modified: branches/2016Q3/devel/p4ftpd/Makefile ============================================================================== --- branches/2016Q3/devel/p4ftpd/Makefile Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4ftpd/Makefile Sun Jul 17 22:13:08 2016 (r418680) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1387479 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = ae68ed35dcce72afa2e50ae550c33d71b3afb792a803db1b585ed78f6db8024d -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = 2582272 +TIMESTAMP = 1467868251 +SHA256 (perforce/2016.1.1387479/bin.freebsd100x86/p4ftpd) = 0b65a6d7e09d229a71bb3a47d51abda6daeadaeca098f59b8417653b5b194b3c +SIZE (perforce/2016.1.1387479/bin.freebsd100x86/p4ftpd) = 2633452 Modified: branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86_64 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4ftpd/distinfo.freebsd100x86_64 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 4fef3546a731e7f7b1c74bf8bb9c6c7c5afa7d3d74136af16c4151fc7237dbc5 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 2840992 +TIMESTAMP = 1467701312 +SHA256 (perforce/2016.1.1387479/bin.freebsd100x86_64/p4ftpd) = d87a021072099e368d5266ac196216dd5c61be66dae4d7b0551be5190d6f6c0a +SIZE (perforce/2016.1.1387479/bin.freebsd100x86_64/p4ftpd) = 2890456 Modified: branches/2016Q3/devel/p4p/Makefile ============================================================================== --- branches/2016Q3/devel/p4p/Makefile Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4p/Makefile Sun Jul 17 22:13:08 2016 (r418680) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1404799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q3/devel/p4p/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 08ad15fcb958705c0f6c849971337732204ed0883151c93a5110be6074d9f2eb -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 2338644 +TIMESTAMP = 1467701344 +SHA256 (perforce/2016.1.1404799/bin.freebsd100x86/p4p) = 3f36f51e9aab3209f9660efb1d917300e831a831bdaa63936b0618d936b8976a +SIZE (perforce/2016.1.1404799/bin.freebsd100x86/p4p) = 2438480 Modified: branches/2016Q3/devel/p4p/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 17 21:34:51 2016 (r418679) +++ branches/2016Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 17 22:13:08 2016 (r418680) @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = b80ec1ec6de65e62a3e0aec0805a8bba88e4c6203feac0bd938f2ae41e59f5f7 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = 2607536 +TIMESTAMP = 1467701341 +SHA256 (perforce/2016.1.1404799/bin.freebsd100x86_64/p4p) = 73132d3092ac0f835d4d57f2f5014487692eafff75afe7ae5df2102a53abc540 +SIZE (perforce/2016.1.1404799/bin.freebsd100x86_64/p4p) = 2706664 From owner-svn-ports-branches@freebsd.org Mon Jul 18 19:59:31 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B23BB9D630; Mon, 18 Jul 2016 19:59:31 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A491A1A39; Mon, 18 Jul 2016 19:59:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6IJxTpU000901; Mon, 18 Jul 2016 19:59:29 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6IJxT1N000899; Mon, 18 Jul 2016 19:59:29 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201607181959.u6IJxT1N000899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 18 Jul 2016 19:59:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418740 - in branches/2016Q3/net/asterisk13: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2016 19:59:31 -0000 Author: madpilot Date: Mon Jul 18 19:59:29 2016 New Revision: 418740 URL: https://svnweb.freebsd.org/changeset/ports/418740 Log: MFH: r418726 FreeBSD's regexec() libc function is more restrictive than the linux one and will not accept an empty expression. Add patch (from PR) to fix this problem. PR: 211187 Submitted by: Dmitry Vagin Approved by: ports-secteam (feld) Added: branches/2016Q3/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c - copied unchanged from r418726, head/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c Modified: branches/2016Q3/net/asterisk13/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net/asterisk13/Makefile ============================================================================== --- branches/2016Q3/net/asterisk13/Makefile Mon Jul 18 19:56:42 2016 (r418739) +++ branches/2016Q3/net/asterisk13/Makefile Mon Jul 18 19:59:29 2016 (r418740) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Copied: branches/2016Q3/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c (from r418726, head/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c Mon Jul 18 19:59:29 2016 (r418740, copy of r418726, head/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c) @@ -0,0 +1,11 @@ +--- res/res_pjsip/pjsip_cli.c.orig 2016-05-13 17:41:41 UTC ++++ res/res_pjsip/pjsip_cli.c +@@ -172,7 +172,7 @@ char *ast_sip_cli_traverse_objects(struc + } + regex = a->argv[4]; + } else { +- regex = ""; ++ regex = "."; + } + + if (cmd == CLI_GENERATE From owner-svn-ports-branches@freebsd.org Mon Jul 18 20:05:43 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C22CB9D840; Mon, 18 Jul 2016 20:05:43 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0EAC11F2E; Mon, 18 Jul 2016 20:05:42 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6IK5gRM004619; Mon, 18 Jul 2016 20:05:42 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6IK5gJ5004618; Mon, 18 Jul 2016 20:05:42 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201607182005.u6IK5gJ5004618@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 18 Jul 2016 20:05:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418742 - branches/2016Q3/net/mDNSResponder/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2016 20:05:43 -0000 Author: pi Date: Mon Jul 18 20:05:42 2016 New Revision: 418742 URL: https://svnweb.freebsd.org/changeset/ports/418742 Log: net/mDNSResponder: fix build on 9.3-RELEASE - older lex/flex needs yylineno PR: 210723 MFH: r418720 Reported by: Ryan Frederick Submitted by: Walter Schwarzenfeld Approved by: portmgr (feld) Added: branches/2016Q3/net/mDNSResponder/files/patch-dnsextd__lexer.l - copied unchanged from r418720, head/net/mDNSResponder/files/patch-dnsextd__lexer.l Modified: Directory Properties: branches/2016Q3/ (props changed) Copied: branches/2016Q3/net/mDNSResponder/files/patch-dnsextd__lexer.l (from r418720, head/net/mDNSResponder/files/patch-dnsextd__lexer.l) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net/mDNSResponder/files/patch-dnsextd__lexer.l Mon Jul 18 20:05:42 2016 (r418742, copy of r418720, head/net/mDNSResponder/files/patch-dnsextd__lexer.l) @@ -0,0 +1,16 @@ +--- mDNSShared/dnsextd_lexer.l.orig 2016-07-01 01:07:18 UTC ++++ mDNSShared/dnsextd_lexer.l +@@ -23,6 +23,13 @@ + + extern YYSTYPE yylval; + ++#if !defined YYSTYPE_yylineno ++#if YY_FLEX_MAJOR_VERSION <= 2 && YY_FLEX_MINOR_VERSION <= 5 && YY_FLEX_SUBMINOR_VERSION <= 4 ++int yylineno = 1; ++#endif ++#endif ++ ++ + #define YY_NO_INPUT 1 + int yylex(void); + From owner-svn-ports-branches@freebsd.org Mon Jul 18 20:26:10 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B342B9DF51; Mon, 18 Jul 2016 20:26:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 220311433; Mon, 18 Jul 2016 20:26:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6IKQ9MT012709; Mon, 18 Jul 2016 20:26:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6IKQ8PD012698; Mon, 18 Jul 2016 20:26:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201607182026.u6IKQ8PD012698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 18 Jul 2016 20:26:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418745 - in branches/2016Q3/sysutils: exfat-utils exfat-utils/files fusefs-exfat fusefs-exfat/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2016 20:26:10 -0000 Author: jbeich Date: Mon Jul 18 20:26:08 2016 New Revision: 418745 URL: https://svnweb.freebsd.org/changeset/ports/418745 Log: MFH: r418728 sysutils/*exfat*: update to 1.2.4 - Chase project move to GitHub - Chase patent licensing URL [1] - Restore GPLv2 after r328060 [2] - Fix build on DragonFly - Drop unused iconv dependency PR: 199874, 210823 PR: 210162 [1] Suggested by: decke, tijl [2] (via bug 193629) Approved by: maintainer timeout (2 weeks) Approved by: ports-secteam (feld) Added: branches/2016Q3/sysutils/exfat-utils/files/patch-libexfat_platform.h - copied unchanged from r418728, head/sysutils/exfat-utils/files/patch-libexfat_platform.h branches/2016Q3/sysutils/exfat-utils/files/patch-ublio - copied unchanged from r418728, head/sysutils/exfat-utils/files/patch-ublio branches/2016Q3/sysutils/fusefs-exfat/files/patch-libexfat_platform.h - copied unchanged from r418728, head/sysutils/fusefs-exfat/files/patch-libexfat_platform.h branches/2016Q3/sysutils/fusefs-exfat/files/patch-ublio - copied unchanged from r418728, head/sysutils/fusefs-exfat/files/patch-ublio Deleted: branches/2016Q3/sysutils/exfat-utils/files/patch-SConstruct branches/2016Q3/sysutils/fusefs-exfat/files/patch-SConstruct Modified: branches/2016Q3/sysutils/exfat-utils/Makefile branches/2016Q3/sysutils/exfat-utils/distinfo branches/2016Q3/sysutils/exfat-utils/pkg-descr branches/2016Q3/sysutils/fusefs-exfat/Makefile branches/2016Q3/sysutils/fusefs-exfat/distinfo branches/2016Q3/sysutils/fusefs-exfat/pkg-descr Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/sysutils/exfat-utils/Makefile ============================================================================== --- branches/2016Q3/sysutils/exfat-utils/Makefile Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/exfat-utils/Makefile Mon Jul 18 20:26:08 2016 (r418745) @@ -1,41 +1,41 @@ # Created by: Alex Samorukov # $FreeBSD$ -PORTNAME= exfat-utils -PORTVERSION= 1.0.1 +PORTNAME= exfat +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.4 CATEGORIES= sysutils -MASTER_SITES= GOOGLE_CODE +PKGNAMESUFFIX= -utils MAINTAINER= samm@os2.kiev.ua COMMENT= Utilities to create, check, label and dump exFAT filesystem -LICENSE= Microsoft-exFAT -LICENSE_NAME= Microsoft exFAT License -LICENSE_TEXT= Requires license from Microsoft, please see \ - http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx -LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +LICENSE= GPLv2+ MSPAT +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_NAME_MSPAT= Microsoft exFAT Patent License +LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ + available implementations of exFAT do not include a patent \ + license from Microsoft. A license is required in order to \ + implement exFAT and use it in a product or device. \ + https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio -PROJECTHOST= exfat +USE_GITHUB= yes +GH_ACCOUNT= relan -USES= scons +USES= autoreconf localbase pkgconfig +GNU_CONFIGURE= yes PLIST_FILES= sbin/exfatlabel sbin/dumpexfat sbin/exfatfsck sbin/mkexfatfs \ + sbin/fsck.exfat sbin/mkfs.exfat \ man/man8/exfatlabel.8.gz man/man8/mkexfatfs.8.gz man/man8/exfatfsck.8.gz \ man/man8/dumpexfat.8.gz -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/label/exfatlabel ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/dump/dumpexfat ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/fsck/exfatfsck ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/mkfs/mkexfatfs ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/label/exfatlabel.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/mkfs/mkexfatfs.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/dump/dumpexfat.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/fsck/exfatfsck.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e '/fuse/d' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's/ fuse//' ${WRKSRC}/Makefile.am .include Modified: branches/2016Q3/sysutils/exfat-utils/distinfo ============================================================================== --- branches/2016Q3/sysutils/exfat-utils/distinfo Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/exfat-utils/distinfo Mon Jul 18 20:26:08 2016 (r418745) @@ -1,2 +1,2 @@ -SHA256 (exfat-utils-1.0.1.tar.gz) = eeacedca1878065dc3886674ae39cd51149c37bd7d6d7e9325c971a1d1acdab3 -SIZE (exfat-utils-1.0.1.tar.gz) = 51905 +SHA256 (relan-exfat-v1.2.4_GH0.tar.gz) = e65ca1b47f35421a1663b93c66e48abfd737c3e2f0c7f7154128ce2d30ecd0d8 +SIZE (relan-exfat-v1.2.4_GH0.tar.gz) = 55172 Copied: branches/2016Q3/sysutils/exfat-utils/files/patch-libexfat_platform.h (from r418728, head/sysutils/exfat-utils/files/patch-libexfat_platform.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/exfat-utils/files/patch-libexfat_platform.h Mon Jul 18 20:26:08 2016 (r418745, copy of r418728, head/sysutils/exfat-utils/files/patch-libexfat_platform.h) @@ -0,0 +1,11 @@ +--- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC ++++ libexfat/platform.h +@@ -46,7 +46,7 @@ + #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN + #define EXFAT_BIG_ENDIAN BIG_ENDIAN + +-#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + + #include + #define exfat_bswap16(x) bswap16(x) Copied: branches/2016Q3/sysutils/exfat-utils/files/patch-ublio (from r418728, head/sysutils/exfat-utils/files/patch-ublio) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/exfat-utils/files/patch-ublio Mon Jul 18 20:26:08 2016 (r418745, copy of r418728, head/sysutils/exfat-utils/files/patch-ublio) @@ -0,0 +1,176 @@ +# Revert 3959f7d to restore ublio support and add autoconf glue. + +diff --git README.md README.md +index 60d5c71..81446a6 100644 +--- README.md ++++ README.md +@@ -7,6 +7,7 @@ Supported operating systems: + + * GNU/Linux + * Mac OS X 10.5 or later ++* FreeBSD + * OpenBSD + + Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. +diff --git configure.ac configure.ac +index b45db3f..2bcda4b 100644 +--- configure.ac ++++ configure.ac +@@ -31,6 +31,12 @@ AC_PROG_CC_C99 + AC_PROG_RANLIB + AM_PROG_AR + AC_SYS_LARGEFILE ++PKG_CHECK_MODULES([UBLIO], [libublio], [ ++ CFLAGS="$CFLAGS $UBLIO_CFLAGS" ++ LIBS="$LIBS $UBLIO_LIBS" ++ AC_DEFINE([USE_UBLIO], [1], ++ [Define if block devices are not supported.]) ++], [:]) + PKG_CHECK_MODULES([FUSE], [fuse]) + AC_CONFIG_HEADERS([libexfat/config.h]) + AC_CONFIG_FILES([ +diff --git libexfat/io.c libexfat/io.c +index 60f28e2..14c0151 100644 +--- libexfat/io.c ++++ libexfat/io.c +@@ -37,12 +37,20 @@ + #include + #endif + #include ++#ifdef USE_UBLIO ++#include ++#include ++#endif + + struct exfat_dev + { + int fd; + enum exfat_mode mode; + off_t size; /* in bytes */ ++#ifdef USE_UBLIO ++ off_t pos; ++ ublio_filehandle_t ufh; ++#endif + }; + + static int open_ro(const char* spec) +@@ -74,6 +82,9 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + { + struct exfat_dev* dev; + struct stat stbuf; ++#ifdef USE_UBLIO ++ struct ublio_param up; ++#endif + + dev = malloc(sizeof(struct exfat_dev)); + if (dev == NULL) +@@ -211,6 +222,24 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + } + } + ++#ifdef USE_UBLIO ++ memset(&up, 0, sizeof(struct ublio_param)); ++ up.up_blocksize = 256 * 1024; ++ up.up_items = 64; ++ up.up_grace = 32; ++ up.up_priv = &dev->fd; ++ ++ dev->pos = 0; ++ dev->ufh = ublio_open(&up); ++ if (dev->ufh == NULL) ++ { ++ close(dev->fd); ++ free(dev); ++ exfat_error("failed to initialize ublio"); ++ return NULL; ++ } ++#endif ++ + return dev; + } + +@@ -218,6 +247,13 @@ int exfat_close(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_close(dev->ufh) != 0) ++ { ++ exfat_error("failed to close ublio"); ++ rc = -EIO; ++ } ++#endif + if (close(dev->fd) != 0) + { + exfat_error("failed to close device: %s", strerror(errno)); +@@ -231,6 +267,13 @@ int exfat_fsync(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_fsync(dev->ufh) != 0) ++ { ++ exfat_error("ublio fsync failed"); ++ rc = -EIO; ++ } ++#endif + if (fsync(dev->fd) != 0) + { + exfat_error("fsync failed: %s", strerror(errno)); +@@ -251,29 +294,56 @@ off_t exfat_get_size(const struct exfat_dev* dev) + + off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) + { ++#ifdef USE_UBLIO ++ /* XXX SEEK_CUR will be handled incorrectly */ ++ return dev->pos = lseek(dev->fd, offset, whence); ++#else + return lseek(dev->fd, offset, whence); ++#endif + } + + ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return read(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return write(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pread(dev->ufh, buffer, size, offset); ++#else + return pread(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pwrite(dev->ufh, buffer, size, offset); ++#else + return pwrite(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, Modified: branches/2016Q3/sysutils/exfat-utils/pkg-descr ============================================================================== --- branches/2016Q3/sysutils/exfat-utils/pkg-descr Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/exfat-utils/pkg-descr Mon Jul 18 20:26:08 2016 (r418745) @@ -4,4 +4,4 @@ It contains dumpexfat to dump properties errors found on a exFAT filesystem, exfatlabel to label a exFAT filesystem and mkexfatfs to create a exFAT filesystem. -WWW: http://code.google.com/p/exfat/ +WWW: https://github.com/relan/exfat Modified: branches/2016Q3/sysutils/fusefs-exfat/Makefile ============================================================================== --- branches/2016Q3/sysutils/fusefs-exfat/Makefile Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/fusefs-exfat/Makefile Mon Jul 18 20:26:08 2016 (r418745) @@ -2,33 +2,34 @@ # $FreeBSD$ PORTNAME= exfat -PORTVERSION= 1.0.1 +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.4 CATEGORIES= sysutils -MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= fusefs- -DISTNAME= fuse-${PORTNAME}-${PORTVERSION} MAINTAINER= samm@os2.kiev.ua COMMENT= Full-featured exFAT FS implementation as a FUSE module -LICENSE= Microsoft-exFAT -LICENSE_NAME= Microsoft exFAT License -LICENSE_TEXT= Requires license from Microsoft, please see \ - http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx -LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +LICENSE= GPLv2+ MSPAT +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_NAME_MSPAT= Microsoft exFAT Patent License +LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ + available implementations of exFAT do not include a patent \ + license from Microsoft. A license is required in order to \ + implement exFAT and use it in a product or device. \ + https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio -USES= fuse iconv scons +USE_GITHUB= yes +GH_ACCOUNT= relan -PLIST_FILES= bin/mount.exfat-fuse bin/mount.exfat man/man8/mount.exfat-fuse.8.gz +USES= autoreconf fuse localbase pkgconfig +GNU_CONFIGURE= yes +MAKE_ARGS= SUBDIRS="libexfat fuse" -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fuse/mount.exfat-fuse ${STAGEDIR}${PREFIX}/bin - ${LN} -s ${PREFIX}/bin/mount.exfat-fuse ${STAGEDIR}${PREFIX}/bin/mount.exfat - ${INSTALL_MAN} ${WRKSRC}/fuse/mount.exfat-fuse.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|' ${WRKSRC}/SConstruct +PLIST_FILES= sbin/mount.exfat-fuse sbin/mount.exfat man/man8/mount.exfat-fuse.8.gz .include Modified: branches/2016Q3/sysutils/fusefs-exfat/distinfo ============================================================================== --- branches/2016Q3/sysutils/fusefs-exfat/distinfo Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/fusefs-exfat/distinfo Mon Jul 18 20:26:08 2016 (r418745) @@ -1,2 +1,2 @@ -SHA256 (fuse-exfat-1.0.1.tar.gz) = 12ac1ba1b7d4343bef64e7898176705a41cfe3b5a7a179e28549d242e2854758 -SIZE (fuse-exfat-1.0.1.tar.gz) = 39627 +SHA256 (relan-exfat-v1.2.4_GH0.tar.gz) = e65ca1b47f35421a1663b93c66e48abfd737c3e2f0c7f7154128ce2d30ecd0d8 +SIZE (relan-exfat-v1.2.4_GH0.tar.gz) = 55172 Copied: branches/2016Q3/sysutils/fusefs-exfat/files/patch-libexfat_platform.h (from r418728, head/sysutils/fusefs-exfat/files/patch-libexfat_platform.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/fusefs-exfat/files/patch-libexfat_platform.h Mon Jul 18 20:26:08 2016 (r418745, copy of r418728, head/sysutils/fusefs-exfat/files/patch-libexfat_platform.h) @@ -0,0 +1,11 @@ +--- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC ++++ libexfat/platform.h +@@ -46,7 +46,7 @@ + #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN + #define EXFAT_BIG_ENDIAN BIG_ENDIAN + +-#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + + #include + #define exfat_bswap16(x) bswap16(x) Copied: branches/2016Q3/sysutils/fusefs-exfat/files/patch-ublio (from r418728, head/sysutils/fusefs-exfat/files/patch-ublio) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/fusefs-exfat/files/patch-ublio Mon Jul 18 20:26:08 2016 (r418745, copy of r418728, head/sysutils/fusefs-exfat/files/patch-ublio) @@ -0,0 +1,176 @@ +# Revert 3959f7d to restore ublio support and add autoconf glue. + +diff --git README.md README.md +index 60d5c71..81446a6 100644 +--- README.md ++++ README.md +@@ -7,6 +7,7 @@ Supported operating systems: + + * GNU/Linux + * Mac OS X 10.5 or later ++* FreeBSD + * OpenBSD + + Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. +diff --git configure.ac configure.ac +index b45db3f..2bcda4b 100644 +--- configure.ac ++++ configure.ac +@@ -31,6 +31,12 @@ AC_PROG_CC_C99 + AC_PROG_RANLIB + AM_PROG_AR + AC_SYS_LARGEFILE ++PKG_CHECK_MODULES([UBLIO], [libublio], [ ++ CFLAGS="$CFLAGS $UBLIO_CFLAGS" ++ LIBS="$LIBS $UBLIO_LIBS" ++ AC_DEFINE([USE_UBLIO], [1], ++ [Define if block devices are not supported.]) ++], [:]) + PKG_CHECK_MODULES([FUSE], [fuse]) + AC_CONFIG_HEADERS([libexfat/config.h]) + AC_CONFIG_FILES([ +diff --git libexfat/io.c libexfat/io.c +index 60f28e2..14c0151 100644 +--- libexfat/io.c ++++ libexfat/io.c +@@ -37,12 +37,20 @@ + #include + #endif + #include ++#ifdef USE_UBLIO ++#include ++#include ++#endif + + struct exfat_dev + { + int fd; + enum exfat_mode mode; + off_t size; /* in bytes */ ++#ifdef USE_UBLIO ++ off_t pos; ++ ublio_filehandle_t ufh; ++#endif + }; + + static int open_ro(const char* spec) +@@ -74,6 +82,9 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + { + struct exfat_dev* dev; + struct stat stbuf; ++#ifdef USE_UBLIO ++ struct ublio_param up; ++#endif + + dev = malloc(sizeof(struct exfat_dev)); + if (dev == NULL) +@@ -211,6 +222,24 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + } + } + ++#ifdef USE_UBLIO ++ memset(&up, 0, sizeof(struct ublio_param)); ++ up.up_blocksize = 256 * 1024; ++ up.up_items = 64; ++ up.up_grace = 32; ++ up.up_priv = &dev->fd; ++ ++ dev->pos = 0; ++ dev->ufh = ublio_open(&up); ++ if (dev->ufh == NULL) ++ { ++ close(dev->fd); ++ free(dev); ++ exfat_error("failed to initialize ublio"); ++ return NULL; ++ } ++#endif ++ + return dev; + } + +@@ -218,6 +247,13 @@ int exfat_close(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_close(dev->ufh) != 0) ++ { ++ exfat_error("failed to close ublio"); ++ rc = -EIO; ++ } ++#endif + if (close(dev->fd) != 0) + { + exfat_error("failed to close device: %s", strerror(errno)); +@@ -231,6 +267,13 @@ int exfat_fsync(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_fsync(dev->ufh) != 0) ++ { ++ exfat_error("ublio fsync failed"); ++ rc = -EIO; ++ } ++#endif + if (fsync(dev->fd) != 0) + { + exfat_error("fsync failed: %s", strerror(errno)); +@@ -251,29 +294,56 @@ off_t exfat_get_size(const struct exfat_dev* dev) + + off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) + { ++#ifdef USE_UBLIO ++ /* XXX SEEK_CUR will be handled incorrectly */ ++ return dev->pos = lseek(dev->fd, offset, whence); ++#else + return lseek(dev->fd, offset, whence); ++#endif + } + + ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return read(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return write(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pread(dev->ufh, buffer, size, offset); ++#else + return pread(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pwrite(dev->ufh, buffer, size, offset); ++#else + return pwrite(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, Modified: branches/2016Q3/sysutils/fusefs-exfat/pkg-descr ============================================================================== --- branches/2016Q3/sysutils/fusefs-exfat/pkg-descr Mon Jul 18 20:15:17 2016 (r418744) +++ branches/2016Q3/sysutils/fusefs-exfat/pkg-descr Mon Jul 18 20:26:08 2016 (r418745) @@ -3,4 +3,4 @@ exFAT is a simple file system created by replace FAT32 removing some of it's limitations. exFAT is a standard FS for SDXC memory cards. -WWW: http://code.google.com/p/exfat/ +WWW: https://github.com/relan/exfat From owner-svn-ports-branches@freebsd.org Mon Jul 18 21:13:08 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48D0BB9BEE2; Mon, 18 Jul 2016 21:13:08 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 054AB14BD; Mon, 18 Jul 2016 21:13:07 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6ILD7NI031618; Mon, 18 Jul 2016 21:13:07 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6ILD6Ji031616; Mon, 18 Jul 2016 21:13:06 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201607182113.u6ILD6Ji031616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 18 Jul 2016 21:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418752 - branches/2016Q3/multimedia/mpeg4ip/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2016 21:13:08 -0000 Author: riggs Date: Mon Jul 18 21:13:06 2016 New Revision: 418752 URL: https://svnweb.freebsd.org/changeset/ports/418752 Log: MFH: r418702 Fix build with libc++ 3.8.0 Approved by: ports-secteam (build fix blanket) Added: branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp - copied unchanged from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h - copied unchanged from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h Modified: Directory Properties: branches/2016Q3/ (props changed) Copied: branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp (from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp Mon Jul 18 21:13:06 2016 (r418752, copy of r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp) @@ -0,0 +1,20 @@ +--- server/mp4live/audio_oss_source.cpp.orig 2005-09-07 22:28:01 UTC ++++ server/mp4live/audio_oss_source.cpp +@@ -265,7 +265,7 @@ bool COSSAudioSource::InitDevice(void) + + rc = ioctl(m_audioDevice, SNDCTL_DSP_SPEED, &samplingRate); + +- if (rc < 0 || abs(samplingRate - targetSamplingRate) > 1) { ++ if (rc < 0 || abs((int)(samplingRate - targetSamplingRate) > 1)) { + error_message("Couldn't set sampling rate for %s", deviceName); + close(m_audioDevice); + return false; +@@ -450,7 +450,7 @@ bool CAudioCapabilities::ProbeDevice() + rc = ioctl(audioDevice, SNDCTL_DSP_SPEED, &samplingRate); + + // invalid sampling rate, allow deviation of 1 sample/sec +- if (rc < 0 || abs(samplingRate - targetRate) > 1) { ++ if (rc < 0 || abs((int)(samplingRate - targetRate) > 1)) { + debug_message("audio device %s doesn't support sampling rate %u", + m_deviceName, targetRate); + continue; Copied: branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h (from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h Mon Jul 18 21:13:06 2016 (r418752, copy of r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h) @@ -0,0 +1,11 @@ +--- server/mp4live/audio_oss_source.h.orig 2006-05-15 17:52:52 UTC ++++ server/mp4live/audio_oss_source.h +@@ -104,7 +104,7 @@ class CAudioCapabilities : public CCapab + return rate; + } + int32_t calc; +- calc = abs(m_samplingRates[ix] - rate); ++ calc = abs((int)(m_samplingRates[ix] - rate)); + if (calc < diff) { + diff = calc; + ret_rate = m_samplingRates[ix]; From owner-svn-ports-branches@freebsd.org Tue Jul 19 11:39:07 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC585B9EFD7; Tue, 19 Jul 2016 11:39:07 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7FE0413DE; Tue, 19 Jul 2016 11:39:07 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JBd6nN050746; Tue, 19 Jul 2016 11:39:06 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JBd5F3050736; Tue, 19 Jul 2016 11:39:05 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201607191139.u6JBd5F3050736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 19 Jul 2016 11:39:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418770 - in branches/2016Q3/dns: bind9-devel bind9-devel/files bind910 bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2016 11:39:07 -0000 Author: mat Date: Tue Jul 19 11:39:05 2016 New Revision: 418770 URL: https://svnweb.freebsd.org/changeset/ports/418770 Log: MFH: r418013 r418769 BIND9 update, 9.9.9-P2, 9.10.4-P2 and latest 9.12 snapshot. Security: CVE-2016-2775 Changes: https://lists.isc.org/pipermail/bind-announce/2016-July/000996.html Changes: https://lists.isc.org/pipermail/bind-announce/2016-July/000997.html Changes: https://lists.isc.org/pipermail/bind-announce/2016-July/000998.html Changes: https://lists.isc.org/pipermail/bind-announce/2016-July/000999.html Sponsored by: Absolight Modified: branches/2016Q3/dns/bind9-devel/Makefile branches/2016Q3/dns/bind9-devel/distinfo branches/2016Q3/dns/bind9-devel/files/extrapatch-bind-min-override-ttl branches/2016Q3/dns/bind9-devel/files/patch-configure branches/2016Q3/dns/bind910/Makefile branches/2016Q3/dns/bind910/distinfo branches/2016Q3/dns/bind99/Makefile branches/2016Q3/dns/bind99/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/dns/bind9-devel/Makefile ============================================================================== --- branches/2016Q3/dns/bind9-devel/Makefile Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind9-devel/Makefile Tue Jul 19 11:39:05 2016 (r418770) @@ -13,11 +13,11 @@ DISTNAME= ${PORTNAME}9-${HASH} MAINTAINER= mat@FreeBSD.org COMMENT= BIND DNS suite with updated DNSSEC and DNS64 -LICENSE= ISCL +LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0.a20160627 -HASH= 33d0a77 +ISCVERSION= 9.12.0a.2016.07.14 +HASH= 203b693 MAKE_JOBS_UNSAFE= yes Modified: branches/2016Q3/dns/bind9-devel/distinfo ============================================================================== --- branches/2016Q3/dns/bind9-devel/distinfo Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind9-devel/distinfo Tue Jul 19 11:39:05 2016 (r418770) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467029021 -SHA256 (bind9-33d0a77.tar.gz) = 87a43c83b074357d4af9dbd131ba268c35b2dfd9497c5c56cf5bac2815375a2c -SIZE (bind9-33d0a77.tar.gz) = 11759207 +TIMESTAMP = 1468926927 +SHA256 (bind9-203b693.tar.gz) = 1702e2e597c88234c319b2ab83a286e28e6e58e23790858d0165dee6de1f5957 +SIZE (bind9-203b693.tar.gz) = 11763050 Modified: branches/2016Q3/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2016Q3/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Tue Jul 19 11:39:05 2016 (r418770) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-06-27 05:29:38 UTC +--- bin/named/config.c.orig 2016-07-14 05:13:57 UTC +++ bin/named/config.c @@ -151,6 +151,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-06-27 05:29:38 UTC +--- bin/named/server.c.orig 2016-07-14 05:13:57 UTC +++ bin/named/server.c -@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3549,6 +3549,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-06-27 05:29:38 UTC +--- lib/dns/include/dns/view.h.orig 2016-07-14 05:13:57 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-06-27 05:29:38 UTC +--- lib/dns/resolver.c.orig 2016-07-14 05:13:57 UTC +++ lib/dns/resolver.c @@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-06-27 05:29:38 UTC +--- lib/isccfg/namedconf.c.orig 2016-07-14 05:13:57 UTC +++ lib/isccfg/namedconf.c @@ -1707,6 +1707,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, Modified: branches/2016Q3/dns/bind9-devel/files/patch-configure ============================================================================== --- branches/2016Q3/dns/bind9-devel/files/patch-configure Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind9-devel/files/patch-configure Tue Jul 19 11:39:05 2016 (r418770) @@ -1,6 +1,6 @@ ---- configure.orig 2016-06-27 05:29:38 UTC +--- configure.orig 2016-07-14 05:13:57 UTC +++ configure -@@ -14205,27 +14205,9 @@ done +@@ -14338,27 +14338,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14268,47 +14250,7 @@ $as_echo "no" >&6; } ;; +@@ -14401,47 +14383,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22147,7 +22089,7 @@ $as_echo "" >&6; } +@@ -22318,7 +22260,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2016Q3/dns/bind910/Makefile ============================================================================== --- branches/2016Q3/dns/bind910/Makefile Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind910/Makefile Tue Jul 19 11:39:05 2016 (r418770) @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.4-P1 +ISCVERSION= 9.10.4-P2 MAKE_JOBS_UNSAFE= yes Modified: branches/2016Q3/dns/bind910/distinfo ============================================================================== --- branches/2016Q3/dns/bind910/distinfo Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind910/distinfo Tue Jul 19 11:39:05 2016 (r418770) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464252479 -SHA256 (bind-9.10.4-P1.tar.gz) = 7c3b7d1afe48a6bbead8f11f6971fb09eb57fa257dc32a088fcc20a0218131a2 -SIZE (bind-9.10.4-P1.tar.gz) = 9293605 +TIMESTAMP = 1468926862 +SHA256 (bind-9.10.4-P2.tar.gz) = b35b8af8fe030196d03b3e487f5ecd0c0836b5e124abc7a3ecd184740b444423 +SIZE (bind-9.10.4-P2.tar.gz) = 9298010 Modified: branches/2016Q3/dns/bind99/Makefile ============================================================================== --- branches/2016Q3/dns/bind99/Makefile Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind99/Makefile Tue Jul 19 11:39:05 2016 (r418770) @@ -15,7 +15,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.9-P1 +ISCVERSION= 9.9.9-P2 MAKE_JOBS_UNSAFE= yes Modified: branches/2016Q3/dns/bind99/distinfo ============================================================================== --- branches/2016Q3/dns/bind99/distinfo Tue Jul 19 11:30:38 2016 (r418769) +++ branches/2016Q3/dns/bind99/distinfo Tue Jul 19 11:39:05 2016 (r418770) @@ -1,5 +1,3 @@ -TIMESTAMP = 1464252734 -SHA256 (bind-9.9.9-P1.tar.gz) = 9bcc76b8cbee2e64210e80fc6b57a8e8ff07780f994f87d5a2aa312cdfa24aa4 -SIZE (bind-9.9.9-P1.tar.gz) = 8758793 -SHA256 (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 230ab0dbf30e8cf956ea6557d00046618abe158cb2fc3c2204c021ace58e5588 -SIZE (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 39284 +TIMESTAMP = 1468927271 +SHA256 (bind-9.9.9-P2.tar.gz) = 7746cc29071cb7e10f10be013cea836a3027b820a367ce3986cd366c01863bf2 +SIZE (bind-9.9.9-P2.tar.gz) = 8762371 From owner-svn-ports-branches@freebsd.org Tue Jul 19 12:12:05 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98D8DB9D59C; Tue, 19 Jul 2016 12:12:05 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 693BE1E58; Tue, 19 Jul 2016 12:12:05 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JCC4LT064305; Tue, 19 Jul 2016 12:12:04 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JCC4Ll064304; Tue, 19 Jul 2016 12:12:04 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201607191212.u6JCC4Ll064304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 19 Jul 2016 12:12:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418772 - branches/2016Q3/dns/bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2016 12:12:05 -0000 Author: mat Date: Tue Jul 19 12:12:04 2016 New Revision: 418772 URL: https://svnweb.freebsd.org/changeset/ports/418772 Log: MFH: r418771 Add distfile missed in last commit. Modified: branches/2016Q3/dns/bind99/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/dns/bind99/distinfo ============================================================================== --- branches/2016Q3/dns/bind99/distinfo Tue Jul 19 12:11:32 2016 (r418771) +++ branches/2016Q3/dns/bind99/distinfo Tue Jul 19 12:12:04 2016 (r418772) @@ -1,3 +1,5 @@ -TIMESTAMP = 1468927271 +TIMESTAMP = 1468930264 SHA256 (bind-9.9.9-P2.tar.gz) = 7746cc29071cb7e10f10be013cea836a3027b820a367ce3986cd366c01863bf2 SIZE (bind-9.9.9-P2.tar.gz) = 8762371 +SHA256 (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = d7ddc47641b95f4135baf6c7fd1e39ce06a599e1a97ba589e11c02d3be28ceed +SIZE (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = 39288 From owner-svn-ports-branches@freebsd.org Tue Jul 19 15:30:46 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52FB6B9D3C0; Tue, 19 Jul 2016 15:30:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26B3D183B; Tue, 19 Jul 2016 15:30:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JFUjvr039807; Tue, 19 Jul 2016 15:30:45 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JFUibk039803; Tue, 19 Jul 2016 15:30:44 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201607191530.u6JFUibk039803@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 19 Jul 2016 15:30:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418804 - in branches/2016Q3/www: apache22 apache22/files apache24 apache24/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2016 15:30:46 -0000 Author: brnrd Date: Tue Jul 19 15:30:44 2016 New Revision: 418804 URL: https://svnweb.freebsd.org/changeset/ports/418804 Log: MFH: r418743 www/apache24: Fix httpoxy vulnerability (+2.2) - Add upstream patch to www/apache24 - Add upstream patch to www/apache22 - Bump PORTREVISION Approved by: feld (ports-secteam) Security: cf0b5668-4d1b-11e6-b2ec-b499baebfeaf Security: CVE-2016-5387 Approved by: ports-secteam (feld) Added: branches/2016Q3/www/apache22/files/patch-httpoxy - copied unchanged from r418743, head/www/apache22/files/patch-httpoxy branches/2016Q3/www/apache24/files/patch-httpoxy - copied unchanged from r418743, head/www/apache24/files/patch-httpoxy Modified: branches/2016Q3/www/apache22/Makefile branches/2016Q3/www/apache24/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/apache22/Makefile ============================================================================== --- branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:26:54 2016 (r418803) +++ branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:30:44 2016 (r418804) @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.31 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2016Q3/www/apache22/files/patch-httpoxy (from r418743, head/www/apache22/files/patch-httpoxy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/apache22/files/patch-httpoxy Tue Jul 19 15:30:44 2016 (r418804, copy of r418743, head/www/apache22/files/patch-httpoxy) @@ -0,0 +1,63 @@ +https://www.apache.org/security/asf-httpoxy-response.txt + +Apache HTTP Server may be configured to proxy HTTP requests as a forward +or reverse (gateway) proxy server, can proxy requests to a FastCGI service +using mod_proxy_fcgi, can directly serve CGI applications using mod_cgi +or mod_cgid or the related mod_isapi service. The project's mod_fcgid +subproject (available as a separate add-in module) directly manages CGI +scripts using the FastCGI protocol. + +It may also be configured to directly host a number of external modules +which run CGI-style applications in-process. The server itself does not +modify the CGI environment in this case, however, these external modules +may perform such modifications of their environment variables in-process. +Such examples include mod_php, mod_perl and mod_wsgi. + +To mitigate "httpoxy" issues across all of the above mechanisms, the most +direct solution is to drop any "Proxy:" header arriving from an upstream +proxy server or the origin user-agent. this will mitigate the issue for any +vulnerable back-end server or CGI across all traffic through this server. + +The two lines below enabled in the httpd.conf file will remove the "Proxy:" +header from all incoming requests, before further processing; + + LoadModule headers_module {path-to}/mod_headers.so + + RequestHeader unset Proxy early + +(Users who have mod_headers compiled-in to the httpd binary must omit +the LoadModule directive above, others must adjust the {path-to} to point +to the mod_headers.so file.) + +If the administrator wishes to preserve the value of the "Proxy:" header +for most traffic, and only eliminate it from the CGI environment variable +HTTP_PROXY, a second mitigation is offered. This patch will address this +behavior in mod_cgi, mod_cgid, mod_isapi, mod_proxy_fcgi and mod_fcgid, +along with all other consumers of httpd's built-in environment handling. + +The bundled httpd modules all rely on ap_add_common_vars() to set up the +target CGI environment. The project will include the recommended patch +below in all subsequent releases of httpd, including 2.4.24 and 2.2.32. +Users who build httpd 2.2.x or 2.4.x from source may apply the patch below, +recompile and re-install httpd to obtain this mitigation. This migitation +has been assigned the identifier CVE-2016-5387 . + +======= Patch to httpd sources 2.4.x and 2.2.x ======= + +--- server/util_script.c (revision 1752426) ++++ server/util_script.c (working copy) +@@ -186,6 +186,14 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r + else if (!strcasecmp(hdrs[i].key, "Content-length")) { + apr_table_addn(e, "CONTENT_LENGTH", hdrs[i].val); + } ++ /* HTTP_PROXY collides with a popular envvar used to configure ++ * proxies, don't let clients set/override it. But, if you must... ++ */ ++#ifndef SECURITY_HOLE_PASS_PROXY ++ else if (!strcasecmp(hdrs[i].key, "Proxy")) { ++ ; ++ } ++#endif + /* + * You really don't want to disable this check, since it leaves you + * wide open to CGIs stealing passwords and people viewing them Modified: branches/2016Q3/www/apache24/Makefile ============================================================================== --- branches/2016Q3/www/apache24/Makefile Tue Jul 19 15:26:54 2016 (r418803) +++ branches/2016Q3/www/apache24/Makefile Tue Jul 19 15:30:44 2016 (r418804) @@ -2,6 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.23 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2016Q3/www/apache24/files/patch-httpoxy (from r418743, head/www/apache24/files/patch-httpoxy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/apache24/files/patch-httpoxy Tue Jul 19 15:30:44 2016 (r418804, copy of r418743, head/www/apache24/files/patch-httpoxy) @@ -0,0 +1,63 @@ +https://www.apache.org/security/asf-httpoxy-response.txt + +Apache HTTP Server may be configured to proxy HTTP requests as a forward +or reverse (gateway) proxy server, can proxy requests to a FastCGI service +using mod_proxy_fcgi, can directly serve CGI applications using mod_cgi +or mod_cgid or the related mod_isapi service. The project's mod_fcgid +subproject (available as a separate add-in module) directly manages CGI +scripts using the FastCGI protocol. + +It may also be configured to directly host a number of external modules +which run CGI-style applications in-process. The server itself does not +modify the CGI environment in this case, however, these external modules +may perform such modifications of their environment variables in-process. +Such examples include mod_php, mod_perl and mod_wsgi. + +To mitigate "httpoxy" issues across all of the above mechanisms, the most +direct solution is to drop any "Proxy:" header arriving from an upstream +proxy server or the origin user-agent. this will mitigate the issue for any +vulnerable back-end server or CGI across all traffic through this server. + +The two lines below enabled in the httpd.conf file will remove the "Proxy:" +header from all incoming requests, before further processing; + + LoadModule headers_module {path-to}/mod_headers.so + + RequestHeader unset Proxy early + +(Users who have mod_headers compiled-in to the httpd binary must omit +the LoadModule directive above, others must adjust the {path-to} to point +to the mod_headers.so file.) + +If the administrator wishes to preserve the value of the "Proxy:" header +for most traffic, and only eliminate it from the CGI environment variable +HTTP_PROXY, a second mitigation is offered. This patch will address this +behavior in mod_cgi, mod_cgid, mod_isapi, mod_proxy_fcgi and mod_fcgid, +along with all other consumers of httpd's built-in environment handling. + +The bundled httpd modules all rely on ap_add_common_vars() to set up the +target CGI environment. The project will include the recommended patch +below in all subsequent releases of httpd, including 2.4.24 and 2.2.32. +Users who build httpd 2.2.x or 2.4.x from source may apply the patch below, +recompile and re-install httpd to obtain this mitigation. This migitation +has been assigned the identifier CVE-2016-5387 . + +======= Patch to httpd sources 2.4.x and 2.2.x ======= + +--- server/util_script.c (revision 1752426) ++++ server/util_script.c (working copy) +@@ -186,6 +186,14 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r + else if (!strcasecmp(hdrs[i].key, "Content-length")) { + apr_table_addn(e, "CONTENT_LENGTH", hdrs[i].val); + } ++ /* HTTP_PROXY collides with a popular envvar used to configure ++ * proxies, don't let clients set/override it. But, if you must... ++ */ ++#ifndef SECURITY_HOLE_PASS_PROXY ++ else if (!strcasecmp(hdrs[i].key, "Proxy")) { ++ ; ++ } ++#endif + /* + * You really don't want to disable this check, since it leaves you + * wide open to CGIs stealing passwords and people viewing them From owner-svn-ports-branches@freebsd.org Tue Jul 19 15:41:42 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5723B9D64F; Tue, 19 Jul 2016 15:41:42 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 867F21201; Tue, 19 Jul 2016 15:41:42 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JFffbH046656; Tue, 19 Jul 2016 15:41:41 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JFffmn046654; Tue, 19 Jul 2016 15:41:41 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201607191541.u6JFffmn046654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 19 Jul 2016 15:41:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418806 - in branches/2016Q3/www/apache22: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2016 15:41:42 -0000 Author: ohauer Date: Tue Jul 19 15:41:41 2016 New Revision: 418806 URL: https://svnweb.freebsd.org/changeset/ports/418806 Log: MFH: r418746 r418748 - allow reproducible build - set EXPIRATION_DATE to 2017-07-01 [1] [1] Upstream propose EoL of apache 2.2.x during the next 12 months See discussion on dev@apache list. Approved by: ports-secteam (feld@) Added: branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c - copied unchanged from r418746, head/www/apache22/files/extra-patch-server_buildmark.c Modified: branches/2016Q3/www/apache22/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/apache22/Makefile ============================================================================== --- branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:31:44 2016 (r418805) +++ branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:41:41 2016 (r418806) @@ -19,6 +19,9 @@ CONFLICTS_INSTALL= caudium14-1.* \ apache-*-2.2.* apache22-*-2.2.* \ apache-*-2.4.* apache24-*-2.4.* +DEPRECATED= Upstream propose EoL of apache 2.2.x during the next 12 months +EXPIRATION_DATE= 2017-07-01 + USE_APACHE= common22 USES= autoreconf cpe iconv libtool perl5 tar:bzip2 USE_PERL5= run @@ -48,6 +51,10 @@ WITH_MPM?= prefork # or worker, event, WITH_HTTP_PORT?= 80 WITH_SSL_PORT?= 443 +.if !defined(WITH_DEBUG) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c +.endif + .include "${APACHEDIR}/Makefile.options" AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap @@ -59,7 +66,7 @@ LDAP_CONFIGURE_ON= --enable-ldap=shared SSL_CFLAGS= -I${OPENSSLINC} SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} SSL_LDFLAGS= -L${OPENSSLLIB} -SSL_USE= OPENSSL=yes +SSL_USES= ssl SUEXEC_RSRCLIMIT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_rsrclimit SUEXEC_USERDIR_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_userdir Copied: branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c (from r418746, head/www/apache22/files/extra-patch-server_buildmark.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c Tue Jul 19 15:41:41 2016 (r418806, copy of r418746, head/www/apache22/files/extra-patch-server_buildmark.c) @@ -0,0 +1,15 @@ +# disable build time stamp in favor of reproducible build +# except building with DEBUG +============================================================== +--- server/buildmark.c.orig 2016-07-03 16:09:18 UTC ++++ server/buildmark.c +@@ -17,6 +17,9 @@ + #include "ap_config.h" + #include "httpd.h" + ++/* Allow Reproducible build, do not include build time information */ ++#undef __DATE__ ++ + #if defined(__DATE__) && defined(__TIME__) + static const char server_built[] = __DATE__ " " __TIME__; + #else From owner-svn-ports-branches@freebsd.org Wed Jul 20 12:50:20 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5956B9DD4C; Wed, 20 Jul 2016 12:50:20 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 570F215E4; Wed, 20 Jul 2016 12:50:20 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KCoJ9J016657; Wed, 20 Jul 2016 12:50:19 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KCoJSM016654; Wed, 20 Jul 2016 12:50:19 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201607201250.u6KCoJSM016654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 20 Jul 2016 12:50:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418835 - branches/2016Q3/security/libgcrypt X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 12:50:20 -0000 Author: cpm Date: Wed Jul 20 12:50:19 2016 New Revision: 418835 URL: https://svnweb.freebsd.org/changeset/ports/418835 Log: MFH: r418828 - Update to 1.7.2 - Bump library version in pkg-plist Changelog: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000392.html PR: 211153 Reviewed by: junovitch (mentor) Approved by: junovitch (mentor) Exp-run: antoine Differential Revision: D7221 Approved by: ports-secteam (feld) Modified: branches/2016Q3/security/libgcrypt/Makefile branches/2016Q3/security/libgcrypt/distinfo branches/2016Q3/security/libgcrypt/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/security/libgcrypt/Makefile ============================================================================== --- branches/2016Q3/security/libgcrypt/Makefile Wed Jul 20 12:25:51 2016 (r418834) +++ branches/2016Q3/security/libgcrypt/Makefile Wed Jul 20 12:50:19 2016 (r418835) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.2 CATEGORIES= security MASTER_SITES= GNUPG Modified: branches/2016Q3/security/libgcrypt/distinfo ============================================================================== --- branches/2016Q3/security/libgcrypt/distinfo Wed Jul 20 12:25:51 2016 (r418834) +++ branches/2016Q3/security/libgcrypt/distinfo Wed Jul 20 12:50:19 2016 (r418835) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466077169 -SHA256 (libgcrypt-1.7.1.tar.bz2) = 450d9cfcbf1611c64dbe3bd04b627b83379ef89f11406d94c8bba305e36d7a95 -SIZE (libgcrypt-1.7.1.tar.bz2) = 2843435 +TIMESTAMP = 1468663748 +SHA256 (libgcrypt-1.7.2.tar.bz2) = 3d35df906d6eab354504c05d749a9b021944cb29ff5f65c8ef9c3dd5f7b6689f +SIZE (libgcrypt-1.7.2.tar.bz2) = 2845301 Modified: branches/2016Q3/security/libgcrypt/pkg-plist ============================================================================== --- branches/2016Q3/security/libgcrypt/pkg-plist Wed Jul 20 12:25:51 2016 (r418834) +++ branches/2016Q3/security/libgcrypt/pkg-plist Wed Jul 20 12:50:19 2016 (r418835) @@ -6,6 +6,6 @@ include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.1.1 +lib/libgcrypt.so.20.1.2 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4 From owner-svn-ports-branches@freebsd.org Wed Jul 20 21:30:12 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A033DB9FCBF; Wed, 20 Jul 2016 21:30:12 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B77D1E80; Wed, 20 Jul 2016 21:30:12 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KLUBWJ013044; Wed, 20 Jul 2016 21:30:11 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KLU3O0012964; Wed, 20 Jul 2016 21:30:03 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201607202130.u6KLU3O0012964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Wed, 20 Jul 2016 21:30:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418857 - in branches/2016Q3: astro/rmap audio/enscribe audio/mp3plot biology/emboss cad/pcb devel/cvsgraph devel/m17n-lib emulators/fceux games/mkhexgrid games/openlierox graphics/a2pn... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 21:30:12 -0000 Author: dinoex Date: Wed Jul 20 21:30:03 2016 New Revision: 418857 URL: https://svnweb.freebsd.org/changeset/ports/418857 Log: MFH: r418829 - update libgd to 2.2.2 - new MASTER_SITES - add security patch PR: 210913 Submitted by: Piotr Kubaj Security: CVE-2015-8874 Security: CVE-2016-3074 Security: http://www.openwall.com/lists/oss-security/2016/07/12/4 Approved by: portmgr (feld) Added: branches/2016Q3/graphics/gd/files/patch-configure - copied unchanged from r418829, head/graphics/gd/files/patch-configure branches/2016Q3/graphics/gd/files/patch-gd_tga.c - copied unchanged from r418829, head/graphics/gd/files/patch-gd_tga.c Deleted: branches/2016Q3/graphics/gd/files/patch-webpimg.c Modified: branches/2016Q3/astro/rmap/Makefile branches/2016Q3/audio/enscribe/Makefile branches/2016Q3/audio/mp3plot/Makefile branches/2016Q3/biology/emboss/Makefile branches/2016Q3/cad/pcb/Makefile branches/2016Q3/devel/cvsgraph/Makefile branches/2016Q3/devel/m17n-lib/Makefile branches/2016Q3/emulators/fceux/Makefile branches/2016Q3/games/mkhexgrid/Makefile branches/2016Q3/games/openlierox/Makefile branches/2016Q3/graphics/a2png/Makefile branches/2016Q3/graphics/dataplot/Makefile branches/2016Q3/graphics/fly/Makefile branches/2016Q3/graphics/g2/Makefile branches/2016Q3/graphics/gd/Makefile branches/2016Q3/graphics/gd/distinfo branches/2016Q3/graphics/gd/pkg-plist branches/2016Q3/graphics/gdchart/Makefile branches/2016Q3/graphics/gdtclft/Makefile branches/2016Q3/graphics/grads/Makefile branches/2016Q3/graphics/graphviz/Makefile branches/2016Q3/graphics/libgphoto2/Makefile branches/2016Q3/graphics/libpuzzle/Makefile branches/2016Q3/graphics/libsixel/Makefile branches/2016Q3/graphics/lua-gd/Makefile branches/2016Q3/graphics/mapserver/Makefile branches/2016Q3/graphics/mscgen/Makefile branches/2016Q3/graphics/p5-GD/Makefile branches/2016Q3/graphics/php-libpuzzle/Makefile branches/2016Q3/graphics/php5-ffmpeg/Makefile branches/2016Q3/graphics/phplot/Makefile branches/2016Q3/graphics/png2html/Makefile branches/2016Q3/graphics/pstoedit/Makefile branches/2016Q3/graphics/py-gd/Makefile branches/2016Q3/graphics/raster3d/Makefile branches/2016Q3/graphics/repng2jpeg/Makefile branches/2016Q3/graphics/ruby-gd/Makefile branches/2016Q3/graphics/rubygem-gd2/Makefile branches/2016Q3/graphics/scr2png/Makefile branches/2016Q3/graphics/zimg/Makefile branches/2016Q3/lang/fpc/Makefile branches/2016Q3/mail/dspam/Makefile branches/2016Q3/mail/libpst/Makefile branches/2016Q3/math/PDL/Makefile branches/2016Q3/math/gnuplot/Makefile branches/2016Q3/math/ploticus/Makefile branches/2016Q3/math/plplot/Makefile branches/2016Q3/multimedia/kissdx/Makefile branches/2016Q3/multimedia/oggvideotools/Makefile branches/2016Q3/net-mgmt/bandwidthd/Makefile branches/2016Q3/net-mgmt/icinga-classicweb/Makefile branches/2016Q3/net-mgmt/mrtg/Makefile branches/2016Q3/net-mgmt/nagios/Makefile branches/2016Q3/net-mgmt/nagios4/Makefile branches/2016Q3/net-p2p/amule-devel/Makefile branches/2016Q3/net-p2p/amule/Makefile branches/2016Q3/net-p2p/mldonkey/Makefile branches/2016Q3/net/vnstat/Makefile branches/2016Q3/print/texlive-base/Makefile branches/2016Q3/sysutils/apcupsd/Makefile branches/2016Q3/sysutils/nut/Makefile branches/2016Q3/sysutils/pfstat/Makefile branches/2016Q3/textproc/modlogan/Makefile branches/2016Q3/www/analog/Makefile branches/2016Q3/www/asterisk-stat/Makefile branches/2016Q3/www/awffull/Makefile branches/2016Q3/www/http-analyze/Makefile branches/2016Q3/www/mgstat/Makefile branches/2016Q3/www/nginx-devel/Makefile branches/2016Q3/www/nginx/Makefile branches/2016Q3/www/sarg/Makefile branches/2016Q3/www/tengine/Makefile branches/2016Q3/www/webalizer/Makefile branches/2016Q3/x11-toolkits/nucleo/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/astro/rmap/Makefile ============================================================================== --- branches/2016Q3/astro/rmap/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/astro/rmap/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= rmap PORTVERSION= 1.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= astro geography MASTER_SITES= http://rmap.sourceforge.net/ Modified: branches/2016Q3/audio/enscribe/Makefile ============================================================================== --- branches/2016Q3/audio/enscribe/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/audio/enscribe/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= enscribe PORTVERSION= 0.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio graphics MASTER_SITES= http://www.coppercloudmusic.com/enscribe/ Modified: branches/2016Q3/audio/mp3plot/Makefile ============================================================================== --- branches/2016Q3/audio/mp3plot/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/audio/mp3plot/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mp3plot DISTVERSION= 0.6.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio MASTER_SITES= http://p.outlyer.net/mp3plot/files/ Modified: branches/2016Q3/biology/emboss/Makefile ============================================================================== --- branches/2016Q3/biology/emboss/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/biology/emboss/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= emboss PORTVERSION= 6.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/ DISTNAME= ${PORTNAME:tu}-${PORTVERSION} Modified: branches/2016Q3/cad/pcb/Makefile ============================================================================== --- branches/2016Q3/cad/pcb/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/cad/pcb/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= pcb PORTVERSION= 20140316 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q3/devel/cvsgraph/Makefile ============================================================================== --- branches/2016Q3/devel/cvsgraph/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/devel/cvsgraph/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= cvsgraph PORTVERSION= 1.7.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel graphics MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/ Modified: branches/2016Q3/devel/m17n-lib/Makefile ============================================================================== --- branches/2016Q3/devel/m17n-lib/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/devel/m17n-lib/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= m17n-lib PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= devel textproc MASTER_SITES= SAVANNAH/m17n Modified: branches/2016Q3/emulators/fceux/Makefile ============================================================================== --- branches/2016Q3/emulators/fceux/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/emulators/fceux/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -4,7 +4,7 @@ PORTNAME= fceux PORTVERSION= 2.2.2 DISTVERSIONSUFFIX= .src -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= SF/fceultra/Source%20Code/${PORTVERSION}%20src/ Modified: branches/2016Q3/games/mkhexgrid/Makefile ============================================================================== --- branches/2016Q3/games/mkhexgrid/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/games/mkhexgrid/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mkhexgrid PORTVERSION= 0.1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.nomic.net/~uckelman/mkhexgrid/releases/ \ http://aaron.daltons.ca/freebsd/ Modified: branches/2016Q3/games/openlierox/Makefile ============================================================================== --- branches/2016Q3/games/openlierox/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/games/openlierox/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= openlierox DISTVERSION= 0.58_rc3 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} Modified: branches/2016Q3/graphics/a2png/Makefile ============================================================================== --- branches/2016Q3/graphics/a2png/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/a2png/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF Modified: branches/2016Q3/graphics/dataplot/Makefile ============================================================================== --- branches/2016Q3/graphics/dataplot/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/dataplot/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= dataplot PORTVERSION= 20132012 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \ LOCAL/beech:source \ Modified: branches/2016Q3/graphics/fly/Makefile ============================================================================== --- branches/2016Q3/graphics/fly/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/fly/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= fly PORTVERSION= 2.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://fossies.org/unix/www/ \ http://martin.gleeson.com/fly/dist/ Modified: branches/2016Q3/graphics/g2/Makefile ============================================================================== --- branches/2016Q3/graphics/g2/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/g2/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SUNSITE/libs/graphics Modified: branches/2016Q3/graphics/gd/Makefile ============================================================================== --- branches/2016Q3/graphics/gd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/gd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,28 +2,29 @@ # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.1.0 -PORTREVISION?= 7 +PORTVERSION= 2.2.2 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES+= graphics -MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \ - http://cdn.bitbucket.org/libgd/gd-libgd/downloads/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= Graphics library for fast creation of images +LICENSE= MIT + LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 CONFLICTS= bazaar-1.* -USES= jpeg libtool:keepla pathfix pkgconfig shebangfix tar:xz +USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM +OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM WEBP OPTIONS_DEFAULT=FONTCONFIG NO_OPTIONS_SORT=yes FONTCONFIG_LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig @@ -35,6 +36,9 @@ VPX_CONFIGURE_OFF= --without-vpx XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_OFF= --without-webp +WEBP_BROKEN= circular dependencies .include @@ -99,6 +103,6 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202 .include Modified: branches/2016Q3/graphics/gd/distinfo ============================================================================== --- branches/2016Q3/graphics/gd/distinfo Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/gd/distinfo Wed Jul 20 21:30:03 2016 (r418857) @@ -1,2 +1,3 @@ -SHA256 (libgd-2.1.0.tar.xz) = fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a -SIZE (libgd-2.1.0.tar.xz) = 2004304 +TIMESTAMP = 1468106153 +SHA256 (libgd-2.2.2.tar.xz) = 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c +SIZE (libgd-2.2.2.tar.xz) = 2105628 Copied: branches/2016Q3/graphics/gd/files/patch-configure (from r418829, head/graphics/gd/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/graphics/gd/files/patch-configure Wed Jul 20 21:30:03 2016 (r418857, copy of r418829, head/graphics/gd/files/patch-configure) @@ -0,0 +1,11 @@ +--- configure.bak 2016-06-24 07:52:14.000000000 +0200 ++++ configure 2016-07-10 01:24:57.924934000 +0200 +@@ -2463,7 +2463,7 @@ + # Dynamic library version information + # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info + +-GDLIB_LT_CURRENT=3 ++GDLIB_LT_CURRENT=6 + GDLIB_LT_REVISION=$(printf '%i%02i%02i' $GDLIB_MAJOR $GDLIB_MINOR $GDLIB_REVISION) + GDLIB_LT_AGE=0 + Copied: branches/2016Q3/graphics/gd/files/patch-gd_tga.c (from r418829, head/graphics/gd/files/patch-gd_tga.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/graphics/gd/files/patch-gd_tga.c Wed Jul 20 21:30:03 2016 (r418857, copy of r418829, head/graphics/gd/files/patch-gd_tga.c) @@ -0,0 +1,88 @@ +--- src/gd_tga.c.orig 2016-07-18 19:23:11 UTC ++++ src/gd_tga.c +@@ -99,7 +99,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro + if (tga->bits == TGA_BPP_24) { + *tpix = gdTrueColor(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret]); + bitmap_caret += 3; +- } else if (tga->bits == TGA_BPP_32 || tga->alphabits) { ++ } else if (tga->bits == TGA_BPP_32 && tga->alphabits) { + register int a = tga->bitmap[bitmap_caret + 3]; + + *tpix = gdTrueColorAlpha(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret], gdAlphaMax - (a >> 1)); +@@ -159,16 +159,13 @@ int read_header_tga(gdIOCtx *ctx, oTga * + printf("wxh: %i %i\n", tga->width, tga->height); + #endif + +- switch(tga->bits) { +- case 8: +- case 16: +- case 24: +- case 32: +- break; +- default: +- gd_error("bps %i not supported", tga->bits); ++ if (!((tga->bits == TGA_BPP_24 && tga->alphabits == 0) ++ || (tga->bits == TGA_BPP_32 && tga->alphabits == 8))) ++ { ++ gd_error_ex(GD_WARNING, "gd-tga: %u bits per pixel with %u alpha bits not supported\n", ++ tga->bits, tga->alphabits); ++ + return -1; +- break; + } + + tga->ident = NULL; +@@ -285,14 +285,23 @@ int read_image_tga( gdIOCtx *ctx, oTga * + buffer_caret = 0; + + while( bitmap_caret < image_block_size ) { +- ++ + if ((decompression_buffer[buffer_caret] & TGA_RLE_FLAG) == TGA_RLE_FLAG) { + encoded_pixels = ( ( decompression_buffer[ buffer_caret ] & 127 ) + 1 ); + buffer_caret++; + +- for (i = 0; i < encoded_pixels; i++) { +- for (j = 0; j < pixel_block_size; j++, bitmap_caret++) { +- tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ if (encoded_pixels != 0) { ++ ++ if (!((buffer_caret + (encoded_pixels * pixel_block_size)) < image_block_size)) { ++ gdFree( decompression_buffer ); ++ gdFree( conversion_buffer ); ++ return -1; ++ } ++ ++ for (i = 0; i < encoded_pixels; i++) { ++ for (j = 0; j < pixel_block_size; j++, bitmap_caret++) { ++ tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ } + } + } + buffer_caret += pixel_block_size; +@@ -300,11 +309,20 @@ int read_image_tga( gdIOCtx *ctx, oTga * + encoded_pixels = decompression_buffer[ buffer_caret ] + 1; + buffer_caret++; + +- for (i = 0; i < encoded_pixels; i++) { +- for( j = 0; j < pixel_block_size; j++, bitmap_caret++ ) { +- tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ if (encoded_pixels != 0) { ++ ++ if (!((buffer_caret + (encoded_pixels * pixel_block_size)) < image_block_size)) { ++ gdFree( decompression_buffer ); ++ gdFree( conversion_buffer ); ++ return -1; ++ } ++ ++ for (i = 0; i < encoded_pixels; i++) { ++ for( j = 0; j < pixel_block_size; j++, bitmap_caret++ ) { ++ tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ } ++ buffer_caret += pixel_block_size; + } +- buffer_caret += pixel_block_size; + } + } + } + Modified: branches/2016Q3/graphics/gd/pkg-plist ============================================================================== --- branches/2016Q3/graphics/gd/pkg-plist Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/gd/pkg-plist Wed Jul 20 21:30:03 2016 (r418857) @@ -28,6 +28,6 @@ include/gdpp.h lib/libgd.a lib/libgd.la lib/libgd.so -lib/libgd.so.5 -lib/libgd.so.5.0.0 +lib/libgd.so.6 +lib/libgd.so.6.0.20202 libdata/pkgconfig/gdlib.pc Modified: branches/2016Q3/graphics/gdchart/Makefile ============================================================================== --- branches/2016Q3/graphics/gdchart/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/gdchart/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= gdchart PORTVERSION= 0.11.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ Modified: branches/2016Q3/graphics/gdtclft/Makefile ============================================================================== --- branches/2016Q3/graphics/gdtclft/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/gdtclft/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= Gdtclft PORTVERSION= 2.2.5 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics tcl MASTER_SITES= http://BSDforge.com/projects/source/graphics/gdtclft/ DISTNAME= ${PORTNAME}${PORTVERSION} Modified: branches/2016Q3/graphics/grads/Makefile ============================================================================== --- branches/2016Q3/graphics/grads/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/grads/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= grads PORTVERSION= 1.9b4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ ftp://cola.gmu.edu/grads/1.9/:src \ Modified: branches/2016Q3/graphics/graphviz/Makefile ============================================================================== --- branches/2016Q3/graphics/graphviz/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/graphviz/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.38.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ Modified: branches/2016Q3/graphics/libgphoto2/Makefile ============================================================================== --- branches/2016Q3/graphics/libgphoto2/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/libgphoto2/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= libgphoto2 PORTVERSION= 2.5.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} Modified: branches/2016Q3/graphics/libpuzzle/Makefile ============================================================================== --- branches/2016Q3/graphics/libpuzzle/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/libpuzzle/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,7 +2,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ Modified: branches/2016Q3/graphics/libsixel/Makefile ============================================================================== --- branches/2016Q3/graphics/libsixel/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/libsixel/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,6 +2,7 @@ PORTNAME= libsixel PORTVERSION= 1.6.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= graphics Modified: branches/2016Q3/graphics/lua-gd/Makefile ============================================================================== --- branches/2016Q3/graphics/lua-gd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/lua-gd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= lua-gd PORTVERSION= 2.0.33r2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/ Modified: branches/2016Q3/graphics/mapserver/Makefile ============================================================================== --- branches/2016Q3/graphics/mapserver/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/mapserver/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mapserver PORTVERSION= 7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ Modified: branches/2016Q3/graphics/mscgen/Makefile ============================================================================== --- branches/2016Q3/graphics/mscgen/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/mscgen/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mscgen PORTVERSION= 0.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.mcternan.me.uk/mscgen/software/ \ http://romain.blogreen.org/distfiles/ Modified: branches/2016Q3/graphics/p5-GD/Makefile ============================================================================== --- branches/2016Q3/graphics/p5-GD/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/p5-GD/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,7 +2,7 @@ PORTNAME= GD PORTVERSION= 2.56 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: branches/2016Q3/graphics/php-libpuzzle/Makefile ============================================================================== --- branches/2016Q3/graphics/php-libpuzzle/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/php-libpuzzle/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/release/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ Modified: branches/2016Q3/graphics/php5-ffmpeg/Makefile ============================================================================== --- branches/2016Q3/graphics/php5-ffmpeg/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/php5-ffmpeg/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.6.0.20120114 +PORTREVISION= 1 DISTVERSIONPREFIX= php- CATEGORIES= graphics MASTER_SITES= LOCAL/sunpoet Modified: branches/2016Q3/graphics/phplot/Makefile ============================================================================== --- branches/2016Q3/graphics/phplot/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/phplot/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= phplot PORTVERSION= 6.2.0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF \ SF/${PORTNAME}/Manual/20130511:source2 Modified: branches/2016Q3/graphics/png2html/Makefile ============================================================================== --- branches/2016Q3/graphics/png2html/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/png2html/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= png2html PORTVERSION= 1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= http://www.engr.mun.ca/~holden/ Modified: branches/2016Q3/graphics/pstoedit/Makefile ============================================================================== --- branches/2016Q3/graphics/pstoedit/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/pstoedit/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics print MASTER_SITES= SF Modified: branches/2016Q3/graphics/py-gd/Makefile ============================================================================== --- branches/2016Q3/graphics/py-gd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/py-gd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= gd PORTVERSION= 0.59 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2016Q3/graphics/raster3d/Makefile ============================================================================== --- branches/2016Q3/graphics/raster3d/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/raster3d/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= raster3d PORTVERSION= 3.0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E} Modified: branches/2016Q3/graphics/repng2jpeg/Makefile ============================================================================== --- branches/2016Q3/graphics/repng2jpeg/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/repng2jpeg/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= repng2jpeg PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://bsdforge.com/projects/source/graphics/repng2jpeg/ Modified: branches/2016Q3/graphics/ruby-gd/Makefile ============================================================================== --- branches/2016Q3/graphics/ruby-gd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/ruby-gd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= gd PORTVERSION= 0.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics ruby MASTER_SITES= ftp://ftp.jp.vim.org/pub/distfiles/ruby/ \ http://www.mmnt.net/db/0/8/ftp.jp.vim.org/pub/distfiles/ruby/ Modified: branches/2016Q3/graphics/rubygem-gd2/Makefile ============================================================================== --- branches/2016Q3/graphics/rubygem-gd2/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/rubygem-gd2/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= gd2 PORTVERSION= 1.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics rubygems MASTER_SITES= RG Modified: branches/2016Q3/graphics/scr2png/Makefile ============================================================================== --- branches/2016Q3/graphics/scr2png/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/scr2png/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= scr2png PORTVERSION= 1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= LOCAL/nik Modified: branches/2016Q3/graphics/zimg/Makefile ============================================================================== --- branches/2016Q3/graphics/zimg/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/graphics/zimg/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= zimg PORTVERSION= 5.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q3/lang/fpc/Makefile ============================================================================== --- branches/2016Q3/lang/fpc/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/lang/fpc/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -4,7 +4,7 @@ PORTNAME= fpc DISTVERSIONPREFIX= release_ DISTVERSION= 3_0_0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang MASTER_SITES= http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \ LOCAL/acm/freepascal/:bootstrap \ Modified: branches/2016Q3/mail/dspam/Makefile ============================================================================== --- branches/2016Q3/mail/dspam/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/mail/dspam/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -7,7 +7,7 @@ PORTNAME= dspam PORTVERSION= 3.10.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q3/mail/libpst/Makefile ============================================================================== --- branches/2016Q3/mail/libpst/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/mail/libpst/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= libpst PORTVERSION= 0.6.66 +PORTREVISION= 1 CATEGORIES= mail converters MASTER_SITES= http://www.five-ten-sg.com/libpst/packages/ \ http://fossies.org/unix/privat/ \ Modified: branches/2016Q3/math/PDL/Makefile ============================================================================== --- branches/2016Q3/math/PDL/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/math/PDL/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= PDL PORTVERSION= 2.015 +PORTREVISION= 1 CATEGORIES= math perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHM Modified: branches/2016Q3/math/gnuplot/Makefile ============================================================================== --- branches/2016Q3/math/gnuplot/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/math/gnuplot/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,6 +2,7 @@ PORTNAME= gnuplot PORTVERSION= 5.0.3 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= SF Modified: branches/2016Q3/math/ploticus/Makefile ============================================================================== --- branches/2016Q3/math/ploticus/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/math/ploticus/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= ploticus PORTVERSION= 2.40 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math MASTER_SITES= SF DISTNAME= pl${PORTVERSION:S/.//}src Modified: branches/2016Q3/math/plplot/Makefile ============================================================================== --- branches/2016Q3/math/plplot/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/math/plplot/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= plplot PORTVERSION= 5.11.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source Modified: branches/2016Q3/multimedia/kissdx/Makefile ============================================================================== --- branches/2016Q3/multimedia/kissdx/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/multimedia/kissdx/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= kissdx PORTVERSION= 0.13.10a -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia net MASTER_SITES= http://paragi.dk/kiss/ Modified: branches/2016Q3/multimedia/oggvideotools/Makefile ============================================================================== --- branches/2016Q3/multimedia/oggvideotools/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/multimedia/oggvideotools/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= oggvideotools PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME} Modified: branches/2016Q3/net-mgmt/bandwidthd/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/bandwidthd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-mgmt/bandwidthd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= bandwidthd PORTVERSION= 2.0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} Modified: branches/2016Q3/net-mgmt/icinga-classicweb/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/icinga-classicweb/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-mgmt/icinga-classicweb/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= icinga-classicweb -PORTREVISION= 1 +PORTREVISION= 2 DISTNAME= icinga-${PORTVERSION} MAINTAINER= lme@FreeBSD.org Modified: branches/2016Q3/net-mgmt/mrtg/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/mrtg/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-mgmt/mrtg/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mrtg PORTVERSION= 2.17.4 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ Modified: branches/2016Q3/net-mgmt/nagios/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/nagios/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-mgmt/nagios/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 3.5.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q3/net-mgmt/nagios4/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-mgmt/nagios4/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 4.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 Modified: branches/2016Q3/net-p2p/amule-devel/Makefile ============================================================================== --- branches/2016Q3/net-p2p/amule-devel/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-p2p/amule-devel/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= amule PORTVERSION= 10933 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel Modified: branches/2016Q3/net-p2p/amule/Makefile ============================================================================== --- branches/2016Q3/net-p2p/amule/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-p2p/amule/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} Modified: branches/2016Q3/net-p2p/mldonkey/Makefile ============================================================================== --- branches/2016Q3/net-p2p/mldonkey/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net-p2p/mldonkey/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= mldonkey PORTVERSION= 3.1.5 +PORTREVISION= 1 CATEGORIES+= net-p2p MASTER_SITES= SF Modified: branches/2016Q3/net/vnstat/Makefile ============================================================================== --- branches/2016Q3/net/vnstat/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/net/vnstat/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= vnstat PORTVERSION= 1.14 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ \ http://mirror.mcx2.org/ Modified: branches/2016Q3/print/texlive-base/Makefile ============================================================================== --- branches/2016Q3/print/texlive-base/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/print/texlive-base/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base Modified: branches/2016Q3/sysutils/apcupsd/Makefile ============================================================================== --- branches/2016Q3/sysutils/apcupsd/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/sysutils/apcupsd/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= apcupsd PORTVERSION= 3.14.13 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION} Modified: branches/2016Q3/sysutils/nut/Makefile ============================================================================== --- branches/2016Q3/sysutils/nut/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/sysutils/nut/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= nut PORTVERSION= 2.7.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig Modified: branches/2016Q3/sysutils/pfstat/Makefile ============================================================================== --- branches/2016Q3/sysutils/pfstat/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/sysutils/pfstat/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= pfstat PORTVERSION= 2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils net MASTER_SITES= http://www.benzedrine.cx/ Modified: branches/2016Q3/textproc/modlogan/Makefile ============================================================================== --- branches/2016Q3/textproc/modlogan/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/textproc/modlogan/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= modlogan PORTVERSION= 0.8.13 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc www MASTER_SITES= http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/ Modified: branches/2016Q3/www/analog/Makefile ============================================================================== --- branches/2016Q3/www/analog/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/analog/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= analog PORTVERSION= 6.0 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://www.analog.cx/ \ Modified: branches/2016Q3/www/asterisk-stat/Makefile ============================================================================== --- branches/2016Q3/www/asterisk-stat/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/asterisk-stat/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= asterisk-stat PORTVERSION= 2.0.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= www MASTER_SITES= http://ftp.iij.ad.jp/pub/FreeBSD/distfiles/ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g} Modified: branches/2016Q3/www/awffull/Makefile ============================================================================== --- branches/2016Q3/www/awffull/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/awffull/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= awffull PORTVERSION= 3.10.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES?= www MASTER_SITES= http://www.stedee.id.au/files/ Modified: branches/2016Q3/www/http-analyze/Makefile ============================================================================== --- branches/2016Q3/www/http-analyze/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/http-analyze/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= http-analyze PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ftp://ftp.rent-a-guru.de/pub/ DIST_SUBDIR= ${PORTNAME} Modified: branches/2016Q3/www/mgstat/Makefile ============================================================================== --- branches/2016Q3/www/mgstat/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/mgstat/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= mgstat PORTVERSION= 0.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ Modified: branches/2016Q3/www/nginx-devel/Makefile ============================================================================== --- branches/2016Q3/www/nginx-devel/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/nginx-devel/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.11.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa Modified: branches/2016Q3/www/nginx/Makefile ============================================================================== --- branches/2016Q3/www/nginx/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/nginx/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.10.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ Modified: branches/2016Q3/www/sarg/Makefile ============================================================================== --- branches/2016Q3/www/sarg/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/sarg/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,6 +3,7 @@ PORTNAME= sarg PORTVERSION= 2.3.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q3/www/tengine/Makefile ============================================================================== --- branches/2016Q3/www/tengine/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/tengine/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -4,7 +4,7 @@ PORTNAME= tengine PORTVERSION= 2.0.3 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MAINTAINER= ports@FreeBSD.org Modified: branches/2016Q3/www/webalizer/Makefile ============================================================================== --- branches/2016Q3/www/webalizer/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/www/webalizer/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -2,7 +2,7 @@ PORTNAME= webalizer PORTVERSION= 2.23.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \ Modified: branches/2016Q3/x11-toolkits/nucleo/Makefile ============================================================================== --- branches/2016Q3/x11-toolkits/nucleo/Makefile Wed Jul 20 20:44:20 2016 (r418856) +++ branches/2016Q3/x11-toolkits/nucleo/Makefile Wed Jul 20 21:30:03 2016 (r418857) @@ -3,7 +3,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ From owner-svn-ports-branches@freebsd.org Thu Jul 21 10:03:53 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E8B8BA00E1; Thu, 21 Jul 2016 10:03:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5336A19B0; Thu, 21 Jul 2016 10:03:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LA3q4H093402; Thu, 21 Jul 2016 10:03:52 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LA3qC3093399; Thu, 21 Jul 2016 10:03:52 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201607211003.u6LA3qC3093399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 21 Jul 2016 10:03:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418869 - branches/2016Q3/misc/zoneinfo X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2016 10:03:53 -0000 Author: mat Date: Thu Jul 21 10:03:52 2016 New Revision: 418869 URL: https://svnweb.freebsd.org/changeset/ports/418869 Log: MFH: r418868 Update to 2016f. [1] While there, clean things up a bit and really do staging. PR: 211260 [1] Submitted by: devel stasyan com With hat: portmgr Sponsored by: Absolight Added: branches/2016Q3/misc/zoneinfo/pkg-install - copied unchanged from r418868, head/misc/zoneinfo/pkg-install Deleted: branches/2016Q3/misc/zoneinfo/pkg-message Modified: branches/2016Q3/misc/zoneinfo/Makefile branches/2016Q3/misc/zoneinfo/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/misc/zoneinfo/Makefile ============================================================================== --- branches/2016Q3/misc/zoneinfo/Makefile Thu Jul 21 10:00:57 2016 (r418868) +++ branches/2016Q3/misc/zoneinfo/Makefile Thu Jul 21 10:03:52 2016 (r418869) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zoneinfo -DISTVERSION= 2016d +DISTVERSION= 2016f CATEGORIES= misc MASTER_SITES= ftp://ftp.iana.org/tz/releases/ \ ftp://munnari.oz.au/pub/ @@ -11,8 +11,9 @@ DISTNAME= tzdata${DISTVERSION} MAINTAINER= edwin@mavetju.org COMMENT= Updated timezone definitions -WRKSRC= ${WRKDIR} +NO_WRKSUBDIR= yes PREFIX= /usr +NO_ARCH= yes TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica systemv @@ -51,16 +52,6 @@ do-install: ${CP} -R -p ${WRKSRC}/zoneinfo/ ${STAGEDIR}${PREFIX}/share/zoneinfo ${INSTALL_DATA} ${WRKSRC}/zone.tab ${STAGEDIR}${PREFIX}/share/zoneinfo -post-install: - @if [ -f /var/db/zoneinfo -a -O /var/db/zoneinfo -a \ - -G /var/db/zoneinfo -a \ - -f /usr/share/zoneinfo/$$(cat /var/db/zoneinfo) ]; then \ - tzsetup -r; \ - echo "/etc/localtime is updated."; \ - else \ - ${CAT} ${PKGMESSAGE}; \ - fi - test-patches: .for M in ${MISSING} make clean Modified: branches/2016Q3/misc/zoneinfo/distinfo ============================================================================== --- branches/2016Q3/misc/zoneinfo/distinfo Thu Jul 21 10:00:57 2016 (r418868) +++ branches/2016Q3/misc/zoneinfo/distinfo Thu Jul 21 10:03:52 2016 (r418869) @@ -1,2 +1,3 @@ -SHA256 (tzdata2016d.tar.gz) = d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4 -SIZE (tzdata2016d.tar.gz) = 312481 +TIMESTAMP = 1469094101 +SHA256 (tzdata2016f.tar.gz) = ed8c951008d12f1db55a11e96fc055718c6571233327d9de16a7f8475e2502b0 +SIZE (tzdata2016f.tar.gz) = 313286 Copied: branches/2016Q3/misc/zoneinfo/pkg-install (from r418868, head/misc/zoneinfo/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/misc/zoneinfo/pkg-install Thu Jul 21 10:03:52 2016 (r418869, copy of r418868, head/misc/zoneinfo/pkg-install) @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ "$2" != "PRE-INSTALL" ]; then + exit 0 +fi + +if [ -f /var/db/zoneinfo -a -O /var/db/zoneinfo -a -G /var/db/zoneinfo ]; then + if [ -f /usr/share/zoneinfo/$(cat /var/db/zoneinfo) ]; then + tzsetup -r + echo "/etc/localtime is updated." + fi +else + echo "Now run tzsetup(8) again to install the right file to /etc/localtime." +fi From owner-svn-ports-branches@freebsd.org Thu Jul 21 19:12:40 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF155BA09B4; Thu, 21 Jul 2016 19:12:40 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFD7C19FE; Thu, 21 Jul 2016 19:12:40 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LJCdui098623; Thu, 21 Jul 2016 19:12:39 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LJCdr2098622; Thu, 21 Jul 2016 19:12:39 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201607211912.u6LJCdr2098622@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 21 Jul 2016 19:12:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418891 - branches/2016Q3/x11-themes/kde-icons-sky X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2016 19:12:41 -0000 Author: antoine Date: Thu Jul 21 19:12:39 2016 New Revision: 418891 URL: https://svnweb.freebsd.org/changeset/ports/418891 Log: MFH: r418714 - Mark BROKEN: does not fetch Modified: branches/2016Q3/x11-themes/kde-icons-sky/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/x11-themes/kde-icons-sky/Makefile ============================================================================== --- branches/2016Q3/x11-themes/kde-icons-sky/Makefile Thu Jul 21 18:52:18 2016 (r418890) +++ branches/2016Q3/x11-themes/kde-icons-sky/Makefile Thu Jul 21 19:12:39 2016 (r418891) @@ -9,6 +9,8 @@ EXTRACT_SUFX= .tgz COMMENT= KDE SKY iconset +BROKEN= does not fetch (403 forbidden) + WRKSRC= ${WRKDIR}/${PORTNAME} .include "${.CURDIR}/../kde-icons-noia/Makefile.icons" From owner-svn-ports-branches@freebsd.org Thu Jul 21 19:13:11 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA9B2BA09F9; Thu, 21 Jul 2016 19:13:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9B991AE4; Thu, 21 Jul 2016 19:13:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LJDAht098755; Thu, 21 Jul 2016 19:13:10 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LJDAfq098754; Thu, 21 Jul 2016 19:13:10 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201607211913.u6LJDAfq098754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 21 Jul 2016 19:13:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418892 - branches/2016Q3/x11-themes/kde-icons-cezanne X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2016 19:13:12 -0000 Author: antoine Date: Thu Jul 21 19:13:10 2016 New Revision: 418892 URL: https://svnweb.freebsd.org/changeset/ports/418892 Log: MFH: r418713 - Mark BROKEN: does not fetch Modified: branches/2016Q3/x11-themes/kde-icons-cezanne/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/x11-themes/kde-icons-cezanne/Makefile ============================================================================== --- branches/2016Q3/x11-themes/kde-icons-cezanne/Makefile Thu Jul 21 19:12:39 2016 (r418891) +++ branches/2016Q3/x11-themes/kde-icons-cezanne/Makefile Thu Jul 21 19:13:10 2016 (r418892) @@ -10,6 +10,8 @@ COMMENT= KDE Cezanne iconset USES= tar:bzip2 +BROKEN= does not fetch (connect timeout) + WRKSRC= ${WRKDIR}/Cezanne PORT_SHAREDIR?= "${PORTNAME}-${PORTVERSION}" From owner-svn-ports-branches@freebsd.org Thu Jul 21 19:21:17 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF7D4BA0E53; Thu, 21 Jul 2016 19:21:17 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D7BA12B0; Thu, 21 Jul 2016 19:21:17 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LJLGqT099266; Thu, 21 Jul 2016 19:21:16 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LJLGqW099262; Thu, 21 Jul 2016 19:21:16 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201607211921.u6LJLGqW099262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 21 Jul 2016 19:21:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418893 - in branches/2016Q3/editors/openoffice-4: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2016 19:21:17 -0000 Author: truckman Date: Thu Jul 21 19:21:16 2016 New Revision: 418893 URL: https://svnweb.freebsd.org/changeset/ports/418893 Log: MFH 2016Q3 Fix CVE-2016-1513 - Memory Corruption Vulnerability (Impress Presentations). Regenerate distinfo to add TIMESTAMP. Approved by: ports-secteam (blanket) Obtained from: Security: 72f71e26-4f69-11e6-ac37-ac9e174be3af Added: branches/2016Q3/editors/openoffice-4/files/patch-CVE-2016-1513 - copied unchanged from r418885, head/editors/openoffice-4/files/patch-CVE-2016-1513 Modified: branches/2016Q3/editors/openoffice-4/Makefile branches/2016Q3/editors/openoffice-4/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/editors/openoffice-4/Makefile ============================================================================== --- branches/2016Q3/editors/openoffice-4/Makefile Thu Jul 21 19:13:10 2016 (r418892) +++ branches/2016Q3/editors/openoffice-4/Makefile Thu Jul 21 19:21:16 2016 (r418893) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ Modified: branches/2016Q3/editors/openoffice-4/distinfo ============================================================================== --- branches/2016Q3/editors/openoffice-4/distinfo Thu Jul 21 19:13:10 2016 (r418892) +++ branches/2016Q3/editors/openoffice-4/distinfo Thu Jul 21 19:21:16 2016 (r418893) @@ -1,6 +1,7 @@ +TIMESTAMP = 1469002349 SHA256 (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 2e06774424eb564559f9e6d63ff79aa00522b210067717c5a8cfb54b3b7f1812 SIZE (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 219041975 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa -SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa +SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 Copied: branches/2016Q3/editors/openoffice-4/files/patch-CVE-2016-1513 (from r418885, head/editors/openoffice-4/files/patch-CVE-2016-1513) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/editors/openoffice-4/files/patch-CVE-2016-1513 Thu Jul 21 19:21:16 2016 (r418893, copy of r418885, head/editors/openoffice-4/files/patch-CVE-2016-1513) @@ -0,0 +1,26 @@ +--- tools/source/generic/poly2.cxx.orig 2014-02-25 08:20:50 UTC ++++ tools/source/generic/poly2.cxx +@@ -196,8 +196,9 @@ void PolyPolygon::Insert( const Polygon& + + void PolyPolygon::Remove( sal_uInt16 nPos ) + { +- DBG_CHKTHIS( PolyPolygon, NULL ); +- DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" ); ++ DBG_CHKTHIS( PolyPolygon, NULL ); ++ DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" ); ++ if ( nPos >= Count() ) return; // not removable + + if ( mpImplPolyPolygon->mnRefCount > 1 ) + { +@@ -216,8 +217,9 @@ void PolyPolygon::Remove( sal_uInt16 nPo + + void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos ) + { +- DBG_CHKTHIS( PolyPolygon, NULL ); +- DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" ); ++ DBG_CHKTHIS( PolyPolygon, NULL ); ++ DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" ); ++ if ( nPos >= Count() ) return; // not replaceable + + if ( mpImplPolyPolygon->mnRefCount > 1 ) + { From owner-svn-ports-branches@freebsd.org Sat Jul 23 13:44:53 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99E69BA28BF; Sat, 23 Jul 2016 13:44:53 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5119F1860; Sat, 23 Jul 2016 13:44:53 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6NDiqZr056770; Sat, 23 Jul 2016 13:44:52 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6NDiqt0056769; Sat, 23 Jul 2016 13:44:52 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201607231344.u6NDiqt0056769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 23 Jul 2016 13:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418966 - branches/2016Q3/devel/upp/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jul 2016 13:44:53 -0000 Author: riggs Date: Sat Jul 23 13:44:52 2016 New Revision: 418966 URL: https://svnweb.freebsd.org/changeset/ports/418966 Log: MFH: r418965 Fix build with libc++ 3.8.0 PR: 209549 Submitted by: dim Approved by: ports-secteam (build fix blanket), maintainer timeout Added: branches/2016Q3/devel/upp/files/ - copied from r418965, head/devel/upp/files/ Modified: Directory Properties: branches/2016Q3/ (props changed)