From owner-svn-ports-branches@freebsd.org Sun Nov 15 00:18:00 2015 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 28970A2E2D8; Sun, 15 Nov 2015 00:18:00 +0000 (UTC) (envelope-from kwm@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 004421E0F; Sun, 15 Nov 2015 00:17:59 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAF0Hx5h008272; Sun, 15 Nov 2015 00:17:59 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAF0Hwe1008269; Sun, 15 Nov 2015 00:17:58 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201511150017.tAF0Hwe1008269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 15 Nov 2015 00:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401618 - branches/2015Q4/www/linux-c6-flashplugin11 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.20 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, 15 Nov 2015 00:18:00 -0000 Author: kwm Date: Sun Nov 15 00:17:58 2015 New Revision: 401618 URL: https://svnweb.freebsd.org/changeset/ports/401618 Log: MFH: r401614 Update flash to 11.2r202.548. Security: 547fbd98-8b1f-11e5-b48b-bcaec565249c Approved by: portmgr (erwin@) Modified: branches/2015Q4/www/linux-c6-flashplugin11/Makefile branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/Makefile Sat Nov 14 23:20:56 2015 (r401617) +++ branches/2015Q4/www/linux-c6-flashplugin11/Makefile Sun Nov 15 00:17:58 2015 (r401618) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.540 +PORTVERSION= 11.2r202.548 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 Sat Nov 14 23:20:56 2015 (r401617) +++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 Sun Nov 15 00:17:58 2015 (r401618) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9 -SIZE (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 6954096 -SHA256 (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294 +SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598 +SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Sat Nov 14 23:20:56 2015 (r401617) +++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Sun Nov 15 00:17:58 2015 (r401618) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9 -SIZE (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 6954096 -SHA256 (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294 +SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598 +SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 From owner-svn-ports-branches@freebsd.org Sun Nov 15 11:43:13 2015 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 ECDC6A2FBA4; Sun, 15 Nov 2015 11:43:13 +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 9C4751328; Sun, 15 Nov 2015 11:43:13 +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 tAFBhCUh026160; Sun, 15 Nov 2015 11:43:12 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFBhCXR026157; Sun, 15 Nov 2015 11:43:12 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201511151143.tAFBhCXR026157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 15 Nov 2015 11:43:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401694 - branches/2015Q4/graphics/png 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.20 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, 15 Nov 2015 11:43:14 -0000 Author: antoine Date: Sun Nov 15 11:43:12 2015 New Revision: 401694 URL: https://svnweb.freebsd.org/changeset/ports/401694 Log: MFH: r401693 Update to 1.6.19 PR: 204551 Security: CVE-2015-8126 Modified: branches/2015Q4/graphics/png/Makefile branches/2015Q4/graphics/png/distinfo branches/2015Q4/graphics/png/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/png/Makefile ============================================================================== --- branches/2015Q4/graphics/png/Makefile Sun Nov 15 11:41:02 2015 (r401693) +++ branches/2015Q4/graphics/png/Makefile Sun Nov 15 11:43:12 2015 (r401694) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= png -PORTVERSION= 1.6.18 +PORTVERSION= 1.6.19 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} \ + ftp://ftp.simplesystems.org/pub/lib${PORTNAME}/${PORTNAME}/src/lib${PORTNAME}16/ PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/ DISTNAME= lib${PORTNAME}-${PORTVERSION} Modified: branches/2015Q4/graphics/png/distinfo ============================================================================== --- branches/2015Q4/graphics/png/distinfo Sun Nov 15 11:41:02 2015 (r401693) +++ branches/2015Q4/graphics/png/distinfo Sun Nov 15 11:43:12 2015 (r401694) @@ -1,4 +1,4 @@ -SHA256 (libpng-1.6.18.tar.xz) = 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963 -SIZE (libpng-1.6.18.tar.xz) = 932324 -SHA256 (libpng-1.6.18-apng.patch.gz) = 1d595b3b33c09529dddf869ca69f386528dfe1b991d2679377082e2acbca7009 -SIZE (libpng-1.6.18-apng.patch.gz) = 9940 +SHA256 (libpng-1.6.19.tar.xz) = 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 +SIZE (libpng-1.6.19.tar.xz) = 941280 +SHA256 (libpng-1.6.19-apng.patch.gz) = 5ec713a51c35c25d5e53dd61270a6fd5313b26872b382f0fbaed41a0743768a2 +SIZE (libpng-1.6.19-apng.patch.gz) = 10330 Modified: branches/2015Q4/graphics/png/pkg-plist ============================================================================== --- branches/2015Q4/graphics/png/pkg-plist Sun Nov 15 11:41:02 2015 (r401693) +++ branches/2015Q4/graphics/png/pkg-plist Sun Nov 15 11:43:12 2015 (r401694) @@ -13,7 +13,7 @@ lib/libpng.so lib/libpng16.a lib/libpng16.so lib/libpng16.so.16 -lib/libpng16.so.16.18.0 +lib/libpng16.so.16.19.0 libdata/pkgconfig/libpng.pc libdata/pkgconfig/libpng16.pc man/man3/libpng.3.gz From owner-svn-ports-branches@freebsd.org Sun Nov 15 11:46:47 2015 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 05619A2FC98; Sun, 15 Nov 2015 11:46:47 +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 C018D17CF; Sun, 15 Nov 2015 11:46:46 +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 tAFBkjZK026672; Sun, 15 Nov 2015 11:46:45 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFBkj09026671; Sun, 15 Nov 2015 11:46:45 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511151146.tAFBkj09026671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Nov 2015 11:46:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401697 - branches/2015Q4/print/a2pdf 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.20 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, 15 Nov 2015 11:46:47 -0000 Author: riggs Date: Sun Nov 15 11:46:45 2015 New Revision: 401697 URL: https://svnweb.freebsd.org/changeset/ports/401697 Log: MFH: r401692 Fix runtime dependency: a2pdf requires lang/p5-Switch PR: 204137 Submitted by: freebsd@oldach.net Approved by: ports-secteam (fix blanket) Modified: branches/2015Q4/print/a2pdf/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/print/a2pdf/Makefile ============================================================================== --- branches/2015Q4/print/a2pdf/Makefile Sun Nov 15 11:44:50 2015 (r401696) +++ branches/2015Q4/print/a2pdf/Makefile Sun Nov 15 11:46:45 2015 (r401697) @@ -14,6 +14,7 @@ COMMENT= Text to PDF converter LICENSE= ART20 BUILD_DEPENDS= p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2 \ + p5-Switch>=0:lang/p5-Switch \ perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \ p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \ p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type From owner-svn-ports-branches@freebsd.org Sun Nov 15 12:16:53 2015 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 F37FCA2E999; Sun, 15 Nov 2015 12:16:52 +0000 (UTC) (envelope-from wg@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 C14FB1A9A; Sun, 15 Nov 2015 12:16:52 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFCGpQM035765; Sun, 15 Nov 2015 12:16:51 GMT (envelope-from wg@FreeBSD.org) Received: (from wg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFCGpiN035763; Sun, 15 Nov 2015 12:16:51 GMT (envelope-from wg@FreeBSD.org) Message-Id: <201511151216.tAFCGpiN035763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wg set sender to wg@FreeBSD.org using -f From: William Grzybowski Date: Sun, 15 Nov 2015 12:16:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401700 - branches/2015Q4/devel/pysvn 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.20 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, 15 Nov 2015 12:16:53 -0000 Author: wg Date: Sun Nov 15 12:16:51 2015 New Revision: 401700 URL: https://svnweb.freebsd.org/changeset/ports/401700 Log: MFH: r401690 devel/pysvn: update to 1.8.0 - Unbreak build PR: 204132 Submitted by: Matthias Petermann Approved by: portmgr Modified: branches/2015Q4/devel/pysvn/Makefile branches/2015Q4/devel/pysvn/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/pysvn/Makefile ============================================================================== --- branches/2015Q4/devel/pysvn/Makefile Sun Nov 15 12:11:00 2015 (r401699) +++ branches/2015Q4/devel/pysvn/Makefile Sun Nov 15 12:16:51 2015 (r401700) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pysvn -PORTVERSION= 1.7.8 -PORTREVISION= 1 +PORTVERSION= 1.8.0 CATEGORIES= devel MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/ @@ -43,5 +42,6 @@ do-install: ${WRKSRC}/${PORTNAME}/*.py \ ${WRKSRC}/${PORTNAME}/*.so \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so .include Modified: branches/2015Q4/devel/pysvn/distinfo ============================================================================== --- branches/2015Q4/devel/pysvn/distinfo Sun Nov 15 12:11:00 2015 (r401699) +++ branches/2015Q4/devel/pysvn/distinfo Sun Nov 15 12:16:51 2015 (r401700) @@ -1,2 +1,2 @@ -SHA256 (pysvn-1.7.8.tar.gz) = 60936e30e73f8909034d8b51ee2aabbdd8dec04df480b6d271c12f45815367e2 -SIZE (pysvn-1.7.8.tar.gz) = 347114 +SHA256 (pysvn-1.8.0.tar.gz) = 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b +SIZE (pysvn-1.8.0.tar.gz) = 366583 From owner-svn-ports-branches@freebsd.org Sun Nov 15 12:42:18 2015 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 4C5A1A273EC; Sun, 15 Nov 2015 12:42:18 +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 112691C80; Sun, 15 Nov 2015 12:42:17 +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 tAFCgHPj044559; Sun, 15 Nov 2015 12:42:17 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFCgHBn044558; Sun, 15 Nov 2015 12:42:17 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511151242.tAFCgHBn044558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Nov 2015 12:42:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401701 - branches/2015Q4/print/a2pdf 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.20 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, 15 Nov 2015 12:42:18 -0000 Author: riggs Date: Sun Nov 15 12:42:16 2015 New Revision: 401701 URL: https://svnweb.freebsd.org/changeset/ports/401701 Log: MFH: r401699 Bump PORTREVISION after updating runtime dependencies in previous commit PR: 204137 Submitted by: freebsd@oldach.net Approved by: ports-secteam (fix blanket) Modified: branches/2015Q4/print/a2pdf/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/print/a2pdf/Makefile ============================================================================== --- branches/2015Q4/print/a2pdf/Makefile Sun Nov 15 12:16:51 2015 (r401700) +++ branches/2015Q4/print/a2pdf/Makefile Sun Nov 15 12:42:16 2015 (r401701) @@ -3,7 +3,7 @@ PORTNAME= a2pdf PORTVERSION= 1.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JONALLEN From owner-svn-ports-branches@freebsd.org Sun Nov 15 21:14:58 2015 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 6A483A2F0FB; Sun, 15 Nov 2015 21:14:58 +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 3215C1F5A; Sun, 15 Nov 2015 21:14:58 +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 tAFLEv5G003968; Sun, 15 Nov 2015 21:14:57 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLEvmD003967; Sun, 15 Nov 2015 21:14:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511152114.tAFLEvmD003967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Nov 2015 21:14:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401732 - branches/2014Q4/math/ess 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.20 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, 15 Nov 2015 21:14:58 -0000 Author: riggs Date: Sun Nov 15 21:14:57 2015 New Revision: 401732 URL: https://svnweb.freebsd.org/changeset/ports/401732 Log: MFH: r401586 Reset maintainership While on it: - Pet portlint: EXTRACT_SUFX -> USES PR: 204507 Submitted by: cjr@cruwe.de (maintainer) Approved by: ports-secteam (feld) Modified: branches/2014Q4/math/ess/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/math/ess/Makefile ============================================================================== --- branches/2014Q4/math/ess/Makefile Sun Nov 15 21:04:27 2015 (r401731) +++ branches/2014Q4/math/ess/Makefile Sun Nov 15 21:14:57 2015 (r401732) @@ -6,9 +6,8 @@ DISTVERSION= 13.09-1 PORTREVISION= 5 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ -EXTRACT_SUFX= .tgz -MAINTAINER= cjr@cruwe.de +MAINTAINER= ports@freebsd.org COMMENT= R support for Emacsen LICENSE= GPLv2 @@ -16,7 +15,7 @@ LICENSE= GPLv2 RUN_DEPENDS= R:${PORTSDIR}/math/R USE_EMACS= yes -USES= gmake +USES= gmake tar:tgz OPTIONS_DEFINE= DOCS From owner-svn-ports-branches@freebsd.org Sun Nov 15 21:18:55 2015 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 CA0B5A2F1D8; Sun, 15 Nov 2015 21:18:55 +0000 (UTC) (envelope-from tijl@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 85BF211FC; Sun, 15 Nov 2015 21:18:55 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLIsSi004553; Sun, 15 Nov 2015 21:18:54 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLIr3u004546; Sun, 15 Nov 2015 21:18:53 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201511152118.tAFLIr3u004546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 15 Nov 2015 21:18:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401733 - in branches/2015Q4/security: mbedtls polarssl polarssl13 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.20 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, 15 Nov 2015 21:18:56 -0000 Author: tijl Date: Sun Nov 15 21:18:53 2015 New Revision: 401733 URL: https://svnweb.freebsd.org/changeset/ports/401733 Log: MFH: r401112 - Update polarssl/mbedtls ports - Mark polarssl 1.2.x deprecated - Fix sparc64 build by removing -fpic (leaving only -fPIC) Approved by: ports-secteam (feld) Security: https://tls.mbed.org/tech-updates/releases/mbedtls-2.2.0-2.1.3-1.3.15-and-polarssl.1.2.18-released Modified: branches/2015Q4/security/mbedtls/Makefile branches/2015Q4/security/mbedtls/distinfo branches/2015Q4/security/mbedtls/pkg-plist branches/2015Q4/security/polarssl/Makefile branches/2015Q4/security/polarssl/distinfo branches/2015Q4/security/polarssl13/Makefile branches/2015Q4/security/polarssl13/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/mbedtls/Makefile ============================================================================== --- branches/2015Q4/security/mbedtls/Makefile Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/mbedtls/Makefile Sun Nov 15 21:18:53 2015 (r401733) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mbedtls -PORTVERSION= 2.1.2 +PORTVERSION= 2.2.0 DISTVERSIONSUFFIX= -apache CATEGORIES= security devel MASTER_SITES= https://tls.mbed.org/download/ @@ -26,6 +26,7 @@ post-patch: -e 's/PREFIX/NAMEPREFIX/' \ -e 's/$$(DESTDIR)/&$$(PREFIX)/' \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile post-install: ${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \ Modified: branches/2015Q4/security/mbedtls/distinfo ============================================================================== --- branches/2015Q4/security/mbedtls/distinfo Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/mbedtls/distinfo Sun Nov 15 21:18:53 2015 (r401733) @@ -1,2 +1,2 @@ -SHA256 (mbedtls-2.1.2-apache.tgz) = ce57cb9085f976ffde945af7e8cec058a66ad181a96fd228fbcbc485213a7c58 -SIZE (mbedtls-2.1.2-apache.tgz) = 1830208 +SHA256 (mbedtls-2.2.0-apache.tgz) = 3c6d3487ab056da94450cf907afc84f026aff7880182baffe137c98e3d00fb55 +SIZE (mbedtls-2.2.0-apache.tgz) = 1860353 Modified: branches/2015Q4/security/mbedtls/pkg-plist ============================================================================== --- branches/2015Q4/security/mbedtls/pkg-plist Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/mbedtls/pkg-plist Sun Nov 15 21:18:53 2015 (r401733) @@ -10,6 +10,7 @@ bin/mbedtls_dh_genprime bin/mbedtls_dh_server bin/mbedtls_dtls_client bin/mbedtls_dtls_server +bin/mbedtls_ecdh_curve25519 bin/mbedtls_ecdsa bin/mbedtls_gen_entropy bin/mbedtls_gen_key @@ -67,6 +68,7 @@ include/mbedtls/des.h include/mbedtls/dhm.h include/mbedtls/ecdh.h include/mbedtls/ecdsa.h +include/mbedtls/ecjpake.h include/mbedtls/ecp.h include/mbedtls/entropy.h include/mbedtls/entropy_poll.h Modified: branches/2015Q4/security/polarssl/Makefile ============================================================================== --- branches/2015Q4/security/polarssl/Makefile Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/polarssl/Makefile Sun Nov 15 21:18:53 2015 (r401733) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= polarssl -PORTVERSION= 1.2.17 +PORTVERSION= 1.2.18 DISTVERSIONSUFFIX= -gpl CATEGORIES= security devel MASTER_SITES= https://polarssl.org/download/ @@ -11,6 +11,9 @@ COMMENT= Open Source embedded SSL/TLS cr LICENSE= GPLv2 +DEPRECATED= Upstream is ending support for 1.2.x +EXPIRATION_DATE=2015-12-31 + ALL_TARGET= no_test USES= cpe gmake tar:tgz Modified: branches/2015Q4/security/polarssl/distinfo ============================================================================== --- branches/2015Q4/security/polarssl/distinfo Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/polarssl/distinfo Sun Nov 15 21:18:53 2015 (r401733) @@ -1,2 +1,2 @@ -SHA256 (polarssl-1.2.17-gpl.tgz) = 9301d4ebec3eb45bc9f28f2d79bfdb0c3dd351c386aa6cc66643e1b2be274d52 -SIZE (polarssl-1.2.17-gpl.tgz) = 1025523 +SHA256 (polarssl-1.2.18-gpl.tgz) = 63c4ed4d9f6a241088e2287958f265403f874248d6a98b98f27cd3aa2f90f030 +SIZE (polarssl-1.2.18-gpl.tgz) = 1039402 Modified: branches/2015Q4/security/polarssl13/Makefile ============================================================================== --- branches/2015Q4/security/polarssl13/Makefile Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/polarssl13/Makefile Sun Nov 15 21:18:53 2015 (r401733) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= polarssl -PORTVERSION= 1.3.14 +PORTVERSION= 1.3.15 DISTVERSIONSUFFIX= -gpl CATEGORIES= security devel MASTER_SITES= https://polarssl.org/download/ @@ -14,8 +14,6 @@ COMMENT= SSL/TLS and cryptography librar LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_sparc64= fails to compile: relocation error - ALL_TARGET= no_test MAKE_ENV= SHARED=1 USES= cpe gmake tar:tgz @@ -30,6 +28,7 @@ post-patch: -e 's/PREFIX/NAMEPREFIX/' \ -e 's/$$(DESTDIR)/&$$(PREFIX)/' \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile post-install: ${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \ Modified: branches/2015Q4/security/polarssl13/distinfo ============================================================================== --- branches/2015Q4/security/polarssl13/distinfo Sun Nov 15 21:14:57 2015 (r401732) +++ branches/2015Q4/security/polarssl13/distinfo Sun Nov 15 21:18:53 2015 (r401733) @@ -1,2 +1,2 @@ -SHA256 (mbedtls-1.3.14-gpl.tgz) = be76915bc406b4c4109629624baa5bf610a805d9976404e4086d44e5e6c86ff8 -SIZE (mbedtls-1.3.14-gpl.tgz) = 1744343 +SHA256 (mbedtls-1.3.15-gpl.tgz) = ed0be9905ba08f614772ac2b6dcce0c65cf3fb235cab7e6894838efc19518da3 +SIZE (mbedtls-1.3.15-gpl.tgz) = 1758935 From owner-svn-ports-branches@freebsd.org Sun Nov 15 22:41:10 2015 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 9A72BA3058F; Sun, 15 Nov 2015 22:41:10 +0000 (UTC) (envelope-from junovitch@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 3AEC91E32; Sun, 15 Nov 2015 22:41:10 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFMf9HQ033155; Sun, 15 Nov 2015 22:41:09 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFMf9A8033153; Sun, 15 Nov 2015 22:41:09 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201511152241.tAFMf9A8033153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 15 Nov 2015 22:41:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401736 - branches/2015Q4/www/p5-HTML-Scrubber 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.20 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, 15 Nov 2015 22:41:10 -0000 Author: junovitch Date: Sun Nov 15 22:41:08 2015 New Revision: 401736 URL: https://svnweb.freebsd.org/changeset/ports/401736 Log: MFH: r399037 - Update to 0.15 - Add NO_ARCH Changes: http://search.cpan.org/dist/HTML-Scrubber/Changes Security: CVE-2015-5667 Security: https://vuxml.FreeBSD.org/freebsd/2f7f4db2-8819-11e5-ab94-002590263bf5.html Approved by: ports-secteam (feld) Modified: branches/2015Q4/www/p5-HTML-Scrubber/Makefile branches/2015Q4/www/p5-HTML-Scrubber/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/p5-HTML-Scrubber/Makefile ============================================================================== --- branches/2015Q4/www/p5-HTML-Scrubber/Makefile Sun Nov 15 22:17:35 2015 (r401735) +++ branches/2015Q4/www/p5-HTML-Scrubber/Makefile Sun Nov 15 22:41:08 2015 (r401736) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= HTML-Scrubber -PORTVERSION= 0.14 +PORTVERSION= 0.15 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,6 +20,7 @@ TEST_DEPENDS= p5-Test-CPAN-Meta>=0:${POR p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \ p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs +NO_ARCH= yes USES= perl5 USE_PERL5= modbuild Modified: branches/2015Q4/www/p5-HTML-Scrubber/distinfo ============================================================================== --- branches/2015Q4/www/p5-HTML-Scrubber/distinfo Sun Nov 15 22:17:35 2015 (r401735) +++ branches/2015Q4/www/p5-HTML-Scrubber/distinfo Sun Nov 15 22:41:08 2015 (r401736) @@ -1,2 +1,2 @@ -SHA256 (HTML-Scrubber-0.14.tar.gz) = 82596a3a1ead946809ff2e00886c5dd3b4c113beb0625230c3077118700bb201 -SIZE (HTML-Scrubber-0.14.tar.gz) = 33672 +SHA256 (HTML-Scrubber-0.15.tar.gz) = 7133e317e5963168a445836d144f35c69fc9c4edad0025fb17c46729ea432ed4 +SIZE (HTML-Scrubber-0.15.tar.gz) = 34250 From owner-svn-ports-branches@freebsd.org Mon Nov 16 00:54:48 2015 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 4DE4FA30E71; Mon, 16 Nov 2015 00:54:48 +0000 (UTC) (envelope-from junovitch@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 E56A918E0; Mon, 16 Nov 2015 00:54:47 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAG0slm3071679; Mon, 16 Nov 2015 00:54:47 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAG0sj78071664; Mon, 16 Nov 2015 00:54:45 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201511160054.tAG0sj78071664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 16 Nov 2015 00:54:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401740 - in branches/2015Q4: emulators/xen emulators/xen-kernel emulators/xen-kernel/files sysutils/xen-tools sysutils/xen-tools/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.20 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, 16 Nov 2015 00:54:48 -0000 Author: junovitch Date: Mon Nov 16 00:54:45 2015 New Revision: 401740 URL: https://svnweb.freebsd.org/changeset/ports/401740 Log: MFH: r398918, r400020, r400566, r401104, 401564 xen: update to 4.5.2, apply XSAs, pass on maintainership Update xen-kernel to 4.5.1 and add patches to allow live migration, save and restore. Remove qemu-traditional patches (FreeBSD doesn't support qemu-traditional) and add XSA-142. Apply the following XSAs: 148, 149, 150, 151, 152 and 153. More information about the content of each XSA can be found at: http://xenbits.xen.org/xsa/ Update to 4.5.2 and add XSA-156. Sponsored by: Citrix Systems R&D Security: CVE-2015-5307 Security: CVE-2015-7311 Security: CVE-2015-7835 Security: CVE-2015-7969 Security: CVE-2015-7970 Security: CVE-2015-7971 Security: CVE-2015-7972 Security: CVE-2015-8104 Security: https://vuxml.FreeBSD.org/freebsd/301b04d7-881c-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/3d9f6260-881d-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/83350009-881e-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/c0e76d33-8821-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/e3792855-881f-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/e4848ca4-8820-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/fc1f8795-881d-11e5-ab94-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/2cabfbab-8bfb-11e5-bd18-002590263bf5.html Approved by: ports-secteam (feld) Added: branches/2015Q4/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch branches/2015Q4/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch branches/2015Q4/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch branches/2015Q4/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch branches/2015Q4/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch branches/2015Q4/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch branches/2015Q4/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch - copied unchanged from r398918, head/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch branches/2015Q4/emulators/xen-kernel/files/xsa156-4.5.patch - copied unchanged from r401564, head/emulators/xen-kernel/files/xsa156-4.5.patch Deleted: branches/2015Q4/emulators/xen-kernel/files/0001-libelf-fix-elf_parse_bsdsyms-call.patch branches/2015Q4/emulators/xen-kernel/files/0001-x86-pvh-disable-posted-interrupts.patch branches/2015Q4/emulators/xen-kernel/files/iommu_share_p2m_table.patch branches/2015Q4/emulators/xen-kernel/files/xsa117.patch branches/2015Q4/emulators/xen-kernel/files/xsa118-4.5-unstable-1.patch branches/2015Q4/emulators/xen-kernel/files/xsa118-4.5-unstable-2.patch branches/2015Q4/emulators/xen-kernel/files/xsa121.patch branches/2015Q4/emulators/xen-kernel/files/xsa122.patch branches/2015Q4/emulators/xen-kernel/files/xsa123.patch branches/2015Q4/emulators/xen-kernel/files/xsa125.patch branches/2015Q4/emulators/xen-kernel/files/xsa127-4.x.patch branches/2015Q4/emulators/xen-kernel/files/xsa132.patch branches/2015Q4/emulators/xen-kernel/files/xsa134.patch branches/2015Q4/emulators/xen-kernel/files/xsa136.patch branches/2015Q4/sysutils/xen-tools/files/xsa135-qemut-1.patch branches/2015Q4/sysutils/xen-tools/files/xsa135-qemut-2.patch branches/2015Q4/sysutils/xen-tools/files/xsa137.patch branches/2015Q4/sysutils/xen-tools/files/xsa138-qemut-1.patch branches/2015Q4/sysutils/xen-tools/files/xsa138-qemut-2.patch branches/2015Q4/sysutils/xen-tools/files/xsa138-qemuu-1.patch branches/2015Q4/sysutils/xen-tools/files/xsa138-qemuu-2.patch branches/2015Q4/sysutils/xen-tools/files/xsa138-qemuu-3.patch branches/2015Q4/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch branches/2015Q4/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch Modified: branches/2015Q4/emulators/xen-kernel/Makefile branches/2015Q4/emulators/xen-kernel/distinfo branches/2015Q4/emulators/xen/Makefile branches/2015Q4/sysutils/xen-tools/Makefile branches/2015Q4/sysutils/xen-tools/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/emulators/xen-kernel/Makefile ============================================================================== --- branches/2015Q4/emulators/xen-kernel/Makefile Mon Nov 16 00:51:00 2015 (r401739) +++ branches/2015Q4/emulators/xen-kernel/Makefile Mon Nov 16 00:54:45 2015 (r401740) @@ -2,12 +2,11 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel -PORTVERSION= 4.5.0 -PORTREVISION= 5 +PORTVERSION= 4.5.2 CATEGORIES= emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= royger@FreeBSD.org COMMENT= Hypervisor using a microkernel design LICENSE= GPLv2 @@ -24,20 +23,14 @@ PLIST_FILES= /boot/xen \ ALL_TARGET= build STRIP= # WRKSRC_SUBDIR= xen -EXTRA_PATCHES= ${FILESDIR}/iommu_share_p2m_table.patch:-p2 \ - ${FILESDIR}/0001-x86-pvh-disable-posted-interrupts.patch:-p2 \ - ${FILESDIR}/xsa117.patch:-p2 \ - ${FILESDIR}/xsa118-4.5-unstable-1.patch:-p2 \ - ${FILESDIR}/xsa118-4.5-unstable-2.patch:-p2 \ - ${FILESDIR}/xsa121.patch:-p2 \ - ${FILESDIR}/xsa122.patch:-p2 \ - ${FILESDIR}/xsa123.patch:-p2 \ - ${FILESDIR}/xsa125.patch:-p2 \ - ${FILESDIR}/xsa127-4.x.patch:-p2 \ - ${FILESDIR}/xsa132.patch:-p2 \ - ${FILESDIR}/xsa134.patch:-p2 \ - ${FILESDIR}/xsa136.patch:-p2 \ - ${FILESDIR}/0001-libelf-fix-elf_parse_bsdsyms-call.patch:-p2 +EXTRA_PATCHES= ${FILESDIR}/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch:-p2 \ + ${FILESDIR}/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch:-p2 \ + ${FILESDIR}/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch:-p2 \ + ${FILESDIR}/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch:-p2 \ + ${FILESDIR}/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p2 \ + ${FILESDIR}/0006-xen-pvh-enable-mmu_update-hypercall.patch:-p2 \ + ${FILESDIR}/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch:-p2 \ + ${FILESDIR}/xsa156-4.5.patch:-p2 .include Modified: branches/2015Q4/emulators/xen-kernel/distinfo ============================================================================== --- branches/2015Q4/emulators/xen-kernel/distinfo Mon Nov 16 00:51:00 2015 (r401739) +++ branches/2015Q4/emulators/xen-kernel/distinfo Mon Nov 16 00:54:45 2015 (r401740) @@ -1,2 +1,2 @@ -SHA256 (xen-4.5.0.tar.gz) = 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b -SIZE (xen-4.5.0.tar.gz) = 18404933 +SHA256 (xen-4.5.2.tar.gz) = 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 +SIZE (xen-4.5.2.tar.gz) = 18416220 Copied: branches/2015Q4/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch (from r398918, head/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch) @@ -0,0 +1,141 @@ +From 411801087603a1a070de7abbfa4373afe91ca3f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 9 Oct 2015 12:57:31 +0200 +Subject: [PATCH 1/8] introduce a helper to allocate non-contiguous memory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The allocator uses independent calls to alloc_domheap_pages in order to get +the desired amount of memory and then maps all the independent physical +addresses into a contiguous virtual address space. + +Signed-off-by: Roger Pau Monné +Tested-by: Julien Grall (ARM) +Reviewed-by: Tim Deegan +--- + xen/common/vmap.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ + xen/include/asm-arm/mm.h | 2 ++ + xen/include/asm-x86/page.h | 2 ++ + xen/include/xen/vmap.h | 3 +++ + 4 files changed, 74 insertions(+) + +diff --git a/xen/common/vmap.c b/xen/common/vmap.c +index 783cea3..b6827b5 100644 +--- a/xen/common/vmap.c ++++ b/xen/common/vmap.c +@@ -215,4 +215,71 @@ void vunmap(const void *va) + #endif + vm_free(va); + } ++ ++void *vmalloc(size_t size) ++{ ++ unsigned long *mfn; ++ size_t pages, i; ++ struct page_info *pg; ++ void *va; ++ ++ ASSERT(size); ++ ++ pages = PFN_UP(size); ++ mfn = xmalloc_array(unsigned long, pages); ++ if ( mfn == NULL ) ++ return NULL; ++ ++ for ( i = 0; i < pages; i++ ) ++ { ++ pg = alloc_domheap_page(NULL, 0); ++ if ( pg == NULL ) ++ goto error; ++ mfn[i] = page_to_mfn(pg); ++ } ++ ++ va = vmap(mfn, pages); ++ if ( va == NULL ) ++ goto error; ++ ++ xfree(mfn); ++ return va; ++ ++ error: ++ while ( i-- ) ++ free_domheap_page(mfn_to_page(mfn[i])); ++ xfree(mfn); ++ return NULL; ++} ++ ++void *vzalloc(size_t size) ++{ ++ void *p = vmalloc(size); ++ int i; ++ ++ if ( p == NULL ) ++ return NULL; ++ ++ for ( i = 0; i < size; i += PAGE_SIZE ) ++ clear_page(p + i); ++ ++ return p; ++} ++ ++void vfree(void *va) ++{ ++ unsigned int i, pages = vm_size(va); ++ struct page_info *pg; ++ PAGE_LIST_HEAD(pg_list); ++ ++ ASSERT(pages); ++ ++ for ( i = 0; i < pages; i++ ) ++ page_list_add(vmap_to_page(va + i * PAGE_SIZE), &pg_list); ++ ++ vunmap(va); ++ ++ while ( (pg = page_list_remove_head(&pg_list)) != NULL ) ++ free_domheap_page(pg); ++} + #endif +diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h +index d25e485..c0afcec 100644 +--- a/xen/include/asm-arm/mm.h ++++ b/xen/include/asm-arm/mm.h +@@ -208,6 +208,8 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) + #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) + #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) + #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) ++#define vmap_to_mfn(va) paddr_to_pfn(virt_to_maddr((vaddr_t)va)) ++#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) + + /* Page-align address and convert to frame number format */ + #define paddr_to_pfn_aligned(paddr) paddr_to_pfn(PAGE_ALIGN(paddr)) +diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h +index ccf0752..27c2ae7 100644 +--- a/xen/include/asm-x86/page.h ++++ b/xen/include/asm-x86/page.h +@@ -262,6 +262,8 @@ void copy_page_sse2(void *, const void *); + #define pfn_to_paddr(pfn) __pfn_to_paddr(pfn) + #define paddr_to_pfn(pa) __paddr_to_pfn(pa) + #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) ++#define vmap_to_mfn(va) l1e_get_pfn(*virt_to_xen_l1e((unsigned long)(va))) ++#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) + + #endif /* !defined(__ASSEMBLY__) */ + +diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h +index b1923dd..a13591d 100644 +--- a/xen/include/xen/vmap.h ++++ b/xen/include/xen/vmap.h +@@ -11,6 +11,9 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, + unsigned int nr, unsigned int align, unsigned int flags); + void *vmap(const unsigned long *mfn, unsigned int nr); + void vunmap(const void *); ++void *vmalloc(size_t size); ++void *vzalloc(size_t size); ++void vfree(void *va); + + void __iomem *ioremap(paddr_t, size_t); + +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch (from r398918, head/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch) @@ -0,0 +1,43 @@ +From ed4a7917a6faa8b7e8f211eaeda270f96e45de7d Mon Sep 17 00:00:00 2001 +From: Andrew Cooper +Date: Fri, 9 Oct 2015 12:57:31 +0200 +Subject: [PATCH 2/8] vmap: avoid hitting an ASSERT with vfree(NULL) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +and unconditionally defer the vm_size() call, as it doesn't have a NULL +short circuit. + +Reported-by: Wei Liu +Signed-off-by: Andrew Cooper +Tested-by: Wei Liu +Reviewed-by: Roger Pau Monné +Acked-by: Tim Deegan +--- + xen/common/vmap.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/xen/common/vmap.c b/xen/common/vmap.c +index b6827b5..9028802 100644 +--- a/xen/common/vmap.c ++++ b/xen/common/vmap.c +@@ -268,10 +268,14 @@ void *vzalloc(size_t size) + + void vfree(void *va) + { +- unsigned int i, pages = vm_size(va); ++ unsigned int i, pages; + struct page_info *pg; + PAGE_LIST_HEAD(pg_list); + ++ if ( !va ) ++ return; ++ ++ pages = vm_size(va); + ASSERT(pages); + + for ( i = 0; i < pages; i++ ) +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch (from r398918, head/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch) @@ -0,0 +1,120 @@ +From 055ee44e3cc7c40dc3a3319370d287591771a7f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 9 Oct 2015 12:57:32 +0200 +Subject: [PATCH 3/8] x86/shadow: fix shadow_track_dirty_vram to work on hvm + guests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Modify shadow_track_dirty_vram to use a local buffer and then flush to the +guest without the paging_lock held. This is modeled after +hap_track_dirty_vram. + +Signed-off-by: Roger Pau Monné +Reviewed-by: Tim Deegan +--- + xen/arch/x86/mm/shadow/common.c | 49 +++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 19 deletions(-) + +diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c +index a5eed28..6b91b8c 100644 +--- a/xen/arch/x86/mm/shadow/common.c ++++ b/xen/arch/x86/mm/shadow/common.c +@@ -3478,7 +3478,7 @@ void shadow_clean_dirty_bitmap(struct domain *d) + int shadow_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, +- XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) ++ XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) + { + int rc; + unsigned long end_pfn = begin_pfn + nr; +@@ -3488,6 +3488,7 @@ int shadow_track_dirty_vram(struct domain *d, + p2m_type_t t; + struct sh_dirty_vram *dirty_vram; + struct p2m_domain *p2m = p2m_get_hostp2m(d); ++ uint8_t *dirty_bitmap = NULL; + + if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) + return -EINVAL; +@@ -3516,6 +3517,12 @@ int shadow_track_dirty_vram(struct domain *d, + goto out; + } + ++ dirty_bitmap = vzalloc(dirty_size); ++ if ( dirty_bitmap == NULL ) ++ { ++ rc = -ENOMEM; ++ goto out; ++ } + /* This should happen seldomly (Video mode change), + * no need to be careful. */ + if ( !dirty_vram ) +@@ -3546,12 +3553,8 @@ int shadow_track_dirty_vram(struct domain *d, + rc = -ENODATA; + } + else if (dirty_vram->last_dirty == -1) +- { + /* still completely clean, just copy our empty bitmap */ +- rc = -EFAULT; +- if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) +- rc = 0; +- } ++ memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); + else + { + unsigned long map_mfn = INVALID_MFN; +@@ -3630,21 +3633,19 @@ int shadow_track_dirty_vram(struct domain *d, + if ( map_sl1p ) + sh_unmap_domain_page(map_sl1p); + +- rc = -EFAULT; +- if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) { +- memset(dirty_vram->dirty_bitmap, 0, dirty_size); +- if (dirty_vram->last_dirty + SECONDS(2) < NOW()) ++ memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); ++ memset(dirty_vram->dirty_bitmap, 0, dirty_size); ++ if ( dirty_vram->last_dirty + SECONDS(2) < NOW() ) ++ { ++ /* was clean for more than two seconds, try to disable guest ++ * write access */ ++ for ( i = begin_pfn; i < end_pfn; i++ ) + { +- /* was clean for more than two seconds, try to disable guest +- * write access */ +- for ( i = begin_pfn; i < end_pfn; i++ ) { +- mfn_t mfn = get_gfn_query_unlocked(d, i, &t); +- if (mfn_x(mfn) != INVALID_MFN) +- flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); +- } +- dirty_vram->last_dirty = -1; ++ mfn_t mfn = get_gfn_query_unlocked(d, i, &t); ++ if ( mfn_x(mfn) != INVALID_MFN ) ++ flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); + } +- rc = 0; ++ dirty_vram->last_dirty = -1; + } + } + if ( flush_tlb ) +@@ -3659,6 +3660,16 @@ out_dirty_vram: + + out: + paging_unlock(d); ++ if ( rc == 0 && dirty_bitmap != NULL && ++ copy_to_guest(guest_dirty_bitmap, dirty_bitmap, dirty_size) ) ++ { ++ paging_lock(d); ++ for ( i = 0; i < dirty_size; i++ ) ++ dirty_vram->dirty_bitmap[i] |= dirty_bitmap[i]; ++ paging_unlock(d); ++ rc = -EFAULT; ++ } ++ vfree(dirty_bitmap); + p2m_unlock(p2m_get_hostp2m(d)); + return rc; + } +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch (from r398918, head/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch) @@ -0,0 +1,44 @@ +From 50ca52274eda838f0562938fae3432a0f05f2585 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 9 Oct 2015 12:57:32 +0200 +Subject: [PATCH 4/8] x86/hap: make hap_track_dirty_vram use non-contiguous + memory for temporary map +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just like it's done for shadow_track_dirty_vram allocate the temporary +buffer using non-contiguous memory. + +Signed-off-by: Roger Pau Monné +Reviewed-by: Tim Deegan +--- + xen/arch/x86/mm/hap/hap.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c +index abf3d7a..f7b12a8 100644 +--- a/xen/arch/x86/mm/hap/hap.c ++++ b/xen/arch/x86/mm/hap/hap.c +@@ -87,7 +87,7 @@ int hap_track_dirty_vram(struct domain *d, + } + + rc = -ENOMEM; +- dirty_bitmap = xzalloc_bytes(size); ++ dirty_bitmap = vzalloc(size); + if ( !dirty_bitmap ) + goto out; + +@@ -168,8 +168,7 @@ int hap_track_dirty_vram(struct domain *d, + p2m_ram_logdirty, p2m_ram_rw); + } + out: +- if ( dirty_bitmap ) +- xfree(dirty_bitmap); ++ vfree(dirty_bitmap); + + return rc; + } +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch (from r398918, head/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch) @@ -0,0 +1,214 @@ +From 63d4838f2f5644060c064f356078a748ca413364 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 9 Oct 2015 12:57:32 +0200 +Subject: [PATCH 5/8] x86: rework paging_log_dirty_op to work with hvm guests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the caller of paging_log_dirty_op is a hvm guest Xen would choke when +trying to copy the dirty bitmap to the guest because the paging lock is +already held. + +Fix this by independently mapping each page of the guest bitmap as needed +without the paging lock held. + +Signed-off-by: Roger Pau Monné +Reviewed-by: Tim Deegan +--- + xen/arch/x86/mm/paging.c | 98 +++++++++++++++++++++++++++++++++++++++----- + xen/include/asm-x86/domain.h | 1 + + 2 files changed, 88 insertions(+), 11 deletions(-) + +diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c +index 6b788f7..06dc7fa 100644 +--- a/xen/arch/x86/mm/paging.c ++++ b/xen/arch/x86/mm/paging.c +@@ -397,6 +397,51 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) + return rv; + } + ++static inline void *map_dirty_bitmap(XEN_GUEST_HANDLE_64(uint8) dirty_bitmap, ++ unsigned long pages, ++ struct page_info **page) ++{ ++ uint32_t pfec = PFEC_page_present | PFEC_write_access; ++ unsigned long gfn; ++ p2m_type_t p2mt; ++ ++ gfn = paging_gva_to_gfn(current, ++ (unsigned long)(dirty_bitmap.p + (pages >> 3)), ++ &pfec); ++ if ( gfn == INVALID_GFN ) ++ return NULL; ++ ++ *page = get_page_from_gfn(current->domain, gfn, &p2mt, P2M_UNSHARE); ++ ++ if ( !p2m_is_ram(p2mt) ) ++ { ++ put_page(*page); ++ return NULL; ++ } ++ if ( p2m_is_paging(p2mt) ) ++ { ++ put_page(*page); ++ p2m_mem_paging_populate(current->domain, gfn); ++ return NULL; ++ } ++ if ( p2m_is_shared(p2mt) ) ++ { ++ put_page(*page); ++ return NULL; ++ } ++ ++ return __map_domain_page(*page); ++} ++ ++static inline void unmap_dirty_bitmap(void *addr, struct page_info *page) ++{ ++ if ( addr != NULL ) ++ { ++ unmap_domain_page(addr); ++ put_page(page); ++ } ++} ++ + + /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, + * clear the bitmap and stats as well. */ +@@ -409,9 +454,22 @@ static int paging_log_dirty_op(struct domain *d, + mfn_t *l4 = NULL, *l3 = NULL, *l2 = NULL; + unsigned long *l1 = NULL; + int i4, i3, i2; ++ uint8_t *dirty_bitmap; ++ struct page_info *page; ++ unsigned long index_mapped; + ++ again: + if ( !resuming ) + domain_pause(d); ++ ++ index_mapped = resuming ? d->arch.paging.preempt.log_dirty.done : 0; ++ dirty_bitmap = map_dirty_bitmap(sc->dirty_bitmap, index_mapped, &page); ++ if ( dirty_bitmap == NULL ) ++ { ++ domain_unpause(d); ++ return -EFAULT; ++ } ++ + paging_lock(d); + + if ( !d->arch.paging.preempt.dom ) +@@ -451,18 +509,18 @@ static int paging_log_dirty_op(struct domain *d, + l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; ++ i2 = d->arch.paging.preempt.log_dirty.i2; + pages = d->arch.paging.preempt.log_dirty.done; + + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + { + l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; +- for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) ++ for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); ++ i3++, i2 = 0 ) + { + l2 = ((l3 && mfn_valid(l3[i3])) ? + map_domain_page(mfn_x(l3[i3])) : NULL); +- for ( i2 = 0; +- (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); +- i2++ ) ++ for ( ; (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) + { + unsigned int bytes = PAGE_SIZE; + l1 = ((l2 && mfn_valid(l2[i2])) ? +@@ -471,15 +529,28 @@ static int paging_log_dirty_op(struct domain *d, + bytes = (unsigned int)((sc->pages - pages + 7) >> 3); + if ( likely(peek) ) + { +- if ( (l1 ? copy_to_guest_offset(sc->dirty_bitmap, +- pages >> 3, (uint8_t *)l1, +- bytes) +- : clear_guest_offset(sc->dirty_bitmap, +- pages >> 3, bytes)) != 0 ) ++ if ( pages >> (3 + PAGE_SHIFT) != ++ index_mapped >> (3 + PAGE_SHIFT) ) + { +- rv = -EFAULT; +- goto out; ++ /* We need to map next page */ ++ d->arch.paging.preempt.log_dirty.i4 = i4; ++ d->arch.paging.preempt.log_dirty.i3 = i3; ++ d->arch.paging.preempt.log_dirty.i2 = i2; ++ d->arch.paging.preempt.log_dirty.done = pages; ++ d->arch.paging.preempt.dom = current->domain; ++ d->arch.paging.preempt.op = sc->op; ++ resuming = 1; ++ paging_unlock(d); ++ unmap_dirty_bitmap(dirty_bitmap, page); ++ goto again; + } ++ ASSERT(((pages >> 3) % PAGE_SIZE) + bytes <= PAGE_SIZE); ++ if ( l1 ) ++ memcpy(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), l1, ++ bytes); ++ else ++ memset(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), 0, ++ bytes); + } + pages += bytes << 3; + if ( l1 ) +@@ -496,6 +567,7 @@ static int paging_log_dirty_op(struct domain *d, + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; ++ d->arch.paging.preempt.log_dirty.i2 = 0; + rv = -ERESTART; + break; + } +@@ -508,6 +580,7 @@ static int paging_log_dirty_op(struct domain *d, + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; ++ d->arch.paging.preempt.log_dirty.i2 = 0; + rv = -ERESTART; + } + if ( rv ) +@@ -537,6 +610,7 @@ static int paging_log_dirty_op(struct domain *d, + if ( rv ) + { + /* Never leave the domain paused on real errors. */ ++ unmap_dirty_bitmap(dirty_bitmap, page); + ASSERT(rv == -ERESTART); + return rv; + } +@@ -549,12 +623,14 @@ static int paging_log_dirty_op(struct domain *d, + * paging modes (shadow or hap). Safe because the domain is paused. */ + d->arch.paging.log_dirty.clean_dirty_bitmap(d); + } ++ unmap_dirty_bitmap(dirty_bitmap, page); + domain_unpause(d); + return rv; + + out: + d->arch.paging.preempt.dom = NULL; + paging_unlock(d); ++ unmap_dirty_bitmap(dirty_bitmap, page); + domain_unpause(d); + + if ( l1 ) +diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h +index 6a77a93..63dea9c 100644 +--- a/xen/include/asm-x86/domain.h ++++ b/xen/include/asm-x86/domain.h +@@ -197,6 +197,7 @@ struct paging_domain { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; ++ unsigned long i2:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch (from r398918, head/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0006-xen-pvh-enable-mmu_update-hypercall.patch) @@ -0,0 +1,33 @@ +From bec71ff2b61acc42e71a2bd79ec5cf172130e5f8 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Fri, 9 Oct 2015 12:57:32 +0200 +Subject: [PATCH 6/8] xen/pvh: enable mmu_update hypercall +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is needed for performing save/restore of PV guests. + +Signed-off-by: Roger Pau Monné +Cc: Tim Deegan +Cc: Jan Beulich +Cc: Andrew Cooper +--- + xen/arch/x86/hvm/hvm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c +index 7d53c6c..d3fdc3d 100644 +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -4843,6 +4843,7 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { + [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op, + HYPERCALL(vcpu_op), + HYPERCALL(mmuext_op), ++ HYPERCALL(mmu_update), + HYPERCALL(xsm_op), + HYPERCALL(sched_op), + HYPERCALL(event_channel_op), +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch (from r398918, head/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r398918, head/emulators/xen-kernel/files/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch) @@ -0,0 +1,86 @@ +From 43f76b1443c8fc3b54dbb9fb466becbb9d584d6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 9 Oct 2015 12:57:33 +0200 +Subject: [PATCH 7/8] iommu: fix usage of shared EPT/IOMMU page tables on PVH + guests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +iommu_share_p2m_table should not prevent PVH guests from using a shared page +table between the IOMMU and EPT. Clean the code by removing the asserts in +the vendor specific implementations (amd_iommu_share_p2m, iommu_set_pgd), +and moving the hap_enabled assert to the caller (iommu_share_p2m_table). + +Also fix another incorrect usage of is_hvm_domain usage in +arch_iommu_populate_page_table. This has not given problems so far because +all the pages in PVH guests are of type PGT_writable_page. + +Signed-off-by: Roger Pau Monné +Reviewed-by: Jan Beulich +Tested-by: David Vrabel +Reviewed-by: Tim Deegan +Acked-by: Kevin Tian +--- + xen/drivers/passthrough/amd/iommu_map.c | 2 -- + xen/drivers/passthrough/iommu.c | 3 ++- + xen/drivers/passthrough/vtd/iommu.c | 2 -- + xen/drivers/passthrough/x86/iommu.c | 2 +- + 4 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c +index a8c60ec..31dc05d 100644 +--- a/xen/drivers/passthrough/amd/iommu_map.c ++++ b/xen/drivers/passthrough/amd/iommu_map.c +@@ -785,8 +785,6 @@ void amd_iommu_share_p2m(struct domain *d) + struct page_info *p2m_table; + mfn_t pgd_mfn; + +- ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); +- + if ( !iommu_use_hap_pt(d) ) + return; + +diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c +index cc12735..7fcbbb1 100644 +--- a/xen/drivers/passthrough/iommu.c ++++ b/xen/drivers/passthrough/iommu.c +@@ -332,7 +332,8 @@ void iommu_share_p2m_table(struct domain* d) + { + const struct iommu_ops *ops = iommu_get_ops(); + +- if ( iommu_enabled && is_hvm_domain(d) ) ++ ASSERT( hap_enabled(d) ); ++ if ( iommu_enabled ) + ops->share_p2m(d); + } + +diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c +index 5a946d4..a5a111c 100644 +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -1802,8 +1802,6 @@ static void iommu_set_pgd(struct domain *d) + struct hvm_iommu *hd = domain_hvm_iommu(d); + mfn_t pgd_mfn; + +- ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled ); +- + if ( !iommu_use_hap_pt(d) ) + return; + +diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c +index ce0ca5a..3d2c12a 100644 +--- a/xen/drivers/passthrough/x86/iommu.c ++++ b/xen/drivers/passthrough/x86/iommu.c +@@ -56,7 +56,7 @@ int arch_iommu_populate_page_table(struct domain *d) + + while ( !rc && (page = page_list_remove_head(&d->page_list)) ) + { +- if ( is_hvm_domain(d) || ++ if ( has_hvm_container_domain(d) || + (page->u.inuse.type_info & PGT_type_mask) == PGT_writable_page ) + { + BUG_ON(SHARED_M2P(mfn_to_gmfn(d, page_to_mfn(page)))); +-- +1.9.5 (Apple Git-50.3) + Copied: branches/2015Q4/emulators/xen-kernel/files/xsa156-4.5.patch (from r401564, head/emulators/xen-kernel/files/xsa156-4.5.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/xen-kernel/files/xsa156-4.5.patch Mon Nov 16 00:54:45 2015 (r401740, copy of r401564, head/emulators/xen-kernel/files/xsa156-4.5.patch) @@ -0,0 +1,127 @@ +x86/HVM: always intercept #AC and #DB + +Both being benign exceptions, and both being possible to get triggered +by exception delivery, this is required to prevent a guest from locking +up a CPU (resulting from no other VM exits occurring once getting into +such a loop). + +The specific scenarios: + +1) #AC may be raised during exception delivery if the handler is set to +be a ring-3 one by a 32-bit guest, and the stack is misaligned. + +2) #DB may be raised during exception delivery when a breakpoint got +placed on a data structure involved in delivering the exception. This +can result in an endless loop when a 64-bit guest uses a non-zero IST +for the vector 1 IDT entry, but even without use of IST the time it +takes until a contributory fault would get raised (results depending +on the handler) may be quite long. + +This is XSA-156. + +Reported-by: Benjamin Serebrin +Signed-off-by: Jan Beulich +Reviewed-by: Andrew Cooper +Tested-by: Andrew Cooper + +--- a/xen/arch/x86/hvm/svm/svm.c ++++ b/xen/arch/x86/hvm/svm/svm.c +@@ -1045,10 +1045,11 @@ static void noreturn svm_do_resume(struc + unlikely(v->arch.hvm_vcpu.debug_state_latch != debug_state) ) + { + uint32_t intercepts = vmcb_get_exception_intercepts(vmcb); +- uint32_t mask = (1U << TRAP_debug) | (1U << TRAP_int3); ++ + v->arch.hvm_vcpu.debug_state_latch = debug_state; + vmcb_set_exception_intercepts( +- vmcb, debug_state ? (intercepts | mask) : (intercepts & ~mask)); ++ vmcb, debug_state ? (intercepts | (1U << TRAP_int3)) ++ : (intercepts & ~(1U << TRAP_int3))); + } + + if ( v->arch.hvm_svm.launch_core != smp_processor_id() ) +@@ -2435,8 +2436,9 @@ void svm_vmexit_handler(struct cpu_user_ + + case VMEXIT_EXCEPTION_DB: + if ( !v->domain->debugger_attached ) +- goto unexpected_exit_type; +- domain_pause_for_debugger(); ++ hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); ++ else ++ domain_pause_for_debugger(); + break; + + case VMEXIT_EXCEPTION_BP: +@@ -2484,6 +2486,11 @@ void svm_vmexit_handler(struct cpu_user_ + break; + } + ++ case VMEXIT_EXCEPTION_AC: ++ HVMTRACE_1D(TRAP, TRAP_alignment_check); ++ hvm_inject_hw_exception(TRAP_alignment_check, vmcb->exitinfo1); ++ break; ++ + case VMEXIT_EXCEPTION_UD: + svm_vmexit_ud_intercept(regs); + break; +--- a/xen/arch/x86/hvm/vmx/vmx.c ++++ b/xen/arch/x86/hvm/vmx/vmx.c +@@ -1186,16 +1186,10 @@ static void vmx_update_host_cr3(struct v + + void vmx_update_debug_state(struct vcpu *v) + { +- unsigned long mask; +- +- mask = 1u << TRAP_int3; +- if ( !cpu_has_monitor_trap_flag ) +- mask |= 1u << TRAP_debug; +- + if ( v->arch.hvm_vcpu.debug_state_latch ) +- v->arch.hvm_vmx.exception_bitmap |= mask; ++ v->arch.hvm_vmx.exception_bitmap |= 1U << TRAP_int3; + else +- v->arch.hvm_vmx.exception_bitmap &= ~mask; ++ v->arch.hvm_vmx.exception_bitmap &= ~(1U << TRAP_int3); + + vmx_vmcs_enter(v); + vmx_update_exception_bitmap(v); +@@ -2801,9 +2795,10 @@ void vmx_vmexit_handler(struct cpu_user_ + __vmread(EXIT_QUALIFICATION, &exit_qualification); + HVMTRACE_1D(TRAP_DEBUG, exit_qualification); + write_debugreg(6, exit_qualification | 0xffff0ff0); +- if ( !v->domain->debugger_attached || cpu_has_monitor_trap_flag ) +- goto exit_and_crash; +- domain_pause_for_debugger(); ++ if ( !v->domain->debugger_attached ) ++ hvm_inject_hw_exception(vector, HVM_DELIVER_NO_ERROR_CODE); ++ else ++ domain_pause_for_debugger(); + break; + case TRAP_int3: + { +@@ -2868,6 +2863,11 @@ void vmx_vmexit_handler(struct cpu_user_ + + hvm_inject_page_fault(regs->error_code, exit_qualification); + break; ++ case TRAP_alignment_check: ++ HVMTRACE_1D(TRAP, vector); ++ __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); ++ hvm_inject_hw_exception(vector, ecode); ++ break; + case TRAP_nmi: + if ( (intr_info & INTR_INFO_INTR_TYPE_MASK) != + (X86_EVENTTYPE_NMI << 8) ) +--- a/xen/include/asm-x86/hvm/hvm.h ++++ b/xen/include/asm-x86/hvm/hvm.h +@@ -378,7 +378,10 @@ static inline int hvm_event_pending(stru + (X86_CR4_VMXE | X86_CR4_PAE | X86_CR4_MCE)) + + /* These exceptions must always be intercepted. */ +-#define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) ++#define HVM_TRAP_MASK ((1U << TRAP_debug) | \ ++ (1U << TRAP_invalid_op) | \ ++ (1U << TRAP_alignment_check) | \ ++ (1U << TRAP_machine_check)) + + /* + * x86 event types. This enumeration is valid for: Modified: branches/2015Q4/emulators/xen/Makefile ============================================================================== --- branches/2015Q4/emulators/xen/Makefile Mon Nov 16 00:51:00 2015 (r401739) +++ branches/2015Q4/emulators/xen/Makefile Mon Nov 16 00:54:45 2015 (r401740) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= xen -PORTVERSION= 4.5.0 +PORTVERSION= 4.5.2 CATEGORIES= emulators -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= royger@FreeBSD.org COMMENT= Xen Hyvervisor meta port LICENSE= GPLv2 Modified: branches/2015Q4/sysutils/xen-tools/Makefile ============================================================================== --- branches/2015Q4/sysutils/xen-tools/Makefile Mon Nov 16 00:51:00 2015 (r401739) +++ branches/2015Q4/sysutils/xen-tools/Makefile Mon Nov 16 00:54:45 2015 (r401740) @@ -1,13 +1,13 @@ # $FreeBSD$ PORTNAME= xen -PORTVERSION= 4.5.1 +PORTVERSION= 4.5.2 CATEGORIES= sysutils emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \ http://code.coreboot.org/p/seabios/downloads/get/:seabios PKGNAMESUFFIX= -tools -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= royger@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight LICENSE= GPLv2 LGPL3 @@ -47,8 +47,7 @@ QEMU_ARGS= --disable-gtk \ --disable-curl \ --cxx=c++ -EXTRA_PATCHES= ${FILESDIR}/xsa137.patch:-p1 \ - ${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1 +EXTRA_PATCHES= ${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" SHEBANG_FILES= tools/misc/xencov_split \ @@ -75,14 +74,6 @@ post-patch: ${WRKSRC}/tools/libxl/libxl_dm.c \ ${WRKSRC}/tools/qemu-xen-traditional/i386-dm/helper2.c \ ${WRKSRC}/docs/man/* - @for p in ${FILESDIR}/*qemut*.patch; do \ - ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen-traditional ; \ - done - @for p in ${FILESDIR}/*qemuu*.patch; do \ - ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ - done post-install: ${MKDIR} ${STAGEDIR}/var/run/xen Modified: branches/2015Q4/sysutils/xen-tools/distinfo ============================================================================== --- branches/2015Q4/sysutils/xen-tools/distinfo Mon Nov 16 00:51:00 2015 (r401739) +++ branches/2015Q4/sysutils/xen-tools/distinfo Mon Nov 16 00:54:45 2015 (r401740) @@ -1,4 +1,4 @@ -SHA256 (xen-4.5.1.tar.gz) = 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 -SIZE (xen-4.5.1.tar.gz) = 18410400 +SHA256 (xen-4.5.2.tar.gz) = 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 +SIZE (xen-4.5.2.tar.gz) = 18416220 SHA256 (seabios-1.8.1.tar.gz) = 283bd848f5ce9d4bc52add973a856347e02c9ce89a9e6bc92c99359b87c9871d SIZE (seabios-1.8.1.tar.gz) = 537712 From owner-svn-ports-branches@freebsd.org Mon Nov 16 01:39:12 2015 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 03452A2F925; Mon, 16 Nov 2015 01:39:12 +0000 (UTC) (envelope-from wen@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 A82311F50; Mon, 16 Nov 2015 01:39:11 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAG1dAaY083543; Mon, 16 Nov 2015 01:39:10 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAG1dAVW083539; Mon, 16 Nov 2015 01:39:10 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201511160139.tAG1dAVW083539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Mon, 16 Nov 2015 01:39:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401741 - in branches/2015Q4/www: moodle28 moodle29 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.20 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, 16 Nov 2015 01:39:12 -0000 Author: wen Date: Mon Nov 16 01:39:10 2015 New Revision: 401741 URL: https://svnweb.freebsd.org/changeset/ports/401741 Log: MFH: r401308 - Update to moodle-2.8.9 and moodle-2.9.3 Approved by: ports-secteam (feld) Modified: branches/2015Q4/www/moodle28/Makefile branches/2015Q4/www/moodle28/distinfo branches/2015Q4/www/moodle29/Makefile branches/2015Q4/www/moodle29/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/moodle28/Makefile ============================================================================== --- branches/2015Q4/www/moodle28/Makefile Mon Nov 16 00:54:45 2015 (r401740) +++ branches/2015Q4/www/moodle28/Makefile Mon Nov 16 01:39:10 2015 (r401741) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 2.8.8 +PORTVERSION= 2.8.9 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable28/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} Modified: branches/2015Q4/www/moodle28/distinfo ============================================================================== --- branches/2015Q4/www/moodle28/distinfo Mon Nov 16 00:54:45 2015 (r401740) +++ branches/2015Q4/www/moodle28/distinfo Mon Nov 16 01:39:10 2015 (r401741) @@ -1,2 +1,2 @@ -SHA256 (moodle-2.8.8.tgz) = e5f9289edc847e84159a99767bf6621ddd930ef0aa1fd43d41d484e06f58d6f5 -SIZE (moodle-2.8.8.tgz) = 35960643 +SHA256 (moodle-2.8.9.tgz) = 09fca589cdf4b63052e5319931e8c42ca2e0e53d5eeb12cab852ef84bb50f034 +SIZE (moodle-2.8.9.tgz) = 35992485 Modified: branches/2015Q4/www/moodle29/Makefile ============================================================================== --- branches/2015Q4/www/moodle29/Makefile Mon Nov 16 00:54:45 2015 (r401740) +++ branches/2015Q4/www/moodle29/Makefile Mon Nov 16 01:39:10 2015 (r401741) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 2.9.2 +PORTVERSION= 2.9.3 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable29/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} Modified: branches/2015Q4/www/moodle29/distinfo ============================================================================== --- branches/2015Q4/www/moodle29/distinfo Mon Nov 16 00:54:45 2015 (r401740) +++ branches/2015Q4/www/moodle29/distinfo Mon Nov 16 01:39:10 2015 (r401741) @@ -1,2 +1,2 @@ -SHA256 (moodle-2.9.2.tgz) = 14599e518b95269aa770d00c29b45b8d3acab6308f6112197564205674b171c2 -SIZE (moodle-2.9.2.tgz) = 36435068 +SHA256 (moodle-2.9.3.tgz) = 48f59bd77df53fb5f608da492f09c21eb7c8994c3ddce39fa7a9fd8e3e0e8f46 +SIZE (moodle-2.9.3.tgz) = 36476693 From owner-svn-ports-branches@freebsd.org Mon Nov 16 14:16:40 2015 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 8CB7CA30AAB; Mon, 16 Nov 2015 14:16:40 +0000 (UTC) (envelope-from garga@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 526DF17EE; Mon, 16 Nov 2015 14:16:40 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGEGd9L007238; Mon, 16 Nov 2015 14:16:39 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGEGdPY007236; Mon, 16 Nov 2015 14:16:39 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201511161416.tAGEGdPY007236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 16 Nov 2015 14:16:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401763 - branches/2015Q4/security/strongswan 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.20 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, 16 Nov 2015 14:16:40 -0000 Author: garga Date: Mon Nov 16 14:16:38 2015 New Revision: 401763 URL: https://svnweb.freebsd.org/changeset/ports/401763 Log: MFH: r401762 Update security/strongswan to 5.3.4 PR: 204597 Submitted by: strongswan@nanoteq.com (maintainer) Security: CVE 2015-8023 Security: https://github.com/strongswan/strongswan/commit/453e204ac40dfff2e0978e8f84a5f8ff0cbc45e2 Sponsored by: Rubicon Communications (Netgate) Approved by: ports-secteam (feld) Modified: branches/2015Q4/security/strongswan/Makefile branches/2015Q4/security/strongswan/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/strongswan/Makefile ============================================================================== --- branches/2015Q4/security/strongswan/Makefile Mon Nov 16 14:08:25 2015 (r401762) +++ branches/2015Q4/security/strongswan/Makefile Mon Nov 16 14:16:38 2015 (r401763) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= strongswan -PORTVERSION= 5.3.3 -PORTREVISION= 1 +PORTVERSION= 5.3.4 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ Modified: branches/2015Q4/security/strongswan/distinfo ============================================================================== --- branches/2015Q4/security/strongswan/distinfo Mon Nov 16 14:08:25 2015 (r401762) +++ branches/2015Q4/security/strongswan/distinfo Mon Nov 16 14:16:38 2015 (r401763) @@ -1,2 +1,2 @@ -SHA256 (strongswan-5.3.3.tar.bz2) = 39d2e8f572a57a77dda8dd8bdaf2ee47ad3cefeb86bbb840d594aa75f00f33e2 -SIZE (strongswan-5.3.3.tar.bz2) = 4423437 +SHA256 (strongswan-5.3.4.tar.bz2) = 938ad1f7b612e039f1d32333f4865160be70f9fb3c207a31127d0168116459aa +SIZE (strongswan-5.3.4.tar.bz2) = 4418300 From owner-svn-ports-branches@freebsd.org Mon Nov 16 14:17:38 2015 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 387F4A30AE4; Mon, 16 Nov 2015 14:17:38 +0000 (UTC) (envelope-from garga@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 05F1B18FF; Mon, 16 Nov 2015 14:17:37 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGEHbWq007424; Mon, 16 Nov 2015 14:17:37 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGEHb2Z007423; Mon, 16 Nov 2015 14:17:37 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201511161417.tAGEHb2Z007423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 16 Nov 2015 14:17:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401764 - branches/2015Q4/ports-mgmt/freebsd-bugzilla-cli 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.20 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, 16 Nov 2015 14:17:38 -0000 Author: garga Date: Mon Nov 16 14:17:36 2015 New Revision: 401764 URL: https://svnweb.freebsd.org/changeset/ports/401764 Log: MFH: r401233 - Add security/ca_root_nss to the list of dependencies, without it FreeBSD svn HTTPS certificate cannot be validated - Bump PORTREVISION PR: 204026 Submitted by: garga Approved by: ports-secteam (feld), maintainer timeout (> 2 weeks) Modified: branches/2015Q4/ports-mgmt/freebsd-bugzilla-cli/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/ports-mgmt/freebsd-bugzilla-cli/Makefile ============================================================================== --- branches/2015Q4/ports-mgmt/freebsd-bugzilla-cli/Makefile Mon Nov 16 14:16:38 2015 (r401763) +++ branches/2015Q4/ports-mgmt/freebsd-bugzilla-cli/Makefile Mon Nov 16 14:17:36 2015 (r401764) @@ -3,6 +3,7 @@ PORTNAME= freebsd-bugzilla-cli PORTVERSION= 0.14.0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MAINTAINER= pgollucci@FreeBSD.org @@ -10,6 +11,8 @@ COMMENT= Interact with the FreeBSD bugzi LICENSE= APACHE20 +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss + OPTIONS_GROUP= BACKEND OPTIONS_GROUP_BACKEND= PYBUGZ OPTIONS_DEFAULT= PYBUGZ From owner-svn-ports-branches@freebsd.org Mon Nov 16 15:56:58 2015 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 49BA6A30322; Mon, 16 Nov 2015 15:56:58 +0000 (UTC) (envelope-from garga@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 1233D1166; Mon, 16 Nov 2015 15:56:57 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGFuvnb037264; Mon, 16 Nov 2015 15:56:57 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGFuv9i037263; Mon, 16 Nov 2015 15:56:57 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201511161556.tAGFuv9i037263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 16 Nov 2015 15:56:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401772 - branches/2015Q4/security/strongswan 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.20 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, 16 Nov 2015 15:56:58 -0000 Author: garga Date: Mon Nov 16 15:56:56 2015 New Revision: 401772 URL: https://svnweb.freebsd.org/changeset/ports/401772 Log: Unbreak security/strongswan on 2015Q4 branch adding ${PORTSDIR} back to vstr dependency line Approved by: ports-secteam (feld implicit) Pointy hat to: garga Modified: branches/2015Q4/security/strongswan/Makefile Modified: branches/2015Q4/security/strongswan/Makefile ============================================================================== --- branches/2015Q4/security/strongswan/Makefile Mon Nov 16 15:47:47 2015 (r401771) +++ branches/2015Q4/security/strongswan/Makefile Mon Nov 16 15:56:56 2015 (r401772) @@ -98,7 +98,7 @@ XAUTH_CONFIGURE_ON= --enable-xauth-eap - BUILTIN_CONFIGURE_ON= --with-printf-hooks=builtin LIBC_CONFIGURE_ON= --with-printf-hooks=glibc VSTR_CONFIGURE_ON= --with-printf-hooks=vstr -VSTR_LIB_DEPENDS= libvstr.so:devel/vstr +VSTR_LIB_DEPENDS= libvstr.so:${PORTSDIR}/devel/vstr .include From owner-svn-ports-branches@freebsd.org Mon Nov 16 18:43:18 2015 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 89ED6A3055A; Mon, 16 Nov 2015 18:43:18 +0000 (UTC) (envelope-from jkim@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 521A61980; Mon, 16 Nov 2015 18:43:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGIhHZp088076; Mon, 16 Nov 2015 18:43:17 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGIhGf5088069; Mon, 16 Nov 2015 18:43:16 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201511161843.tAGIhGf5088069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 16 Nov 2015 18:43:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401781 - in branches/2015Q4/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod 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.20 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, 16 Nov 2015 18:43:18 -0000 Author: jkim Date: Mon Nov 16 18:43:16 2015 New Revision: 401781 URL: https://svnweb.freebsd.org/changeset/ports/401781 Log: MFH: r401462 Update to 4.3.34. Approved by: ports-secteam (feld) Modified: branches/2015Q4/emulators/virtualbox-ose-additions/Makefile branches/2015Q4/emulators/virtualbox-ose-additions/distinfo branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo branches/2015Q4/emulators/virtualbox-ose/Makefile branches/2015Q4/emulators/virtualbox-ose/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-additions/Makefile Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose-additions/Makefile Mon Nov 16 18:43:16 2015 (r401781) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.32 +DISTVERSION= 4.3.34 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-additions/distinfo Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose-additions/distinfo Mon Nov 16 18:43:16 2015 (r401781) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 -SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 +SHA256 (VirtualBox-4.3.34.tar.bz2) = 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 +SIZE (VirtualBox-4.3.34.tar.bz2) = 98166680 Modified: branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile Mon Nov 16 18:43:16 2015 (r401781) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.32 +DISTVERSION= 4.3.34 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo Mon Nov 16 18:43:16 2015 (r401781) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 -SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 +SHA256 (VirtualBox-4.3.34.tar.bz2) = 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 +SIZE (VirtualBox-4.3.34.tar.bz2) = 98166680 Modified: branches/2015Q4/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose/Makefile Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose/Makefile Mon Nov 16 18:43:16 2015 (r401781) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.32 +DISTVERSION= 4.3.34 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose/distinfo Mon Nov 16 18:38:56 2015 (r401780) +++ branches/2015Q4/emulators/virtualbox-ose/distinfo Mon Nov 16 18:43:16 2015 (r401781) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 -SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 -SHA256 (VBoxGuestAdditions_4.3.32.iso) = 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe -SIZE (VBoxGuestAdditions_4.3.32.iso) = 58349568 +SHA256 (VirtualBox-4.3.34.tar.bz2) = 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 +SIZE (VirtualBox-4.3.34.tar.bz2) = 98166680 +SHA256 (VBoxGuestAdditions_4.3.34.iso) = a6f20f5b8ec11ae127ae48bcb19c20de488d38dbf807a8608a6468da7353a9a8 +SIZE (VBoxGuestAdditions_4.3.34.iso) = 58361856 From owner-svn-ports-branches@freebsd.org Mon Nov 16 20:33:51 2015 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 4E0E4A302CD; Mon, 16 Nov 2015 20:33:51 +0000 (UTC) (envelope-from mandree@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 16A1218D5; Mon, 16 Nov 2015 20:33:51 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGKXoPT035578; Mon, 16 Nov 2015 20:33:50 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGKXold035576; Mon, 16 Nov 2015 20:33:50 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201511162033.tAGKXold035576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 16 Nov 2015 20:33:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401786 - branches/2015Q4/security/putty 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.20 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, 16 Nov 2015 20:33:51 -0000 Author: mandree Date: Mon Nov 16 20:33:49 2015 New Revision: 401786 URL: https://svnweb.freebsd.org/changeset/ports/401786 Log: MFH: r401087 Update to new upstream release 0.66 (security fix). Switch to USES=gssapi:mit. Security: CVE-2015-5309 Security: 0cb0afd9-86b8-11e5-bf60-080027ef73ec Approved by: ports-secteam (feld) PR: 204386 Modified: branches/2015Q4/security/putty/Makefile branches/2015Q4/security/putty/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/security/putty/Makefile ============================================================================== --- branches/2015Q4/security/putty/Makefile Mon Nov 16 20:12:32 2015 (r401785) +++ branches/2015Q4/security/putty/Makefile Mon Nov 16 20:33:49 2015 (r401786) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= putty -PORTVERSION= 0.65 +PORTVERSION= 0.66 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -45,9 +45,7 @@ MAKE_ARGS+= GTK_CONFIG=: .if ${PORT_OPTIONS:MGSSAPI} _COMPAT= -DSTATIC_GSSAPI -.if ${OSVERSION} >= 900000 -LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5 -.endif +USES+= gssapi:mit .else _COMPAT= -DNO_GSSAPI .endif Modified: branches/2015Q4/security/putty/distinfo ============================================================================== --- branches/2015Q4/security/putty/distinfo Mon Nov 16 20:12:32 2015 (r401785) +++ branches/2015Q4/security/putty/distinfo Mon Nov 16 20:33:49 2015 (r401786) @@ -1,2 +1,2 @@ -SHA256 (putty-0.65.tar.gz) = d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0 -SIZE (putty-0.65.tar.gz) = 1937861 +SHA256 (putty-0.66.tar.gz) = fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 +SIZE (putty-0.66.tar.gz) = 1948323 From owner-svn-ports-branches@freebsd.org Tue Nov 17 00:36:13 2015 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 85D9EA314CB; Tue, 17 Nov 2015 00:36:13 +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 393271774; Tue, 17 Nov 2015 00:36:13 +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 tAH0aCl0037679; Tue, 17 Nov 2015 00:36:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAH0aC6p037678; Tue, 17 Nov 2015 00:36:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201511170036.tAH0aC6p037678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Nov 2015 00:36:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401794 - branches/2015Q4/multimedia/libvpx 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.20 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, 17 Nov 2015 00:36:13 -0000 Author: jbeich Date: Tue Nov 17 00:36:12 2015 New Revision: 401794 URL: https://svnweb.freebsd.org/changeset/ports/401794 Log: MFH: r401217 multimedia/libvpx: bring more Chromium defaults - Add SIZE_LIMIT to work around CVE-2015-4506 - Add MULTIRES and extend POSTPROC - Sort options PR: 203410 Approved by: maintainer timeout (6 weeks) Approved by: ports-secteam (feld) Security: 6ca7eddd-d436-486a-b169-b948436bcf14 Modified: branches/2015Q4/multimedia/libvpx/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/multimedia/libvpx/Makefile ============================================================================== --- branches/2015Q4/multimedia/libvpx/Makefile Mon Nov 16 23:50:26 2015 (r401793) +++ branches/2015Q4/multimedia/libvpx/Makefile Tue Nov 17 00:36:12 2015 (r401794) @@ -5,6 +5,7 @@ PORTNAME= libvpx DISTVERSIONPREFIX= v DISTVERSION= 1.4.0-488 # tracking www/firefox DISTVERSIONSUFFIX= -ge67d45d +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= ashish@FreeBSD.org @@ -24,12 +25,14 @@ HAS_CONFIGURE= yes USE_PERL5= build USE_LDCONFIG= yes -OPTIONS_DEFINE= DEBUG POSTPROC RUNTIME THREADS SHARED -OPTIONS_DEFAULT= POSTPROC RUNTIME THREADS SHARED +OPTIONS_DEFINE= DEBUG MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT THREADS +OPTIONS_DEFAULT=MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT THREADS OPTIONS_EXCLUDE_armv6= RUNTIME +MULTIRES_DESC= Enable multi-resolution encoding POSTPROC_DESC= Enable postprocessing RUNTIME_DESC= Enable runtime CPU detection SHARED_DESC= Enable shared-library support +SIZE_LIMIT_DESC=Maximum size allowed by decoder: ${SIZE_LIMIT} ALL_TARGET= CONFIGURE_ARGS+=--prefix=${PREFIX} \ @@ -44,10 +47,14 @@ MAKE_ENV= LC_ALL=C OPTIONS_SUB= SHARED DEBUG_CONFIGURE_ON= --enable-debug -POSTPROC_CONFIGURE_ON= --enable-postproc +MULTIRES_CONFIGURE_ON= --enable-multi-res-encoding +POSTPROC_CONFIGURE_ON= --enable-postproc --enable-vp9-postproc \ + --enable-vp9-temporal-denoising RUNTIME_CONFIGURE_ON= --enable-runtime-cpu-detect -THREADS_CONFIGURE_OFF= --disable-multithread SHARED_CONFIGURE_ON= --enable-shared +SIZE_LIMIT_CONFIGURE_ON=--size-limit=${SIZE_LIMIT} +SIZE_LIMIT?= 16384x16384 # Chromium; Firefox has 4000x3000 +THREADS_CONFIGURE_OFF= --disable-multithread SHEBANG_FILES= build/make/ads2gas.pl From owner-svn-ports-branches@freebsd.org Wed Nov 18 16:28:18 2015 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 DF0A2A32337; Wed, 18 Nov 2015 16:28:18 +0000 (UTC) (envelope-from kwm@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 B6A2719A9; Wed, 18 Nov 2015 16:28:18 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAIGSHap079971; Wed, 18 Nov 2015 16:28:17 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAIGSHSN079969; Wed, 18 Nov 2015 16:28:17 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201511181628.tAIGSHSN079969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 18 Nov 2015 16:28:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401878 - in branches/2015Q4/x11/gdm: . 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.20 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, 18 Nov 2015 16:28:19 -0000 Author: kwm Date: Wed Nov 18 16:28:17 2015 New Revision: 401878 URL: https://svnweb.freebsd.org/changeset/ports/401878 Log: MFH: r401858 Fix lockscreen bypass. Approved by: portmgr (swills@) Security: 68847b20-8ddc-11e5-b69c-c86000169601 Added: branches/2015Q4/x11/gdm/files/patch-CVE-2015-7496 - copied unchanged from r401858, head/x11/gdm/files/patch-CVE-2015-7496 Modified: branches/2015Q4/x11/gdm/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/x11/gdm/Makefile ============================================================================== --- branches/2015Q4/x11/gdm/Makefile Wed Nov 18 16:23:46 2015 (r401877) +++ branches/2015Q4/x11/gdm/Makefile Wed Nov 18 16:28:17 2015 (r401878) @@ -3,6 +3,7 @@ PORTNAME= gdm PORTVERSION= 3.16.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Copied: branches/2015Q4/x11/gdm/files/patch-CVE-2015-7496 (from r401858, head/x11/gdm/files/patch-CVE-2015-7496) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/x11/gdm/files/patch-CVE-2015-7496 Wed Nov 18 16:28:17 2015 (r401878, copy of r401858, head/x11/gdm/files/patch-CVE-2015-7496) @@ -0,0 +1,207 @@ +From 05e5fc24b0f803098c1d05dae86f5eb05bd0c2a4 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Sun, 15 Nov 2015 14:07:53 -0500 +Subject: session: Cancel worker proxy async ops when freeing conversations + +We need to cancel ongoing async ops for worker proxies when freeing +conversations or we'll crash when the completion handler runs and we +access free'd memory. + +https://bugzilla.gnome.org/show_bug.cgi?id=758032 + +--- + +From 5ac224602f1d603aac5eaa72e1760d3e33a26f0a Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 13 Nov 2015 11:14:59 -0500 +Subject: session: disconnect signals from worker proxy when conversation is + freed + +We don't want an outstanding reference on the worker proxy to lead to +signal handlers getting dispatched after the conversation is freed. + +https://bugzilla.gnome.org/show_bug.cgi?id=758032 + +--- + + +--- daemon/gdm-session.c.orig 2015-11-18 10:47:55.522178000 +0100 ++++ daemon/gdm-session.c 2015-11-18 10:48:00.450095000 +0100 +@@ -73,6 +73,7 @@ typedef struct + GDBusMethodInvocation *pending_invocation; + GdmDBusWorkerManager *worker_manager_interface; + GdmDBusWorker *worker_proxy; ++ GCancellable *worker_cancellable; + char *session_id; + guint32 is_stopping : 1; + +@@ -1031,6 +1032,8 @@ register_worker (GdmDBusWorkerManager * + + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (conversation->worker_proxy), G_MAXINT); + ++ conversation->worker_cancellable = g_cancellable_new (); ++ + g_signal_connect (conversation->worker_proxy, + "username-changed", + G_CALLBACK (worker_on_username_changed), conversation); +@@ -1666,7 +1669,28 @@ free_conversation (GdmSessionConversatio + g_free (conversation->starting_username); + g_free (conversation->session_id); + g_clear_object (&conversation->worker_manager_interface); +- g_clear_object (&conversation->worker_proxy); ++ ++ if (conversation->worker_proxy != NULL) { ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_username_changed), ++ conversation); ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_session_exited), ++ conversation); ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_reauthenticated), ++ conversation); ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_saved_language_name_read), ++ conversation); ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_saved_session_name_read), ++ conversation); ++ g_signal_handlers_disconnect_by_func (conversation->worker_proxy, ++ G_CALLBACK (worker_on_cancel_pending_query), ++ conversation); ++ g_clear_object (&conversation->worker_proxy); ++ } + g_clear_object (&conversation->session); + g_free (conversation); + } +@@ -1828,6 +1852,9 @@ close_conversation (GdmSessionConversati + g_clear_object (&conversation->worker_manager_interface); + } + ++ g_cancellable_cancel (conversation->worker_cancellable); ++ g_clear_object (&conversation->worker_cancellable); ++ + if (conversation->worker_proxy != NULL) { + GDBusConnection *connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (conversation->worker_proxy)); + g_dbus_connection_close_sync (connection, NULL, NULL); +@@ -1996,7 +2023,7 @@ send_setup (GdmSession *self, + display_hostname, + self->priv->display_is_local, + self->priv->display_is_initial, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_setup_complete_cb, + conversation); + } +@@ -2062,7 +2089,7 @@ send_setup_for_user (GdmSession *self, + display_hostname, + self->priv->display_is_local, + self->priv->display_is_initial, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_setup_complete_cb, + conversation); + } +@@ -2124,7 +2151,7 @@ send_setup_for_program (GdmSession *self + self->priv->display_is_local, + self->priv->display_is_initial, + log_file, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_setup_complete_cb, + conversation); + } +@@ -2182,7 +2209,7 @@ gdm_session_authenticate (GdmSession *se + conversation = find_conversation_by_name (self, service_name); + if (conversation != NULL) { + gdm_dbus_worker_call_authenticate (conversation->worker_proxy, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_authenticate_cb, + conversation); + } +@@ -2199,7 +2226,7 @@ gdm_session_authorize (GdmSession *self, + conversation = find_conversation_by_name (self, service_name); + if (conversation != NULL) { + gdm_dbus_worker_call_authorize (conversation->worker_proxy, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_authorize_cb, + conversation); + } +@@ -2216,7 +2243,7 @@ gdm_session_accredit (GdmSession *self, + conversation = find_conversation_by_name (self, service_name); + if (conversation != NULL) { + gdm_dbus_worker_call_establish_credentials (conversation->worker_proxy, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_establish_credentials_cb, + conversation); + } +@@ -2230,7 +2257,8 @@ send_environment_variable (const char + { + gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy, + key, value, +- NULL, NULL, NULL); ++ conversation->worker_cancellable, ++ NULL, NULL); + } + + static void +@@ -2418,7 +2446,8 @@ send_display_mode (GdmSession *self, + mode = gdm_session_get_display_mode (self); + gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy, + gdm_session_display_mode_to_string (mode), +- NULL, NULL, NULL); ++ conversation->worker_cancellable, ++ NULL, NULL); + } + + static void +@@ -2434,7 +2463,8 @@ send_session_type (GdmSession *self, + gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy, + "XDG_SESSION_TYPE", + session_type, +- NULL, NULL, NULL); ++ conversation->worker_cancellable, ++ NULL, NULL); + } + + void +@@ -2452,7 +2482,7 @@ gdm_session_open_session (GdmSession *se + send_session_type (self, conversation); + + gdm_dbus_worker_call_open (conversation->worker_proxy, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_opened, conversation); + } + } +@@ -2638,7 +2668,7 @@ gdm_session_start_session (GdmSession *s + + gdm_dbus_worker_call_start_program (conversation->worker_proxy, + program, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_start_program_cb, + conversation); + g_free (program); +@@ -2770,7 +2800,7 @@ gdm_session_start_reauthentication (GdmS + gdm_dbus_worker_call_start_reauthentication (conversation->worker_proxy, + (int) pid_of_caller, + (int) uid_of_caller, +- NULL, ++ conversation->worker_cancellable, + (GAsyncReadyCallback) on_reauthentication_started_cb, + conversation); + } +@@ -3032,7 +3062,8 @@ gdm_session_select_session (GdmSession * + + gdm_dbus_worker_call_set_session_name (conversation->worker_proxy, + get_session_name (self), +- NULL, NULL, NULL); ++ conversation->worker_cancellable, ++ NULL, NULL); + } + } + From owner-svn-ports-branches@freebsd.org Wed Nov 18 17:37:45 2015 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 C8CEDA31230; Wed, 18 Nov 2015 17:37:45 +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 88B9D1286; Wed, 18 Nov 2015 17:37:45 +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 tAIHbiub001122; Wed, 18 Nov 2015 17:37:44 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAIHbitW001121; Wed, 18 Nov 2015 17:37:44 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201511181737.tAIHbitW001121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 18 Nov 2015 17:37:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401884 - branches/2015Q4/games/corsix-th 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.20 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, 18 Nov 2015 17:37:45 -0000 Author: madpilot Date: Wed Nov 18 17:37:44 2015 New Revision: 401884 URL: https://svnweb.freebsd.org/changeset/ports/401884 Log: MFH: r401757 r401871 r401757: Disable MOVIES option by deafult due to core dumps. PR: 204482 Submitted by: Ben Lavery r401871: Fix build on FreeBSD 9.3. Approved by: ports-secteam (feld) Modified: branches/2015Q4/games/corsix-th/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/games/corsix-th/Makefile ============================================================================== --- branches/2015Q4/games/corsix-th/Makefile Wed Nov 18 17:00:16 2015 (r401883) +++ branches/2015Q4/games/corsix-th/Makefile Wed Nov 18 17:37:44 2015 (r401884) @@ -3,6 +3,7 @@ PORTNAME= corsixth PORTVERSION= 0.50 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= games @@ -21,13 +22,14 @@ DOS2UNIX_FILES= CMake/FindFFmpeg.cmake \ CorsixTH/CMakeLists.txt \ CorsixTH/Src/iso_fs.cpp CMAKE_ARGS= -DWITH_LUAJIT=OFF +CFLAGS+= -I${ICONV_PREFIX}/include USE_GITHUB= yes GH_ACCOUNT= CorsixTH GH_PROJECT= CorsixTH OPTIONS_DEFINE= MOVIES -OPTIONS_DEFAULT= MOVIES +#OPTIONS_DEFAULT= MOVIES MOVIES_DESC= Play in-game movies MOVIES_CMAKE_ON= -DWITH_MOVIES=ON From owner-svn-ports-branches@freebsd.org Wed Nov 18 18:26:13 2015 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 44F57A31FF6; Wed, 18 Nov 2015 18:26:13 +0000 (UTC) (envelope-from rm@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 E99FF1ED1; Wed, 18 Nov 2015 18:26:12 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAIIQCqt016082; Wed, 18 Nov 2015 18:26:12 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAIIQBnA016080; Wed, 18 Nov 2015 18:26:11 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201511181826.tAIIQBnA016080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Wed, 18 Nov 2015 18:26:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401887 - branches/2015Q4/editors/leo 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.20 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, 18 Nov 2015 18:26:13 -0000 Author: rm Date: Wed Nov 18 18:26:11 2015 New Revision: 401887 URL: https://svnweb.freebsd.org/changeset/ports/401887 Log: MFH: r401886 editors/leo: fix runtime - fix runtime - limit to python 2.x, because port's dependency textproc/silvercity fails to build with python3 - bump PORTREVISION because of package change PR: 200920 Submitted by: Michael Krauss Approved by: portmgr (blanket) Modified: branches/2015Q4/editors/leo/Makefile branches/2015Q4/editors/leo/pkg-descr Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/editors/leo/Makefile ============================================================================== --- branches/2015Q4/editors/leo/Makefile Wed Nov 18 18:24:18 2015 (r401886) +++ branches/2015Q4/editors/leo/Makefile Wed Nov 18 18:26:11 2015 (r401887) @@ -3,7 +3,7 @@ PORTNAME= leo PORTVERSION= 5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors python MASTER_SITES= SF/${PORTNAME}/Leo/${PORTVERSION}-final DISTNAME= Leo-${PORTVERSION}-final @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli NO_ARCH= yes -USES= python shebangfix zip +USES= python:2 shebangfix zip SHEBANG_FILES= leo/doc/html/fixup.pl leo/external/saveleo USE_PYTHON= autoplist distutils @@ -35,4 +35,8 @@ OPTIONS_DEFINE= DOCS PYENCHANT PYENCHANT_DESC= Spell checking support via PyEnchant PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:${PORTSDIR}/textproc/py-enchant +post-install: + @${REINPLACE_CMD} -e 's,===,==,' ${STAGEDIR}${PREFIX}/bin/leo \ + ${STAGEDIR}${PREFIX}/bin/leoc + .include Modified: branches/2015Q4/editors/leo/pkg-descr ============================================================================== --- branches/2015Q4/editors/leo/pkg-descr Wed Nov 18 18:24:18 2015 (r401886) +++ branches/2015Q4/editors/leo/pkg-descr Wed Nov 18 18:26:11 2015 (r401887) @@ -17,6 +17,6 @@ * Leo is portable. Leo.py is 100% pure Python and will run on any platform supporting Python and PyQt, including Windows, Linux and MacOS X. -* Leo is Open Software, distributed under the Python License. +* Leo is Open Software, distributed under the Python License. WWW: http://leoeditor.com/ From owner-svn-ports-branches@freebsd.org Thu Nov 19 18:15:37 2015 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 85681A33390; Thu, 19 Nov 2015 18:15:37 +0000 (UTC) (envelope-from jkim@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 246D31A22; Thu, 19 Nov 2015 18:15:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJIFZ7V038317; Thu, 19 Nov 2015 18:15:35 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJIFZGr038315; Thu, 19 Nov 2015 18:15:35 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201511191815.tAJIFZGr038315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 19 Nov 2015 18:15:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401957 - branches/2015Q4/java/openjdk6 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.20 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, 19 Nov 2015 18:15:37 -0000 Author: jkim Date: Thu Nov 19 18:15:35 2015 New Revision: 401957 URL: https://svnweb.freebsd.org/changeset/ports/401957 Log: MFH: r401795 Update to b37. Approved by: ports-secteam (feld) Modified: branches/2015Q4/java/openjdk6/Makefile branches/2015Q4/java/openjdk6/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/java/openjdk6/Makefile ============================================================================== --- branches/2015Q4/java/openjdk6/Makefile Thu Nov 19 17:23:57 2015 (r401956) +++ branches/2015Q4/java/openjdk6/Makefile Thu Nov 19 18:15:35 2015 (r401957) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openjdk6 -PORTVERSION= b36 +PORTVERSION= b37 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE/ant/binaries/:ant \ @@ -28,7 +28,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu -OPENJDK_BUILDDATE= 22_jul_2015 +OPENJDK_BUILDDATE= 11_nov_2015 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE Modified: branches/2015Q4/java/openjdk6/distinfo ============================================================================== --- branches/2015Q4/java/openjdk6/distinfo Thu Nov 19 17:23:57 2015 (r401956) +++ branches/2015Q4/java/openjdk6/distinfo Thu Nov 19 18:15:35 2015 (r401957) @@ -1,6 +1,6 @@ SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965 -SHA256 (openjdk-6-src-b36-22_jul_2015.tar.xz) = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 -SIZE (openjdk-6-src-b36-22_jul_2015.tar.xz) = 33757312 +SHA256 (openjdk-6-src-b37-11_nov_2015.tar.xz) = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d +SIZE (openjdk-6-src-b37-11_nov_2015.tar.xz) = 33790124 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382 From owner-svn-ports-branches@freebsd.org Thu Nov 19 19:25:04 2015 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 DCAAAA33243; Thu, 19 Nov 2015 19:25:04 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3C78B1FFE; Thu, 19 Nov 2015 19:25:03 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0M2nfO-1aFed73Z5S-00sfg4; Thu, 19 Nov 2015 20:24:56 +0100 Subject: Re: svn commit: r401957 - branches/2015Q4/java/openjdk6 To: Jung-uk Kim References: <201511191815.tAJIFZGr038315@repo.freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org From: olli hauer Message-ID: <564E2208.6080702@gmx.de> Date: Thu, 19 Nov 2015 20:24:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <201511191815.tAJIFZGr038315@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:CCogts7VuCD8ZpvHwv47PDpQSvzsOyXlxR6Gsm7MSltYZHiZOW3 Mw/RXst0ZKWhMw1LIey8TgUz6yxwHPHUWoOD4vHyUVxZhTP7u8OT1X3qG4Oz6msNfKaM1II 4QOV7ngLlBsqcSuuLBn+jJ/37X/eihBbuAMV5wm3JMifwk2o6U9D3REcNYdBNswDG+8GZp7 84PKLlGuJqgHgLtseFEjw== X-UI-Out-Filterresults: notjunk:1;V01:K0:bJQjA7QRVOk=:vnFszDNanY4N0lOgrYDJ5g htI7OMpn048b2Prxl19Mg6KLJQCQpOV6Q1+yxe1jQr12UQ76BzpMHWoTuyv11JK8SosUXcZN8 WOvOnUfygOI8jHpTMQTcsSTdf435qOBtABb2sX74EzETHv2fzt7hF/EvC+MJu5uOLYDEyX8LD j+55u8mazTtm1gx24ghM/JePQHprKxQEcop1U0IxfFYRyHuKwUL6IeVWFpCOO41Vz+sk5vDeg UkqhzRVG5fhvZSAoJRlu/uzJdwLSXXI8C9oTAhOrzx4Q3Ew5lc4IH7Oaj04UE9agQFbA3sVvp o953N3g0aE5f2ijZ8toxDCXLYGWs4eEVncuoYzPb746wSZe/BBuca56kkaQ7E1OxAA1q/e5qe fLQptJiYid4wc0G7R23bBq1zd/6lUtMWfha9qWXh+aIcGDzW3ITia+2TkQoOchD333qU0Rvb/ ZkII7TT19HMjffvwBgQIz7vNQ8Qz3kZW2YOC2SSaBQegV2r97XKw4BTWyMqru7A4GbGwggKhj e1RoxE4lfEdxw/nceJzj83TwI+YAiuqGLHuHhpyxEnEfTneawlOaTiw341jLpAR/EHySeNmAL y/xrO4rBktOWdAm0MLEPDuJO7VD4h84yrWtkyWwDjGlnB4da29yTOnCVjK43ZxgE6NS1sCffy 3h0xjRXgOxq/wjp93xQGbc9ye5CWmdMGdN8Zn2Ft9Ci6RV2cTXbnNN7/VDA1yTrmntEqgx2jW Y8OkW5Ro09eakC2p6IG0JuVwbAlCFqPVJuP1FXyg6oy/92X/McfiHJOW+Np9OvoEZWva6pg94 SLA0C/V X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 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, 19 Nov 2015 19:25:05 -0000 On 2015-11-19 19:15, Jung-uk Kim wrote: > Author: jkim > Date: Thu Nov 19 18:15:35 2015 > New Revision: 401957 > URL: https://svnweb.freebsd.org/changeset/ports/401957 > > Log: > MFH: r401795 > > Update to b37. > > Approved by: ports-secteam (feld) > Hi jkim, it seems the source file jtreg-4.1-bin-b05_29_nov_2012.zip is not available on the default download sites. Can you please check the following patch? Index: Makefile =================================================================== --- Makefile (revision 401958) +++ Makefile (working copy) @@ -8,7 +8,7 @@ MASTER_SITES= APACHE/ant/binaries/:ant \ http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \ https://java.net/downloads/openjdk6/ \ - LOCAL/jkim + LOCAL/jkim:jtreg DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE} DISTFILES= ${ANTFILE}:ant \ ${DISTNAME}${EXTRACT_SUFX} -- olli From owner-svn-ports-branches@freebsd.org Thu Nov 19 20:01:39 2015 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 769FDA339EB; Thu, 19 Nov 2015 20:01:39 +0000 (UTC) (envelope-from jkim@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 3F89B1843; Thu, 19 Nov 2015 20:01:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJK1cXG069313; Thu, 19 Nov 2015 20:01:38 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJK1bLj069308; Thu, 19 Nov 2015 20:01:37 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201511192001.tAJK1bLj069308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 19 Nov 2015 20:01:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401959 - in branches/2015Q4/x11/xpra: . 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.20 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, 19 Nov 2015 20:01:39 -0000 Author: jkim Date: Thu Nov 19 20:01:37 2015 New Revision: 401959 URL: https://svnweb.freebsd.org/changeset/ports/401959 Log: MFH: r399796, r401788 Update to 0.15.8. Approved by: ports-secteam (feld) Added: branches/2015Q4/x11/xpra/pkg-message - copied unchanged from r399796, head/x11/xpra/pkg-message Modified: branches/2015Q4/x11/xpra/Makefile branches/2015Q4/x11/xpra/distinfo branches/2015Q4/x11/xpra/files/patch-setup.py branches/2015Q4/x11/xpra/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/x11/xpra/Makefile ============================================================================== --- branches/2015Q4/x11/xpra/Makefile Thu Nov 19 18:36:58 2015 (r401958) +++ branches/2015Q4/x11/xpra/Makefile Thu Nov 19 20:01:37 2015 (r401959) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xpra -PORTVERSION= 0.15.6 +PORTVERSION= 0.15.8 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ @@ -14,7 +14,6 @@ LICENSE= GPLv2 BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \ - pulseaudio:${PORTSDIR}/audio/pulseaudio \ ${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \ @@ -31,27 +30,74 @@ RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7 Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext -LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp \ - libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ - libvpx.so:${PORTSDIR}/multimedia/libvpx \ - libx264.so:${PORTSDIR}/multimedia/libx264 \ - libx265.so:${PORTSDIR}/multimedia/x265 -USES= pkgconfig python tar:xz +USES= desktop-file-utils pkgconfig python shared-mime-info tar:xz USE_PYTHON= distutils USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} +OPTIONS_DEFINE= AVCODEC OPENCL SWSCALE VPX WEBP X264 X265 +OPTIONS_DEFAULT= AVCODEC SWSCALE VPX WEBP X264 X265 +OPTIONS_SUB= yes + +AVCODEC_DESC= Enable avcodec2 decoder +OPENCL_DESC= Enable OpenCL CSC module +SWSCALE_DESC= Enable swscale CSC module +VPX_DESC= Enable VP8 and VP9 encoder +WEBP_DESC= Enable WebP encoder +X264_DESC= Enable X264 encoder +X265_DESC= Enable X265 encoder + +AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 +OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd +OPENCL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyopencl/__init__.py:${PORTSDIR}/devel/py-pyopencl +OPENCL_VARS= XPRA_OPTIONS+=csc_opencl +SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale +VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx +VPX_VARS= XPRA_OPTIONS+=vpx +WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp +WEBP_VARS= XPRA_OPTIONS+=webp +X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 +X264_VARS= XPRA_OPTIONS+=enc_x264 +X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 +X265_VARS= XPRA_OPTIONS+=enc_x265 + PYDISTUTILS_PKGNAME= xpra_all +XPRA_OPTIONS_ALL= csc_opencl csc_swscale dec_avcodec2 +XPRA_OPTIONS_ALL+= enc_x264 enc_x265 vpx webp +XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED} +XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper +XPRA_OPTIONS_DISABLED+= nvenc3 nvenc4 nvenc5 + +.include + +.for opt in ${XPRA_OPTIONS_ALL} +.if empty(XPRA_OPTIONS:M${opt}) +PYDISTUTILS_ARGS+= --without-${opt} +.else +PYDISTUTILS_ARGS+= --with-${opt} +.endif +.endfor + +.if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MSWSCALE} +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +.endif + +.include + +PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} +PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS} +PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS} post-patch: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \ - ${STAGEDIR}${ETCDIR}/xorg.conf.sample + ${RM} ${STAGEDIR}${ETCDIR}/xpra.conf ${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \ + -exec ${STRIP_CMD} {} \; -.include +.include Modified: branches/2015Q4/x11/xpra/distinfo ============================================================================== --- branches/2015Q4/x11/xpra/distinfo Thu Nov 19 18:36:58 2015 (r401958) +++ branches/2015Q4/x11/xpra/distinfo Thu Nov 19 20:01:37 2015 (r401959) @@ -1,2 +1,2 @@ -SHA256 (xpra-0.15.6.tar.xz) = cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 -SIZE (xpra-0.15.6.tar.xz) = 1196700 +SHA256 (xpra-0.15.8.tar.xz) = e6ca124c89cfa81c8ee69dd2d746cdb0b4d896af6b369e60abc50d2fd2d2a0d2 +SIZE (xpra-0.15.8.tar.xz) = 1198496 Modified: branches/2015Q4/x11/xpra/files/patch-setup.py ============================================================================== --- branches/2015Q4/x11/xpra/files/patch-setup.py Thu Nov 19 18:36:58 2015 (r401958) +++ branches/2015Q4/x11/xpra/files/patch-setup.py Thu Nov 19 20:01:37 2015 (r401959) @@ -1,6 +1,15 @@ ---- setup.py.orig 2015-06-12 20:31:00 UTC +--- setup.py.orig 2015-09-10 14:42:44 UTC +++ setup.py -@@ -1552,12 +1552,12 @@ if WIN32: +@@ -147,7 +147,7 @@ nvenc4_ENABLED = pkg_config_ok( + nvenc5_ENABLED = pkg_config_ok("--exists", "nvenc5") + #elif os.path.exists("C:\\nvenc_3.0_windows_sdk") + #... +-csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD() ++csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL") + memoryview_ENABLED = PYTHON3 + + warn_ENABLED = True +@@ -1560,12 +1560,12 @@ if WIN32: else: #OSX and *nix: scripts += ["scripts/xpra", "scripts/xpra_launcher"] @@ -15,7 +24,7 @@ add_data_files("share/appdata", ["xdg/xpra.appdata.xml"]) html5_dir = "share/xpra/www" -@@ -1680,7 +1680,7 @@ if html5_ENABLED: +@@ -1688,7 +1688,7 @@ if html5_ENABLED: if printing_ENABLED and os.name=="posix": #"/usr/lib/cups/backend": Copied: branches/2015Q4/x11/xpra/pkg-message (from r399796, head/x11/xpra/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/x11/xpra/pkg-message Thu Nov 19 20:01:37 2015 (r401959, copy of r399796, head/x11/xpra/pkg-message) @@ -0,0 +1,14 @@ +============================================================================== +x11/xpra install note: + +Requirements for sound forwarding: +* a client with sound output of any kind (even virtual) +* a server with pulseaudio installed (for going beyond the simple test step) +* users must be "pulseaudio-enabled" - whatever that means in terms of + permissions and user setup (policy, user group, etc) + +The runtime dependency on pulseaudio has been dropped from this port since it +is strictly optional at runtime. If you want to forward sound from the server, +then pulseaudio must be installed and configured for use. Pulseaudio is +supported for client side but not required for any feature to function. +============================================================================== Modified: branches/2015Q4/x11/xpra/pkg-plist ============================================================================== --- branches/2015Q4/x11/xpra/pkg-plist Thu Nov 19 18:36:58 2015 (r401958) +++ branches/2015Q4/x11/xpra/pkg-plist Thu Nov 19 20:01:37 2015 (r401959) @@ -1,7 +1,7 @@ bin/xpra bin/xpra_Xdummy bin/xpra_launcher -@sample %%ETCDIR%%/xorg.conf.sample +%%ETCDIR%%/xorg.conf @sample %%ETCDIR%%/xpra.conf.sample %%PYTHON_SITELIBDIR%%/xpra/__init__.py %%PYTHON_SITELIBDIR%%/xpra/__init__.pyc @@ -188,28 +188,37 @@ bin/xpra_launcher %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyo %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/colorspace_converter.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.py +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyc +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyo +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.py +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyc +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyo +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.py +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyc +%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyo +%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py +%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyc +%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyo +%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so +%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py +%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyc +%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyo +%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.py %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyo %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.py %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so +%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.py +%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyc +%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyo +%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so +%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py +%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyc +%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyo +%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo @@ -222,16 +231,16 @@ bin/xpra_launcher %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py -%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyc -%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyo -%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decode.so -%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encode.so +%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py +%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc +%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo +%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so +%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so +%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py +%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyc +%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyo +%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decode.so +%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encode.so %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.py %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo From owner-svn-ports-branches@freebsd.org Thu Nov 19 20:57:37 2015 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 0A90FA33921; Thu, 19 Nov 2015 20:57:37 +0000 (UTC) (envelope-from jkim@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 C5DFA1D23; Thu, 19 Nov 2015 20:57:36 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJKvZSp085594; Thu, 19 Nov 2015 20:57:35 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJKvZdj085593; Thu, 19 Nov 2015 20:57:35 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201511192057.tAJKvZdj085593@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 19 Nov 2015 20:57:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r401972 - branches/2015Q4/java/openjdk6 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.20 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, 19 Nov 2015 20:57:37 -0000 Author: jkim Date: Thu Nov 19 20:57:35 2015 New Revision: 401972 URL: https://svnweb.freebsd.org/changeset/ports/401972 Log: MFH: r401961 The old URL for jtreg disappeared. Approved by: ports-secteam (erwin) Modified: branches/2015Q4/java/openjdk6/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/java/openjdk6/Makefile ============================================================================== --- branches/2015Q4/java/openjdk6/Makefile Thu Nov 19 20:56:37 2015 (r401971) +++ branches/2015Q4/java/openjdk6/Makefile Thu Nov 19 20:57:35 2015 (r401972) @@ -6,12 +6,11 @@ PORTVERSION= b37 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE/ant/binaries/:ant \ - http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \ - https://java.net/downloads/openjdk6/ \ - LOCAL/jkim + https://java.net/downloads/openjdk6/:jdk \ + LOCAL/jkim:jdk,jtreg DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE} DISTFILES= ${ANTFILE}:ant \ - ${DISTNAME}${EXTRACT_SUFX} + ${DISTNAME}${EXTRACT_SUFX}:jdk EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE} MAINTAINER= java@FreeBSD.org From owner-svn-ports-branches@freebsd.org Sat Nov 21 15:32:38 2015 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 F1EF1A34AD5; Sat, 21 Nov 2015 15:32:38 +0000 (UTC) (envelope-from kwm@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 A644610AA; Sat, 21 Nov 2015 15:32:38 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tALFWbVe075159; Sat, 21 Nov 2015 15:32:37 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tALFWbl0075157; Sat, 21 Nov 2015 15:32:37 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201511211532.tALFWbl0075157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 21 Nov 2015 15:32:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r402163 - in branches/2015Q4/textproc/libxslt: . 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.20 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, 21 Nov 2015 15:32:39 -0000 Author: kwm Date: Sat Nov 21 15:32:37 2015 New Revision: 402163 URL: https://svnweb.freebsd.org/changeset/ports/402163 Log: MFH: r402101 Fix CVE-2015-7995 Obtained from: libxslt upstream Security: ecc268f2-8fc2-11e5-918c-bcaec565249c Approved by: portmgr (erwin@) Added: branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995 - copied unchanged from r402101, head/textproc/libxslt/files/patch-CVE-2015-7995 Modified: branches/2015Q4/textproc/libxslt/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/textproc/libxslt/Makefile ============================================================================== --- branches/2015Q4/textproc/libxslt/Makefile Sat Nov 21 15:04:37 2015 (r402162) +++ branches/2015Q4/textproc/libxslt/Makefile Sat Nov 21 15:32:37 2015 (r402163) @@ -3,7 +3,7 @@ PORTNAME= libxslt PORTVERSION= 1.1.28 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ Copied: branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995 (from r402101, head/textproc/libxslt/files/patch-CVE-2015-7995) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995 Sat Nov 21 15:32:37 2015 (r402163, copy of r402101, head/textproc/libxslt/files/patch-CVE-2015-7995) @@ -0,0 +1,29 @@ +From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 29 Oct 2015 19:33:23 +0800 +Subject: Fix for type confusion in preprocessing attributes + +CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 +We need to check that the parent node is an element before dereferencing +its namespace +--- + libxslt/preproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libxslt/preproc.c b/libxslt/preproc.c +index 0eb80a0..7f69325 100644 +--- libxslt/preproc.c ++++ libxslt/preproc.c +@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { + } else if (IS_XSLT_NAME(inst, "attribute")) { + xmlNodePtr parent = inst->parent; + +- if ((parent == NULL) || (parent->ns == NULL) || ++ if ((parent == NULL) || ++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || + ((parent->ns != inst->ns) && + (!xmlStrEqual(parent->ns->href, inst->ns->href))) || + (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { +-- +cgit v0.11.2 + From owner-svn-ports-branches@freebsd.org Sat Nov 21 15:34:01 2015 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 E8B4AA34B3A; Sat, 21 Nov 2015 15:34:00 +0000 (UTC) (envelope-from kwm@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 A589511C9; Sat, 21 Nov 2015 15:34:00 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tALFXxxD075440; Sat, 21 Nov 2015 15:33:59 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tALFXxKJ075433; Sat, 21 Nov 2015 15:33:59 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201511211533.tALFXxKJ075433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 21 Nov 2015 15:33:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r402164 - in branches/2015Q4/textproc: libxml2 libxml2/files py-libxml2 py3-libxml2 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.20 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, 21 Nov 2015 15:34:01 -0000 Author: kwm Date: Sat Nov 21 15:33:58 2015 New Revision: 402164 URL: https://svnweb.freebsd.org/changeset/ports/402164 Log: MFH: r402102 New release to fix a number of CVE's. CVE-2015-1819 is also listed in the release notes of 2.9.3 but that issue was fixed in a previous commit and documented in another vuxml entry. Security: e5423caf-8fb8-11e5-918c-bcaec565249c Approved by: portmgr (erwin@) Deleted: branches/2015Q4/textproc/libxml2/files/patch-CVE-2015-1819 branches/2015Q4/textproc/libxml2/files/patch-parser.c Modified: branches/2015Q4/textproc/libxml2/Makefile branches/2015Q4/textproc/libxml2/distinfo branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0.pc.in branches/2015Q4/textproc/py-libxml2/Makefile branches/2015Q4/textproc/py3-libxml2/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/textproc/libxml2/Makefile ============================================================================== --- branches/2015Q4/textproc/libxml2/Makefile Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/libxml2/Makefile Sat Nov 21 15:33:58 2015 (r402164) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= libxml2 -PORTVERSION= 2.9.2 -PORTREVISION?= 3 +PORTVERSION= 2.9.3 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ @@ -22,6 +22,7 @@ USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ + --without-icu \ --with-lzma=/usr \ --without-python INSTALL_TARGET= install-strip Modified: branches/2015Q4/textproc/libxml2/distinfo ============================================================================== --- branches/2015Q4/textproc/libxml2/distinfo Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/libxml2/distinfo Sat Nov 21 15:33:58 2015 (r402164) @@ -1,2 +1,2 @@ -SHA256 (gnome2/libxml2-2.9.2.tar.gz) = 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc -SIZE (gnome2/libxml2-2.9.2.tar.gz) = 5444991 +SHA256 (gnome2/libxml2-2.9.3.tar.gz) = 4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d +SIZE (gnome2/libxml2-2.9.3.tar.gz) = 5477112 Modified: branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in ============================================================================== --- branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in Sat Nov 21 15:33:58 2015 (r402164) @@ -1,9 +1,9 @@ ---- libxml-2.0-uninstalled.pc.in.orig 2009-07-30 11:24:34.000000000 -0400 -+++ libxml-2.0-uninstalled.pc.in 2013-04-09 15:37:18.000000000 -0400 +--- libxml-2.0-uninstalled.pc.in.orig 2014-10-03 11:00:53.000000000 +0200 ++++ libxml-2.0-uninstalled.pc.in 2015-07-31 13:26:13.641069000 +0200 @@ -8,5 +8,5 @@ Version: @VERSION@ Description: libXML library version2. Requires: --Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ Modified: branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0.pc.in ============================================================================== --- branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0.pc.in Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/libxml2/files/patch-libxml-2.0.pc.in Sat Nov 21 15:33:58 2015 (r402164) @@ -1,9 +1,9 @@ ---- libxml-2.0.pc.in.orig 2010-05-14 11:26:41.000000000 -0400 -+++ libxml-2.0.pc.in 2013-04-09 15:35:53.000000000 -0400 +--- libxml-2.0.pc.in.orig 2014-10-03 11:00:53.000000000 +0200 ++++ libxml-2.0.pc.in 2015-07-31 13:26:13.647320000 +0200 @@ -9,5 +9,5 @@ Description: libXML library version2. Requires: Libs: -L${libdir} -lxml2 --Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ +-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ +Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ Modified: branches/2015Q4/textproc/py-libxml2/Makefile ============================================================================== --- branches/2015Q4/textproc/py-libxml2/Makefile Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/py-libxml2/Makefile Sat Nov 21 15:33:58 2015 (r402164) @@ -1,6 +1,5 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ -# $MCom: ports/trunk/textproc/py-libxml2/Makefile 18999 2014-02-04 18:55:27Z kwm $ PORTREVISION= 0 CATEGORIES= textproc gnome python Modified: branches/2015Q4/textproc/py3-libxml2/Makefile ============================================================================== --- branches/2015Q4/textproc/py3-libxml2/Makefile Sat Nov 21 15:32:37 2015 (r402163) +++ branches/2015Q4/textproc/py3-libxml2/Makefile Sat Nov 21 15:33:58 2015 (r402164) @@ -1,8 +1,7 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ -# $MCom: ports/trunk/textproc/py3-libxml2/Makefile 19293 2014-03-24 20:46:10Z kwm $ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}