From owner-svn-ports-branches@freebsd.org Tue Dec 20 09:42:12 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16BEDC87486; Tue, 20 Dec 2016 09:42:12 +0000 (UTC) (envelope-from royger@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 DFEF91EE5; Tue, 20 Dec 2016 09:42:11 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBK9gB65087408; Tue, 20 Dec 2016 09:42:11 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBK9gARL087406; Tue, 20 Dec 2016 09:42:10 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201612200942.uBK9gARL087406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Tue, 20 Dec 2016 09:42:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428983 - in branches/2016Q4/emulators/xen-kernel: . 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.23 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, 20 Dec 2016 09:42:12 -0000 Author: royger (src committer) Date: Tue Dec 20 09:42:10 2016 New Revision: 428983 URL: https://svnweb.freebsd.org/changeset/ports/428983 Log: MFH: r428950 xen-kernel: add fix for XSA-204 Sponsored by: Citrix Systems R&D Approved by: ports-secteam (junovitch) Added: branches/2016Q4/emulators/xen-kernel/files/xsa204-4.7.patch - copied unchanged from r428950, head/emulators/xen-kernel/files/xsa204-4.7.patch Modified: branches/2016Q4/emulators/xen-kernel/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/emulators/xen-kernel/Makefile ============================================================================== --- branches/2016Q4/emulators/xen-kernel/Makefile Tue Dec 20 09:30:25 2016 (r428982) +++ branches/2016Q4/emulators/xen-kernel/Makefile Tue Dec 20 09:42:10 2016 (r428983) @@ -3,7 +3,7 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel PORTVERSION= 4.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -45,7 +45,8 @@ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logd ${FILESDIR}/xsa193-4.7.patch \ ${FILESDIR}/xsa194.patch \ ${FILESDIR}/xsa195.patch \ - ${FILESDIR}/xsa200-4.7.patch + ${FILESDIR}/xsa200-4.7.patch \ + ${FILESDIR}/xsa204-4.7.patch .include Copied: branches/2016Q4/emulators/xen-kernel/files/xsa204-4.7.patch (from r428950, head/emulators/xen-kernel/files/xsa204-4.7.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa204-4.7.patch Tue Dec 20 09:42:10 2016 (r428983, copy of r428950, head/emulators/xen-kernel/files/xsa204-4.7.patch) @@ -0,0 +1,69 @@ +From: Andrew Cooper +Date: Sun, 18 Dec 2016 15:42:59 +0000 +Subject: [PATCH] x86/emul: Correct the handling of eflags with SYSCALL + +A singlestep #DB is determined by the resulting eflags value from the +execution of SYSCALL, not the original eflags value. + +By using the original eflags value, we negate the guest kernels attempt to +protect itself from a privilege escalation by masking TF. + +Introduce a tf boolean and have the SYSCALL emulation recalculate it +after the instruction is complete. + +This is XSA-204 + +Signed-off-by: Andrew Cooper +Reviewed-by: Jan Beulich +--- + xen/arch/x86/x86_emulate/x86_emulate.c | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c +index bca7045..abe442e 100644 +--- a/xen/arch/x86/x86_emulate/x86_emulate.c ++++ b/xen/arch/x86/x86_emulate/x86_emulate.c +@@ -1582,6 +1582,7 @@ x86_emulate( + union vex vex = {}; + unsigned int op_bytes, def_op_bytes, ad_bytes, def_ad_bytes; + bool_t lock_prefix = 0; ++ bool_t tf = !!(ctxt->regs->eflags & EFLG_TF); + int override_seg = -1, rc = X86EMUL_OKAY; + struct operand src = { .reg = REG_POISON }; + struct operand dst = { .reg = REG_POISON }; +@@ -3910,9 +3911,8 @@ x86_emulate( + } + + no_writeback: +- /* Inject #DB if single-step tracing was enabled at instruction start. */ +- if ( (ctxt->regs->eflags & EFLG_TF) && (rc == X86EMUL_OKAY) && +- (ops->inject_hw_exception != NULL) ) ++ /* Should a singlestep #DB be raised? */ ++ if ( tf && (rc == X86EMUL_OKAY) && (ops->inject_hw_exception != NULL) ) + rc = ops->inject_hw_exception(EXC_DB, -1, ctxt) ? : X86EMUL_EXCEPTION; + + /* Commit shadow register state. */ +@@ -4143,6 +4143,23 @@ x86_emulate( + (rc = ops->write_segment(x86_seg_ss, &ss, ctxt)) ) + goto done; + ++ /* ++ * SYSCALL (unlike most instructions) evaluates its singlestep action ++ * based on the resulting EFLG_TF, not the starting EFLG_TF. ++ * ++ * As the #DB is raised after the CPL change and before the OS can ++ * switch stack, it is a large risk for privilege escalation. ++ * ++ * 64bit kernels should mask EFLG_TF in MSR_FMASK to avoid any ++ * vulnerability. Running the #DB handler on an IST stack is also a ++ * mitigation. ++ * ++ * 32bit kernels have no ability to mask EFLG_TF at all. Their only ++ * mitigation is to use a task gate for handling #DB (or to not use ++ * enable EFER.SCE to start with). ++ */ ++ tf = !!(_regs.eflags & EFLG_TF); ++ + break; + } + From owner-svn-ports-branches@freebsd.org Wed Dec 21 05:14:06 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30829C89A8A; Wed, 21 Dec 2016 05:14:06 +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 0B07212B5; Wed, 21 Dec 2016 05:14:05 +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 uBL5E5aZ065232; Wed, 21 Dec 2016 05:14:05 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBL5E4vi065228; Wed, 21 Dec 2016 05:14:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612210514.uBL5E4vi065228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Dec 2016 05:14:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429040 - in branches/2016Q4/devel: py-game_sdl2 renpy 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.23 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, 21 Dec 2016 05:14:06 -0000 Author: jbeich Date: Wed Dec 21 05:14:04 2016 New Revision: 429040 URL: https://svnweb.freebsd.org/changeset/ports/429040 Log: MFH: r428991 devel/py-game_sdl2, devel/renpy: update to 6.99.12 Changes: http://www.renpy.org/latest.html (see Announcement) Changes: http://www.renpy.org/doc/html/changelog.html#ren-py-6-99-12 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/devel/py-game_sdl2/Makefile branches/2016Q4/devel/py-game_sdl2/distinfo branches/2016Q4/devel/renpy/Makefile branches/2016Q4/devel/renpy/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/py-game_sdl2/Makefile ============================================================================== --- branches/2016Q4/devel/py-game_sdl2/Makefile Wed Dec 21 05:11:26 2016 (r429039) +++ branches/2016Q4/devel/py-game_sdl2/Makefile Wed Dec 21 05:14:04 2016 (r429040) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 6.99.11 +PORTVERSION= 6.99.12 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Modified: branches/2016Q4/devel/py-game_sdl2/distinfo ============================================================================== --- branches/2016Q4/devel/py-game_sdl2/distinfo Wed Dec 21 05:11:26 2016 (r429039) +++ branches/2016Q4/devel/py-game_sdl2/distinfo Wed Dec 21 05:14:04 2016 (r429040) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473182080 -SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.11.tar.gz) = c25dfc70e97a4f7de0f0329fac087b78b561338505668bf502d4bb95e3d05270 -SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.11.tar.gz) = 2298606 +TIMESTAMP = 1482204080 +SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.12.tar.gz) = 1c322a01114397190049eab77f7d4e1b43bc98a5128c62114556376585d2f2c9 +SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.12.tar.gz) = 2291818 Modified: branches/2016Q4/devel/renpy/Makefile ============================================================================== --- branches/2016Q4/devel/renpy/Makefile Wed Dec 21 05:11:26 2016 (r429039) +++ branches/2016Q4/devel/renpy/Makefile Wed Dec 21 05:14:04 2016 (r429040) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 6.99.11 +PORTVERSION?= 6.99.12 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= devel games @@ -26,10 +26,8 @@ RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}gam CONFLICTS_INSTALL?= ${PORTNAME}6-* -.ifndef PKGNAMESUFFIX # Upstream tends to reroll distfiles before moving under /release/ -PORTSCOUT= site:http://www.renpy.org/dl/release/ -.endif +PORTSCOUT?= site:http://www.renpy.org/dl/release/ USES= python:2.7 shebangfix tar:bz2 USE_GL= glew @@ -70,6 +68,9 @@ LICENSE_FILE_${lic}= ${WRKSRC}/LICENSE.t LICENSE_PERMS_${lic}= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept . endfor +post-extract: + @${FIND} ${WRKSRC}/lib ${WRKSRC}/renpy.app -type d -empty -delete + .if !target(post-patch) post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ Modified: branches/2016Q4/devel/renpy/distinfo ============================================================================== --- branches/2016Q4/devel/renpy/distinfo Wed Dec 21 05:11:26 2016 (r429039) +++ branches/2016Q4/devel/renpy/distinfo Wed Dec 21 05:14:04 2016 (r429040) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473182080 -SHA256 (renpy-6.99.11-sdk.tar.bz2) = 2b3944cf070376de3f053fb2bca7a98e0c048f09dd569ca2bf5bf0d565604869 -SIZE (renpy-6.99.11-sdk.tar.bz2) = 57615217 +TIMESTAMP = 1480999861 +SHA256 (renpy-6.99.12-sdk.tar.bz2) = 8a58d1b133c05243e3d43717253ef72319cffbabf8db207717e9d9e0f45a7a93 +SIZE (renpy-6.99.12-sdk.tar.bz2) = 56689673 From owner-svn-ports-branches@freebsd.org Thu Dec 22 02:03:23 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77661C8B76C; Thu, 22 Dec 2016 02:03:23 +0000 (UTC) (envelope-from adamw@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 0A1667D7; Thu, 22 Dec 2016 02:03:22 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBM23MOU077412; Thu, 22 Dec 2016 02:03:22 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBM23Lwh077408; Thu, 22 Dec 2016 02:03:21 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201612220203.uBM23Lwh077408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 22 Dec 2016 02:03:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429136 - in branches/2016Q4/www/joomla3: . 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.23 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, 22 Dec 2016 02:03:23 -0000 Author: adamw Date: Thu Dec 22 02:03:21 2016 New Revision: 429136 URL: https://svnweb.freebsd.org/changeset/ports/429136 Log: MFH: r429131 Update to 3.6.5, which addresses a number of CVEs. Add postgresql support via a knob, and pass maintainership to submitter. Thanks to nivit for looking after this port for so long. PR: 215058 Submitted by: Larry Rosenman Approved by: maintainer timeout Security: CVE-2016-8869 Security: CVE-2016-8870 Security: CVE-2016-9081 Security: CVE-2016-9836 Security: CVE-2016-9837 Security: CVE-2016-9838 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/www/joomla3/Makefile branches/2016Q4/www/joomla3/distinfo branches/2016Q4/www/joomla3/files/pkg-message.in branches/2016Q4/www/joomla3/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/joomla3/Makefile ============================================================================== --- branches/2016Q4/www/joomla3/Makefile Thu Dec 22 01:29:03 2016 (r429135) +++ branches/2016Q4/www/joomla3/Makefile Thu Dec 22 02:03:21 2016 (r429136) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= joomla -PORTVERSION= 3.4.6 +PORTVERSION= 3.6.5 CATEGORIES= www PKGNAMESUFFIX= 3 -MAINTAINER= nivit@FreeBSD.org +MAINTAINER= ler@lerctr.org COMMENT= Dynamic web content management system (CMS) LICENSE= GPLv2 @@ -16,19 +16,24 @@ GH_PROJECT= ${PORTNAME}-cms NO_ARCH= yes NO_BUILD= yes +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT=MYSQL +OPTIONS_SUB= yes + PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -USES= shebangfix +USES= php:web shebangfix SHEBANG_FILES= build/indexmaker.php \ libraries/vendor/leafo/lessphp/lessify SUB_FILES= pkg-message USE_GITHUB= yes -USE_MYSQL= yes -USE_PHP= gd json mbstring mysql mysqli pcre pdf session simplexml xml zip zlib +USE_PHP= gd json mbstring pcre pdf session simplexml xml zip zlib + +MYSQL_USE= PHP=mysqli +PGSQL_USE= PHP=pgsql -WANT_PHP_WEB= yes WWWDIR= ${PREFIX}/www/${PORTNAME}${PORTVERSION:R:R} do-install: Modified: branches/2016Q4/www/joomla3/distinfo ============================================================================== --- branches/2016Q4/www/joomla3/distinfo Thu Dec 22 01:29:03 2016 (r429135) +++ branches/2016Q4/www/joomla3/distinfo Thu Dec 22 02:03:21 2016 (r429136) @@ -1,2 +1,3 @@ -SHA256 (joomla-joomla-cms-3.4.6_GH0.tar.gz) = e9d8c54d0da7c7b0eb566710cc9d86bb936f13548206e0ee8311f57fe8c7c34d -SIZE (joomla-joomla-cms-3.4.6_GH0.tar.gz) = 9510229 +TIMESTAMP = 1482291902 +SHA256 (joomla-joomla-cms-3.6.5_GH0.tar.gz) = 4a3f71d31c33bf355318f95ee3b22e0b36d893a1890b0b7862dc7e793d879a9a +SIZE (joomla-joomla-cms-3.6.5_GH0.tar.gz) = 10507060 Modified: branches/2016Q4/www/joomla3/files/pkg-message.in ============================================================================== --- branches/2016Q4/www/joomla3/files/pkg-message.in Thu Dec 22 01:29:03 2016 (r429135) +++ branches/2016Q4/www/joomla3/files/pkg-message.in Thu Dec 22 02:03:21 2016 (r429136) @@ -20,4 +20,8 @@ 3) As of 2.5.5, php5-mysqli and php5-zip are installed. Use of mysqli for mysql is recommended over mysql. + 4) As of 3.6.4, php7 is also supported, and the php*-mysql extension is NOT + asked for. Also, the php*-pgsql extension is asked for as Joomla supports + PostgreSQL as well. + ================================================================================ Modified: branches/2016Q4/www/joomla3/pkg-plist ============================================================================== --- branches/2016Q4/www/joomla3/pkg-plist Thu Dec 22 01:29:03 2016 (r429135) +++ branches/2016Q4/www/joomla3/pkg-plist Thu Dec 22 02:03:21 2016 (r429136) @@ -1,6 +1,10 @@ @owner %%WWWOWN%% @group %%WWWGRP%% -%%WWWDIR%%/CONTRIBUTING.md +%%WWWDIR%%/.drone.yml +%%WWWDIR%%/.github/CONTRIBUTING.md +%%WWWDIR%%/.github/ISSUE_TEMPLATE.md +%%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md +%%WWWDIR%%/.php_cs %%WWWDIR%%/README.txt %%WWWDIR%%/administrator/cache/index.html %%WWWDIR%%/administrator/components/com_admin/admin.php @@ -18,7 +22,10 @@ %%WWWDIR%%/administrator/components/com_admin/postinstall/htaccess.php %%WWWDIR%%/administrator/components/com_admin/postinstall/languageaccess340.php %%WWWDIR%%/administrator/components/com_admin/postinstall/phpversion.php +%%WWWDIR%%/administrator/components/com_admin/postinstall/statscollection.php %%WWWDIR%%/administrator/components/com_admin/script.php +%%WWWDIR%%/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-06.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-16.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-19.sql @@ -68,6 +75,25 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-02-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-13.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-09.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-05-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql @@ -100,6 +126,20 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-02-26.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.4.4-2015-07-11.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-13.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-09.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql @@ -138,6 +178,21 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-02-26.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.4.4-2015-07-11.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-13.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-09.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-05-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql %%WWWDIR%%/administrator/components/com_admin/views/help/tmpl/default.php %%WWWDIR%%/administrator/components/com_admin/views/help/view.html.php %%WWWDIR%%/administrator/components/com_admin/views/profile/tmpl/edit.php @@ -149,6 +204,8 @@ %%WWWDIR%%/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php %%WWWDIR%%/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php %%WWWDIR%%/administrator/components/com_admin/views/sysinfo/view.html.php +%%WWWDIR%%/administrator/components/com_admin/views/sysinfo/view.json.php +%%WWWDIR%%/administrator/components/com_admin/views/sysinfo/view.text.php %%WWWDIR%%/administrator/components/com_ajax/ajax.php %%WWWDIR%%/administrator/components/com_ajax/ajax.xml %%WWWDIR%%/administrator/components/com_banners/access.xml @@ -178,6 +235,7 @@ %%WWWDIR%%/administrator/components/com_banners/models/forms/download.xml %%WWWDIR%%/administrator/components/com_banners/models/forms/filter_banners.xml %%WWWDIR%%/administrator/components/com_banners/models/forms/filter_clients.xml +%%WWWDIR%%/administrator/components/com_banners/models/forms/filter_tracks.xml %%WWWDIR%%/administrator/components/com_banners/models/tracks.php %%WWWDIR%%/administrator/components/com_banners/sql/install.mysql.utf8.sql %%WWWDIR%%/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql @@ -204,7 +262,10 @@ %%WWWDIR%%/administrator/components/com_cache/config.xml %%WWWDIR%%/administrator/components/com_cache/controller.php %%WWWDIR%%/administrator/components/com_cache/helpers/cache.php +%%WWWDIR%%/administrator/components/com_cache/layouts/joomla/searchtools/default.php +%%WWWDIR%%/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php %%WWWDIR%%/administrator/components/com_cache/models/cache.php +%%WWWDIR%%/administrator/components/com_cache/models/forms/filter_cache.xml %%WWWDIR%%/administrator/components/com_cache/views/cache/tmpl/default.php %%WWWDIR%%/administrator/components/com_cache/views/cache/view.html.php %%WWWDIR%%/administrator/components/com_cache/views/purge/tmpl/default.php @@ -247,6 +308,7 @@ %%WWWDIR%%/administrator/components/com_checkin/config.xml %%WWWDIR%%/administrator/components/com_checkin/controller.php %%WWWDIR%%/administrator/components/com_checkin/models/checkin.php +%%WWWDIR%%/administrator/components/com_checkin/models/forms/filter_checkin.xml %%WWWDIR%%/administrator/components/com_checkin/views/checkin/tmpl/default.php %%WWWDIR%%/administrator/components/com_checkin/views/checkin/view.html.php %%WWWDIR%%/administrator/components/com_config/access.xml @@ -255,9 +317,10 @@ %%WWWDIR%%/administrator/components/com_config/controller.php %%WWWDIR%%/administrator/components/com_config/controller/application/cancel.php %%WWWDIR%%/administrator/components/com_config/controller/application/display.php -%%WWWDIR%%/administrator/components/com_config/controller/application/refreshhelp.php %%WWWDIR%%/administrator/components/com_config/controller/application/removeroot.php %%WWWDIR%%/administrator/components/com_config/controller/application/save.php +%%WWWDIR%%/administrator/components/com_config/controller/application/sendtestmail.php +%%WWWDIR%%/administrator/components/com_config/controller/application/store.php %%WWWDIR%%/administrator/components/com_config/controller/component/cancel.php %%WWWDIR%%/administrator/components/com_config/controller/component/display.php %%WWWDIR%%/administrator/components/com_config/controller/component/save.php @@ -307,6 +370,7 @@ %%WWWDIR%%/administrator/components/com_contact/models/contacts.php %%WWWDIR%%/administrator/components/com_contact/models/fields/modal/contact.php %%WWWDIR%%/administrator/components/com_contact/models/forms/contact.xml +%%WWWDIR%%/administrator/components/com_contact/models/forms/filter_contacts.xml %%WWWDIR%%/administrator/components/com_contact/sql/install.mysql.utf8.sql %%WWWDIR%%/administrator/components/com_contact/sql/uninstall.mysql.utf8.sql %%WWWDIR%%/administrator/components/com_contact/tables/contact.php @@ -412,11 +476,17 @@ %%WWWDIR%%/administrator/components/com_finder/helpers/indexer/taxonomy.php %%WWWDIR%%/administrator/components/com_finder/helpers/indexer/token.php %%WWWDIR%%/administrator/components/com_finder/helpers/language.php +%%WWWDIR%%/administrator/components/com_finder/models/fields/branches.php +%%WWWDIR%%/administrator/components/com_finder/models/fields/contentmap.php +%%WWWDIR%%/administrator/components/com_finder/models/fields/contenttypes.php %%WWWDIR%%/administrator/components/com_finder/models/fields/directories.php %%WWWDIR%%/administrator/components/com_finder/models/fields/searchfilter.php %%WWWDIR%%/administrator/components/com_finder/models/filter.php %%WWWDIR%%/administrator/components/com_finder/models/filters.php %%WWWDIR%%/administrator/components/com_finder/models/forms/filter.xml +%%WWWDIR%%/administrator/components/com_finder/models/forms/filter_filters.xml +%%WWWDIR%%/administrator/components/com_finder/models/forms/filter_index.xml +%%WWWDIR%%/administrator/components/com_finder/models/forms/filter_maps.xml %%WWWDIR%%/administrator/components/com_finder/models/index.php %%WWWDIR%%/administrator/components/com_finder/models/indexer.php %%WWWDIR%%/administrator/components/com_finder/models/maps.php @@ -451,12 +521,22 @@ %%WWWDIR%%/administrator/components/com_installer/controllers/update.php %%WWWDIR%%/administrator/components/com_installer/controllers/updatesites.php %%WWWDIR%%/administrator/components/com_installer/helpers/html/manage.php +%%WWWDIR%%/administrator/components/com_installer/helpers/html/updatesites.php %%WWWDIR%%/administrator/components/com_installer/helpers/installer.php %%WWWDIR%%/administrator/components/com_installer/installer.php %%WWWDIR%%/administrator/components/com_installer/installer.xml %%WWWDIR%%/administrator/components/com_installer/models/database.php %%WWWDIR%%/administrator/components/com_installer/models/discover.php %%WWWDIR%%/administrator/components/com_installer/models/extension.php +%%WWWDIR%%/administrator/components/com_installer/models/fields/extensionstatus.php +%%WWWDIR%%/administrator/components/com_installer/models/fields/folder.php +%%WWWDIR%%/administrator/components/com_installer/models/fields/location.php +%%WWWDIR%%/administrator/components/com_installer/models/fields/type.php +%%WWWDIR%%/administrator/components/com_installer/models/forms/filter_discover.xml +%%WWWDIR%%/administrator/components/com_installer/models/forms/filter_languages.xml +%%WWWDIR%%/administrator/components/com_installer/models/forms/filter_manage.xml +%%WWWDIR%%/administrator/components/com_installer/models/forms/filter_update.xml +%%WWWDIR%%/administrator/components/com_installer/models/forms/filter_updatesites.xml %%WWWDIR%%/administrator/components/com_installer/models/install.php %%WWWDIR%%/administrator/components/com_installer/models/languages.php %%WWWDIR%%/administrator/components/com_installer/models/manage.php @@ -474,7 +554,6 @@ %%WWWDIR%%/administrator/components/com_installer/views/install/tmpl/default.php %%WWWDIR%%/administrator/components/com_installer/views/install/view.html.php %%WWWDIR%%/administrator/components/com_installer/views/languages/tmpl/default.php -%%WWWDIR%%/administrator/components/com_installer/views/languages/tmpl/default_filter.php %%WWWDIR%%/administrator/components/com_installer/views/languages/view.html.php %%WWWDIR%%/administrator/components/com_installer/views/manage/tmpl/default.php %%WWWDIR%%/administrator/components/com_installer/views/manage/view.html.php @@ -488,18 +567,26 @@ %%WWWDIR%%/administrator/components/com_joomlaupdate/config.xml %%WWWDIR%%/administrator/components/com_joomlaupdate/controller.php %%WWWDIR%%/administrator/components/com_joomlaupdate/controllers/update.php -%%WWWDIR%%/administrator/components/com_joomlaupdate/helpers/download.php %%WWWDIR%%/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php %%WWWDIR%%/administrator/components/com_joomlaupdate/helpers/select.php %%WWWDIR%%/administrator/components/com_joomlaupdate/joomlaupdate.php %%WWWDIR%%/administrator/components/com_joomlaupdate/joomlaupdate.xml %%WWWDIR%%/administrator/components/com_joomlaupdate/models/default.php %%WWWDIR%%/administrator/components/com_joomlaupdate/restore.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/restore_finalisation.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/view.html.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/update/tmpl/default.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/update/view.html.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/upload/view.html.php %%WWWDIR%%/administrator/components/com_languages/access.xml %%WWWDIR%%/administrator/components/com_languages/config.xml %%WWWDIR%%/administrator/components/com_languages/controller.php @@ -515,6 +602,10 @@ %%WWWDIR%%/administrator/components/com_languages/helpers/multilangstatus.php %%WWWDIR%%/administrator/components/com_languages/languages.php %%WWWDIR%%/administrator/components/com_languages/languages.xml +%%WWWDIR%%/administrator/components/com_languages/layouts/joomla/searchtools/default.php +%%WWWDIR%%/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php +%%WWWDIR%%/administrator/components/com_languages/models/forms/filter_installed.xml +%%WWWDIR%%/administrator/components/com_languages/models/forms/filter_languages.xml %%WWWDIR%%/administrator/components/com_languages/models/forms/language.xml %%WWWDIR%%/administrator/components/com_languages/models/forms/override.xml %%WWWDIR%%/administrator/components/com_languages/models/installed.php @@ -553,7 +644,6 @@ %%WWWDIR%%/administrator/components/com_media/layouts/toolbar/uploadmedia.php %%WWWDIR%%/administrator/components/com_media/media.php %%WWWDIR%%/administrator/components/com_media/media.xml -%%WWWDIR%%/administrator/components/com_media/models/forms/index.html %%WWWDIR%%/administrator/components/com_media/models/list.php %%WWWDIR%%/administrator/components/com_media/models/manager.php %%WWWDIR%%/administrator/components/com_media/views/images/tmpl/default.php @@ -572,11 +662,13 @@ %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/details_folder.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/details_img.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/details_up.php +%%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/details_video.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php %%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php +%%WWWDIR%%/administrator/components/com_media/views/medialist/tmpl/thumbs_video.php %%WWWDIR%%/administrator/components/com_media/views/medialist/view.html.php %%WWWDIR%%/administrator/components/com_menus/access.xml %%WWWDIR%%/administrator/components/com_menus/config.xml @@ -587,6 +679,7 @@ %%WWWDIR%%/administrator/components/com_menus/controllers/menus.php %%WWWDIR%%/administrator/components/com_menus/helpers/html/menus.php %%WWWDIR%%/administrator/components/com_menus/helpers/menus.php +%%WWWDIR%%/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php %%WWWDIR%%/administrator/components/com_menus/layouts/joomla/searchtools/default.php %%WWWDIR%%/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php %%WWWDIR%%/administrator/components/com_menus/menus.php @@ -595,6 +688,7 @@ %%WWWDIR%%/administrator/components/com_menus/models/fields/menuparent.php %%WWWDIR%%/administrator/components/com_menus/models/fields/menutype.php %%WWWDIR%%/administrator/components/com_menus/models/forms/filter_items.xml +%%WWWDIR%%/administrator/components/com_menus/models/forms/filter_menus.xml %%WWWDIR%%/administrator/components/com_menus/models/forms/item.xml %%WWWDIR%%/administrator/components/com_menus/models/forms/item_alias.xml %%WWWDIR%%/administrator/components/com_menus/models/forms/item_component.xml @@ -636,8 +730,10 @@ %%WWWDIR%%/administrator/components/com_messages/messages.php %%WWWDIR%%/administrator/components/com_messages/messages.xml %%WWWDIR%%/administrator/components/com_messages/models/config.php +%%WWWDIR%%/administrator/components/com_messages/models/fields/messagestates.php %%WWWDIR%%/administrator/components/com_messages/models/fields/usermessages.php %%WWWDIR%%/administrator/components/com_messages/models/forms/config.xml +%%WWWDIR%%/administrator/components/com_messages/models/forms/filter_messages.xml %%WWWDIR%%/administrator/components/com_messages/models/forms/message.xml %%WWWDIR%%/administrator/components/com_messages/models/message.php %%WWWDIR%%/administrator/components/com_messages/models/messages.php @@ -657,9 +753,14 @@ %%WWWDIR%%/administrator/components/com_modules/helpers/html/modules.php %%WWWDIR%%/administrator/components/com_modules/helpers/modules.php %%WWWDIR%%/administrator/components/com_modules/helpers/xml.php +%%WWWDIR%%/administrator/components/com_modules/layouts/joomla/searchtools/default.php +%%WWWDIR%%/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php %%WWWDIR%%/administrator/components/com_modules/layouts/toolbar/cancelselect.php %%WWWDIR%%/administrator/components/com_modules/layouts/toolbar/newmodule.php +%%WWWDIR%%/administrator/components/com_modules/models/fields/modulesmodule.php +%%WWWDIR%%/administrator/components/com_modules/models/fields/modulesposition.php %%WWWDIR%%/administrator/components/com_modules/models/forms/advanced.xml +%%WWWDIR%%/administrator/components/com_modules/models/forms/filter_modules.xml %%WWWDIR%%/administrator/components/com_modules/models/forms/module.xml %%WWWDIR%%/administrator/components/com_modules/models/module.php %%WWWDIR%%/administrator/components/com_modules/models/modules.php @@ -678,6 +779,7 @@ %%WWWDIR%%/administrator/components/com_modules/views/modules/tmpl/default_batch.php %%WWWDIR%%/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php %%WWWDIR%%/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php +%%WWWDIR%%/administrator/components/com_modules/views/modules/tmpl/modal.php %%WWWDIR%%/administrator/components/com_modules/views/modules/view.html.php %%WWWDIR%%/administrator/components/com_modules/views/positions/tmpl/modal.php %%WWWDIR%%/administrator/components/com_modules/views/positions/view.html.php @@ -694,6 +796,7 @@ %%WWWDIR%%/administrator/components/com_newsfeeds/helpers/newsfeeds.php %%WWWDIR%%/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php %%WWWDIR%%/administrator/components/com_newsfeeds/models/fields/newsfeeds.php +%%WWWDIR%%/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml %%WWWDIR%%/administrator/components/com_newsfeeds/models/forms/newsfeed.xml %%WWWDIR%%/administrator/components/com_newsfeeds/models/newsfeed.php %%WWWDIR%%/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -726,6 +829,8 @@ %%WWWDIR%%/administrator/components/com_plugins/controllers/plugins.php %%WWWDIR%%/administrator/components/com_plugins/helpers/plugins.php %%WWWDIR%%/administrator/components/com_plugins/models/fields/pluginordering.php +%%WWWDIR%%/administrator/components/com_plugins/models/fields/plugintype.php +%%WWWDIR%%/administrator/components/com_plugins/models/forms/filter_plugins.xml %%WWWDIR%%/administrator/components/com_plugins/models/forms/plugin.xml %%WWWDIR%%/administrator/components/com_plugins/models/plugin.php %%WWWDIR%%/administrator/components/com_plugins/models/plugins.php @@ -753,7 +858,9 @@ %%WWWDIR%%/administrator/components/com_redirect/controllers/links.php %%WWWDIR%%/administrator/components/com_redirect/helpers/html/redirect.php %%WWWDIR%%/administrator/components/com_redirect/helpers/redirect.php +%%WWWDIR%%/administrator/components/com_redirect/layouts/toolbar/batch.php %%WWWDIR%%/administrator/components/com_redirect/models/fields/redirect.php +%%WWWDIR%%/administrator/components/com_redirect/models/forms/filter_links.xml %%WWWDIR%%/administrator/components/com_redirect/models/forms/link.xml %%WWWDIR%%/administrator/components/com_redirect/models/link.php %%WWWDIR%%/administrator/components/com_redirect/models/links.php @@ -774,6 +881,7 @@ %%WWWDIR%%/administrator/components/com_search/controllers/searches.php %%WWWDIR%%/administrator/components/com_search/helpers/search.php %%WWWDIR%%/administrator/components/com_search/helpers/site.php +%%WWWDIR%%/administrator/components/com_search/models/forms/filter_searches.xml %%WWWDIR%%/administrator/components/com_search/models/searches.php %%WWWDIR%%/administrator/components/com_search/search.php %%WWWDIR%%/administrator/components/com_search/search.xml @@ -785,6 +893,7 @@ %%WWWDIR%%/administrator/components/com_tags/controllers/tag.php %%WWWDIR%%/administrator/components/com_tags/controllers/tags.php %%WWWDIR%%/administrator/components/com_tags/helpers/tags.php +%%WWWDIR%%/administrator/components/com_tags/models/forms/filter_tags.xml %%WWWDIR%%/administrator/components/com_tags/models/forms/tag.xml %%WWWDIR%%/administrator/components/com_tags/models/tag.php %%WWWDIR%%/administrator/components/com_tags/models/tags.php @@ -809,6 +918,12 @@ %%WWWDIR%%/administrator/components/com_templates/helpers/html/templates.php %%WWWDIR%%/administrator/components/com_templates/helpers/template.php %%WWWDIR%%/administrator/components/com_templates/helpers/templates.php +%%WWWDIR%%/administrator/components/com_templates/layouts/joomla/searchtools/default.php +%%WWWDIR%%/administrator/components/com_templates/layouts/joomla/searchtools/default/bar.php +%%WWWDIR%%/administrator/components/com_templates/models/fields/templatelocation.php +%%WWWDIR%%/administrator/components/com_templates/models/fields/templatename.php +%%WWWDIR%%/administrator/components/com_templates/models/forms/filter_styles.xml +%%WWWDIR%%/administrator/components/com_templates/models/forms/filter_templates.xml %%WWWDIR%%/administrator/components/com_templates/models/forms/source.xml %%WWWDIR%%/administrator/components/com_templates/models/forms/style.xml %%WWWDIR%%/administrator/components/com_templates/models/forms/style_administrator.xml @@ -830,6 +945,18 @@ %%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default.php %%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_description.php %%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_folders.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php +%%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php %%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/default_tree.php %%WWWDIR%%/administrator/components/com_templates/views/template/tmpl/readonly.php %%WWWDIR%%/administrator/components/com_templates/views/template/view.html.php @@ -845,6 +972,7 @@ %%WWWDIR%%/administrator/components/com_users/controllers/mail.php %%WWWDIR%%/administrator/components/com_users/controllers/note.php %%WWWDIR%%/administrator/components/com_users/controllers/notes.php +%%WWWDIR%%/administrator/components/com_users/controllers/profile.json.php %%WWWDIR%%/administrator/components/com_users/controllers/user.php %%WWWDIR%%/administrator/components/com_users/controllers/users.php %%WWWDIR%%/administrator/components/com_users/helpers/debug.php @@ -852,7 +980,14 @@ %%WWWDIR%%/administrator/components/com_users/helpers/users.php %%WWWDIR%%/administrator/components/com_users/models/debuggroup.php %%WWWDIR%%/administrator/components/com_users/models/debuguser.php +%%WWWDIR%%/administrator/components/com_users/models/fields/components.php %%WWWDIR%%/administrator/components/com_users/models/fields/groupparent.php +%%WWWDIR%%/administrator/components/com_users/models/fields/levels.php +%%WWWDIR%%/administrator/components/com_users/models/forms/filter_debuggroup.xml +%%WWWDIR%%/administrator/components/com_users/models/forms/filter_debuguser.xml +%%WWWDIR%%/administrator/components/com_users/models/forms/filter_groups.xml +%%WWWDIR%%/administrator/components/com_users/models/forms/filter_levels.xml +%%WWWDIR%%/administrator/components/com_users/models/forms/filter_notes.xml %%WWWDIR%%/administrator/components/com_users/models/forms/filter_users.xml %%WWWDIR%%/administrator/components/com_users/models/forms/group.xml %%WWWDIR%%/administrator/components/com_users/models/forms/level.xml @@ -1031,6 +1166,8 @@ %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini @@ -1055,6 +1192,12 @@ %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini @@ -1095,6 +1238,10 @@ %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_sef.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_stats.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini +%%WWWDIR%%/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini %%WWWDIR%%/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini @@ -1112,14 +1259,15 @@ %%WWWDIR%%/administrator/language/en-GB/en-GB.xml %%WWWDIR%%/administrator/language/en-GB/install.xml %%WWWDIR%%/administrator/language/overrides/index.html +%%WWWDIR%%/administrator/logs/index.html %%WWWDIR%%/administrator/manifests/files/joomla.xml %%WWWDIR%%/administrator/manifests/libraries/fof.xml %%WWWDIR%%/administrator/manifests/libraries/idna_convert.xml %%WWWDIR%%/administrator/manifests/libraries/joomla.xml %%WWWDIR%%/administrator/manifests/libraries/phpass.xml %%WWWDIR%%/administrator/manifests/libraries/phputf8.xml -%%WWWDIR%%/administrator/manifests/libraries/simplepie.xml %%WWWDIR%%/administrator/manifests/packages/index.html +%%WWWDIR%%/administrator/manifests/packages/pkg_en-GB.xml %%WWWDIR%%/administrator/manifests/packages/pkg_weblinks.xml %%WWWDIR%%/administrator/modules/mod_custom/mod_custom.php %%WWWDIR%%/administrator/modules/mod_custom/mod_custom.xml @@ -1215,6 +1363,7 @@ %%WWWDIR%%/administrator/templates/hathor/html/com_banners/banners/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_banners/client/edit.php %%WWWDIR%%/administrator/templates/hathor/html/com_banners/clients/default.php +%%WWWDIR%%/administrator/templates/hathor/html/com_banners/download/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_banners/tracks/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_cache/cache/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_cache/purge/default.php @@ -1249,6 +1398,7 @@ %%WWWDIR%%/administrator/templates/hathor/html/com_content/articles/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_content/articles/modal.php %%WWWDIR%%/administrator/templates/hathor/html/com_content/featured/default.php +%%WWWDIR%%/administrator/templates/hathor/html/com_contenthistory/history/modal.php %%WWWDIR%%/administrator/templates/hathor/html/com_cpanel/cpanel/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_finder/filters/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_finder/index/default.php @@ -1309,6 +1459,7 @@ %%WWWDIR%%/administrator/templates/hathor/html/com_users/debuguser/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_users/groups/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_users/levels/default.php +%%WWWDIR%%/administrator/templates/hathor/html/com_users/note/edit.php %%WWWDIR%%/administrator/templates/hathor/html/com_users/notes/default.php %%WWWDIR%%/administrator/templates/hathor/html/com_users/user/edit.php %%WWWDIR%%/administrator/templates/hathor/html/com_users/users/default.php @@ -1334,6 +1485,7 @@ %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php +%%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php %%WWWDIR%%/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php @@ -1582,6 +1734,7 @@ %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-calendar.png %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-cancel.png %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-checkin.png +%%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-cog.png %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-component.png %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-config.png %%WWWDIR%%/administrator/templates/hathor/images/toolbar/icon-32-contacts-categories.png @@ -1661,7 +1814,9 @@ %%WWWDIR%%/administrator/templates/isis/error.php %%WWWDIR%%/administrator/templates/isis/favicon.ico %%WWWDIR%%/administrator/templates/isis/html/editor_content.css +%%WWWDIR%%/administrator/templates/isis/html/layouts/joomla/form/field/user.php %%WWWDIR%%/administrator/templates/isis/html/layouts/joomla/system/message.php +%%WWWDIR%%/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php %%WWWDIR%%/administrator/templates/isis/html/mod_version/default.php %%WWWDIR%%/administrator/templates/isis/html/modules.php %%WWWDIR%%/administrator/templates/isis/html/pagination.php @@ -1711,9 +1866,7 @@ %%WWWDIR%%/administrator/templates/isis/img/glyphicons-halflings.png %%WWWDIR%%/administrator/templates/isis/index.php %%WWWDIR%%/administrator/templates/isis/js/application.js -%%WWWDIR%%/administrator/templates/isis/js/bootstrap.min.js %%WWWDIR%%/administrator/templates/isis/js/classes.js -%%WWWDIR%%/administrator/templates/isis/js/jquery.js %%WWWDIR%%/administrator/templates/isis/js/template.js %%WWWDIR%%/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini %%WWWDIR%%/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini @@ -1753,6 +1906,7 @@ %%WWWDIR%%/build/bootstrap/js/bootstrap-transition.js %%WWWDIR%%/build/bootstrap/js/bootstrap-typeahead.js %%WWWDIR%%/build/build.php +%%WWWDIR%%/build/bump.php %%WWWDIR%%/build/generatecss.php %%WWWDIR%%/build/helpTOC.php %%WWWDIR%%/build/indexmaker.php @@ -1766,31 +1920,29 @@ %%WWWDIR%%/build/phpcs/Joomla/Sniffs/Commenting/FunctionCommentSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/Commenting/SingleCommentSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/ControlStructures/ControlSignatureSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/ControlStructures/ElseIfDeclarationSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/ControlStructures/InlineControlStructureSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/ControlStructures/MultiLineConditionSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/Functions/FunctionCallSignatureSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/Functions/FunctionDeclarationSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/PHP/LowerCaseConstantSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/CastSpacingSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/ConcatenationSpacingSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/OperatorSpacingSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/SemicolonSpacingSniff.php %%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/SpaceAfterCastSniff.php -%%WWWDIR%%/build/phpcs/Joomla/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php %%WWWDIR%%/build/phpcs/Joomla/ruleset.xml %%WWWDIR%%/build/phpmd.xml %%WWWDIR%%/build/travis/apache2/php-apache +%%WWWDIR%%/build/travis/javascript-tests.sh %%WWWDIR%%/build/travis/php-apache.sh %%WWWDIR%%/build/travis/phpenv/apc-5.3.ini %%WWWDIR%%/build/travis/phpenv/apc-5.4.ini -%%WWWDIR%%/build/travis/phpenv/apc-5.5.ini -%%WWWDIR%%/build/travis/phpenv/apc-5.6.ini +%%WWWDIR%%/build/travis/phpenv/apcu-5.5.ini +%%WWWDIR%%/build/travis/phpenv/apcu-5.6.ini +%%WWWDIR%%/build/travis/phpenv/apcu-7.0.ini +%%WWWDIR%%/build/travis/phpenv/apcu-7.1.ini +%%WWWDIR%%/build/travis/phpenv/memcache.ini %%WWWDIR%%/build/travis/phpenv/memcached.ini %%WWWDIR%%/build/travis/phpenv/redis.ini +%%WWWDIR%%/build/travis/unit-tests.sh %%WWWDIR%%/cache/index.html %%WWWDIR%%/cli/deletefiles.php %%WWWDIR%%/cli/finder_indexer.php @@ -1849,6 +2001,7 @@ %%WWWDIR%%/components/com_contact/helpers/association.php %%WWWDIR%%/components/com_contact/helpers/category.php %%WWWDIR%%/components/com_contact/helpers/route.php +%%WWWDIR%%/components/com_contact/layouts/joomla/form/renderfield.php %%WWWDIR%%/components/com_contact/metadata.xml %%WWWDIR%%/components/com_contact/models/categories.php %%WWWDIR%%/components/com_contact/models/category.php @@ -1973,6 +2126,9 @@ %%WWWDIR%%/components/com_mailto/views/sent/tmpl/default.php %%WWWDIR%%/components/com_mailto/views/sent/view.html.php %%WWWDIR%%/components/com_media/media.php +%%WWWDIR%%/components/com_modules/controller.php +%%WWWDIR%%/components/com_modules/models/forms/filter_modules.xml +%%WWWDIR%%/components/com_modules/modules.php %%WWWDIR%%/components/com_newsfeeds/controller.php %%WWWDIR%%/components/com_newsfeeds/helpers/association.php %%WWWDIR%%/components/com_newsfeeds/helpers/category.php @@ -2034,6 +2190,7 @@ %%WWWDIR%%/components/com_users/controller.php %%WWWDIR%%/components/com_users/controllers/profile.json.php %%WWWDIR%%/components/com_users/controllers/profile.php +%%WWWDIR%%/components/com_users/controllers/profile_base_json.php %%WWWDIR%%/components/com_users/controllers/registration.php %%WWWDIR%%/components/com_users/controllers/remind.php %%WWWDIR%%/components/com_users/controllers/reset.php @@ -2056,6 +2213,8 @@ %%WWWDIR%%/components/com_users/models/registration.php %%WWWDIR%%/components/com_users/models/remind.php %%WWWDIR%%/components/com_users/models/reset.php +%%WWWDIR%%/components/com_users/models/rules/loginuniquefield.php +%%WWWDIR%%/components/com_users/models/rules/logoutuniquefield.php %%WWWDIR%%/components/com_users/router.php %%WWWDIR%%/components/com_users/users.php %%WWWDIR%%/components/com_users/views/login/metadata.xml @@ -2063,6 +2222,7 @@ %%WWWDIR%%/components/com_users/views/login/tmpl/default.xml %%WWWDIR%%/components/com_users/views/login/tmpl/default_login.php %%WWWDIR%%/components/com_users/views/login/tmpl/default_logout.php +%%WWWDIR%%/components/com_users/views/login/tmpl/logout.xml %%WWWDIR%%/components/com_users/views/login/view.html.php %%WWWDIR%%/components/com_users/views/profile/metadata.xml %%WWWDIR%%/components/com_users/views/profile/tmpl/default.php @@ -2091,7 +2251,6 @@ %%WWWDIR%%/components/com_wrapper/controller.php %%WWWDIR%%/components/com_wrapper/metadata.xml %%WWWDIR%%/components/com_wrapper/router.php -%%WWWDIR%%/components/com_wrapper/views/wrapper/metadata.xml %%WWWDIR%%/components/com_wrapper/views/wrapper/tmpl/default.php %%WWWDIR%%/components/com_wrapper/views/wrapper/tmpl/default.xml %%WWWDIR%%/components/com_wrapper/views/wrapper/view.html.php @@ -2149,6 +2308,7 @@ %%WWWDIR%%/installation/application/framework.php %%WWWDIR%%/installation/application/router.php %%WWWDIR%%/installation/application/web.php +%%WWWDIR%%/installation/cache/index.html %%WWWDIR%%/installation/configuration.php-dist %%WWWDIR%%/installation/controller/database.php %%WWWDIR%%/installation/controller/default.php @@ -2174,7 +2334,7 @@ %%WWWDIR%%/installation/form/field/sample.php %%WWWDIR%%/installation/form/rule/prefix.php %%WWWDIR%%/installation/helper/database.php -%%WWWDIR%%/installation/helper/html/installation.php +%%WWWDIR%%/installation/html/helper.php %%WWWDIR%%/installation/index.php %%WWWDIR%%/installation/language/af-ZA/af-ZA.ini %%WWWDIR%%/installation/language/af-ZA/af-ZA.xml @@ -2198,6 +2358,8 @@ %%WWWDIR%%/installation/language/da-DK/da-DK.xml %%WWWDIR%%/installation/language/de-DE/de-DE.ini %%WWWDIR%%/installation/language/de-DE/de-DE.xml +%%WWWDIR%%/installation/language/dz-BT/dz-BT.ini +%%WWWDIR%%/installation/language/dz-BT/dz-BT.xml %%WWWDIR%%/installation/language/el-GR/el-GR.ini %%WWWDIR%%/installation/language/el-GR/el-GR.xml %%WWWDIR%%/installation/language/en-AU/en-AU.ini @@ -2206,12 +2368,20 @@ %%WWWDIR%%/installation/language/en-CA/en-CA.xml %%WWWDIR%%/installation/language/en-GB/en-GB.ini %%WWWDIR%%/installation/language/en-GB/en-GB.xml +%%WWWDIR%%/installation/language/en-NZ/en-NZ.ini +%%WWWDIR%%/installation/language/en-NZ/en-NZ.xml %%WWWDIR%%/installation/language/en-US/en-US.ini %%WWWDIR%%/installation/language/en-US/en-US.xml +%%WWWDIR%%/installation/language/eo-XX/eo-XX.ini +%%WWWDIR%%/installation/language/eo-XX/eo-XX.xml +%%WWWDIR%%/installation/language/es-CO/es-CO.ini +%%WWWDIR%%/installation/language/es-CO/es-CO.xml %%WWWDIR%%/installation/language/es-ES/es-ES.ini %%WWWDIR%%/installation/language/es-ES/es-ES.xml %%WWWDIR%%/installation/language/et-EE/et-EE.ini %%WWWDIR%%/installation/language/et-EE/et-EE.xml +%%WWWDIR%%/installation/language/eu-ES/eu-ES.ini +%%WWWDIR%%/installation/language/eu-ES/eu-ES.xml %%WWWDIR%%/installation/language/fa-IR/fa-IR.ini %%WWWDIR%%/installation/language/fa-IR/fa-IR.xml %%WWWDIR%%/installation/language/fi-FI/fi-FI.ini @@ -2220,6 +2390,8 @@ %%WWWDIR%%/installation/language/fr-CA/fr-CA.xml %%WWWDIR%%/installation/language/fr-FR/fr-FR.ini %%WWWDIR%%/installation/language/fr-FR/fr-FR.xml +%%WWWDIR%%/installation/language/ga-IE/ga-IE.ini +%%WWWDIR%%/installation/language/ga-IE/ga-IE.xml %%WWWDIR%%/installation/language/gl-ES/gl-ES.ini %%WWWDIR%%/installation/language/gl-ES/gl-ES.xml %%WWWDIR%%/installation/language/he-IL/he-IL.ini @@ -2238,6 +2410,8 @@ %%WWWDIR%%/installation/language/it-IT/it-IT.xml %%WWWDIR%%/installation/language/ja-JP/ja-JP.ini %%WWWDIR%%/installation/language/ja-JP/ja-JP.xml +%%WWWDIR%%/installation/language/ka-GE/ka-GE.ini +%%WWWDIR%%/installation/language/ka-GE/ka-GE.xml %%WWWDIR%%/installation/language/km-KH/km-KH.ini %%WWWDIR%%/installation/language/km-KH/km-KH.xml %%WWWDIR%%/installation/language/ko-KR/ko-KR.ini @@ -2270,6 +2444,8 @@ %%WWWDIR%%/installation/language/si-LK/si-LK.xml %%WWWDIR%%/installation/language/sk-SK/sk-SK.ini %%WWWDIR%%/installation/language/sk-SK/sk-SK.xml +%%WWWDIR%%/installation/language/sl-SI/sl-SI.ini +%%WWWDIR%%/installation/language/sl-SI/sl-SI.xml %%WWWDIR%%/installation/language/sr-RS/sr-RS.ini %%WWWDIR%%/installation/language/sr-RS/sr-RS.xml %%WWWDIR%%/installation/language/sr-YU/sr-YU.ini @@ -2286,6 +2462,8 @@ %%WWWDIR%%/installation/language/ta-IN/ta-IN.xml %%WWWDIR%%/installation/language/th-TH/th-TH.ini %%WWWDIR%%/installation/language/th-TH/th-TH.xml +%%WWWDIR%%/installation/language/tk-TM/tk-TM.ini +%%WWWDIR%%/installation/language/tk-TM/tk-TM.xml %%WWWDIR%%/installation/language/tr-TR/tr-TR.ini %%WWWDIR%%/installation/language/tr-TR/tr-TR.xml %%WWWDIR%%/installation/language/ug-CN/ug-CN.ini @@ -2331,24 +2509,7 @@ %%WWWDIR%%/installation/template/body.php %%WWWDIR%%/installation/template/css/template.css %%WWWDIR%%/installation/template/css/template_rtl.css -%%WWWDIR%%/installation/template/images/ajax-loader.gif -%%WWWDIR%%/installation/template/images/j_arrow.png -%%WWWDIR%%/installation/template/images/j_arrow_down.png -%%WWWDIR%%/installation/template/images/j_arrow_left.png -%%WWWDIR%%/installation/template/images/j_button1_admin.png -%%WWWDIR%%/installation/template/images/j_button1_collate.png -%%WWWDIR%%/installation/template/images/j_button1_left.png -%%WWWDIR%%/installation/template/images/j_button1_next.png -%%WWWDIR%%/installation/template/images/j_button1_prev.png -%%WWWDIR%%/installation/template/images/j_button1_refresh.png -%%WWWDIR%%/installation/template/images/j_button1_right.png -%%WWWDIR%%/installation/template/images/j_button1_site.png -%%WWWDIR%%/installation/template/images/j_divider.png -%%WWWDIR%%/installation/template/images/j_header_middle.png -%%WWWDIR%%/installation/template/images/j_joomla_box.png %%WWWDIR%%/installation/template/images/joomla.png -%%WWWDIR%%/installation/template/images/logo.png -%%WWWDIR%%/installation/template/images/spinner.gif %%WWWDIR%%/installation/template/index.php %%WWWDIR%%/installation/template/js/installation.js %%WWWDIR%%/installation/view/complete/html.php @@ -2369,6 +2530,7 @@ %%WWWDIR%%/installation/view/site/tmpl/default.php %%WWWDIR%%/installation/view/summary/html.php %%WWWDIR%%/installation/view/summary/tmpl/default.php +%%WWWDIR%%/karma.conf.js %%WWWDIR%%/language/en-GB/en-GB.com_ajax.ini %%WWWDIR%%/language/en-GB/en-GB.com_config.ini %%WWWDIR%%/language/en-GB/en-GB.com_contact.ini @@ -2487,8 +2649,32 @@ %%WWWDIR%%/layouts/joomla/edit/title_alias.php %%WWWDIR%%/layouts/joomla/editors/buttons.php %%WWWDIR%%/layouts/joomla/editors/buttons/button.php +%%WWWDIR%%/layouts/joomla/form/field/checkboxes.php +%%WWWDIR%%/layouts/joomla/form/field/contenthistory.php +%%WWWDIR%%/layouts/joomla/form/field/file.php +%%WWWDIR%%/layouts/joomla/form/field/media.php +%%WWWDIR%%/layouts/joomla/form/field/moduleorder.php +%%WWWDIR%%/layouts/joomla/form/field/radio.php +%%WWWDIR%%/layouts/joomla/form/field/subform/default.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable-table.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable-table/section.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php +%%WWWDIR%%/layouts/joomla/form/field/subform/repeatable/section.php +%%WWWDIR%%/layouts/joomla/form/field/user.php %%WWWDIR%%/layouts/joomla/form/renderfield.php %%WWWDIR%%/layouts/joomla/form/renderlabel.php +%%WWWDIR%%/layouts/joomla/html/batch/access.php +%%WWWDIR%%/layouts/joomla/html/batch/item.php +%%WWWDIR%%/layouts/joomla/html/batch/language.php +%%WWWDIR%%/layouts/joomla/html/batch/tag.php +%%WWWDIR%%/layouts/joomla/html/batch/user.php +%%WWWDIR%%/layouts/joomla/html/formbehavior/ajaxchosen.php +%%WWWDIR%%/layouts/joomla/html/formbehavior/chosen.php +%%WWWDIR%%/layouts/joomla/html/sortablelist.php +%%WWWDIR%%/layouts/joomla/html/tag.php +%%WWWDIR%%/layouts/joomla/html/treeprefix.php %%WWWDIR%%/layouts/joomla/links/groupclose.php %%WWWDIR%%/layouts/joomla/links/groupopen.php %%WWWDIR%%/layouts/joomla/links/groupsclose.php @@ -2507,6 +2693,7 @@ %%WWWDIR%%/layouts/joomla/searchtools/default/bar.php %%WWWDIR%%/layouts/joomla/searchtools/default/filters.php %%WWWDIR%%/layouts/joomla/searchtools/default/list.php +%%WWWDIR%%/layouts/joomla/searchtools/default/noitems.php %%WWWDIR%%/layouts/joomla/searchtools/grid/sort.php %%WWWDIR%%/layouts/joomla/sidebars/submenu.php %%WWWDIR%%/layouts/joomla/sidebars/toggle.php @@ -2523,6 +2710,7 @@ %%WWWDIR%%/layouts/joomla/toolbar/help.php %%WWWDIR%%/layouts/joomla/toolbar/iconclass.php %%WWWDIR%%/layouts/joomla/toolbar/link.php +%%WWWDIR%%/layouts/joomla/toolbar/modal.php %%WWWDIR%%/layouts/joomla/toolbar/popup.php %%WWWDIR%%/layouts/joomla/toolbar/separator.php %%WWWDIR%%/layouts/joomla/toolbar/slider.php @@ -2542,6 +2730,7 @@ %%WWWDIR%%/libraries/cms/application/cms.php %%WWWDIR%%/libraries/cms/application/helper.php %%WWWDIR%%/libraries/cms/application/site.php +%%WWWDIR%%/libraries/cms/authentication/helper.php %%WWWDIR%%/libraries/cms/captcha/captcha.php %%WWWDIR%%/libraries/cms/class/loader.php %%WWWDIR%%/libraries/cms/component/helper.php @@ -2549,6 +2738,8 @@ %%WWWDIR%%/libraries/cms/component/router/interface.php %%WWWDIR%%/libraries/cms/component/router/legacy.php %%WWWDIR%%/libraries/cms/component/router/rules/interface.php +%%WWWDIR%%/libraries/cms/component/router/view.php +%%WWWDIR%%/libraries/cms/component/router/viewconfiguration.php %%WWWDIR%%/libraries/cms/editor/editor.php %%WWWDIR%%/libraries/cms/error/page.php %%WWWDIR%%/libraries/cms/form/field/author.php @@ -2558,8 +2749,10 @@ %%WWWDIR%%/libraries/cms/form/field/contentlanguage.php %%WWWDIR%%/libraries/cms/form/field/contenttype.php %%WWWDIR%%/libraries/cms/form/field/editor.php +%%WWWDIR%%/libraries/cms/form/field/frontend_language.php %%WWWDIR%%/libraries/cms/form/field/headertag.php %%WWWDIR%%/libraries/cms/form/field/helpsite.php +%%WWWDIR%%/libraries/cms/form/field/lastvisitdaterange.php %%WWWDIR%%/libraries/cms/form/field/limitbox.php %%WWWDIR%%/libraries/cms/form/field/media.php %%WWWDIR%%/libraries/cms/form/field/menu.php @@ -2568,6 +2761,7 @@ %%WWWDIR%%/libraries/cms/form/field/moduleposition.php %%WWWDIR%%/libraries/cms/form/field/moduletag.php %%WWWDIR%%/libraries/cms/form/field/ordering.php +%%WWWDIR%%/libraries/cms/form/field/plugin_status.php %%WWWDIR%%/libraries/cms/form/field/registrationdaterange.php %%WWWDIR%%/libraries/cms/form/field/status.php %%WWWDIR%%/libraries/cms/form/field/tag.php @@ -2586,6 +2780,7 @@ %%WWWDIR%%/libraries/cms/helper/media.php %%WWWDIR%%/libraries/cms/helper/route.php %%WWWDIR%%/libraries/cms/helper/tags.php +%%WWWDIR%%/libraries/cms/helper/usergroups.php %%WWWDIR%%/libraries/cms/html/access.php %%WWWDIR%%/libraries/cms/html/actionsdropdown.php %%WWWDIR%%/libraries/cms/html/batch.php @@ -2635,6 +2830,7 @@ %%WWWDIR%%/libraries/cms/installer/manifest.php %%WWWDIR%%/libraries/cms/installer/manifest/library.php %%WWWDIR%%/libraries/cms/installer/manifest/package.php +%%WWWDIR%%/libraries/cms/installer/script.php %%WWWDIR%%/libraries/cms/language/associations.php %%WWWDIR%%/libraries/cms/language/multilang.php %%WWWDIR%%/libraries/cms/layout/base.php @@ -2691,22 +2887,59 @@ %%WWWDIR%%/libraries/fof/config/domain/views.php %%WWWDIR%%/libraries/fof/config/provider.php %%WWWDIR%%/libraries/fof/controller/controller.php +%%WWWDIR%%/libraries/fof/database/database.php +%%WWWDIR%%/libraries/fof/database/driver.php +%%WWWDIR%%/libraries/fof/database/driver/joomla.php +%%WWWDIR%%/libraries/fof/database/driver/mysql.php +%%WWWDIR%%/libraries/fof/database/driver/mysqli.php +%%WWWDIR%%/libraries/fof/database/driver/oracle.php +%%WWWDIR%%/libraries/fof/database/driver/pdo.php +%%WWWDIR%%/libraries/fof/database/driver/pdomysql.php +%%WWWDIR%%/libraries/fof/database/driver/postgresql.php +%%WWWDIR%%/libraries/fof/database/driver/sqlazure.php +%%WWWDIR%%/libraries/fof/database/driver/sqlite.php +%%WWWDIR%%/libraries/fof/database/driver/sqlsrv.php +%%WWWDIR%%/libraries/fof/database/factory.php %%WWWDIR%%/libraries/fof/database/installer.php +%%WWWDIR%%/libraries/fof/database/interface.php %%WWWDIR%%/libraries/fof/database/iterator.php %%WWWDIR%%/libraries/fof/database/iterator/azure.php %%WWWDIR%%/libraries/fof/database/iterator/mysql.php %%WWWDIR%%/libraries/fof/database/iterator/mysqli.php +%%WWWDIR%%/libraries/fof/database/iterator/oracle.php %%WWWDIR%%/libraries/fof/database/iterator/pdo.php +%%WWWDIR%%/libraries/fof/database/iterator/pdomysql.php %%WWWDIR%%/libraries/fof/database/iterator/postgresql.php +%%WWWDIR%%/libraries/fof/database/iterator/sqlite.php %%WWWDIR%%/libraries/fof/database/iterator/sqlsrv.php +%%WWWDIR%%/libraries/fof/database/query.php +%%WWWDIR%%/libraries/fof/database/query/element.php +%%WWWDIR%%/libraries/fof/database/query/limitable.php +%%WWWDIR%%/libraries/fof/database/query/mysql.php +%%WWWDIR%%/libraries/fof/database/query/mysqli.php +%%WWWDIR%%/libraries/fof/database/query/oracle.php +%%WWWDIR%%/libraries/fof/database/query/pdo.php +%%WWWDIR%%/libraries/fof/database/query/pdomysql.php +%%WWWDIR%%/libraries/fof/database/query/postgresql.php +%%WWWDIR%%/libraries/fof/database/query/preparable.php +%%WWWDIR%%/libraries/fof/database/query/sqlazure.php +%%WWWDIR%%/libraries/fof/database/query/sqlite.php +%%WWWDIR%%/libraries/fof/database/query/sqlsrv.php %%WWWDIR%%/libraries/fof/dispatcher/dispatcher.php %%WWWDIR%%/libraries/fof/download/adapter/abstract.php +%%WWWDIR%%/libraries/fof/download/adapter/cacert.pem %%WWWDIR%%/libraries/fof/download/adapter/curl.php %%WWWDIR%%/libraries/fof/download/adapter/fopen.php %%WWWDIR%%/libraries/fof/download/download.php %%WWWDIR%%/libraries/fof/download/interface.php %%WWWDIR%%/libraries/fof/encrypt/aes.php +%%WWWDIR%%/libraries/fof/encrypt/aes/abstract.php +%%WWWDIR%%/libraries/fof/encrypt/aes/interface.php +%%WWWDIR%%/libraries/fof/encrypt/aes/mcrypt.php +%%WWWDIR%%/libraries/fof/encrypt/aes/openssl.php %%WWWDIR%%/libraries/fof/encrypt/base32.php +%%WWWDIR%%/libraries/fof/encrypt/randval.php +%%WWWDIR%%/libraries/fof/encrypt/randvalinterface.php %%WWWDIR%%/libraries/fof/encrypt/totp.php %%WWWDIR%%/libraries/fof/form/field.php %%WWWDIR%%/libraries/fof/form/field/accesslevel.php @@ -2778,6 +3011,11 @@ %%WWWDIR%%/libraries/fof/include.php %%WWWDIR%%/libraries/fof/inflector/inflector.php %%WWWDIR%%/libraries/fof/input/input.php +%%WWWDIR%%/libraries/fof/input/jinput/cli.php +%%WWWDIR%%/libraries/fof/input/jinput/cookie.php +%%WWWDIR%%/libraries/fof/input/jinput/files.php +%%WWWDIR%%/libraries/fof/input/jinput/input.php +%%WWWDIR%%/libraries/fof/input/jinput/json.php %%WWWDIR%%/libraries/fof/integration/joomla/filesystem/filesystem.php %%WWWDIR%%/libraries/fof/integration/joomla/platform.php %%WWWDIR%%/libraries/fof/layout/file.php @@ -2824,12 +3062,15 @@ %%WWWDIR%%/libraries/fof/toolbar/toolbar.php %%WWWDIR%%/libraries/fof/utils/array/array.php %%WWWDIR%%/libraries/fof/utils/cache/cleaner.php +%%WWWDIR%%/libraries/fof/utils/config/helper.php %%WWWDIR%%/libraries/fof/utils/filescheck/filescheck.php +%%WWWDIR%%/libraries/fof/utils/ini/parser.php %%WWWDIR%%/libraries/fof/utils/installscript/installscript.php %%WWWDIR%%/libraries/fof/utils/ip/ip.php %%WWWDIR%%/libraries/fof/utils/object/object.php %%WWWDIR%%/libraries/fof/utils/observable/dispatcher.php %%WWWDIR%%/libraries/fof/utils/observable/event.php +%%WWWDIR%%/libraries/fof/utils/phpfunc/phpfunc.php %%WWWDIR%%/libraries/fof/utils/timer/timer.php %%WWWDIR%%/libraries/fof/utils/update/collection.php %%WWWDIR%%/libraries/fof/utils/update/extension.php @@ -2851,6 +3092,7 @@ %%WWWDIR%%/libraries/import.php %%WWWDIR%%/libraries/index.html %%WWWDIR%%/libraries/joomla/access/access.php +%%WWWDIR%%/libraries/joomla/access/exception/notallowed.php %%WWWDIR%%/libraries/joomla/access/rule.php %%WWWDIR%%/libraries/joomla/access/rules.php %%WWWDIR%%/libraries/joomla/access/wrapper/access.php @@ -2859,7 +3101,6 @@ %%WWWDIR%%/libraries/joomla/application/daemon.php %%WWWDIR%%/libraries/joomla/application/route.php %%WWWDIR%%/libraries/joomla/application/web.php -%%WWWDIR%%/libraries/joomla/application/web/client.php %%WWWDIR%%/libraries/joomla/application/web/router.php %%WWWDIR%%/libraries/joomla/application/web/router/base.php *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu Dec 22 02:15:33 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15EC6C8BC7F; Thu, 22 Dec 2016 02:15:33 +0000 (UTC) (envelope-from adamw@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 CAB94E62; Thu, 22 Dec 2016 02:15:32 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBM2FVop082097; Thu, 22 Dec 2016 02:15:31 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBM2FViL082095; Thu, 22 Dec 2016 02:15:31 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201612220215.uBM2FViL082095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 22 Dec 2016 02:15:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429138 - branches/2016Q4/editors/vim 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.23 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, 22 Dec 2016 02:15:33 -0000 Author: adamw Date: Thu Dec 22 02:15:31 2016 New Revision: 429138 URL: https://svnweb.freebsd.org/changeset/ports/429138 Log: MFH: r423210 r423515 r424023 r424478 r424920 r425397 r425999 r426531 r427169 r427618 r428306 r428789 Update vim to patchlevel 134 (the current patchlevel in head). This addresses a CVE that was fixed in patchlevel 54. Also included in this update are fixes for DfBSD and support for parallel make. Thanks to ohauer for alerting me to this. Security: CVE-2016-1248 More info: http://openwall.com/lists/oss-security/2016/11/22/20 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/editors/vim/Makefile branches/2016Q4/editors/vim/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/editors/vim/Makefile ============================================================================== --- branches/2016Q4/editors/vim/Makefile Thu Dec 22 02:11:05 2016 (r429137) +++ branches/2016Q4/editors/vim/Makefile Thu Dec 22 02:15:31 2016 (r429138) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 8.0.0019 +PORTVERSION= 8.0.0134 DISTVERSIONPREFIX= v -PORTREVISION= 1 -CATEGORIES?= editors +CATEGORIES= editors -MAINTAINER?= adamw@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT?= Improved version of the vi editor LICENSE= VIM @@ -36,10 +35,9 @@ LANGBIND_DESC= Optional language bindin ALL_TARGET= # empty MAKE_ARGS+= CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" MAKE_ARGS+= VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR} -MAKE_ARGS+= CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib +MAKE_ARGS+= CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=ncurses REINPLACE_ARGS= -i '' USES= cpe iconv ncurses pkgconfig shebangfix -MAKE_JOBS_UNSAFE= yes PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA= ${VIM_VER} @@ -93,16 +91,16 @@ ATHENA_USE= XORG=ice,sm,x11,xaw,xmu,xpm CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --without-x" CONSOLE_PLIST_SUB= GUI="@comment " -GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 GNOME_PLIST_SUB= GUI="" GNOME_IMPLIES= NLS GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt -GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 GTK2_PLIST_SUB= GUI="" GTK2_USE= GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt -GTK3_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk3 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" +GTK3_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk3 GTK3_PLIST_SUB= GUI="" GTK3_USE= GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt @@ -111,9 +109,9 @@ MOTIF_PLIST_SUB= GUI="" MOTIF_USES= motif MOTIF_USE= XORG=ice,sm,x11,xmu,xt -X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt" +X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X11_PLIST_SUB= GUI="@comment " -X11_USE= XORG=x11,xt +X11_USE= XORG=ice,sm,x11,xt # LANGUAGE BINDINGS LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} @@ -140,6 +138,9 @@ MAKE_ARGS+= CONF_OPT_PYTHON="--enable-py .endif .endif +post-extract: + ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap + post-patch: @${FIND} ${WRKSRC}/ -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e 's| $$<| $$>|' @${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile @@ -169,15 +170,9 @@ post-configure: @${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/ -.for file in evim rview rvim vimdiff - ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} -.endfor -.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11) -.for file in eview gview gvim gvimdiff rgview rgvim - ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} +.for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff + ${LN} -s vim ${STAGEDIR}${PREFIX}/bin/$F .endfor -.endif post-install-DEFAULT_VIMRC-on: @${MKDIR} ${STAGEDIR}${ETCDIR} @@ -185,11 +180,8 @@ post-install-DEFAULT_VIMRC-on: ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample post-install-NLS-off: + @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap - ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap - -post-install-NLS-on: - ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap .include Modified: branches/2016Q4/editors/vim/distinfo ============================================================================== --- branches/2016Q4/editors/vim/distinfo Thu Dec 22 02:11:05 2016 (r429137) +++ branches/2016Q4/editors/vim/distinfo Thu Dec 22 02:15:31 2016 (r429138) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475291592 -SHA256 (vim-vim-v8.0.0019_GH0.tar.gz) = f13a76504b2f976228edd7169d592870a6af45614d82ae2a9c312fc17ab3d4ad -SIZE (vim-vim-v8.0.0019_GH0.tar.gz) = 12919003 +TIMESTAMP = 1481996189 +SHA256 (vim-vim-v8.0.0134_GH0.tar.gz) = 1b3e3e7d187eed55cbdb0a1dae6b8f3b885005fbae84222420877d7afa3b2310 +SIZE (vim-vim-v8.0.0134_GH0.tar.gz) = 12949311 From owner-svn-ports-branches@freebsd.org Thu Dec 22 06:27:10 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA26AC8CD9E; Thu, 22 Dec 2016 06:27:10 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AF097B5; Thu, 22 Dec 2016 06:27:10 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBM6R9Cm083254; Thu, 22 Dec 2016 06:27:09 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBM6R963083252; Thu, 22 Dec 2016 06:27:09 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201612220627.uBM6R963083252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Thu, 22 Dec 2016 06:27:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429144 - in branches/2016Q4/www/apache24: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 22 Dec 2016 06:27:10 -0000 Author: ohauer Date: Thu Dec 22 06:27:09 2016 New Revision: 429144 URL: https://svnweb.freebsd.org/changeset/ports/429144 Log: MFH: r425421 r429063 - Add LICENSE - update to 2.4.25 PR: 215457 Reported by: Apache Software Foundation Security: vid 862d6ab3-c75e-11e6-9f98-20cf30e32f6d CVE-2016-8743 CVE-2016-2161 CVE-2016-0736 CVE-2016-8740 CVE-2016-5387 Approved by: ports-secteam (junovitch) Deleted: branches/2016Q4/www/apache24/files/patch-CVE-2016-8740 branches/2016Q4/www/apache24/files/patch-httpoxy Modified: branches/2016Q4/www/apache24/Makefile branches/2016Q4/www/apache24/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/apache24/Makefile ============================================================================== --- branches/2016Q4/www/apache24/Makefile Thu Dec 22 06:24:48 2016 (r429143) +++ branches/2016Q4/www/apache24/Makefile Thu Dec 22 06:27:09 2016 (r429144) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.23 -PORTREVISION= 2 +PORTVERSION= 2.4.25 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -11,6 +10,9 @@ DIST_SUBDIR= apache24 MAINTAINER= apache@FreeBSD.org COMMENT= Version 2.4.x of Apache web server +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + LIB_DEPENDS= libexpat.so:textproc/expat2 \ libapr-1.so:devel/apr1 \ libpcre.so:devel/pcre @@ -150,7 +152,7 @@ USE_GNOME= libxml2 post-extract: # remove possible leftover .svn directories in the sources - @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf + @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r # limit grep results ... @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete # make sure the configure script contains our patches, preserve the original script for comparsion @@ -168,7 +170,7 @@ post-patch: ${WRKSRC}/include/httpd.h ${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \ ${WRKSRC}/configure.in - ${RM} -f ${WRKSRC}/docs/docroot/*.bak + ${RM} ${WRKSRC}/docs/docroot/*.bak ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual pre-configure:: Modified: branches/2016Q4/www/apache24/distinfo ============================================================================== --- branches/2016Q4/www/apache24/distinfo Thu Dec 22 06:24:48 2016 (r429143) +++ branches/2016Q4/www/apache24/distinfo Thu Dec 22 06:27:09 2016 (r429144) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467307196 -SHA256 (apache24/httpd-2.4.23.tar.bz2) = 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58 -SIZE (apache24/httpd-2.4.23.tar.bz2) = 6351875 +TIMESTAMP = 1482168542 +SHA256 (apache24/httpd-2.4.25.tar.bz2) = f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 +SIZE (apache24/httpd-2.4.25.tar.bz2) = 6398218 From owner-svn-ports-branches@freebsd.org Thu Dec 22 09:52:27 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31030C8CD3E; Thu, 22 Dec 2016 09:52:27 +0000 (UTC) (envelope-from royger@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 060B8849; Thu, 22 Dec 2016 09:52:26 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBM9qQki067663; Thu, 22 Dec 2016 09:52:26 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBM9qQAt067661; Thu, 22 Dec 2016 09:52:26 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201612220952.uBM9qQAt067661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Thu, 22 Dec 2016 09:52:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429150 - in branches/2016Q4/emulators/xen-kernel: . 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.23 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, 22 Dec 2016 09:52:27 -0000 Author: royger (src committer) Date: Thu Dec 22 09:52:25 2016 New Revision: 429150 URL: https://svnweb.freebsd.org/changeset/ports/429150 Log: MFH: r429074 xen: apply XSA-202 Sponsored by: Citrix Systems R&D Approved by: ports-secteam (junovitch) Added: branches/2016Q4/emulators/xen-kernel/files/xsa202.patch - copied unchanged from r429074, head/emulators/xen-kernel/files/xsa202.patch Modified: branches/2016Q4/emulators/xen-kernel/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/emulators/xen-kernel/Makefile ============================================================================== --- branches/2016Q4/emulators/xen-kernel/Makefile Thu Dec 22 09:01:01 2016 (r429149) +++ branches/2016Q4/emulators/xen-kernel/Makefile Thu Dec 22 09:52:25 2016 (r429150) @@ -3,7 +3,7 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel PORTVERSION= 4.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -46,7 +46,8 @@ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logd ${FILESDIR}/xsa194.patch \ ${FILESDIR}/xsa195.patch \ ${FILESDIR}/xsa200-4.7.patch \ - ${FILESDIR}/xsa204-4.7.patch + ${FILESDIR}/xsa204-4.7.patch \ + ${FILESDIR}/xsa202.patch .include Copied: branches/2016Q4/emulators/xen-kernel/files/xsa202.patch (from r429074, head/emulators/xen-kernel/files/xsa202.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa202.patch Thu Dec 22 09:52:25 2016 (r429150, copy of r429074, head/emulators/xen-kernel/files/xsa202.patch) @@ -0,0 +1,75 @@ +From: Jan Beulich +Subject: x86: force EFLAGS.IF on when exiting to PV guests + +Guest kernels modifying instructions in the process of being emulated +for another of their vCPU-s may effect EFLAGS.IF to be cleared upon +next exiting to guest context, by converting the being emulated +instruction to CLI (at the right point in time). Prevent any such bad +effects by always forcing EFLAGS.IF on. And to cover hypothetical other +similar issues, also force EFLAGS.{IOPL,NT,VM} to zero. + +This is XSA-202. + +Signed-off-by: Jan Beulich +Reviewed-by: Andrew Cooper +--- + +--- a/xen/arch/x86/x86_64/compat/entry.S ++++ b/xen/arch/x86/x86_64/compat/entry.S +@@ -109,6 +109,8 @@ compat_process_trap: + /* %rbx: struct vcpu, interrupts disabled */ + ENTRY(compat_restore_all_guest) + ASSERT_INTERRUPTS_DISABLED ++ mov $~(X86_EFLAGS_IOPL|X86_EFLAGS_NT|X86_EFLAGS_VM),%r11d ++ and UREGS_eflags(%rsp),%r11d + .Lcr4_orig: + .skip .Lcr4_alt_end - .Lcr4_alt, 0x90 + .Lcr4_orig_end: +@@ -144,6 +146,8 @@ ENTRY(compat_restore_all_guest) + (.Lcr4_orig_end - .Lcr4_orig), \ + (.Lcr4_alt_end - .Lcr4_alt) + .popsection ++ or $X86_EFLAGS_IF,%r11 ++ mov %r11d,UREGS_eflags(%rsp) + RESTORE_ALL adj=8 compat=1 + .Lft0: iretq + _ASM_PRE_EXTABLE(.Lft0, handle_exception) +--- a/xen/arch/x86/x86_64/entry.S ++++ b/xen/arch/x86/x86_64/entry.S +@@ -40,28 +40,29 @@ restore_all_guest: + testw $TRAP_syscall,4(%rsp) + jz iret_exit_to_guest + ++ movq 24(%rsp),%r11 # RFLAGS ++ andq $~(X86_EFLAGS_IOPL|X86_EFLAGS_NT|X86_EFLAGS_VM),%r11 ++ orq $X86_EFLAGS_IF,%r11 ++ + /* Don't use SYSRET path if the return address is not canonical. */ + movq 8(%rsp),%rcx + sarq $47,%rcx + incl %ecx + cmpl $1,%ecx +- ja .Lforce_iret ++ movq 8(%rsp),%rcx # RIP ++ ja iret_exit_to_guest + + cmpw $FLAT_USER_CS32,16(%rsp)# CS +- movq 8(%rsp),%rcx # RIP +- movq 24(%rsp),%r11 # RFLAGS + movq 32(%rsp),%rsp # RSP + je 1f + sysretq + 1: sysretl + +-.Lforce_iret: +- /* Mimic SYSRET behavior. */ +- movq 8(%rsp),%rcx # RIP +- movq 24(%rsp),%r11 # RFLAGS + ALIGN + /* No special register assumptions. */ + iret_exit_to_guest: ++ andl $~(X86_EFLAGS_IOPL|X86_EFLAGS_NT|X86_EFLAGS_VM),24(%rsp) ++ orl $X86_EFLAGS_IF,24(%rsp) + addq $8,%rsp + .Lft0: iretq + _ASM_PRE_EXTABLE(.Lft0, handle_exception) From owner-svn-ports-branches@freebsd.org Thu Dec 22 10:00:35 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D460DC8CE26; Thu, 22 Dec 2016 10:00:35 +0000 (UTC) (envelope-from avilla@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 8387BAAF; Thu, 22 Dec 2016 10:00:35 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBMA0YHI068216; Thu, 22 Dec 2016 10:00:34 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBMA0Y9R068215; Thu, 22 Dec 2016 10:00:34 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201612221000.uBMA0Y9R068215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Thu, 22 Dec 2016 10:00:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429152 - branches/2016Q4/multimedia/kdenlive/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.23 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, 22 Dec 2016 10:00:35 -0000 Author: avilla Date: Thu Dec 22 10:00:34 2016 New Revision: 429152 URL: https://svnweb.freebsd.org/changeset/ports/429152 Log: MFH: r426356 Fix build of multimedia/kdenlive -- ambiguity of abs() Approved by: antoine Approved by: ports-secteam (blanket) Added: branches/2016Q4/multimedia/kdenlive/files/ - copied from r426356, head/multimedia/kdenlive/files/ Modified: Directory Properties: branches/2016Q4/ (props changed) From owner-svn-ports-branches@freebsd.org Thu Dec 22 12:37:44 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7DC6C8BD86; Thu, 22 Dec 2016 12:37:44 +0000 (UTC) (envelope-from avilla@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 9D7FA1810; Thu, 22 Dec 2016 12:37:44 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBMCbhjp032736; Thu, 22 Dec 2016 12:37:43 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBMCbh7E032735; Thu, 22 Dec 2016 12:37:43 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201612221237.uBMCbh7E032735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Thu, 22 Dec 2016 12:37:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429156 - branches/2016Q4/sysutils/qzeitgeist 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.23 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, 22 Dec 2016 12:37:45 -0000 Author: avilla Date: Thu Dec 22 12:37:43 2016 New Revision: 429156 URL: https://svnweb.freebsd.org/changeset/ports/429156 Log: MFH: r429155 - Fix build with Python 3 PR: 214737 Reported by: freebsd@get-experience.com Approved by: ports-secteam (blanket) Modified: branches/2016Q4/sysutils/qzeitgeist/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/sysutils/qzeitgeist/Makefile ============================================================================== --- branches/2016Q4/sysutils/qzeitgeist/Makefile Thu Dec 22 12:36:23 2016 (r429155) +++ branches/2016Q4/sysutils/qzeitgeist/Makefile Thu Dec 22 12:37:43 2016 (r429156) @@ -22,7 +22,7 @@ BUILD_DEPENDS= rapper:textproc/raptor2 \ USES= cmake kde:4 python:build tar:bzip2 USE_KDE= automoc4 -USE_QT4= dbus declarative qtestlib \ +USE_QT4= corelib dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes @@ -38,6 +38,8 @@ post-extract: data/ontology \ ${WRKSRC}/scripts +.include + post-patch: ${REINPLACE_CMD} -e '/\.pc/ s|pkgconfig|../libdata/pkgconfig|' \ -e 's|share/${PORTNAME}/cmake|lib/cmake/${PORTNAME}|' \ @@ -46,8 +48,16 @@ post-patch: ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/QZeitgeistConfig.cmake.in ${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \ + -e 's|env python|env ${PYTHON_CMD}|g' \ ${WRKSRC}/scripts/onto2cpp.py - ${REINPLACE_CMD} -e 's|env python|env ${PYTHON_CMD}|g' \ - ${WRKSRC}/scripts/onto2cpp.py +.if ${PYTHON_VERSION:M*3*} + ${REINPLACE_CMD} -E -e '/except/ s|,| as |' \ + -e 's|(print) +>> +(sys\.stderr) *, *(.*)|\1(\3, file=\2)|' \ + -e 's|(print) +(.*)|\1(\2)|' \ + -e '/gettext\.install/ s|\((.*),.*\)|(\1)|' \ + -e 's|execfile\((.*)\)|exec(compile(open(\1, "rb").read(), \1, "exec"))|' \ + -e '/iter(items|keys|values)\(\)/ s|iter||g' \ + ${WRKSRC}/scripts/*.py +.endif -.include +.include From owner-svn-ports-branches@freebsd.org Fri Dec 23 01:35:41 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21110C8C9D8; Fri, 23 Dec 2016 01:35:41 +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 E36461B4C; Fri, 23 Dec 2016 01:35:40 +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 uBN1ZeXK053467; Fri, 23 Dec 2016 01:35:40 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN1ZdTn053462; Fri, 23 Dec 2016 01:35:39 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612230135.uBN1ZdTn053462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 23 Dec 2016 01:35:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429212 - in branches/2016Q4/editors/neovim: . 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.23 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: Fri, 23 Dec 2016 01:35:41 -0000 Author: junovitch Date: Fri Dec 23 01:35:39 2016 New Revision: 429212 URL: https://svnweb.freebsd.org/changeset/ports/429212 Log: MFH: r423366 r424094 r425833 r428479 editors/neovim: update 0.1.4 -> 0.1.7 PR: 214897 Submitted by: Oleg Gushchenkov (maintainer) Reported by: ohauer (as a security issue) Security: CVE-2016-1248 Security: https://vuxml.FreeBSD.org/freebsd/c11629d3-c8ad-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Added: branches/2016Q4/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c - copied, changed from r424094, head/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c Deleted: branches/2016Q4/editors/neovim/files/patch-config__CMakeLists.txt branches/2016Q4/editors/neovim/files/patch-config__config.h.in branches/2016Q4/editors/neovim/files/patch-src__nvim__shada.c branches/2016Q4/editors/neovim/files/patch-src_nvim_event_pty__process.c Modified: branches/2016Q4/editors/neovim/Makefile branches/2016Q4/editors/neovim/distinfo branches/2016Q4/editors/neovim/files/patch-CMakeLists.txt branches/2016Q4/editors/neovim/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/editors/neovim/Makefile ============================================================================== --- branches/2016Q4/editors/neovim/Makefile Fri Dec 23 01:29:44 2016 (r429211) +++ branches/2016Q4/editors/neovim/Makefile Fri Dec 23 01:35:39 2016 (r429212) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= neovim -PORTVERSION= 0.1.4 +PORTVERSION= 0.1.7 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= editors MAINTAINER= gor@clogic.com.ua @@ -13,7 +12,8 @@ COMMENT= Next generation Vim LICENSE= APACHE20 BUILD_DEPENDS= ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \ - ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg + ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg \ + gperf:devel/gperf LIB_DEPENDS= libunibilium.so:devel/unibilium \ libvterm.so:devel/libvterm \ libtermkey.so:devel/libtermkey \ @@ -23,7 +23,7 @@ LIB_DEPENDS= libunibilium.so:devel/unibi USES= cmake:outsource gettext iconv ninja lua:build pathfix pkgconfig USE_GITHUB= yes -GH_TUPLE= tarruda:libmpack:1.0.2:libmpack +GH_TUPLE= tarruda:libmpack:1.0.3:libmpack CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ -DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \ @@ -42,5 +42,6 @@ pre-build: -I${LUA_INCDIR} -shared lmpack.c -o \ ${BUILD_WRKSRC}/src/nvim/mpack.so \ ${LUA_LIBDIR}/liblua-${LUA_VER}.so) + @${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mpack.so .include Modified: branches/2016Q4/editors/neovim/distinfo ============================================================================== --- branches/2016Q4/editors/neovim/distinfo Fri Dec 23 01:29:44 2016 (r429211) +++ branches/2016Q4/editors/neovim/distinfo Fri Dec 23 01:35:39 2016 (r429212) @@ -1,4 +1,5 @@ -SHA256 (neovim-neovim-v0.1.4_GH0.tar.gz) = bb7e359eb83db20c5ec5984b470b249372b6dcd813ae2ccf72c01cce560f93e9 -SIZE (neovim-neovim-v0.1.4_GH0.tar.gz) = 7678847 -SHA256 (tarruda-libmpack-1.0.2_GH0.tar.gz) = 9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9 -SIZE (tarruda-libmpack-1.0.2_GH0.tar.gz) = 44671 +TIMESTAMP = 1480313427 +SHA256 (neovim-neovim-v0.1.7_GH0.tar.gz) = d8f885d019b1ad608f36ae23b8f1b15b7e33585e16f7514666ab6c9809bb4b7e +SIZE (neovim-neovim-v0.1.7_GH0.tar.gz) = 7601279 +SHA256 (tarruda-libmpack-1.0.3_GH0.tar.gz) = 65eb21cfa9313204ac5296e3b305d752b8422c724b6375caecc6385f0a6d6e22 +SIZE (tarruda-libmpack-1.0.3_GH0.tar.gz) = 45720 Modified: branches/2016Q4/editors/neovim/files/patch-CMakeLists.txt ============================================================================== --- branches/2016Q4/editors/neovim/files/patch-CMakeLists.txt Fri Dec 23 01:29:44 2016 (r429211) +++ branches/2016Q4/editors/neovim/files/patch-CMakeLists.txt Fri Dec 23 01:35:39 2016 (r429212) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2016-05-09 13:04:04 UTC +--- CMakeLists.txt.orig 2016-11-08 05:44:53 UTC +++ CMakeLists.txt -@@ -213,7 +213,7 @@ else() +@@ -221,7 +221,7 @@ else() # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang # 3.4.1 used there. @@ -9,12 +9,15 @@ add_definitions(-Wno-c11-extensions) endif() endif() -@@ -367,7 +367,7 @@ endforeach() +@@ -386,9 +386,9 @@ endforeach() # Find Lua interpreter include(LuaHelpers) -set(LUA_DEPENDENCIES lpeg mpack bit) +set(LUA_DEPENDENCIES lpeg bit) if(NOT LUA_PRG) - foreach(CURRENT_LUA_PRG luajit lua) +- foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua) ++ foreach(CURRENT_LUA_PRG luajit) # If LUA_PRG is set find_program() will not search + unset(LUA_PRG CACHE) + unset(LUA_PRG_WORKS) Copied and modified: branches/2016Q4/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c (from r424094, head/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c) ============================================================================== --- head/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c Mon Oct 17 05:13:35 2016 (r424094, copy source) +++ branches/2016Q4/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c Fri Dec 23 01:35:39 2016 (r429212) @@ -1,11 +1,11 @@ ---- src/nvim/os/pty_process_unix.c.orig 2016-08-22 02:14:28 UTC +--- src/nvim/os/pty_process_unix.c.orig 2016-11-08 05:50:09 UTC +++ src/nvim/os/pty_process_unix.c @@ -9,7 +9,7 @@ #include // forkpty is not in POSIX, so headers are platform-specific -#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined __DragonFly__ ++#if defined(__FreeBSD__) || defined (__DragonFly__) # include #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) # include Modified: branches/2016Q4/editors/neovim/pkg-plist ============================================================================== --- branches/2016Q4/editors/neovim/pkg-plist Fri Dec 23 01:29:44 2016 (r429211) +++ branches/2016Q4/editors/neovim/pkg-plist Fri Dec 23 01:35:39 2016 (r429212) @@ -13,30 +13,21 @@ share/locale/fr/LC_MESSAGES/nvim.mo share/locale/ga/LC_MESSAGES/nvim.mo share/locale/it/LC_MESSAGES/nvim.mo share/locale/ja.euc-jp/LC_MESSAGES/nvim.mo -share/locale/ja.sjis/LC_MESSAGES/nvim.mo share/locale/ja/LC_MESSAGES/nvim.mo share/locale/ko.UTF-8/LC_MESSAGES/nvim.mo -share/locale/ko/LC_MESSAGES/nvim.mo share/locale/nb/LC_MESSAGES/nvim.mo share/locale/nl/LC_MESSAGES/nvim.mo share/locale/no/LC_MESSAGES/nvim.mo share/locale/pl.UTF-8/LC_MESSAGES/nvim.mo -share/locale/pl.cp1250/LC_MESSAGES/nvim.mo -share/locale/pl/LC_MESSAGES/nvim.mo share/locale/pt_BR/LC_MESSAGES/nvim.mo -share/locale/ru.cp1251/LC_MESSAGES/nvim.mo share/locale/ru/LC_MESSAGES/nvim.mo share/locale/sk.cp1250/LC_MESSAGES/nvim.mo share/locale/sk/LC_MESSAGES/nvim.mo share/locale/sv/LC_MESSAGES/nvim.mo -share/locale/uk.cp1251/LC_MESSAGES/nvim.mo share/locale/uk/LC_MESSAGES/nvim.mo share/locale/vi/LC_MESSAGES/nvim.mo share/locale/zh_CN.UTF-8/LC_MESSAGES/nvim.mo -share/locale/zh_CN.cp936/LC_MESSAGES/nvim.mo -share/locale/zh_CN/LC_MESSAGES/nvim.mo share/locale/zh_TW.UTF-8/LC_MESSAGES/nvim.mo -share/locale/zh_TW/LC_MESSAGES/nvim.mo share/nvim/runtime/autoload/ada.vim share/nvim/runtime/autoload/adacomplete.vim share/nvim/runtime/autoload/ccomplete.vim @@ -45,6 +36,9 @@ share/nvim/runtime/autoload/csscomplete. share/nvim/runtime/autoload/decada.vim share/nvim/runtime/autoload/gnat.vim share/nvim/runtime/autoload/gzip.vim +share/nvim/runtime/autoload/health.vim +share/nvim/runtime/autoload/health/nvim.vim +share/nvim/runtime/autoload/health/provider.vim share/nvim/runtime/autoload/htmlcomplete.vim share/nvim/runtime/autoload/javascriptcomplete.vim share/nvim/runtime/autoload/man.vim @@ -60,6 +54,7 @@ share/nvim/runtime/autoload/provider/pyt share/nvim/runtime/autoload/provider/python3.vim share/nvim/runtime/autoload/provider/pythonx.vim share/nvim/runtime/autoload/provider/ruby.vim +share/nvim/runtime/autoload/provider/script_host.rb share/nvim/runtime/autoload/python3complete.vim share/nvim/runtime/autoload/pythoncomplete.vim share/nvim/runtime/autoload/remote/define.vim @@ -72,7 +67,6 @@ share/nvim/runtime/autoload/syntaxcomple share/nvim/runtime/autoload/tar.vim share/nvim/runtime/autoload/tohtml.vim share/nvim/runtime/autoload/tutor.vim -share/nvim/runtime/autoload/vimball.vim share/nvim/runtime/autoload/vimexpect.vim share/nvim/runtime/autoload/xml/html32.vim share/nvim/runtime/autoload/xml/html401f.vim @@ -173,6 +167,7 @@ share/nvim/runtime/doc/autocmd.txt share/nvim/runtime/doc/change.txt share/nvim/runtime/doc/cmdline.txt share/nvim/runtime/doc/debug.txt +share/nvim/runtime/doc/deprecated.txt share/nvim/runtime/doc/develop.txt share/nvim/runtime/doc/diff.txt share/nvim/runtime/doc/digraph.txt @@ -184,13 +179,13 @@ share/nvim/runtime/doc/fold.txt share/nvim/runtime/doc/ft_ada.txt share/nvim/runtime/doc/ft_sql.txt share/nvim/runtime/doc/gui.txt -share/nvim/runtime/doc/gui_w32.txt share/nvim/runtime/doc/hebrew.txt share/nvim/runtime/doc/help.txt share/nvim/runtime/doc/helphelp.txt share/nvim/runtime/doc/howto.txt share/nvim/runtime/doc/if_cscop.txt share/nvim/runtime/doc/if_pyth.txt +share/nvim/runtime/doc/if_ruby.txt share/nvim/runtime/doc/indent.txt share/nvim/runtime/doc/index.txt share/nvim/runtime/doc/insert.txt @@ -205,15 +200,12 @@ share/nvim/runtime/doc/mlang.txt share/nvim/runtime/doc/motion.txt share/nvim/runtime/doc/msgpack_rpc.txt share/nvim/runtime/doc/nvim.txt -share/nvim/runtime/doc/nvim_clipboard.txt -share/nvim/runtime/doc/nvim_from_vim.txt -share/nvim/runtime/doc/nvim_provider.txt -share/nvim/runtime/doc/nvim_python.txt share/nvim/runtime/doc/nvim_terminal_emulator.txt share/nvim/runtime/doc/options.txt share/nvim/runtime/doc/os_win32.txt share/nvim/runtime/doc/pattern.txt share/nvim/runtime/doc/pi_gzip.txt +share/nvim/runtime/doc/pi_health.txt share/nvim/runtime/doc/pi_matchit.txt share/nvim/runtime/doc/pi_msgpack.txt share/nvim/runtime/doc/pi_netrw.txt @@ -221,12 +213,11 @@ share/nvim/runtime/doc/pi_paren.txt share/nvim/runtime/doc/pi_spec.txt share/nvim/runtime/doc/pi_tar.txt share/nvim/runtime/doc/pi_tutor.txt -share/nvim/runtime/doc/pi_vimball.txt share/nvim/runtime/doc/pi_zip.txt share/nvim/runtime/doc/print.txt +share/nvim/runtime/doc/provider.txt share/nvim/runtime/doc/quickfix.txt share/nvim/runtime/doc/quickref.txt -share/nvim/runtime/doc/quotes.txt share/nvim/runtime/doc/recover.txt share/nvim/runtime/doc/remote.txt share/nvim/runtime/doc/remote_plugin.txt @@ -332,6 +323,7 @@ share/nvim/runtime/ftplugin/dosbatch.vim share/nvim/runtime/ftplugin/dosini.vim share/nvim/runtime/ftplugin/dtd.vim share/nvim/runtime/ftplugin/dtrace.vim +share/nvim/runtime/ftplugin/eiffel.vim share/nvim/runtime/ftplugin/elinks.vim share/nvim/runtime/ftplugin/erlang.vim share/nvim/runtime/ftplugin/eruby.vim @@ -350,12 +342,15 @@ share/nvim/runtime/ftplugin/gitsendemail share/nvim/runtime/ftplugin/go.vim share/nvim/runtime/ftplugin/gpg.vim share/nvim/runtime/ftplugin/gprof.vim +share/nvim/runtime/ftplugin/groovy.vim share/nvim/runtime/ftplugin/group.vim share/nvim/runtime/ftplugin/grub.vim share/nvim/runtime/ftplugin/haml.vim share/nvim/runtime/ftplugin/hamster.vim share/nvim/runtime/ftplugin/haskell.vim share/nvim/runtime/ftplugin/help.vim +share/nvim/runtime/ftplugin/hgcommit.vim +share/nvim/runtime/ftplugin/hog.vim share/nvim/runtime/ftplugin/hostconf.vim share/nvim/runtime/ftplugin/hostsaccess.vim share/nvim/runtime/ftplugin/html.vim @@ -531,6 +526,7 @@ share/nvim/runtime/indent/gitolite.vim share/nvim/runtime/indent/go.vim share/nvim/runtime/indent/haml.vim share/nvim/runtime/indent/hamster.vim +share/nvim/runtime/indent/hog.vim share/nvim/runtime/indent/html.vim share/nvim/runtime/indent/htmldjango.vim share/nvim/runtime/indent/idlang.vim @@ -684,7 +680,15 @@ share/nvim/runtime/makemenu.vim share/nvim/runtime/menu.vim share/nvim/runtime/mswin.vim share/nvim/runtime/optwin.vim +share/nvim/runtime/pack/dist/opt/justify/plugin/justify.vim +share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim +share/nvim/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim +share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim +share/nvim/runtime/pack/dist/opt/vimball/doc/tags +share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt +share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim share/nvim/runtime/plugin/gzip.vim +share/nvim/runtime/plugin/health.vim share/nvim/runtime/plugin/man.vim share/nvim/runtime/plugin/matchit.vim share/nvim/runtime/plugin/matchparen.vim @@ -696,7 +700,6 @@ share/nvim/runtime/plugin/spellfile.vim share/nvim/runtime/plugin/tarPlugin.vim share/nvim/runtime/plugin/tohtml.vim share/nvim/runtime/plugin/tutor.vim -share/nvim/runtime/plugin/vimballPlugin.vim share/nvim/runtime/plugin/zipPlugin.vim share/nvim/runtime/print/ascii.ps share/nvim/runtime/print/cidfont.ps @@ -769,6 +772,7 @@ share/nvim/runtime/syntax/autohotkey.vim share/nvim/runtime/syntax/autoit.vim share/nvim/runtime/syntax/automake.vim share/nvim/runtime/syntax/ave.vim +share/nvim/runtime/syntax/avra.vim share/nvim/runtime/syntax/awk.vim share/nvim/runtime/syntax/ayacc.vim share/nvim/runtime/syntax/b.vim From owner-svn-ports-branches@freebsd.org Fri Dec 23 03:46:36 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F4124C8D2E0; Fri, 23 Dec 2016 03:46:35 +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 B62361BC1; Fri, 23 Dec 2016 03:46:35 +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 uBN3kYKU008738; Fri, 23 Dec 2016 03:46:34 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN3kYUu008734; Fri, 23 Dec 2016 03:46:34 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612230346.uBN3kYUu008734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 23 Dec 2016 03:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429218 - in branches/2016Q4/www/squid: . 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.23 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: Fri, 23 Dec 2016 03:46:36 -0000 Author: junovitch Date: Fri Dec 23 03:46:34 2016 New Revision: 429218 URL: https://svnweb.freebsd.org/changeset/ports/429218 Log: MFH: r427008 r427389 (www/squid only) r429217 www/squid: update 3.5.22 -> 3.5.23 - Switch to options helpers - Mark as not openssl-devel ready - Spell CHOSEN_COMPILER_TYPE correctly - Remove upstreamed patch (IPv6 + PF crash) - Add --enable-zph-qos option to default set http://wiki.squid-cache.org/Features/QualityOfService PR: 215416 Submitted by: Pavel Timofeev (maintainer) Security: CVE-2016-10002 Security: CVE-2016-10003 Security: https://vuxml.FreeBSD.org/freebsd/41f8af15-c8b9-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2016Q4/www/squid/Makefile branches/2016Q4/www/squid/distinfo branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/squid/Makefile ============================================================================== --- branches/2016Q4/www/squid/Makefile Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/Makefile Fri Dec 23 03:46:34 2016 (r429218) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.20 +PORTVERSION= 3.5.23 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -222,6 +222,7 @@ CONFIGURE_ARGS= --with-default-user=squi --with-swapdir=/var/squid/cache \ --without-gnutls \ --enable-auth \ + --enable-zph-qos \ --enable-build-info \ --enable-loadable-modules \ --enable-removal-policies="lru heap" \ @@ -294,7 +295,7 @@ post-patch: ${change_files}) @(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample) -.if !${PORT_OPTIONS:MIPV6} +post-patch-IPV6-off: @${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \ -e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \ -e's/ 2001:DB8::a:0\/64//' \ @@ -302,7 +303,6 @@ post-patch: -e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \ -e'/tcp_outgoing_address 2001:db8::1/d' \ ${WRKSRC}/src/cf.data.pre -.endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -313,11 +313,14 @@ post-install: .include -.if ${COMPILER_TYPE} == clang +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if ${CHOSEN_COMPILER_TYPE} == clang #CXXFLAGS+= -Wno-unused-private-field -.if ${COMPILER_VERSION} >= 35 +CXXFLAGS+= -Wno-unknown-warning-option CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess .endif -.endif .include Modified: branches/2016Q4/www/squid/distinfo ============================================================================== --- branches/2016Q4/www/squid/distinfo Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/distinfo Fri Dec 23 03:46:34 2016 (r429218) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467937151 -SHA256 (squid3.5/squid-3.5.20.tar.xz) = 37db73bd33ddd3503fe375bc3f2b47d9fb7309042e439ad3651f21d5dcf2d395 -SIZE (squid3.5/squid-3.5.20.tar.xz) = 2319780 +TIMESTAMP = 1479930399 +SHA256 (squid3.5/squid-3.5.23.tar.xz) = fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb +SIZE (squid3.5/squid-3.5.23.tar.xz) = 2325884 Modified: branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc ============================================================================== --- branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Fri Dec 23 03:46:34 2016 (r429218) @@ -13,41 +13,3 @@ return false; #else natLookup.nl_v = 6; -@@ -323,13 +323,21 @@ - } - - memset(&nl, 0, sizeof(struct pfioc_natlook)); -- newConn->remote.getInAddr(nl.saddr.v4); -+ if (newConn->remote.isIPv4()) { -+ newConn->remote.getInAddr(nl.saddr.v4); -+ } else { -+ newConn->remote.getInAddr(nl.saddr.v6); -+ } - nl.sport = htons(newConn->remote.port()); - -- newConn->local.getInAddr(nl.daddr.v4); -+ if (newConn->local.isIPv4()) { -+ newConn->local.getInAddr(nl.daddr.v4); -+ } else { -+ newConn->local.getInAddr(nl.daddr.v6); -+ } - nl.dport = htons(newConn->local.port()); - -- nl.af = AF_INET; -+ nl.af = newConn->remote.isIPv4() ? AF_INET : AF_INET6; - nl.proto = IPPROTO_TCP; - nl.direction = PF_OUT; - -@@ -345,7 +353,11 @@ - debugs(89, 9, HERE << "address: " << newConn); - return false; - } else { -- newConn->local = nl.rdaddr.v4; -+ if (nl.af == AF_INET) { -+ newConn->local = nl.rdaddr.v4; -+ } else { -+ newConn->local = nl.rdaddr.v6; -+ } - newConn->local.port(ntohs(nl.rdport)); - debugs(89, 5, HERE << "address NAT: " << newConn); - return true; From owner-svn-ports-branches@freebsd.org Fri Dec 23 04:39:50 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0833C8C06D; Fri, 23 Dec 2016 04:39:50 +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 76CF5144C; Fri, 23 Dec 2016 04:39:50 +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 uBN4dnd9030522; Fri, 23 Dec 2016 04:39:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN4dlOq030493; Fri, 23 Dec 2016 04:39:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612230439.uBN4dlOq030493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Dec 2016 04:39:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429221 - in branches/2016Q4: Mk/Uses www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/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.23 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: Fri, 23 Dec 2016 04:39:50 -0000 Author: jbeich Date: Fri Dec 23 04:39:47 2016 New Revision: 429221 URL: https://svnweb.freebsd.org/changeset/ports/429221 Log: MFH: r428671 r429039 www/seamonkey: update to 2.46 Changes: http://www.seamonkey-project.org/news#2016-12-22 Security: 4f00dac0-1e18-4481-95af-7aaad63fd303 Security: 2225c5b4-1e5a-44fc-9920-b3201c384a15 Security: 1bcfd963-e483-41b8-ab8e-bad5c3ce49c9 Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f Security: 8065d37b-8e7c-4707-a608-1b0a2b8509c3 Security: aa1aefe3-6e37-47db-bfda-343ef4acb1b5 Security: 2c57c47e-8bb3-4694-83c8-9fc3abad3964 Security: 18f39fb6-7400-4063-acaf-0806e92c094f Approved by: ports-secteam (junovitch) Added: branches/2016Q4/www/seamonkey/files/patch-bug1231349 (contents, props changed) branches/2016Q4/www/seamonkey/files/patch-bug1256136 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1256136 branches/2016Q4/www/seamonkey/files/patch-bug1288587 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1288587 branches/2016Q4/www/seamonkey/files/patch-bug1299694 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1299694 branches/2016Q4/www/seamonkey/files/patch-bug1315986 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1315986 branches/2016Q4/www/seamonkey/files/patch-bug1320991 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1320991 branches/2016Q4/www/seamonkey/files/patch-bug1321877 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1321877 branches/2016Q4/www/seamonkey/files/patch-bug1322112 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1322112 branches/2016Q4/www/seamonkey/files/patch-bug1322660 - copied unchanged from r428671, head/www/seamonkey/files/patch-bug1322660 Deleted: branches/2016Q4/www/seamonkey/files/patch-bug1209410 branches/2016Q4/www/seamonkey/files/patch-bug1228255 branches/2016Q4/www/seamonkey/files/patch-bug1228742 branches/2016Q4/www/seamonkey/files/patch-bug1233275 branches/2016Q4/www/seamonkey/files/patch-bug1234033 branches/2016Q4/www/seamonkey/files/patch-bug1243312 branches/2016Q4/www/seamonkey/files/patch-bug1245076 branches/2016Q4/www/seamonkey/files/patch-bug1268816 branches/2016Q4/www/seamonkey/files/patch-bug1269165 branches/2016Q4/www/seamonkey/files/patch-bug1269171 branches/2016Q4/www/seamonkey/files/patch-bug1285501 branches/2016Q4/www/seamonkey/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c branches/2016Q4/www/seamonkey/files/patch-modules-libpref-init-all.js branches/2016Q4/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h Modified: branches/2016Q4/Mk/Uses/gecko.mk branches/2016Q4/www/linux-seamonkey/Makefile branches/2016Q4/www/linux-seamonkey/distinfo branches/2016Q4/www/linux-seamonkey/pkg-plist branches/2016Q4/www/seamonkey-i18n/Makefile branches/2016Q4/www/seamonkey-i18n/distinfo branches/2016Q4/www/seamonkey/Makefile branches/2016Q4/www/seamonkey/distinfo branches/2016Q4/www/seamonkey/files/patch-bug1021761 branches/2016Q4/www/seamonkey/files/patch-bug1320621 branches/2016Q4/www/seamonkey/files/patch-bug702179 branches/2016Q4/www/seamonkey/files/patch-bug826985 branches/2016Q4/www/seamonkey/files/patch-bug847568 branches/2016Q4/www/seamonkey/files/patch-config-baseconfig.mk branches/2016Q4/www/seamonkey/files/patch-ijg-libjpeg branches/2016Q4/www/seamonkey/files/patch-sample-type branches/2016Q4/www/seamonkey/files/patch-z-bug517422 Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2016Q4/Mk/Uses/gecko.mk Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/Mk/Uses/gecko.mk Fri Dec 23 04:39:47 2016 (r429221) @@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .elif ${gecko_ARGS:Mseamonkey} -_GECKO_DEFAULT_VERSION= 40 -_GECKO_VERSIONS= 40 +_GECKO_DEFAULT_VERSION= 46 +_GECKO_VERSIONS= 46 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) @@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Seamonkey versions -40_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey +46_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey .elif ${gecko_ARGS:Mthunderbird} Modified: branches/2016Q4/www/linux-seamonkey/Makefile ============================================================================== --- branches/2016Q4/www/linux-seamonkey/Makefile Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/linux-seamonkey/Makefile Fri Dec 23 04:39:47 2016 (r429221) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.40 +DISTVERSION= 2.46 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser Modified: branches/2016Q4/www/linux-seamonkey/distinfo ============================================================================== --- branches/2016Q4/www/linux-seamonkey/distinfo Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/linux-seamonkey/distinfo Fri Dec 23 04:39:47 2016 (r429221) @@ -1,6 +1,6 @@ -TIMESTAMP = 1475123784 -SHA256 (seamonkey-2.40.tar.bz2) = dc42044206fe4f3d2f2c797ef1516635e27789d6983293a56c6557626e1841be -SIZE (seamonkey-2.40.tar.bz2) = 50683245 +TIMESTAMP = 1481682190 +SHA256 (seamonkey-2.46.tar.bz2) = 096a1a8e229eaa05c2db5ae0661f856aceae58f1cae406cf52d2b270ca8a9957 +SIZE (seamonkey-2.46.tar.bz2) = 48816262 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2016Q4/www/linux-seamonkey/pkg-plist ============================================================================== --- branches/2016Q4/www/linux-seamonkey/pkg-plist Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/linux-seamonkey/pkg-plist Fri Dec 23 04:39:47 2016 (r429221) @@ -51,7 +51,6 @@ lib/%%APP_NAME%%/chrome/icons/default/pl lib/%%APP_NAME%%/chrome/icons/default/places48.png lib/%%APP_NAME%%/chrome/icons/default/seamonkey.png lib/%%APP_NAME%%/components/components.manifest -lib/%%APP_NAME%%/components/libmozgnome.so lib/%%APP_NAME%%/components/libsuite.so lib/%%APP_NAME%%/crashreporter lib/%%APP_NAME%%/crashreporter-override.ini @@ -66,11 +65,10 @@ lib/%%APP_NAME%%/defaults/profile/panels lib/%%APP_NAME%%/dependentlibs.list lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic -lib/%%APP_NAME%%/distribution/extensions/inspector@mozilla.org.xpi -lib/%%APP_NAME%%/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi lib/%%APP_NAME%%/extensions/modern@themes.mozilla.org.xpi lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi lib/%%APP_NAME%%/icons/updater.png +lib/%%APP_NAME%%/icudt56l.dat lib/%%APP_NAME%%/isp/Bogofilter.sfd lib/%%APP_NAME%%/isp/DSPAM.sfd lib/%%APP_NAME%%/isp/POPFile.sfd @@ -78,8 +76,8 @@ lib/%%APP_NAME%%/isp/SpamAssassin.sfd lib/%%APP_NAME%%/isp/SpamPal.sfd lib/%%APP_NAME%%/isp/movemail.rdf lib/%%APP_NAME%%/isp/rss.rdf -lib/%%APP_NAME%%/libfreebl3.chk -lib/%%APP_NAME%%/libfreebl3.so +lib/%%APP_NAME%%/libfreeblpriv3.chk +lib/%%APP_NAME%%/libfreeblpriv3.so lib/%%APP_NAME%%/libldap60.so lib/%%APP_NAME%%/libldif60.so lib/%%APP_NAME%%/liblgpllibs.so Modified: branches/2016Q4/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2016Q4/www/seamonkey-i18n/Makefile Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey-i18n/Makefile Fri Dec 23 04:39:47 2016 (r429221) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.40 +PORTVERSION= 2.46 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build9/langpack PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2016Q4/www/seamonkey-i18n/distinfo ============================================================================== --- branches/2016Q4/www/seamonkey-i18n/distinfo Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey-i18n/distinfo Fri Dec 23 04:39:47 2016 (r429221) @@ -1,53 +1,53 @@ -TIMESTAMP = 1475123784 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 257bd56c3db3d62600e8fcb4e621df1cb3cede2e73354a0f588516152598e9b8 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 846940 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 06d423fc182c0d6b674572a94c0628febbe314883dc0be7f481583ae21ce9485 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 838972 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = b2485aaed83ad46edb565fd6d35b785fc350ae96a7c32df91eb028807d8f442e -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = 831462 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 8d72d02bcec01e63a6b4630bcfd092fa1dcdf21b8424f4de878d4460e6ba1865 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 839670 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = b19890d7c446ffd98a9c94f95986cbbed9842f4149ce549d3463128957f1ed9f -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = 801900 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 45c6f3aee27022a7523268d21f38924dbfa3553f2dfca25e8e11ef41c1119392 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 801237 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 096bfcbd124463398d1776955587036f7d8d969582053d8980dde18e34e21738 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 850745 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 8d95036953298f880de663961a4b686bed9b233dfdc247a5107465d97d671b68 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 819863 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = fbbca3abdc2fca3a7d18500e606ef75e3ee4ecbaefce3fc6bec211422521ac0e -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = 806026 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = faed1301c6f7eebf6999521feb7a8161f4ec5c6dab01ae717f9bb7df360a6382 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = 812115 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 36d8a69aa1a526dd8ecc6a2fe2da55b5b4d3e4bcbbd2d13af0f76fa79ae21fc4 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 817071 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = b259e45414ea7247c586605797064743efd203ad22ef4a6ca734d9d39ea0ddcd -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = 849367 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 6818ac8634aa959c049791bd96e228ee68fb4af214d73b2ded67cdf9e8fba159 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 730855 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 73c868aad2fdcc3ddf3cbb84bdca2ec7e43c7fcf0ac1d5ec243717123dcaf353 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 888099 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = eb99109e0b25415e460c31fe6be35d41ada6040ca91bb90fb29af951f0b21b6a -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = 858221 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 2762bcddb6b4d36b2d14bb961e6b3604420e099216d5efc60b8835bc2709251d -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 829131 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = fa6f780f2fec5b43c75bc46778ddcfa983c989fe16a0c1995c0bc65a375188f9 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = 796595 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 96d1eaf1bafce2a4b11abfc7b3cccc3409b073e7353416ec7eaec48f61d0ed83 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 861834 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 1ef665be4063a864564ac13d6cf87892bc5c3c57a9e4115efd03403382e14b8b -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 831873 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 68f6ca318be2cd1f78245db311ac9c0e0ae877697c0e310284615b352338a61e -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 892052 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = af8c126fe02cb3a8b9783c4a1f8d4bdec8b684195a2a8b5be537df88e2ec2861 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = 858148 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = fc970bfc8b52119c147d564076904df9b3722fb922bc9703709ceb5be2bd6144 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = 824804 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = c5dce74507307008127e3402e0c9a877f333f2b1085b1c912c77969f4a433632 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = 814264 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 9932ca0ac00312a9fd9bab3199f7e55564beb6f5f339647c7a6c0cdd4cd82241 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 875815 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 28f634be2ed10526dbf6bf310b28f4da921d5809bce8216418c34ad07ac75443 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 839892 -SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = eaec998d922789be13cfc42660ab96abd0b1ec47cb4394b8a9f725969141ba89 -SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = 861767 +TIMESTAMP = 1481640594 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = 936650 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 937577 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 4fae0f46a8ba83a72e6c7a50b7ba73153f153055b874fa3e857ebf6867a48ff3 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 936101 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = e6d000492fbb3aa1f7624dbb3a546742bd9badb67a9cee8a95fd8b8ead7ac0eb +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = 942796 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = be1e956e11c4e36def6af6ee0c0795f5ec19e4370d811b6f3fdf60ed38f184c4 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = 900232 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = ff188a86cebac99fa25575b8f8a2eb01d0f6ee009485c826dd9fbf3701839eb4 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = 900829 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 5b7a9da73fe69c9004487f844f97f5f18d3db79e49dd151ae9a6229545ef7d2c +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 952318 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = da0c4b4e156965310ad4280c5ab461abd778b89e55d16a1f1ee78f692bbb76cb +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = 881728 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 9242710c283628b6e9f68eee0425e1f7b81d81be27c1d5c3dc441018751b1511 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 905048 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = e8e01037b879fe49e9dc042f27e08737083ac2bd7f9652ec2216d69f3de84ac9 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = 945990 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = e10ed62becc1e090c1734434d4a48b403dadb75b2231b70b33e2f34666fa42fa +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = 915640 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 7366d80af72e1e5c46275b0f3f4efa36290b59ac2c24dc4b2debf06dbdc469fe +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 950137 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 939162085a89575988fc44251f6f484bce087433bf06220fe94a3a3ef31a4279 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 788290 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = b3f8a0e23cbd3e235d33d1fb083ff6b5b4d0abdd4697d89be444f90e657afea5 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = 1000175 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 32ca1b4668234c96c161512e6e7a444d864229d86efdc89caafff5e1d882bd0d +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 951611 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 20b93b1f9475fc97a9f86f48d2bbcdeca43015c2cfe62a5a7b4d204dee1d7e0f +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 921937 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = eb9e84781c9c70411ccc199b8ccd6bf96729763ac09210d67d2dbe9178f9b8c4 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = 926891 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 47a18be4d673bc8ef172b358512390d5bcfc6f81d1c2d327669aa135b2aec482 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 918214 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 0ba281071038143950c64a03edaab7a37a4d284ed1583b50633ab58e393c7743 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 934340 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = fd50c7fd8f291530f68af88424dffd15e59340cb854a1edc915d2d5dc548ec78 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = 960162 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 124d643a414d595941cc5fd72c0529629df8f3ea15c0f16186e7e3d5550dca22 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 962527 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 6cadce5a8b40aaf1cc39157f5a9be3de5890d4b298082c11f9da1bdf43638869 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 935346 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 1ad81e539c119d4bcc9b4c15dc1a54d604ae8d999c3e7dbc112c2633dd914409 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 912742 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 50be5f1fc5bf46133308185fee7f6761eca90550bbbb6d27ded3a0f81e2cfb81 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 995478 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 19e835ebb01e3c7c8bdd3aeee9105f18187fb7c588bf2e329db45c39acb4e5dc +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 942579 +SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 2fe7403370d70d4daa6a302fc24fc72a062cb9777acc672faf20f51f2ed73955 +SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 970970 Modified: branches/2016Q4/www/seamonkey/Makefile ============================================================================== --- branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:39:47 2016 (r429221) @@ -2,28 +2,27 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.40 -MOZILLA_VER= 43 # above + 3 -PORTREVISION= 2 +DISTVERSION= 2.46 +MOZILLA_VER= 49 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.10.10:devel/nspr \ - nss>=3.20.1:security/nss \ +BUILD_DEPENDS= nspr>=4.12:devel/nspr \ + nss>=3.25:security/nss \ libevent2>=2.0.21_2:devel/libevent2 \ soundtouch>=1.9.0:audio/soundtouch \ - harfbuzz>=1.0.3:print/harfbuzz \ - graphite2>=1.3.4:graphics/graphite2 \ - png>=1.6.17:graphics/png \ + harfbuzz>=1.2.6:print/harfbuzz \ + graphite2>=1.3.8:graphics/graphite2 \ + png>=1.6.21:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.8.11.1:databases/sqlite3 \ + sqlite3>=3.13:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ @@ -32,8 +31,8 @@ BUILD_DEPENDS= nspr>=4.10.10:devel/nspr LIB_DEPENDS= libv4l2.so:multimedia/libv4l -EM_VERSION= 1.9.5 -L_VERSION= 4.5 +EM_VERSION= 1.9.6.1 +L_VERSION= 5.1 SSP_UNSAFE= yes USE_GECKO= gecko @@ -42,46 +41,32 @@ USES= tar:xz MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default -MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ - --enable-application=suite +MOZ_OPTIONS+= --enable-application=suite USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 -OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS RUST +OPTIONS_DEFINE= ENIGMAIL LDAP LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL GTK2 LDAP LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CANBERRA ENIGMAIL GTK2 LDAP LIGHTNING -CHATZILLA_DESC?=Chatzilla IRC module -COMPOSER_DESC?= HTML Composer module LDAP_DESC?= LDAP support for Mailnews -MAILNEWS_DESC?= Mail and News modules .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -.if ${PORT_OPTIONS:MCHATZILLA} -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc -.endif - -.include - WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi -.if ! ${PORT_OPTIONS:MMAILNEWS} -MOZ_OPTIONS+= --disable-ldap --disable-mailnews -.else -# mail and news desired, but not LDAP .if ! ${PORT_OPTIONS:MLDAP} -MOZ_OPTIONS+= --disable-ldap --enable-mailnews +MOZ_OPTIONS+= --disable-ldap .else -MOZ_OPTIONS+= --enable-ldap --enable-mailnews +MOZ_OPTIONS+= --enable-ldap .endif .if ${PORT_OPTIONS:MENIGMAIL} MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail @@ -96,11 +81,6 @@ EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/ins ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/app.jsm .endif -.endif - -.if ! ${PORT_OPTIONS:MCOMPOSER} -MOZ_OPTIONS+= --disable-composer -.endif .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar @@ -113,7 +93,7 @@ XPI_ID= lightning@seamonkey.mozilla.org MOZ_OPTIONS+= --disable-calendar .endif -.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +.if ${PORT_OPTIONS:MENIGMAIL} post-extract: @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ -C ${WRKSRC}/mailnews/extensions @@ -127,7 +107,7 @@ post-patch: @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop -.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +.if ${PORT_OPTIONS:MENIGMAIL} @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl @@ -145,13 +125,13 @@ pre-configure: (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) -.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +.if ${PORT_OPTIONS:MENIGMAIL} post-configure: cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure .endif -.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +.if ${PORT_OPTIONS:MENIGMAIL} post-build: ${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \ -C ${WRKSRC}/mailnews/extensions/enigmail @@ -170,7 +150,7 @@ post-install: @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST} .endif -.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +.if ${PORT_OPTIONS:MENIGMAIL} @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} @(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/g} @@ -180,4 +160,4 @@ post-install: @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} .endif -.include +.include Modified: branches/2016Q4/www/seamonkey/distinfo ============================================================================== --- branches/2016Q4/www/seamonkey/distinfo Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/distinfo Fri Dec 23 04:39:47 2016 (r429221) @@ -1,5 +1,5 @@ -TIMESTAMP = 1475123784 -SHA256 (seamonkey-2.40.source.tar.xz) = 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01 -SIZE (seamonkey-2.40.source.tar.xz) = 193702432 -SHA256 (enigmail-1.9.5.tar.gz) = 831e53a4add0f465241f075be9475103367aa1452675adae054d8fb272e5d3ad -SIZE (enigmail-1.9.5.tar.gz) = 1744278 +TIMESTAMP = 1481682190 +SHA256 (seamonkey-2.46.source.tar.xz) = 39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912 +SIZE (seamonkey-2.46.source.tar.xz) = 204913776 +SHA256 (enigmail-1.9.6.1.tar.gz) = 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f +SIZE (enigmail-1.9.6.1.tar.gz) = 1745021 Modified: branches/2016Q4/www/seamonkey/files/patch-bug1021761 ============================================================================== --- branches/2016Q4/www/seamonkey/files/patch-bug1021761 Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/files/patch-bug1021761 Fri Dec 23 04:39:47 2016 (r429221) @@ -1,7 +1,19 @@ -diff --git configure.in configure.in +diff --git build/moz.configure/old.configure build/moz.configure/old.configure +index b95dd2b..4cbefd5 100644 +--- mozilla/build/moz.configure/old.configure ++++ mozilla/build/moz.configure/old.configure +@@ -305,6 +305,7 @@ def old_configure_options(*options): + '--with-nspr-prefix', + '--with-nss-exec-prefix', + '--with-nss-prefix', ++ '--with-oss', + '--with-pthreads', + '--with-qemu-exe', + '--with-servo', +diff --git old-configure.in configure.in index 48e60c0..ec08417 100644 ---- mozilla/configure.in -+++ mozilla/configure.in +--- mozilla/old-configure.in ++++ mozilla/old-configure.in @@ -5591,6 +5591,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) @@ -503,23 +515,21 @@ index a962553..1f780f4 100644 assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -848,23 +954,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, +@@ -859,7 +965,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } - r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -- stm->params.channels, stm->params.rate, 1, -- latency * 1000); + r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -+ stm->params.channels, stm->params.rate, 1, -+ latency * 1000); + stm->params.channels, stm->params.rate, 1, + latency * 1000); if (r < 0) { - alsa_stream_destroy(stm); +@@ -867,15 +973,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR_INVALID_FORMAT; } -- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size); -+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size); +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); assert(r == 0); - stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); @@ -561,7 +571,7 @@ index a962553..1f780f4 100644 /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); + r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); if (r < 0) { return CUBEB_ERROR; @@ -643,7 +653,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,432 @@ +@@ -0,0 +1,442 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -664,6 +674,7 @@ index 0000000..5e38e27 +#include +#include +#include ++#include + +#include "cubeb/cubeb.h" +#include "cubeb-internal.h" @@ -762,7 +773,7 @@ index 0000000..5e38e27 + pthread_mutex_lock(&stream->state_mutex); + if (stream->data_callback && stream->running && !stream->stopped) { + pthread_mutex_unlock(&stream->state_mutex); -+ got = stream->data_callback(stream, stream->user_ptr, buffer, nframes); ++ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes); + } else { + pthread_mutex_unlock(&stream->state_mutex); + } @@ -892,7 +903,10 @@ index 0000000..5e38e27 + +static int oss_stream_init(cubeb * context, cubeb_stream ** stm, + char const * stream_name, -+ cubeb_stream_params stream_params, ++ cubeb_devid input_device, ++ cubeb_stream_params * input_stream_params, ++ cubeb_devid output_device, ++ cubeb_stream_params * output_stream_params, + unsigned int latency, + cubeb_data_callback data_callback, + cubeb_state_callback state_callback, void * user_ptr) @@ -903,6 +917,12 @@ index 0000000..5e38e27 + stream->state_callback = state_callback; + stream->user_ptr = user_ptr; + ++ assert(!input_stream_params && "not supported."); ++ if (input_device || output_device) { ++ /* Device selection not yet implemented. */ ++ return CUBEB_ERROR_DEVICE_UNAVAILABLE; ++ } ++ + if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { + free(stream); + return CUBEB_ERROR; @@ -914,7 +934,7 @@ index 0000000..5e38e27 + free(stream); \ + return CUBEB_ERROR_INVALID_FORMAT; } } while (0) + -+ stream->params = stream_params; ++ stream->params = *output_stream_params; + stream->volume = 1.0; + stream->panning = 0.0; + @@ -1138,13 +1158,13 @@ index 991f03f..3d99eb5 100644 +if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] - if CONFIG['MOZ_NATIVE_JPEG']: + if CONFIG['MOZ_SYSTEM_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] diff --git toolkit/library/moz.build toolkit/library/moz.build index e191f13..4fb268a 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build -@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] Added: branches/2016Q4/www/seamonkey/files/patch-bug1231349 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1231349 Fri Dec 23 04:39:47 2016 (r429221) @@ -0,0 +1,16 @@ +diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in +--- suite/installer/package-manifest.in ++++ suite/installer/package-manifest.in +@@ -911,3 +956,12 @@ + @RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@ + #endif + #endif ++ ++#ifdef MOZ_CALENDAR ++[calendar] ++#ifdef NIGHTLY_BUILD ++@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/ ++#else ++@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/ ++#endif ++#endif Copied: branches/2016Q4/www/seamonkey/files/patch-bug1256136 (from r428671, head/www/seamonkey/files/patch-bug1256136) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1256136 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1256136) @@ -0,0 +1,21 @@ +diff --git xpcom/glue/nsISupportsImpl.h xpcom/glue/nsISupportsImpl.h +index 9102102..e1f34c0 100644 +--- mozilla/xpcom/glue/nsISupportsImpl.h ++++ mozilla/xpcom/glue/nsISupportsImpl.h +@@ -32,11 +32,11 @@ + #include "mozilla/TypeTraits.h" + + #if defined(__clang__) +- // bug 1028428 shows that at least in FreeBSD 10.0 with Clang 3.4 and libc++ 3.4, +- // std::is_destructible is buggy in that it returns false when it should return true +- // on ipc::SharedMemory. On the other hand, all Clang versions currently in use +- // seem to handle the fallback just fine. +-# define MOZ_CAN_USE_IS_DESTRUCTIBLE_FALLBACK ++# if MOZ_USING_LIBCXX && __has_include() ++# define MOZ_HAVE_STD_IS_DESTRUCTIBLE ++# else ++# define MOZ_CAN_USE_IS_DESTRUCTIBLE_FALLBACK ++# endif + #elif defined(__GNUC__) + // GCC 4.7 is has buggy std::is_destructible + # if MOZ_USING_LIBSTDCXX && MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) Copied: branches/2016Q4/www/seamonkey/files/patch-bug1288587 (from r428671, head/www/seamonkey/files/patch-bug1288587) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1288587 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1288587) @@ -0,0 +1,67 @@ +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 855214a..1e91d51 100644 +--- mozilla/build/moz.configure/init.configure ++++ mozilla/build/moz.configure/init.configure +@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter') + # ============================================================== + @depends('PYTHON', check_build_environment, mozconfig, '--help') + @imports('os') + @imports('sys') + @imports('subprocess') + @imports(_from='mozbuild.configure.util', _import='LineIO') + @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') + @imports(_from='mozbuild.virtualenv', _import='verify_python_version') ++@imports(_from='__builtin__', _import='KeyError') + @imports('distutils.sysconfig') + def virtualenv_python(env_python, build_env, mozconfig, help): + if help: + return + + python = env_python[0] if env_python else None + + # Ideally we'd rely on the mozconfig injection from mozconfig_options, +@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help): + if 'PYTHON' in mozconfig['env']['added']: + python = mozconfig['env']['added']['PYTHON'] + elif 'PYTHON' in mozconfig['env']['modified']: + python = mozconfig['env']['modified']['PYTHON'][1] + elif 'PYTHON' in mozconfig['vars']['added']: + python = mozconfig['vars']['added']['PYTHON'] + elif 'PYTHON' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON'][1] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON'] ++ except KeyError: ++ pass + + with LineIO(lambda l: log.error(l)) as out: + verify_python_version(out) + topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir + if topobjdir.endswith('/js/src'): + topobjdir = topobjdir[:-7] + + with LineIO(lambda l: log.info(l)) as out: +@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help): + log.info('Creating Python environment') + manager.build(python) + + python = normsep(manager.python_path) + + if python != normsep(sys.executable): + log.info('Reexecuting in the virtualenv') + if env_python: +- del os.environ['PYTHON'] ++ try: ++ del os.environ['PYTHON'] ++ except KeyError: ++ pass + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) + + # We are now in the virtualenv + if not distutils.sysconfig.get_python_lib(): + die('Could not determine python site packages directory') + Copied: branches/2016Q4/www/seamonkey/files/patch-bug1299694 (from r428671, head/www/seamonkey/files/patch-bug1299694) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1299694 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1299694) @@ -0,0 +1,31 @@ +commit 6ab2496 +Author: Chris Pearce +Date: Mon Sep 5 13:54:37 2016 +1200 + + Bug 1299694 - Ensure we don't enable Widevine unintentionally. r=glandium + + On FreeBSD the target.kernel etc checks in enable_eme are failing, + but we're still falling through to |return value|, and so Widevine + is being enabled. If we remove the |return value| from enable_eme + we at least make Widevine disabled where it's not supposed to be + enabled. + + MozReview-Commit-ID: D1h0IUidxhv +--- + toolkit/moz.configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git toolkit/moz.configure toolkit/moz.configure +index 0c98c7a..a00b6eb 100644 +--- mozilla/toolkit/moz.configure ++++ mozilla/toolkit/moz.configure +@@ -366,7 +366,8 @@ def enable_eme(value, target): + return value + elif value and value.origin != 'default': + die('%s is not supported on %s' % (value.format('--enable-eme'), target.alias)) +- return value ++ # Return the same type of OptionValue (Positive or Negative), with an empty tuple. ++ return value.__class__(()) + + @depends(enable_eme, fmp4) + def eme(value, fmp4): Copied: branches/2016Q4/www/seamonkey/files/patch-bug1315986 (from r428671, head/www/seamonkey/files/patch-bug1315986) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1315986 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1315986) @@ -0,0 +1,49 @@ +commit c0d2685148b5 +Author: Jonathan Kew +Date: Wed Nov 9 15:07:54 2016 +0000 + + Bug 1315986 - Update line-break class mapping in nsJISx4051LineBreaker to handle new classes in ICU58/Unicode 9, and add assertions to detect any future additions that will require further updates. r=masayuki +--- + intl/lwbrk/nsJISx4051LineBreaker.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git intl/lwbrk/nsJISx4051LineBreaker.cpp intl/lwbrk/nsJISx4051LineBreaker.cpp +index 0d89e91..1b262fa 100644 +--- mozilla/intl/lwbrk/nsJISx4051LineBreaker.cpp ++++ mozilla/intl/lwbrk/nsJISx4051LineBreaker.cpp +@@ -12,6 +12,10 @@ + #include "nsTArray.h" + #include "nsUnicodeProperties.h" + ++#if ENABLE_INTL_API ++#include "unicode/uchar.h" // for U_LB_COUNT until bug 1305700 ++#endif ++ + /* + + Simplification of Pair Table in JIS X 4051 +@@ -547,10 +551,22 @@ GetClass(uint32_t u) + /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER, + /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE, + /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER, +- /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER ++ /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, ++#if U_ICU_VERSION_MAJOR_NUM > 57 ++ /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, ++ /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, ++ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, ++#endif + }; + +- return sUnicodeLineBreakToClass[mozilla::unicode::GetLineBreakClass(u)]; ++#if ENABLE_INTL_API ++ static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), ++ "Gecko vs ICU LineBreak class mismatch"); ++#endif ++ ++ auto cls = mozilla::unicode::GetLineBreakClass(u); ++ MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass)); ++ return sUnicodeLineBreakToClass[cls]; + } + + static bool Modified: branches/2016Q4/www/seamonkey/files/patch-bug1320621 ============================================================================== --- branches/2016Q4/www/seamonkey/files/patch-bug1320621 Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/files/patch-bug1320621 Fri Dec 23 04:39:47 2016 (r429221) @@ -10,7 +10,7 @@ Make sure --enable-system-hunspell picks - FINAL_LIBRARY = 'xul' -+if CONFIG['MOZ_NATIVE_HUNSPELL']: ++if CONFIG['MOZ_SYSTEM_HUNSPELL']: + CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS'] +else: + LOCAL_INCLUDES += ['../src'] @@ -26,7 +26,7 @@ Make sure --enable-system-hunspell picks FINAL_LIBRARY = 'xul' -+if CONFIG['MOZ_NATIVE_HUNSPELL']: ++if CONFIG['MOZ_SYSTEM_HUNSPELL']: + CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS'] +else: + LOCAL_INCLUDES += ['../hunspell/src'] Copied: branches/2016Q4/www/seamonkey/files/patch-bug1320991 (from r428671, head/www/seamonkey/files/patch-bug1320991) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1320991 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1320991) @@ -0,0 +1,24 @@ +--- mozilla/modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC ++++ mozilla/modules/libmar/tests/moz.build +@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh + DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] + + if CONFIG['OS_TARGET'] != 'Android': +- nss_files = ['nss3'] +- if not CONFIG['MOZ_FOLD_LIBS']: +- nss_files.extend([ +- 'nssutil3', +- 'plc4', +- 'nspr4', +- 'plds4', +- ]) +- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( +- ['!/dist/bin/%s%s%s' % ( +- CONFIG['DLL_PREFIX'], +- name, +- CONFIG['DLL_SUFFIX'], +- ) for name in nss_files] +- ) + TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ + '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], + ] Copied: branches/2016Q4/www/seamonkey/files/patch-bug1321877 (from r428671, head/www/seamonkey/files/patch-bug1321877) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1321877 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1321877) @@ -0,0 +1,42 @@ +commit a13d95795217 +Author: +Date: Thu Dec 8 18:20:12 2016 -0600 + + Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel +--- + image/Downscaler.h | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git image/Downscaler.h image/Downscaler.h +index 21179a38f200..0bdef0eaa646 100644 +--- mozilla/image/Downscaler.h ++++ mozilla/image/Downscaler.h +@@ -154,14 +154,14 @@ private: + class Downscaler + { + public: +- explicit Downscaler(const nsIntSize&) ++ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0) + { + MOZ_RELEASE_ASSERT(false, "Skia is not enabled"); + } + +- const nsIntSize& OriginalSize() const { return nsIntSize(); } +- const nsIntSize& TargetSize() const { return nsIntSize(); } +- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); } ++ const nsIntSize& OriginalSize() const { return mSize; } ++ const nsIntSize& TargetSize() const { return mSize; } ++ const gfxSize& Scale() const { return mScale; } + + nsresult BeginFrame(const nsIntSize&, const Maybe&, uint8_t*, bool, bool = false) + { +@@ -177,6 +177,9 @@ public: + DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); } + void ResetForNextProgressivePass() { } + const nsIntSize FrameSize() const { return nsIntSize(0, 0); } ++private: ++ nsIntSize mSize; ++ gfxSize mScale; + }; + + #endif // MOZ_ENABLE_SKIA Copied: branches/2016Q4/www/seamonkey/files/patch-bug1322112 (from r428671, head/www/seamonkey/files/patch-bug1322112) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1322112 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1322112) @@ -0,0 +1,23 @@ +--- mozilla/image/decoders/nsIconDecoder.cpp ++++ mozilla/image/decoders/nsIconDecoder.cpp +@@ -89,17 +89,18 @@ nsIconDecoder::ReadRowOfPixels(const cha + { + MOZ_ASSERT(aLength % 4 == 0, "Rows should contain a multiple of four bytes"); + + auto result = mPipe.WritePixels([&]() -> NextPixel { + if (aLength == 0) { + return AsVariant(WriteState::NEED_MORE_DATA); // Done with this row. + } + +- uint32_t pixel = *reinterpret_cast(aData); ++ uint32_t pixel; ++ memcpy(&pixel, aData, 4); + aData += 4; + aLength -= 4; + + return AsVariant(pixel); + }); + + MOZ_ASSERT(result != WriteState::FAILURE); + + Copied: branches/2016Q4/www/seamonkey/files/patch-bug1322660 (from r428671, head/www/seamonkey/files/patch-bug1322660) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1322660 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1322660) @@ -0,0 +1,80 @@ +--- mozilla/modules/woff2/src/store_bytes.h ++++ mozilla/modules/woff2/src/store_bytes.h +@@ -29,41 +29,44 @@ inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) { + dst[offset + 1] = x >> 16; + dst[offset + 2] = x >> 8; + dst[offset + 3] = x; + return offset + 4; + } + + inline size_t Store16(uint8_t* dst, size_t offset, int x) { + #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) +- *reinterpret_cast(dst + offset) = +- ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); ++ uint16_t v = ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); ++ memcpy(dst + offset, &v, 2); + #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) +- *reinterpret_cast(dst + offset) = static_cast(x); ++ uint16_t v = static_cast(x); ++ memcpy(dst + offset, &v, 2); + #else + dst[offset] = x >> 8; + dst[offset + 1] = x; + #endif + return offset + 2; + } + + inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) { + dst[(*offset)++] = val >> 24; + dst[(*offset)++] = val >> 16; + dst[(*offset)++] = val >> 8; + dst[(*offset)++] = val; + } + + inline void Store16(int val, size_t* offset, uint8_t* dst) { + #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) +- *reinterpret_cast(dst + *offset) = ++ uint16_t v = ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); ++ memcpy(dst + *offset, &v, 2); + ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); + *offset += 2; + #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) +- *reinterpret_cast(dst + *offset) = static_cast(val); ++ uint16_t v = static_cast(val); ++ memcpy(dst + *offset, &v, 2); + *offset += 2; + #else + dst[(*offset)++] = val >> 8; + dst[(*offset)++] = val; + #endif + } + + inline void StoreBytes(const uint8_t* data, size_t len, +--- mozilla/modules/woff2/src/woff2_common.cc ++++ mozilla/modules/woff2/src/woff2_common.cc +@@ -20,22 +20,23 @@ + + namespace woff2 { + + + uint32_t ComputeULongSum(const uint8_t* buf, size_t size) { + uint32_t checksum = 0; + size_t aligned_size = size & ~3; + for (size_t i = 0; i < aligned_size; i += 4) { ++ uint32_t v; ++ memcpy(&v, buf + i, 4); + #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) +- uint32_t v = *reinterpret_cast(buf + i); + checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | + ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24)); + #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) +- checksum += *reinterpret_cast(buf + i); ++ checksum += v; + #else + checksum += (buf[i] << 24) | (buf[i + 1] << 16) | + (buf[i + 2] << 8) | buf[i + 3]; + #endif + } + + // treat size not aligned on 4 as if it were padded to 4 with 0's + if (size != aligned_size) { Modified: branches/2016Q4/www/seamonkey/files/patch-bug702179 ============================================================================== --- branches/2016Q4/www/seamonkey/files/patch-bug702179 Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/files/patch-bug702179 Fri Dec 23 04:39:47 2016 (r429221) @@ -1,10 +1,13 @@ ---- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC -+++ mozilla/js/src/moz.build -@@ -637,7 +637,3 @@ +--- mozilla/js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100 ++++ mozilla/js/src/moz.build 2015-12-16 12:32:09.032032000 +0100 +@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS'] + CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] + LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES'] - if not CONFIG['GNU_CXX']: - ALLOW_COMPILER_WARNINGS = True -- -NO_EXPAND_LIBS = True - -DIST_INSTALL = True +- + # Prepare self-hosted JS code for embedding + GENERATED_FILES += ['selfhosted.out.h'] + selfhosted = GENERATED_FILES['selfhosted.out.h'] Modified: branches/2016Q4/www/seamonkey/files/patch-bug826985 ============================================================================== --- branches/2016Q4/www/seamonkey/files/patch-bug826985 Fri Dec 23 04:39:06 2016 (r429220) +++ branches/2016Q4/www/seamonkey/files/patch-bug826985 Fri Dec 23 04:39:47 2016 (r429221) @@ -5,7 +5,7 @@ Date: Fri Jan 4 13:49:22 2013 +0100 Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux. --- config/system-headers | 1 + - configure.in | 7 +++++++ + old-configure.in | 7 +++++++ media/webrtc/signaling/test/Makefile.in | 1 + .../modules/video_capture/linux/device_info_linux.cc | 17 +++++++++++++++++ .../modules/video_capture/linux/video_capture_linux.cc | 16 +++++++++++++++- @@ -17,18 +17,18 @@ diff --git config/system-headers config/ index 55e4cd1..76567b3 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -627,6 +627,7 @@ libgnome/libgnome.h +@@ -629,6 +629,7 @@ libgnome/libgnome.h libgnomeui/gnome-icon-lookup.h libgnomeui/gnome-icon-theme.h libgnomeui/gnome-ui-init.h +libv4l2.h - lib$routines.h limits limits.h -diff --git configure.in configure.in + link.h +diff --git old-configure.in configure.in index 55e4cd1..76567b3 100644 ---- mozilla/configure.in -+++ mozilla/configure.in +--- mozilla/old-configure.in ++++ mozilla/old-configure.in @@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 @@ -145,26 +145,26 @@ index d46b5aa..e452223 100644 'targets': [ { 'target_name': 'video_capture_module', -@@ -69,6 +72,19 @@ - 'linux/video_capture_linux.cc', - 'linux/video_capture_linux.h', - ], -+ 'conditions': [ -+ ['use_libv4l2==1', { -+ 'defines': [ -+ 'HAVE_LIBV4L2', +@@ -75,6 +78,19 @@ + 'linux/video_capture_linux.cc', + 'linux/video_capture_linux.h', + ], ++ 'conditions': [ ++ ['use_libv4l2==1', { ++ 'defines': [ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Dec 23 04:41:10 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3485DC8C21C; Fri, 23 Dec 2016 04: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 02E8F15E9; Fri, 23 Dec 2016 04:41:09 +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 uBN4f9Xb032239; Fri, 23 Dec 2016 04:41:09 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN4f8Hm032228; Fri, 23 Dec 2016 04:41:08 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612230441.uBN4f8Hm032228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 23 Dec 2016 04:41:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429222 - in branches/2016Q4/www/squid-devel: . 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.23 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: Fri, 23 Dec 2016 04:41:10 -0000 Author: junovitch Date: Fri Dec 23 04:41:07 2016 New Revision: 429222 URL: https://svnweb.freebsd.org/changeset/ports/429222 Log: MFH: r425986 r429220 www/squid-devel: update 4.0.14 -> 4.0.17 - Spell CHOSEN_COMPILER_TYPE correctly - Remove upstreamed patch (IPv6 + PF crash) - Add --enable-zph-qos option to default set http://wiki.squid-cache.org/Features/QualityOfService - Mark broken if ssl set to openssl-devel, it doesn't build - Switch IPV6 option to options helpers PR: 215418 Submitted by: Pavel Timofeev (maintainer) Security: CVE-2016-10002 Security: CVE-2016-10003 Security: https://vuxml.FreeBSD.org/freebsd/41f8af15-c8b9-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2016Q4/www/squid-devel/Makefile branches/2016Q4/www/squid-devel/distinfo branches/2016Q4/www/squid-devel/files/patch-compat_compat.h branches/2016Q4/www/squid-devel/files/patch-compat_shm.cc branches/2016Q4/www/squid-devel/files/patch-configure branches/2016Q4/www/squid-devel/files/patch-src-cf.data.pre branches/2016Q4/www/squid-devel/files/patch-src_DiskIO_Mmapped_MmappedFile.cc branches/2016Q4/www/squid-devel/files/patch-src__ip__Intercept.cc branches/2016Q4/www/squid-devel/files/patch-src_ipc_mem_Segment.cc branches/2016Q4/www/squid-devel/files/patch-src_tools.cc Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/squid-devel/Makefile ============================================================================== --- branches/2016Q4/www/squid-devel/Makefile Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/Makefile Fri Dec 23 04:41:07 2016 (r429222) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.0.14 +PORTVERSION= 4.0.17 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ @@ -216,6 +216,7 @@ CONFIGURE_ARGS= --with-default-user=squi --with-swapdir=/var/squid/cache \ --without-gnutls \ --enable-auth \ + --enable-zph-qos \ --enable-build-info \ --enable-loadable-modules \ --enable-removal-policies="lru heap" \ @@ -288,7 +289,7 @@ post-patch: ${change_files}) @(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample) -.if !${PORT_OPTIONS:MIPV6} +post-patch-IPV6-off: @${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \ -e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \ -e's/ 2001:DB8::a:0\/64//' \ @@ -296,7 +297,6 @@ post-patch: -e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \ -e'/tcp_outgoing_address 2001:db8::1/d' \ ${WRKSRC}/src/cf.data.pre -.endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -307,11 +307,14 @@ post-install: .include -.if ${COMPILER_TYPE} == clang +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if ${CHOSEN_COMPILER_TYPE} == clang #CXXFLAGS+= -Wno-unused-private-field -.if ${COMPILER_VERSION} >= 35 +CXXFLAGS+= -Wno-unknown-warning-option CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess .endif -.endif .include Modified: branches/2016Q4/www/squid-devel/distinfo ============================================================================== --- branches/2016Q4/www/squid-devel/distinfo Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/distinfo Fri Dec 23 04:41:07 2016 (r429222) @@ -1,3 +1,3 @@ TIMESTAMP = 1467941699 -SHA256 (squid4.0/squid-4.0.14.tar.xz) = c0e9e2d1bc2e18b2317aff165d3d697eac253977a6c37b9659de3ed81d004d1a -SIZE (squid4.0/squid-4.0.14.tar.xz) = 2404528 +SHA256 (squid4.0/squid-4.0.17.tar.xz) = 8b1f3487495d1b02892bd63d6bdd97862be62a9cebc27245426de4543876239c +SIZE (squid4.0/squid-4.0.17.tar.xz) = 2410244 Modified: branches/2016Q4/www/squid-devel/files/patch-compat_compat.h ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-compat_compat.h Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-compat_compat.h Fri Dec 23 04:41:07 2016 (r429222) @@ -1,8 +1,8 @@ ---- compat/compat.h.orig 2015-11-01 10:44:25 UTC +--- compat/compat.h.orig 2016-12-16 10:06:20 UTC +++ compat/compat.h -@@ -42,17 +42,6 @@ - #endif - #endif +@@ -29,17 +29,6 @@ + /******************************************************/ + #include "compat/osdetect.h" -/* Solaris 10 has a broken definition for minor_t in IPFilter compat. - * We must pre-define before doing anything with OS headers so the OS Modified: branches/2016Q4/www/squid-devel/files/patch-compat_shm.cc ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-compat_shm.cc Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-compat_shm.cc Fri Dec 23 04:41:07 2016 (r429222) @@ -1,4 +1,4 @@ ---- compat/shm.cc.orig 2015-11-01 10:44:25 UTC +--- compat/shm.cc.orig 2016-12-16 10:06:20 UTC +++ compat/shm.cc @@ -29,6 +29,8 @@ shm_portable_segment_name_is_path() size_t len = sizeof(jailed); Modified: branches/2016Q4/www/squid-devel/files/patch-configure ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-configure Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-configure Fri Dec 23 04:41:07 2016 (r429222) @@ -1,6 +1,6 @@ ---- configure.orig 2015-11-01 10:46:19 UTC +--- configure.orig 2016-12-16 10:19:31 UTC +++ configure -@@ -32038,7 +32040,7 @@ done +@@ -33043,7 +33043,7 @@ done ## BUILD_HELPER="NIS" @@ -9,7 +9,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " -@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" +@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22,7 +22,7 @@ fi done -@@ -32519,7 +32523,7 @@ done +@@ -33532,7 +33534,7 @@ done # unconditionally requires crypt(3), for now if test "x$ac_cv_func_crypt" != "x"; then @@ -31,7 +31,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -34574,7 +34578,7 @@ for ac_header in \ +@@ -35882,7 +35884,7 @@ for ac_header in \ arpa/nameser.h \ assert.h \ bstring.h \ @@ -40,7 +40,7 @@ ctype.h \ direct.h \ errno.h \ -@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -36092,6 +36094,7 @@ ac_fn_cxx_check_header_compile "$LINENO" #include #endif #if HAVE_NETINET_IP_COMPAT_H @@ -48,7 +48,7 @@ #include #endif #if HAVE_NETINET_IP_FIL_H -@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x +@@ -40315,6 +40318,7 @@ if test "x$enable_ipf_transparent" != "x # include # include @@ -56,7 +56,7 @@ # include # include # include -@@ -38803,6 +38809,7 @@ else +@@ -40345,6 +40349,7 @@ else # include # include #undef minor_t @@ -64,7 +64,7 @@ # include # include # include -@@ -38847,6 +38854,7 @@ _ACEOF +@@ -40389,6 +40394,7 @@ _ACEOF ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ @@ -72,7 +72,7 @@ netinet/ip_compat.h \ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ -@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -40418,6 +40424,7 @@ ac_fn_cxx_check_header_compile "$LINENO" #if HAVE_IP_COMPAT_H #include #elif HAVE_NETINET_IP_COMPAT_H Modified: branches/2016Q4/www/squid-devel/files/patch-src-cf.data.pre ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-src-cf.data.pre Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-src-cf.data.pre Fri Dec 23 04:41:07 2016 (r429222) @@ -1,6 +1,6 @@ ---- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC +--- src/cf.data.pre.orig 2016-12-16 10:06:20 UTC +++ src/cf.data.pre -@@ -4558,6 +4558,10 @@ DEFAULT: @DEFAULT_PID_FILE@ +@@ -4754,6 +4754,10 @@ DEFAULT: @DEFAULT_PID_FILE@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". Modified: branches/2016Q4/www/squid-devel/files/patch-src_DiskIO_Mmapped_MmappedFile.cc ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Fri Dec 23 04:41:07 2016 (r429222) @@ -1,6 +1,6 @@ ---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC +--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2016-12-16 10:06:20 UTC +++ src/DiskIO/Mmapped/MmappedFile.cc -@@ -235,7 +235,7 @@ Mmapping::map() +@@ -236,7 +236,7 @@ Mmapping::map() static const int pageSize = getpagesize(); delta = offset % pageSize; Modified: branches/2016Q4/www/squid-devel/files/patch-src__ip__Intercept.cc ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-src__ip__Intercept.cc Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-src__ip__Intercept.cc Fri Dec 23 04:41:07 2016 (r429222) @@ -1,6 +1,6 @@ ---- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 UTC +--- src/ip/Intercept.cc.orig 2016-12-16 10:06:20 UTC +++ src/ip/Intercept.cc -@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com +@@ -206,10 +206,10 @@ Ip::Intercept::IpfInterception(const Com // for NAT lookup set local and remote IP:port's if (newConn->remote.isIPv6()) { #if IPFILTER_VERSION < 5000003 @@ -11,43 +11,5 @@ - warningLevel = (warningLevel + 1) % 10; + warningLevel = (warningLevel + 1) % 1048576; return false; - #else - natLookup.nl_v = 6; -@@ -323,13 +323,21 @@ } - - memset(&nl, 0, sizeof(struct pfioc_natlook)); -- newConn->remote.getInAddr(nl.saddr.v4); -+ if (newConn->remote.isIPv4()) { -+ newConn->remote.getInAddr(nl.saddr.v4); -+ } else { -+ newConn->remote.getInAddr(nl.saddr.v6); -+ } - nl.sport = htons(newConn->remote.port()); - -- newConn->local.getInAddr(nl.daddr.v4); -+ if (newConn->local.isIPv4()) { -+ newConn->local.getInAddr(nl.daddr.v4); -+ } else { -+ newConn->local.getInAddr(nl.daddr.v6); -+ } - nl.dport = htons(newConn->local.port()); - -- nl.af = AF_INET; -+ nl.af = newConn->remote.isIPv4() ? AF_INET : AF_INET6; - nl.proto = IPPROTO_TCP; - nl.direction = PF_OUT; - -@@ -345,7 +353,11 @@ - debugs(89, 9, HERE << "address: " << newConn); - return false; - } else { -- newConn->local = nl.rdaddr.v4; -+ if (nl.af == AF_INET) { -+ newConn->local = nl.rdaddr.v4; -+ } else { -+ newConn->local = nl.rdaddr.v6; -+ } - newConn->local.port(ntohs(nl.rdport)); - debugs(89, 5, HERE << "address NAT: " << newConn); - return true; + newConn->local.getInAddr(natLookup.nl_inip); Modified: branches/2016Q4/www/squid-devel/files/patch-src_ipc_mem_Segment.cc ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-src_ipc_mem_Segment.cc Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-src_ipc_mem_Segment.cc Fri Dec 23 04:41:07 2016 (r429222) @@ -1,11 +1,11 @@ ---- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC +--- src/ipc/mem/Segment.cc.orig 2016-12-16 10:06:20 UTC +++ src/ipc/mem/Segment.cc -@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach() +@@ -173,7 +173,7 @@ Ipc::Mem::Segment::attach() assert(theSize == static_cast(static_cast(theSize))); void *const p = - mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0); + mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0); if (p == MAP_FAILED) { - debugs(54, 5, HERE << "mmap " << theName << ": " << xstrerror()); - fatalf("Ipc::Mem::Segment::attach failed to mmap(%s): %s\n", + int xerrno = errno; + debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno)); Modified: branches/2016Q4/www/squid-devel/files/patch-src_tools.cc ============================================================================== --- branches/2016Q4/www/squid-devel/files/patch-src_tools.cc Fri Dec 23 04:39:47 2016 (r429221) +++ branches/2016Q4/www/squid-devel/files/patch-src_tools.cc Fri Dec 23 04:41:07 2016 (r429222) @@ -1,4 +1,4 @@ ---- src/tools.cc.orig 2015-11-01 10:44:25 UTC +--- src/tools.cc.orig 2016-12-16 10:06:20 UTC +++ src/tools.cc @@ -603,7 +603,7 @@ no_suid(void) uid = geteuid(); From owner-svn-ports-branches@freebsd.org Fri Dec 23 04:45:48 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8C26C8C2CE; Fri, 23 Dec 2016 04:45:48 +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 B314B19FE; Fri, 23 Dec 2016 04:45:48 +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 uBN4jlce034998; Fri, 23 Dec 2016 04:45:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN4jkkF034988; Fri, 23 Dec 2016 04:45:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612230445.uBN4jkkF034988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Dec 2016 04:45:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429224 - in branches/2016Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/s... 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.23 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: Fri, 23 Dec 2016 04:45:48 -0000 Author: jbeich Date: Fri Dec 23 04:45:46 2016 New Revision: 429224 URL: https://svnweb.freebsd.org/changeset/ports/429224 Log: MFH: r428566 gecko: improve NSS 3.28 compatibility https://bugzilla.mozilla.org/show_bug.cgi?id=1323209 Approved by: ports-secteam (junovitch) Added: branches/2016Q4/mail/thunderbird/files/patch-bug1290037 - copied unchanged from r428566, head/mail/thunderbird/files/patch-bug1290037 branches/2016Q4/www/firefox-esr/files/patch-bug1290037 - copied unchanged from r428566, head/www/firefox-esr/files/patch-bug1290037 branches/2016Q4/www/firefox/files/patch-bug1290037 - copied unchanged from r428566, head/www/firefox/files/patch-bug1290037 branches/2016Q4/www/libxul/files/patch-bug1290037 - copied unchanged from r428566, head/www/libxul/files/patch-bug1290037 branches/2016Q4/www/seamonkey/files/patch-bug1290037 - copied unchanged from r428566, head/www/seamonkey/files/patch-bug1290037 Modified: branches/2016Q4/mail/thunderbird/Makefile branches/2016Q4/www/firefox-esr/Makefile branches/2016Q4/www/firefox/Makefile branches/2016Q4/www/libxul/Makefile branches/2016Q4/www/seamonkey/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2016Q4/mail/thunderbird/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/mail/thunderbird/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2016Q4/mail/thunderbird/files/patch-bug1290037 (from r428566, head/mail/thunderbird/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/mail/thunderbird/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/mail/thunderbird/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- mozilla/netwerk/protocol/http/Http2Session.cpp ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/firefox-esr/Makefile ============================================================================== --- branches/2016Q4/www/firefox-esr/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/firefox-esr/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.6.0 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Copied: branches/2016Q4/www/firefox-esr/files/patch-bug1290037 (from r428566, head/www/firefox-esr/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/firefox-esr/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/firefox-esr/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/firefox/Makefile ============================================================================== --- branches/2016Q4/www/firefox/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/firefox/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 50.1.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied: branches/2016Q4/www/firefox/files/patch-bug1290037 (from r428566, head/www/firefox/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/firefox/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/firefox/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/libxul/Makefile ============================================================================== --- branches/2016Q4/www/libxul/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/libxul/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source Copied: branches/2016Q4/www/libxul/files/patch-bug1290037 (from r428566, head/www/libxul/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/libxul/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/libxul/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- netwerk/protocol/http/Http2Session.cpp ++++ netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } Modified: branches/2016Q4/www/seamonkey/Makefile ============================================================================== --- branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:42:12 2016 (r429223) +++ branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:45:46 2016 (r429224) @@ -4,6 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.46 MOZILLA_VER= 49 # above + 3 +PORTREVISION= 1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source Copied: branches/2016Q4/www/seamonkey/files/patch-bug1290037 (from r428566, head/www/seamonkey/files/patch-bug1290037) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/seamonkey/files/patch-bug1290037 Fri Dec 23 04:45:46 2016 (r429224, copy of r428566, head/www/seamonkey/files/patch-bug1290037) @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- mozilla/netwerk/protocol/http/Http2Session.cpp ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } From owner-svn-ports-branches@freebsd.org Fri Dec 23 04:48:21 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F867C8C351; Fri, 23 Dec 2016 04:48:21 +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 D79391AF1; Fri, 23 Dec 2016 04:48:20 +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 uBN4mKd3035294; Fri, 23 Dec 2016 04:48:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN4mJXM035289; Fri, 23 Dec 2016 04:48:19 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612230448.uBN4mJXM035289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Dec 2016 04:48:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429225 - in branches/2016Q4/security: ca_root_nss nss 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.23 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: Fri, 23 Dec 2016 04:48:21 -0000 Author: jbeich Date: Fri Dec 23 04:48:19 2016 New Revision: 429225 URL: https://svnweb.freebsd.org/changeset/ports/429225 Log: MFH: r429163 security/nss: update to 3.28 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.28_release_notes Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/security/ca_root_nss/Makefile branches/2016Q4/security/ca_root_nss/distinfo branches/2016Q4/security/nss/Makefile branches/2016Q4/security/nss/distinfo branches/2016Q4/security/nss/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/ca_root_nss/Makefile ============================================================================== --- branches/2016Q4/security/ca_root_nss/Makefile Fri Dec 23 04:45:46 2016 (r429224) +++ branches/2016Q4/security/ca_root_nss/Makefile Fri Dec 23 04:48:19 2016 (r429225) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.27.1 +VERSION_NSS= 3.28 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2016Q4/security/ca_root_nss/distinfo ============================================================================== --- branches/2016Q4/security/ca_root_nss/distinfo Fri Dec 23 04:45:46 2016 (r429224) +++ branches/2016Q4/security/ca_root_nss/distinfo Fri Dec 23 04:48:19 2016 (r429225) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475947616 -SHA256 (nss-3.27.1.tar.gz) = fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b -SIZE (nss-3.27.1.tar.gz) = 7397737 +TIMESTAMP = 1482321387 +SHA256 (nss-3.28.tar.gz) = c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 +SIZE (nss-3.28.tar.gz) = 7440502 Modified: branches/2016Q4/security/nss/Makefile ============================================================================== --- branches/2016Q4/security/nss/Makefile Fri Dec 23 04:45:46 2016 (r429224) +++ branches/2016Q4/security/nss/Makefile Fri Dec 23 04:48:19 2016 (r429225) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.27.2 +PORTVERSION= 3.28 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2016Q4/security/nss/distinfo ============================================================================== --- branches/2016Q4/security/nss/distinfo Fri Dec 23 04:45:46 2016 (r429224) +++ branches/2016Q4/security/nss/distinfo Fri Dec 23 04:48:19 2016 (r429225) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480381418 -SHA256 (nss-3.27.2.tar.gz) = dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 -SIZE (nss-3.27.2.tar.gz) = 7397599 +TIMESTAMP = 1482321387 +SHA256 (nss-3.28.tar.gz) = c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 +SIZE (nss-3.28.tar.gz) = 7440502 Modified: branches/2016Q4/security/nss/pkg-plist ============================================================================== --- branches/2016Q4/security/nss/pkg-plist Fri Dec 23 04:45:46 2016 (r429224) +++ branches/2016Q4/security/nss/pkg-plist Fri Dec 23 04:48:19 2016 (r429225) @@ -38,6 +38,7 @@ include/nss/nss/crmf.h include/nss/nss/crmft.h include/nss/nss/cryptohi.h include/nss/nss/cryptoht.h +include/nss/nss/eccutil.h include/nss/nss/ecl-exp.h include/nss/nss/hasht.h include/nss/nss/jar-ds.h From owner-svn-ports-branches@freebsd.org Fri Dec 23 08:17:13 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31B6FC891AE; Fri, 23 Dec 2016 08:17:13 +0000 (UTC) (envelope-from sunpoet@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 DC64B1B5D; Fri, 23 Dec 2016 08:17:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBN8HC3x020943; Fri, 23 Dec 2016 08:17:12 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN8HBYq020940; Fri, 23 Dec 2016 08:17:11 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612230817.uBN8HBYq020940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 23 Dec 2016 08:17:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429230 - branches/2016Q4/graphics/webp 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.23 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: Fri, 23 Dec 2016 08:17:13 -0000 Author: sunpoet Date: Fri Dec 23 08:17:11 2016 New Revision: 429230 URL: https://svnweb.freebsd.org/changeset/ports/429230 Log: MFH: r426405 r429175 - Update to 0.5.1 Changes: https://chromium.googlesource.com/webm/libwebp/+/master/NEWS - Update to 0.5.2 Changes: https://chromium.googlesource.com/webm/libwebp/+/master/NEWS Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/graphics/webp/Makefile branches/2016Q4/graphics/webp/distinfo branches/2016Q4/graphics/webp/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/graphics/webp/Makefile ============================================================================== --- branches/2016Q4/graphics/webp/Makefile Fri Dec 23 08:03:24 2016 (r429229) +++ branches/2016Q4/graphics/webp/Makefile Fri Dec 23 08:17:11 2016 (r429230) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webp -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.2 CATEGORIES= graphics MASTER_SITES= http://downloads.webmproject.org/releases/webp/ DISTNAME= lib${PORTNAME}-${PORTVERSION} Modified: branches/2016Q4/graphics/webp/distinfo ============================================================================== --- branches/2016Q4/graphics/webp/distinfo Fri Dec 23 08:03:24 2016 (r429229) +++ branches/2016Q4/graphics/webp/distinfo Fri Dec 23 08:17:11 2016 (r429230) @@ -1,2 +1,3 @@ -SHA256 (libwebp-0.5.0.tar.gz) = 5cd3bb7b623aff1f4e70bd611dc8dbabbf7688fd5eb225b32e02e09e37dfb274 -SIZE (libwebp-0.5.0.tar.gz) = 1121986 +TIMESTAMP = 1482426864 +SHA256 (libwebp-0.5.2.tar.gz) = b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef +SIZE (libwebp-0.5.2.tar.gz) = 1221153 Modified: branches/2016Q4/graphics/webp/pkg-plist ============================================================================== --- branches/2016Q4/graphics/webp/pkg-plist Fri Dec 23 08:03:24 2016 (r429229) +++ branches/2016Q4/graphics/webp/pkg-plist Fri Dec 23 08:17:11 2016 (r429230) @@ -12,19 +12,19 @@ include/webp/types.h lib/libwebp.a lib/libwebp.so lib/libwebp.so.6 -lib/libwebp.so.6.0.0 +lib/libwebp.so.6.0.2 lib/libwebpdecoder.a lib/libwebpdecoder.so lib/libwebpdecoder.so.2 -lib/libwebpdecoder.so.2.0.0 +lib/libwebpdecoder.so.2.0.2 lib/libwebpdemux.a lib/libwebpdemux.so lib/libwebpdemux.so.2 -lib/libwebpdemux.so.2.0.0 +lib/libwebpdemux.so.2.0.1 lib/libwebpmux.a lib/libwebpmux.so lib/libwebpmux.so.2 -lib/libwebpmux.so.2.0.0 +lib/libwebpmux.so.2.0.2 libdata/pkgconfig/libwebp.pc libdata/pkgconfig/libwebpdecoder.pc libdata/pkgconfig/libwebpdemux.pc From owner-svn-ports-branches@freebsd.org Fri Dec 23 08:25:44 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7FF9C89471; Fri, 23 Dec 2016 08:25:44 +0000 (UTC) (envelope-from sunpoet@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 84A4E1031; Fri, 23 Dec 2016 08:25:44 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBN8Phs9024961; Fri, 23 Dec 2016 08:25:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN8Phi0024958; Fri, 23 Dec 2016 08:25:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612230825.uBN8Phi0024958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 23 Dec 2016 08:25:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429231 - branches/2016Q4/ftp/curl 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.23 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: Fri, 23 Dec 2016 08:25:44 -0000 Author: sunpoet Date: Fri Dec 23 08:25:43 2016 New Revision: 429231 URL: https://svnweb.freebsd.org/changeset/ports/429231 Log: MFH: r429173 - Update to 7.52.0 Changes: https://curl.haxx.se/changes.html Security: 42880202-c81c-11e6-a9a5-b499baebfeaf Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/ftp/curl/Makefile branches/2016Q4/ftp/curl/distinfo branches/2016Q4/ftp/curl/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/ftp/curl/Makefile ============================================================================== --- branches/2016Q4/ftp/curl/Makefile Fri Dec 23 08:17:11 2016 (r429230) +++ branches/2016Q4/ftp/curl/Makefile Fri Dec 23 08:25:43 2016 (r429231) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.51.0 -PORTREVISION= 1 -CATEGORIES= ftp www +PORTVERSION= 7.52.0 +CATEGORIES= ftp net www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet Modified: branches/2016Q4/ftp/curl/distinfo ============================================================================== --- branches/2016Q4/ftp/curl/distinfo Fri Dec 23 08:17:11 2016 (r429230) +++ branches/2016Q4/ftp/curl/distinfo Fri Dec 23 08:25:43 2016 (r429231) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478074540 -SHA256 (curl-7.51.0.tar.lzma) = 9eef5f6bbb972ffc631f4c76cfe93161bf5186926133c77267b24f5191700518 -SIZE (curl-7.51.0.tar.lzma) = 2061223 +TIMESTAMP = 1482428326 +SHA256 (curl-7.52.0.tar.lzma) = c8f0114c7c72c8627d716416326593d061274b208cdf123c418c20c6dbe009c2 +SIZE (curl-7.52.0.tar.lzma) = 2069931 Modified: branches/2016Q4/ftp/curl/pkg-plist ============================================================================== --- branches/2016Q4/ftp/curl/pkg-plist Fri Dec 23 08:17:11 2016 (r429230) +++ branches/2016Q4/ftp/curl/pkg-plist Fri Dec 23 08:25:43 2016 (r429231) @@ -92,7 +92,9 @@ man/man3/CURLINFO_PRETRANSFER_TIME.3.gz man/man3/CURLINFO_PRIMARY_IP.3.gz man/man3/CURLINFO_PRIMARY_PORT.3.gz man/man3/CURLINFO_PRIVATE.3.gz +man/man3/CURLINFO_PROTOCOL.3.gz man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz +man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz man/man3/CURLINFO_REDIRECT_COUNT.3.gz man/man3/CURLINFO_REDIRECT_TIME.3.gz man/man3/CURLINFO_REDIRECT_URL.3.gz @@ -102,6 +104,7 @@ man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz man/man3/CURLINFO_RTSP_SESSION_ID.3.gz +man/man3/CURLINFO_SCHEME.3.gz man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz man/man3/CURLINFO_SIZE_UPLOAD.3.gz man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz @@ -252,12 +255,11 @@ man/man3/CURLOPT_POSTFIELDSIZE.3.gz man/man3/CURLOPT_POSTQUOTE.3.gz man/man3/CURLOPT_POSTREDIR.3.gz man/man3/CURLOPT_PREQUOTE.3.gz +man/man3/CURLOPT_PRE_PROXY.3.gz man/man3/CURLOPT_PRIVATE.3.gz man/man3/CURLOPT_PROGRESSDATA.3.gz man/man3/CURLOPT_PROGRESSFUNCTION.3.gz man/man3/CURLOPT_PROTOCOLS.3.gz -man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz -man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz man/man3/CURLOPT_PROXY.3.gz man/man3/CURLOPT_PROXYAUTH.3.gz man/man3/CURLOPT_PROXYHEADER.3.gz @@ -266,6 +268,25 @@ man/man3/CURLOPT_PROXYPORT.3.gz man/man3/CURLOPT_PROXYTYPE.3.gz man/man3/CURLOPT_PROXYUSERNAME.3.gz man/man3/CURLOPT_PROXYUSERPWD.3.gz +man/man3/CURLOPT_PROXY_CAINFO.3.gz +man/man3/CURLOPT_PROXY_CAPATH.3.gz +man/man3/CURLOPT_PROXY_CRLFILE.3.gz +man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz +man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz +man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz +man/man3/CURLOPT_PROXY_SSLCERT.3.gz +man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz +man/man3/CURLOPT_PROXY_SSLKEY.3.gz +man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz +man/man3/CURLOPT_PROXY_SSLVERSION.3.gz +man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz +man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz +man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz +man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz +man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz +man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz +man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz +man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz man/man3/CURLOPT_PUT.3.gz man/man3/CURLOPT_QUOTE.3.gz man/man3/CURLOPT_RANDOM_FILE.3.gz From owner-svn-ports-branches@freebsd.org Sat Dec 24 00:02:13 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA003C8E9B4; Sat, 24 Dec 2016 00:02:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97361229; Sat, 24 Dec 2016 00:02:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBO02Cbl008611; Sat, 24 Dec 2016 00:02:12 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBO02CkO008608; Sat, 24 Dec 2016 00:02:12 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201612240002.uBO02CkO008608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sat, 24 Dec 2016 00:02:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429295 - in branches/2016Q4/security/libgcrypt: . 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.23 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, 24 Dec 2016 00:02:14 -0000 Author: cpm Date: Sat Dec 24 00:02:12 2016 New Revision: 429295 URL: https://svnweb.freebsd.org/changeset/ports/429295 Log: MFH: r429273 security/libgcrypt: Update to 1.7.5 - Update to 1.7.5 - Remove files useless to install from DOCS - Remove patch since sparc v8 is not supported on FreeBSD - Bump library version in pkg-plist Changelog: https://lists.gnupg.org/pipermail/gnupg-announce/2016q4/000399.html PR: 215236 Approved by: amdmi3 (mentor) Exp-run by: antoine Approved by: ports-secteam (junovitch) Deleted: branches/2016Q4/security/libgcrypt/files/ Modified: branches/2016Q4/security/libgcrypt/Makefile branches/2016Q4/security/libgcrypt/distinfo branches/2016Q4/security/libgcrypt/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/libgcrypt/Makefile ============================================================================== --- branches/2016Q4/security/libgcrypt/Makefile Fri Dec 23 23:30:06 2016 (r429294) +++ branches/2016Q4/security/libgcrypt/Makefile Sat Dec 24 00:02:12 2016 (r429295) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.5 CATEGORIES= security MASTER_SITES= GNUPG @@ -24,8 +24,8 @@ CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/} USE_LDCONFIG= yes TEST_TARGET= check -DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \ - README.GIT THANKS TODO doc/HACKING doc/README.apichanges +DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS THANKS TODO \ + doc/HACKING doc/README.apichanges INFO= gcrypt PORTDOCS= * Modified: branches/2016Q4/security/libgcrypt/distinfo ============================================================================== --- branches/2016Q4/security/libgcrypt/distinfo Fri Dec 23 23:30:06 2016 (r429294) +++ branches/2016Q4/security/libgcrypt/distinfo Sat Dec 24 00:02:12 2016 (r429295) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471514079 -SHA256 (libgcrypt-1.7.3.tar.bz2) = ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071 -SIZE (libgcrypt-1.7.3.tar.bz2) = 2861294 +TIMESTAMP = 1481866213 +SHA256 (libgcrypt-1.7.5.tar.bz2) = d1fea4128beef2bb30a470af6bafabccc503ced350534fb9dd8f5a53ffbae800 +SIZE (libgcrypt-1.7.5.tar.bz2) = 2883968 Modified: branches/2016Q4/security/libgcrypt/pkg-plist ============================================================================== --- branches/2016Q4/security/libgcrypt/pkg-plist Fri Dec 23 23:30:06 2016 (r429294) +++ branches/2016Q4/security/libgcrypt/pkg-plist Sat Dec 24 00:02:12 2016 (r429295) @@ -6,6 +6,6 @@ include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.1.3 +lib/libgcrypt.so.20.1.5 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4