From owner-svn-ports-branches@freebsd.org Sun Jan 7 12:07:47 2018 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 3537DE6974F; Sun, 7 Jan 2018 12:07:47 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F3CE83848; Sun, 7 Jan 2018 12:07:47 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3940C20F45; Sun, 7 Jan 2018 12:07:46 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w07C7k8V030588; Sun, 7 Jan 2018 12:07:46 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w07C7kFN030587; Sun, 7 Jan 2018 12:07:46 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201801071207.w07C7kFN030587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 7 Jan 2018 12:07:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458316 - branches/2018Q1/audio/timidity++ X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q1/audio/timidity++ X-SVN-Commit-Revision: 458316 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jan 2018 12:07:47 -0000 Author: riggs Date: Sun Jan 7 12:07:45 2018 New Revision: 458316 URL: https://svnweb.freebsd.org/changeset/ports/458316 Log: MFH: r458315 Fix build failure in check-plist; add missing dependency on libogg PR: 221566 Submitted by: yuri Approved by: ports-secteam (build fix blanket) Modified: branches/2018Q1/audio/timidity++/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/audio/timidity++/Makefile ============================================================================== --- branches/2018Q1/audio/timidity++/Makefile Sun Jan 7 12:03:23 2018 (r458315) +++ branches/2018Q1/audio/timidity++/Makefile Sun Jan 7 12:07:45 2018 (r458316) @@ -3,7 +3,7 @@ PORTNAME= timidity++ PORTVERSION= 2.14.0 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES+= audio MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION} DISTNAME= TiMidity++-${PORTVERSION} @@ -15,7 +15,8 @@ LICENSE= GPLv2+ .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libarc.so:archivers/libarc \ - libvorbis.so:audio/libvorbis + libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg RUN_DEPENDS= eawpats>0:audio/eawpats .endif @@ -81,6 +82,7 @@ post-install:: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} ${DOCFILES} \ ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}) + @${RMDIR} ${STAGEDIR}${PREFIX}/share/timidity .endif # PKGNAMESUFFIX .include From owner-svn-ports-branches@freebsd.org Sun Jan 7 19:02:36 2018 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 932D0E7B474; Sun, 7 Jan 2018 19:02:36 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CB7C73A46; Sun, 7 Jan 2018 19:02:36 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB02E252C8; Sun, 7 Jan 2018 19:02:35 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w07J2ZW1010214; Sun, 7 Jan 2018 19:02:35 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w07J2ZTj010210; Sun, 7 Jan 2018 19:02:35 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201801071902.w07J2ZTj010210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 7 Jan 2018 19:02:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458371 - in branches/2018Q1/sysutils/devcpu-data: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q1/sysutils/devcpu-data: . files X-SVN-Commit-Revision: 458371 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jan 2018 19:02:36 -0000 Author: antoine Date: Sun Jan 7 19:02:35 2018 New Revision: 458371 URL: https://svnweb.freebsd.org/changeset/ports/458371 Log: MFH: r458169 r458363 sysutils/devcpu-data: - Update Intel microcode to 20171117 - Use local distcache for amd microcode Modified: branches/2018Q1/sysutils/devcpu-data/Makefile branches/2018Q1/sysutils/devcpu-data/distinfo branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in branches/2018Q1/sysutils/devcpu-data/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/devcpu-data/Makefile ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/Makefile Sun Jan 7 18:54:47 2018 (r458370) +++ branches/2018Q1/sysutils/devcpu-data/Makefile Sun Jan 7 19:02:35 2018 (r458371) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 1.11 -PORTREVISION= 1 +PORTVERSION= 1.12 CATEGORIES= sysutils -MASTER_SITES= https://downloadmirror.intel.com/26925/eng/:intel \ - http://www.amd64.org/microcode/:amd +MASTER_SITES= https://downloadmirror.intel.com/27337/eng/:intel \ + LOCAL/sbruno:amd PKGNAMEPREFIX= devcpu- -DISTFILES= microcode-20170707.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd +DISTFILES= microcode-20171117.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd MAINTAINER= clarkjc@runbox.com COMMENT= Intel and AMD CPUs microcode updates @@ -18,10 +17,9 @@ LICENSE_NAME= Intel Software License Agreement LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept +ONLY_FOR_ARCHS= amd64 i386 NO_ARCH= yes NO_WRKSUBDIR= yes - -ONLY_FOR_ARCHS= i386 amd64 DATADIR= ${PREFIX}/share/cpucontrol Modified: branches/2018Q1/sysutils/devcpu-data/distinfo ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/distinfo Sun Jan 7 18:54:47 2018 (r458370) +++ branches/2018Q1/sysutils/devcpu-data/distinfo Sun Jan 7 19:02:35 2018 (r458371) @@ -1,5 +1,5 @@ -TIMESTAMP = 1499864291 -SHA256 (microcode-20170707.tgz) = 4fd44769bf52a7ac11e90651a307aa6e56ca6e1a814e50d750ba8207973bee93 -SIZE (microcode-20170707.tgz) = 2908882 +TIMESTAMP = 1515095259 +SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc +SIZE (microcode-20171117.tgz) = 3594762 SHA256 (amd-ucode-2014-12-01.tar.bz2) = e8f37ed12955585a625ee7cd48d89f9a04ceb2afa36081b52cc59d08a3bb8293 SIZE (amd-ucode-2014-12-01.tar.bz2) = 20585 Modified: branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Sun Jan 7 18:54:47 2018 (r458370) +++ branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Sun Jan 7 19:02:35 2018 (r458371) @@ -6,6 +6,7 @@ # PROVIDE: microcode_update # REQUIRE: root mountcritlocal # KEYWORD: nojail +# BEFORE: SERVERS # # Add the following line to /etc/rc.conf to enable flow-capture: Modified: branches/2018Q1/sysutils/devcpu-data/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/pkg-plist Sun Jan 7 18:54:47 2018 (r458370) +++ branches/2018Q1/sysutils/devcpu-data/pkg-plist Sun Jan 7 19:02:35 2018 (r458371) @@ -73,6 +73,7 @@ %%DATADIR%%/m01f6402.fw %%DATADIR%%/m01f6508.fw %%DATADIR%%/m021066142.fw +%%DATADIR%%/m02906eb_00000071_00000072.fw %%DATADIR%%/m02f0a15.fw %%DATADIR%%/m02f241f.fw %%DATADIR%%/m02f252a.fw @@ -127,6 +128,7 @@ %%DATADIR%%/m206fbBA.fw %%DATADIR%%/m206fda4.fw %%DATADIR%%/m2240671_00000017.fw +%%DATADIR%%/m22906ea_0000006f_00000070.fw %%DATADIR%%/m22f6809.fw %%DATADIR%%/m2a906e9_0000005d_0000005e.fw %%DATADIR%%/m32306c3_00000022.fw @@ -154,17 +156,19 @@ %%DATADIR%%/m806fbBA.fw %%DATADIR%%/m806fda4.fw %%DATADIR%%/m9220655_00000004.fw -%%DATADIR%%/m9750654_02000022.fw %%DATADIR%%/m9df4305.fw %%DATADIR%%/m9df4406.fw %%DATADIR%%/m9df4703.fw %%DATADIR%%/mA01067AA0B.fw +%%DATADIR%%/m_01_706a1_0000001e.fw +%%DATADIR%%/m_03_506c9_0000002c.fw +%%DATADIR%%/mb750654_02000035.fw %%DATADIR%%/mbdf4117.fw %%DATADIR%%/mbdf4903.fw %%DATADIR%%/mc0306d4_00000025.fw %%DATADIR%%/mc0406e3_000000b9_000000ba.fw %%DATADIR%%/mc0806e9_00000061_00000062.fw -%%DATADIR%%/mc0806ea_00000065_00000066.fw +%%DATADIR%%/mc0806ea_0000006f_00000070.fw %%DATADIR%%/med306e4_00000428.fw %%DATADIR%%/med306e6_00000600.fw %%DATADIR%%/med306e7_0000070d.fw From owner-svn-ports-branches@freebsd.org Mon Jan 8 00:25:29 2018 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 85980E692E0; Mon, 8 Jan 2018 00:25:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 479948053F; Mon, 8 Jan 2018 00:25:29 +0000 (UTC) (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AB90285D1; Mon, 8 Jan 2018 00:25:28 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w080PSZZ045507; Mon, 8 Jan 2018 00:25:28 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w080PSjn045506; Mon, 8 Jan 2018 00:25:28 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201801080025.w080PSjn045506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 8 Jan 2018 00:25:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458395 - branches/2018Q1/Mk X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: branches/2018Q1/Mk X-SVN-Commit-Revision: 458395 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2018 00:25:29 -0000 Author: bdrewery Date: Mon Jan 8 00:25:28 2018 New Revision: 458395 URL: https://svnweb.freebsd.org/changeset/ports/458395 Log: MFH: r458394 Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set. The helpers were being evaluated before the default FLAVOR was set. The helpers worked fine if the FLAVOR was specified by the user but not if it was left to the default value. Resolve this by moving the helpers right after the default FLAVOR is set. PR: 224879 exp-run by: antoine Approved by: portmgr (implicit) Differential Revision: https://reviews.freebsd.org/D13756 Modified: branches/2018Q1/Mk/bsd.port.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.port.mk ============================================================================== --- branches/2018Q1/Mk/bsd.port.mk Mon Jan 8 00:24:48 2018 (r458394) +++ branches/2018Q1/Mk/bsd.port.mk Mon Jan 8 00:25:28 2018 (r458395) @@ -1089,34 +1089,6 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} # Do not leak flavors to childs make .MAKEOVERRIDES:= ${.MAKEOVERRIDES:NFLAVOR} -.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS) -_DID_FLAVORS_HELPERS= yes -_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX -_FLAVOR_HELPERS_APPEND= CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \ - PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \ - FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \ - RUN_DEPENDS TEST_DEPENDS -# These overwrite the current value -.for v in ${_FLAVOR_HELPERS_OVERRIDE} -.if defined(${FLAVOR}_${v}) -${v}= ${${FLAVOR}_${v}} -.endif -.endfor - -# These append to the current value -.for v in ${_FLAVOR_HELPERS_APPEND} -.if defined(${FLAVOR}_${v}) -${v}+= ${${FLAVOR}_${v}} -.endif -.endfor - -.for v in BROKEN IGNORE -.if defined(${FLAVOR}_${v}) -${v}= flavor "${FLAVOR}" ${${FLAVOR}_${v}} -.endif -.endfor -.endif # defined(${FLAVOR}) - .if defined(CROSS_TOOLCHAIN) .if !defined(CROSS_SYSROOT) IGNORE= CROSS_SYSROOT should be defined @@ -1515,6 +1487,35 @@ IGNORE= Unknown flavor '${FLAVOR}', possible flavors: .if !empty(FLAVORS) && empty(FLAVOR) FLAVOR= ${FLAVORS:[1]} .endif + +.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS) +_DID_FLAVORS_HELPERS= yes +_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX +_FLAVOR_HELPERS_APPEND= CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \ + PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \ + FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \ + RUN_DEPENDS TEST_DEPENDS +# These overwrite the current value +.for v in ${_FLAVOR_HELPERS_OVERRIDE} +.if defined(${FLAVOR}_${v}) +${v}= ${${FLAVOR}_${v}} +.endif +.endfor + +# These append to the current value +.for v in ${_FLAVOR_HELPERS_APPEND} +.if defined(${FLAVOR}_${v}) +${v}+= ${${FLAVOR}_${v}} +.endif +.endfor + +.for v in BROKEN IGNORE +.if defined(${FLAVOR}_${v}) +${v}= flavor "${FLAVOR}" ${${FLAVOR}_${v}} +.endif +.endfor +.endif # defined(${FLAVOR}) + EXTRACT_SUFX?= .tar.gz From owner-svn-ports-branches@freebsd.org Tue Jan 9 00:54:30 2018 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 2971BE70276; Tue, 9 Jan 2018 00:54:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05DF07E570; Tue, 9 Jan 2018 00:54:30 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 351977995; Tue, 9 Jan 2018 00:54:29 +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 w090sTCL090763; Tue, 9 Jan 2018 00:54:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w090sSEq090761; Tue, 9 Jan 2018 00:54:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801090054.w090sSEq090761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 9 Jan 2018 00:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458500 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 458500 X-SVN-Commit-Repository: ports 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.25 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, 09 Jan 2018 00:54:30 -0000 Author: jbeich Date: Tue Jan 9 00:54:28 2018 New Revision: 458500 URL: https://svnweb.freebsd.org/changeset/ports/458500 Log: MFH: r458499 www/waterfox: regen distfiles --- addon-sdk/source/python-lib/cuddlefish/_version.py 2018-01-05 15:13:08 UTC +++ addon-sdk/source/python-lib/cuddlefish/_version.py 2018-01-06 01:21:25 UTC @@ -9,8 +9,8 @@ # (https://github.com/warner/python-versioneer) # these strings will be replaced by git during git-archive -git_refnames = " (HEAD -> master, tag: 56.0.2)" -git_full = "d0769caa90211e71c90bc4f89d95d7ff36af7f8c" +git_refnames = " (tag: 56.0.2)" +git_full = "5404f1c5a5bb8add0abc75f2f0e42d28532f74ed" import subprocess --- media/libcubeb/src/moz.build 2018-01-05 15:13:08 UTC +++ media/libcubeb/src/moz.build 2018-01-06 01:21:25 UTC @@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] # We allow warnings for third-party code that can be updated from upstream. -AllowCompilerWarnings() +ALLOW_COMPILER_WARNINGS = True Approved by: ports-secteam blanket Modified: branches/2018Q1/www/waterfox/distinfo branches/2018Q1/www/waterfox/files/patch-typos Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/distinfo ============================================================================== --- branches/2018Q1/www/waterfox/distinfo Tue Jan 9 00:52:37 2018 (r458499) +++ branches/2018Q1/www/waterfox/distinfo Tue Jan 9 00:54:28 2018 (r458500) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515165188 -SHA256 (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = edb392795c8ce3658a9c4e7874424548f0091ea45ca0a36bd587be484c335111 -SIZE (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = 394203963 +TIMESTAMP = 1515201685 +SHA256 (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = baf0717ed49005535cce646976c4d088a25033bd83960381388e7b2ba23389c9 +SIZE (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = 394203428 Modified: branches/2018Q1/www/waterfox/files/patch-typos ============================================================================== --- branches/2018Q1/www/waterfox/files/patch-typos Tue Jan 9 00:52:37 2018 (r458499) +++ branches/2018Q1/www/waterfox/files/patch-typos Tue Jan 9 00:54:28 2018 (r458500) @@ -10,14 +10,6 @@ Mismerges found by comparing changes with Firefox 56 if (elem) { elem->NodeInfoChanged(newDoc); } ---- media/libcubeb/src/moz.build -+++ media/libcubeb/src/moz.build -@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. --AllowCompilerWarnings() -+ALLOW_COMPILER_WARNINGS = True --- security/nss/lib/softoken/softkver.h.orig +++ security/nss/lib/softoken/softkver.h @@ -26,6 +26,6 @@ From owner-svn-ports-branches@freebsd.org Tue Jan 9 15:13:32 2018 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 95D7CE5B1B3; Tue, 9 Jan 2018 15:13:32 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 70D1080A16; Tue, 9 Jan 2018 15:13:32 +0000 (UTC) (envelope-from woodsb02@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0AF018908; Tue, 9 Jan 2018 15:13:31 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w09FDVqY051335; Tue, 9 Jan 2018 15:13:31 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w09FDVIi051334; Tue, 9 Jan 2018 15:13:31 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201801091513.w09FDVIi051334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Tue, 9 Jan 2018 15:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458533 - branches/2018Q1/graphics/synfigstudio X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: branches/2018Q1/graphics/synfigstudio X-SVN-Commit-Revision: 458533 X-SVN-Commit-Repository: ports 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.25 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, 09 Jan 2018 15:13:32 -0000 Author: woodsb02 Date: Tue Jan 9 15:13:31 2018 New Revision: 458533 URL: https://svnweb.freebsd.org/changeset/ports/458533 Log: MFH: r458532 graphics/synfigstudio: Unbreak build Reported by: Ian Trudel Approved by: ports-secteam (implicit) Modified: branches/2018Q1/graphics/synfigstudio/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/graphics/synfigstudio/Makefile ============================================================================== --- branches/2018Q1/graphics/synfigstudio/Makefile Tue Jan 9 15:11:09 2018 (r458532) +++ branches/2018Q1/graphics/synfigstudio/Makefile Tue Jan 9 15:13:31 2018 (r458533) @@ -3,7 +3,7 @@ PORTNAME= synfigstudio PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics multimedia MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source @@ -12,10 +12,6 @@ COMMENT= Vector-based 2D animation software package LICENSE= GPLv2+ -BROKEN= missing header -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 - BUILD_DEPENDS= etl>=0.04.19_1:devel/etl LIB_DEPENDS= libsynfig.so:devel/synfig RUN_DEPENDS= xdg-open:devel/xdg-utils @@ -56,6 +52,40 @@ post-patch: s|sk_SK|sk| ; \ s|sv_SE|sv|' \ ${WRKSRC}/po/LINGUAS + @${REINPLACE_CMD} -e \ + 's|^#include $$|#include | ; \ + s|^#include $$|#include | ; \ + s|^#include $$|#include |' \ + ${WRKSRC}/src/gui/canvasview.cpp \ + ${WRKSRC}/src/gui/compview.cpp \ + ${WRKSRC}/src/gui/docks/dock_children.cpp \ + ${WRKSRC}/src/gui/docks/dock_curves.cpp \ + ${WRKSRC}/src/gui/docks/dock_history.cpp \ + ${WRKSRC}/src/gui/docks/dock_keyframes.cpp \ + ${WRKSRC}/src/gui/docks/dock_layergroups.cpp \ + ${WRKSRC}/src/gui/docks/dock_layers.cpp \ + ${WRKSRC}/src/gui/docks/dock_metadata.cpp \ + ${WRKSRC}/src/gui/docks/dock_params.cpp \ + ${WRKSRC}/src/gui/docks/dock_timetrack.cpp \ + ${WRKSRC}/src/gui/docks/dock_toolbox.cpp \ + ${WRKSRC}/src/gui/docks/dockable.cpp \ + ${WRKSRC}/src/gui/docks/dockdialog.cpp \ + ${WRKSRC}/src/gui/docks/dockmanager.h \ + ${WRKSRC}/src/gui/duck.h \ + ${WRKSRC}/src/gui/duckmatic.cpp \ + ${WRKSRC}/src/gui/duckmatic.h \ + ${WRKSRC}/src/gui/instance.cpp \ + ${WRKSRC}/src/gui/instance.h \ + ${WRKSRC}/src/gui/states/state_stroke.h \ + ${WRKSRC}/src/gui/states/state_zoom.cpp \ + ${WRKSRC}/src/gui/widgets/widget_curves.cpp \ + ${WRKSRC}/src/gui/workarea.cpp \ + ${WRKSRC}/src/gui/workarearenderer/workarearenderer.h \ + ${WRKSRC}/src/synfigapp/action_system.h \ + ${WRKSRC}/src/synfigapp/canvasinterface.h \ + ${WRKSRC}/src/synfigapp/instance.h \ + ${WRKSRC}/src/synfigapp/main.h \ + ${WRKSRC}/src/synfigapp/uimanager.h pre-build: # FIX LC_MESSAGES From owner-svn-ports-branches@freebsd.org Tue Jan 9 21:16:18 2018 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 BC126E732F0; Tue, 9 Jan 2018 21:16:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 96E8171B6D; Tue, 9 Jan 2018 21:16:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D34F91C58D; Tue, 9 Jan 2018 21:16:17 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w09LGHr1007495; Tue, 9 Jan 2018 21:16:17 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w09LGH1X007493; Tue, 9 Jan 2018 21:16:17 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201801092116.w09LGH1X007493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 9 Jan 2018 21:16:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458575 - branches/2018Q1/www/linux-flashplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: branches/2018Q1/www/linux-flashplayer X-SVN-Commit-Revision: 458575 X-SVN-Commit-Repository: ports 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.25 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, 09 Jan 2018 21:16:18 -0000 Author: jkim Date: Tue Jan 9 21:16:17 2018 New Revision: 458575 URL: https://svnweb.freebsd.org/changeset/ports/458575 Log: MFH: r458574 Update to 28.0.0.137. https://helpx.adobe.com/security/products/flash-player/apsb18-01.html PR: 225034 Approved by: ports-secteam (blanket) Modified: branches/2018Q1/www/linux-flashplayer/Makefile branches/2018Q1/www/linux-flashplayer/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/linux-flashplayer/Makefile ============================================================================== --- branches/2018Q1/www/linux-flashplayer/Makefile Tue Jan 9 21:12:55 2018 (r458574) +++ branches/2018Q1/www/linux-flashplayer/Makefile Tue Jan 9 21:16:17 2018 (r458575) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 28.0.0.126 +PORTVERSION= 28.0.0.137 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2018Q1/www/linux-flashplayer/distinfo ============================================================================== --- branches/2018Q1/www/linux-flashplayer/distinfo Tue Jan 9 21:12:55 2018 (r458574) +++ branches/2018Q1/www/linux-flashplayer/distinfo Tue Jan 9 21:16:17 2018 (r458575) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513099078 -SHA256 (flashplayer/28.0.0.126/flash_player_npapi_linux.i386.tar.gz) = 9ef7d79adce8bdf5529d26a4e1ded20d754dea628da60c455500e3532396de4f -SIZE (flashplayer/28.0.0.126/flash_player_npapi_linux.i386.tar.gz) = 8510309 +TIMESTAMP = 1515532169 +SHA256 (flashplayer/28.0.0.137/flash_player_npapi_linux.i386.tar.gz) = 706ee8e5154451fd1eba123b8792c1e16ca4c5b66ec4ddd44dc27fa2563b4181 +SIZE (flashplayer/28.0.0.137/flash_player_npapi_linux.i386.tar.gz) = 8511300 From owner-svn-ports-branches@freebsd.org Wed Jan 10 10:05:47 2018 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 4F3A9E768F7; Wed, 10 Jan 2018 10:05:47 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E220D6C35A; Wed, 10 Jan 2018 10:05:46 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24FC1242A3; Wed, 10 Jan 2018 10:05:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AA5k8x032015; Wed, 10 Jan 2018 10:05:46 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AA5jV3032012; Wed, 10 Jan 2018 10:05:45 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201801101005.w0AA5jV3032012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 10 Jan 2018 10:05:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458618 - branches/2018Q1/sysutils/devcpu-data X-SVN-Group: ports-branches X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: branches/2018Q1/sysutils/devcpu-data X-SVN-Commit-Revision: 458618 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 10:05:47 -0000 Author: bapt Date: Wed Jan 10 10:05:45 2018 New Revision: 458618 URL: https://svnweb.freebsd.org/changeset/ports/458618 Log: MFH: r458617 Update Intel microcode to 20180108 Sponsored by: Gandi.net Modified: branches/2018Q1/sysutils/devcpu-data/Makefile branches/2018Q1/sysutils/devcpu-data/distinfo branches/2018Q1/sysutils/devcpu-data/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/devcpu-data/Makefile ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/Makefile Wed Jan 10 10:04:25 2018 (r458617) +++ branches/2018Q1/sysutils/devcpu-data/Makefile Wed Jan 10 10:05:45 2018 (r458618) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 1.12 +PORTVERSION= 1.13 CATEGORIES= sysutils -MASTER_SITES= https://downloadmirror.intel.com/27337/eng/:intel \ +MASTER_SITES= https://downloadmirror.intel.com/27431/eng/:intel \ LOCAL/sbruno:amd PKGNAMEPREFIX= devcpu- -DISTFILES= microcode-20171117.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd +DISTFILES= microcode-20180108.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd MAINTAINER= clarkjc@runbox.com COMMENT= Intel and AMD CPUs microcode updates Modified: branches/2018Q1/sysutils/devcpu-data/distinfo ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/distinfo Wed Jan 10 10:04:25 2018 (r458617) +++ branches/2018Q1/sysutils/devcpu-data/distinfo Wed Jan 10 10:05:45 2018 (r458618) @@ -1,5 +1,5 @@ -TIMESTAMP = 1515095259 -SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc -SIZE (microcode-20171117.tgz) = 3594762 +TIMESTAMP = 1515578462 +SHA256 (microcode-20180108.tgz) = 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130 +SIZE (microcode-20180108.tgz) = 3676678 SHA256 (amd-ucode-2014-12-01.tar.bz2) = e8f37ed12955585a625ee7cd48d89f9a04ceb2afa36081b52cc59d08a3bb8293 SIZE (amd-ucode-2014-12-01.tar.bz2) = 20585 Modified: branches/2018Q1/sysutils/devcpu-data/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/pkg-plist Wed Jan 10 10:04:25 2018 (r458617) +++ branches/2018Q1/sysutils/devcpu-data/pkg-plist Wed Jan 10 10:05:45 2018 (r458618) @@ -73,7 +73,7 @@ %%DATADIR%%/m01f6402.fw %%DATADIR%%/m01f6508.fw %%DATADIR%%/m021066142.fw -%%DATADIR%%/m02906eb_00000071_00000072.fw +%%DATADIR%%/m02906eb_0000007f_00000080.fw %%DATADIR%%/m02f0a15.fw %%DATADIR%%/m02f241f.fw %%DATADIR%%/m02f252a.fw @@ -102,8 +102,8 @@ %%DATADIR%%/m0df330c.fw %%DATADIR%%/m101067660F.fw %%DATADIR%%/m101067770A.fw -%%DATADIR%%/m1050662_0000000f.fw -%%DATADIR%%/m1050663_0700000d.fw +%%DATADIR%%/m1050662_00000014.fw +%%DATADIR%%/m1050663_07000011.fw %%DATADIR%%/m1050664_0f00000a.fw %%DATADIR%%/m1069507.fw %%DATADIR%%/m106f76a.fw @@ -127,14 +127,14 @@ %%DATADIR%%/m206f6d1.fw %%DATADIR%%/m206fbBA.fw %%DATADIR%%/m206fda4.fw -%%DATADIR%%/m2240671_00000017.fw -%%DATADIR%%/m22906ea_0000006f_00000070.fw +%%DATADIR%%/m2240671_0000001b.fw +%%DATADIR%%/m22906ea_00000080.fw %%DATADIR%%/m22f6809.fw -%%DATADIR%%/m2a906e9_0000005d_0000005e.fw -%%DATADIR%%/m32306c3_00000022.fw -%%DATADIR%%/m3240661_00000017.fw +%%DATADIR%%/m2a906e9_0000007f_00000080.fw +%%DATADIR%%/m32306c3_00000023.fw +%%DATADIR%%/m3240661_00000018.fw %%DATADIR%%/m34f6404.fw -%%DATADIR%%/m36506e3_000000b9_000000ba.fw +%%DATADIR%%/m36506e3_000000c1_000000c2.fw %%DATADIR%%/m401067660F.fw %%DATADIR%%/m406f76b.fw %%DATADIR%%/m406fbBC.fw @@ -145,11 +145,11 @@ %%DATADIR%%/m5ff4807.fw %%DATADIR%%/m6d206d6_00000619.fw %%DATADIR%%/m6d206d7_00000710.fw -%%DATADIR%%/m6f306f2_0000003a.fw -%%DATADIR%%/m7240651_00000020.fw +%%DATADIR%%/m6f306f2_0000003b.fw +%%DATADIR%%/m7240651_00000021.fw %%DATADIR%%/m801066144.fw %%DATADIR%%/m801067660F.fw -%%DATADIR%%/m80306f4_0000000f.fw +%%DATADIR%%/m80306f4_00000010.fw %%DATADIR%%/m8069547.fw %%DATADIR%%/m806ec59.fw %%DATADIR%%/m806fa95.fw @@ -160,16 +160,16 @@ %%DATADIR%%/m9df4406.fw %%DATADIR%%/m9df4703.fw %%DATADIR%%/mA01067AA0B.fw -%%DATADIR%%/m_01_706a1_0000001e.fw +%%DATADIR%%/m_01_706a1_00000022.fw %%DATADIR%%/m_03_506c9_0000002c.fw -%%DATADIR%%/mb750654_02000035.fw +%%DATADIR%%/mb750654_0200003c.fw %%DATADIR%%/mbdf4117.fw %%DATADIR%%/mbdf4903.fw -%%DATADIR%%/mc0306d4_00000025.fw -%%DATADIR%%/mc0406e3_000000b9_000000ba.fw -%%DATADIR%%/mc0806e9_00000061_00000062.fw -%%DATADIR%%/mc0806ea_0000006f_00000070.fw -%%DATADIR%%/med306e4_00000428.fw +%%DATADIR%%/mc0306d4_00000028.fw +%%DATADIR%%/mc0406e3_000000c1_000000c2.fw +%%DATADIR%%/mc0806e9_0000007f_00000080.fw +%%DATADIR%%/mc0806ea_0000007f_00000080.fw +%%DATADIR%%/med306e4_0000042a.fw %%DATADIR%%/med306e6_00000600.fw %%DATADIR%%/med306e7_0000070d.fw %%DATADIR%%/mef406f1_0b000021.fw From owner-svn-ports-branches@freebsd.org Wed Jan 10 12:04:33 2018 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 48FEBE7C6A1; Wed, 10 Jan 2018 12:04:33 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2500870D52; Wed, 10 Jan 2018 12:04:33 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67A1A25596; Wed, 10 Jan 2018 12:04:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AC4WTg081605; Wed, 10 Jan 2018 12:04:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AC4W5x081604; Wed, 10 Jan 2018 12:04:32 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201801101204.w0AC4W5x081604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Jan 2018 12:04:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458623 - branches/2018Q1/security/nettle X-SVN-Group: ports-branches X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: branches/2018Q1/security/nettle X-SVN-Commit-Revision: 458623 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 12:04:33 -0000 Author: amdmi3 Date: Wed Jan 10 12:04:31 2018 New Revision: 458623 URL: https://svnweb.freebsd.org/changeset/ports/458623 Log: MFH: r458622 - Don't try to use lib32 directory, fixes build on mips - While here, tiny whitespace fix With hat: ports-secteam Approved by: portmgr blanket Modified: branches/2018Q1/security/nettle/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/nettle/Makefile ============================================================================== --- branches/2018Q1/security/nettle/Makefile Wed Jan 10 12:02:42 2018 (r458622) +++ branches/2018Q1/security/nettle/Makefile Wed Jan 10 12:04:31 2018 (r458623) @@ -5,7 +5,7 @@ PORTNAME= nettle PORTVERSION= 3.4 CATEGORIES= security MASTER_SITES= GNU \ - http://www.lysator.liu.se/~nisse/archive/ + http://www.lysator.liu.se/~nisse/archive/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Low-level cryptographic library @@ -36,8 +36,9 @@ PORTEXAMPLES= *.c *.h CONFIGURE_ENV+= CCPIC=-fPIC .endif -.if ${ARCH} == "mips64" post-patch: + @${REINPLACE_CMD} -e '/libdir=/ s|lib32|lib|' ${WRKSRC}/configure +.if ${ARCH} == "mips64" @${REINPLACE_CMD} -e 's|__sgi|__unix__|' ${WRKSRC}/configure .endif From owner-svn-ports-branches@freebsd.org Wed Jan 10 12:41:05 2018 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 AC8E0E7E14A; Wed, 10 Jan 2018 12:41:05 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 867C37229B; Wed, 10 Jan 2018 12:41:05 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C375225A8B; Wed, 10 Jan 2018 12:41:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0ACf4UJ096740; Wed, 10 Jan 2018 12:41:04 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0ACf4Kx096739; Wed, 10 Jan 2018 12:41:04 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201801101241.w0ACf4Kx096739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Jan 2018 12:41:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458626 - branches/2018Q1/security/py-cryptography X-SVN-Group: ports-branches X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: branches/2018Q1/security/py-cryptography X-SVN-Commit-Revision: 458626 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 12:41:05 -0000 Author: amdmi3 Date: Wed Jan 10 12:41:04 2018 New Revision: 458626 URL: https://svnweb.freebsd.org/changeset/ports/458626 Log: MFH: r458625 - Fix build on mips by disabling unknown warning flag Approved by: portmgr blanket With hat: ports-secteam Modified: branches/2018Q1/security/py-cryptography/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/py-cryptography/Makefile ============================================================================== --- branches/2018Q1/security/py-cryptography/Makefile Wed Jan 10 12:35:02 2018 (r458625) +++ branches/2018Q1/security/py-cryptography/Makefile Wed Jan 10 12:41:04 2018 (r458626) @@ -25,16 +25,24 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:dev ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} # Python 2.7, 3.4-3.6 -USES= python ssl +USES= compiler:env python ssl USE_PYTHON= autoplist concurrent distutils CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 +post-patch: + @${REINPLACE_CMD} -e 's|"-Wno-error=sign-conversion"||' \ + ${WRKSRC}/src/_cffi_src/build_openssl.py +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include +.include From owner-svn-ports-branches@freebsd.org Wed Jan 10 19:42:35 2018 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 CE47DE7238B; Wed, 10 Jan 2018 19:42:35 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A946B63C9B; Wed, 10 Jan 2018 19:42:35 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6CD72125; Wed, 10 Jan 2018 19:42:34 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AJgYQZ081574; Wed, 10 Jan 2018 19:42:34 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AJgYCG081573; Wed, 10 Jan 2018 19:42:34 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201801101942.w0AJgYCG081573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 10 Jan 2018 19:42:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458683 - branches/2018Q1/finance/gnucash X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: branches/2018Q1/finance/gnucash X-SVN-Commit-Revision: 458683 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 19:42:35 -0000 Author: madpilot Date: Wed Jan 10 19:42:34 2018 New Revision: 458683 URL: https://svnweb.freebsd.org/changeset/ports/458683 Log: MFH: r458165 Fix conditional in flavoring. I missed this change when I committed the approved review. Reviewed by: portmgr (mat) Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D13478 Approved by: ports-secteam (swills) Modified: branches/2018Q1/finance/gnucash/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/finance/gnucash/Makefile ============================================================================== --- branches/2018Q1/finance/gnucash/Makefile Wed Jan 10 19:33:07 2018 (r458682) +++ branches/2018Q1/finance/gnucash/Makefile Wed Jan 10 19:42:34 2018 (r458683) @@ -100,7 +100,7 @@ GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml .if ${FLAVOR:U} == guile1 CONFIGURE_ARGS+= --with-guile=1.8 PLIST_SUB+= GUILE2="@comment " -.elif ${FLAVOR:U} == guile2 +.elif ${FLAVOR:U${FLAVORS:[1]}} == guile2 CONFIGURE_ARGS+= --with-guile=2.0 PLIST_SUB+= GUILE2="" .endif From owner-svn-ports-branches@freebsd.org Wed Jan 10 19:47:13 2018 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 27465E7282C; Wed, 10 Jan 2018 19:47:13 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 018BD68235; Wed, 10 Jan 2018 19:47:13 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50EAB2137; Wed, 10 Jan 2018 19:47:12 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AJlCuu082057; Wed, 10 Jan 2018 19:47:12 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AJlCv0082055; Wed, 10 Jan 2018 19:47:12 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201801101947.w0AJlCv0082055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 10 Jan 2018 19:47:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458685 - branches/2018Q1/sysutils/e2fsprogs X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: branches/2018Q1/sysutils/e2fsprogs X-SVN-Commit-Revision: 458685 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 19:47:13 -0000 Author: mandree Date: Wed Jan 10 19:47:11 2018 New Revision: 458685 URL: https://svnweb.freebsd.org/changeset/ports/458685 Log: MFH: r457962 Bugfix update to new upstream release 1.43.8. This fixes a few important bugs where updates are missed, displayed data is incorrect, a use-after-free-bug and fixes important bugs WRT super block handling on big-endian systems (missed byte-swaps). Changelog: Approved by: ports-secteam (swills) Modified: branches/2018Q1/sysutils/e2fsprogs/Makefile branches/2018Q1/sysutils/e2fsprogs/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2018Q1/sysutils/e2fsprogs/Makefile Wed Jan 10 19:44:08 2018 (r458684) +++ branches/2018Q1/sysutils/e2fsprogs/Makefile Wed Jan 10 19:47:11 2018 (r458685) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.7 -PORTREVISION?= 4 +PORTVERSION= 1.43.8 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -25,7 +25,10 @@ BROKEN_aarch64= fails to link: missing sbrk USES= cpe gmake makeinfo pkgconfig tar:xz CPE_VENDOR= e2fsprogs_project USE_CSTD= gnu99 -USE_LDCONFIG= yes +# this seems a bit redundant to the --rpath below, but +# the latter should be more robust in case someone needs +# to deal with the file systems from a system not yet fully booted. +USE_LDCONFIG= ${LOCALBASE}/lib/e2fsprogs GNU_CONFIGURE= yes LLD_UNSAFE= yes CONFIGURE_ARGS?=--disable-fsck \ Modified: branches/2018Q1/sysutils/e2fsprogs/distinfo ============================================================================== --- branches/2018Q1/sysutils/e2fsprogs/distinfo Wed Jan 10 19:44:08 2018 (r458684) +++ branches/2018Q1/sysutils/e2fsprogs/distinfo Wed Jan 10 19:47:11 2018 (r458685) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508879954 -SHA256 (e2fsprogs-1.43.7.tar.xz) = 2a6367289047d68d9ba6a46cf89ab9a1efd0556cde02a51ebaf414ff51edded9 -SIZE (e2fsprogs-1.43.7.tar.xz) = 5286684 +TIMESTAMP = 1514978158 +SHA256 (e2fsprogs-1.43.8.tar.xz) = c0841d5fe724d49132158850f3975e886fccfcef642878dca2425a1b5d30b12a +SIZE (e2fsprogs-1.43.8.tar.xz) = 5287448 From owner-svn-ports-branches@freebsd.org Wed Jan 10 20:07:54 2018 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 69E7DE73C17; Wed, 10 Jan 2018 20:07:54 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 442E469454; Wed, 10 Jan 2018 20:07:54 +0000 (UTC) (envelope-from ultima@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62BA5246D; Wed, 10 Jan 2018 20:07:53 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AK7r8j091630; Wed, 10 Jan 2018 20:07:53 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AK7qTM091626; Wed, 10 Jan 2018 20:07:52 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201801102007.w0AK7qTM091626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Wed, 10 Jan 2018 20:07:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458690 - in branches/2018Q1/www/libevhtp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in branches/2018Q1/www/libevhtp: . files X-SVN-Commit-Revision: 458690 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 20:07:54 -0000 Author: ultima Date: Wed Jan 10 20:07:52 2018 New Revision: 458690 URL: https://svnweb.freebsd.org/changeset/ports/458690 Log: MFH: r458045 * Updated to 1.2.15 * Uses system oniguruma when REGEX option is enabled, default on Reviewed by: mat Security: https://vuxml.freebsd.org/freebsd/b396cf6c-62e6-11e7-9def-b499baebfeaf.html Differential Revision: https://reviews.freebsd.org/D13742 Approved by: ports-secteam (swills) Added: branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt - copied unchanged from r458045, head/www/libevhtp/files/patch-CMakeLists.txt Deleted: branches/2018Q1/www/libevhtp/files/patch-evhtp.c Modified: branches/2018Q1/www/libevhtp/Makefile branches/2018Q1/www/libevhtp/distinfo branches/2018Q1/www/libevhtp/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/libevhtp/Makefile ============================================================================== --- branches/2018Q1/www/libevhtp/Makefile Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/Makefile Wed Jan 10 20:07:52 2018 (r458690) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libevhtp -PORTVERSION= 1.2.11 -PORTREVISION= 4 +PORTVERSION= 1.2.15 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org @@ -13,35 +12,28 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent -USE_GITHUB= yes -GH_ACCOUNT= ellzey - USES= cmake:outsource USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= criticalstack + CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/event2 \ -DCMAKE_LIBRARY_PATH:PATH=lib/event2 PLIST_SUB+= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= SSL THREADS STATIC DEBUG -OPTIONS_DEFAULT=SSL THREADS +OPTIONS_DEFINE= REGEX SSL THREADS STATIC DEBUG +OPTIONS_DEFAULT=REGEX SSL THREADS OPTIONS_SUB= yes -SSL_CMAKE_ON= -DEVHTP_DISABLE_SSL:STRING=OFF -SSL_CMAKE_OFF= -DEVHTP_DISABLE_SSL:STRING=ON -THREADS_CMAKE_ON= -DEVHTP_DISABLE_EVTHR:STRING=OFF -THREADS_CMAKE_OFF= -DEVHTP_DISABLE_EVTHR:STRING=ON -STATIC_CMAKE_ON= -DEVHTP_BUILD_SHARED:STRING=OFF -STATIC_CMAKE_OFF= -DEVHTP_BUILD_SHARED:STRING=ON +REGEX_CMAKE_BOOL_OFF= EVHTP_DISABLE_REGEX +REGEX_LIB_DEPENDS= libonig.so:devel/oniguruma -post-patch: - @${REINPLACE_CMD} '/HAS_SYS_ONIG onig/d ; s/lib\/pkgconfig/libdata\/pkgconfig/ ; s/PATCH_VERSION [0-9]*/PATCH_VERSION ${PORTVERSION:S/1.2.//}/' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's//"evhtp-config.h"/ ; s//"evthr.h"/ ; s//"htparse.h"/' \ - ${WRKSRC}/evhtp.h ${WRKSRC}/evthr.h +SSL_CMAKE_BOOL_OFF= EVHTP_DISABLE_SSL +SSL_USES= ssl -post-build: - @${REINPLACE_CMD} 's//"onigposix.h"/' \ - ${WRKSRC}/evhtp.h +THREADS_CMAKE_BOOL_OFF= EVHTP_DISABLE_EVTHR + +STATIC_CMAKE_BOOL_OFF= EVHTP_BUILD_SHARED .include Modified: branches/2018Q1/www/libevhtp/distinfo ============================================================================== --- branches/2018Q1/www/libevhtp/distinfo Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/distinfo Wed Jan 10 20:07:52 2018 (r458690) @@ -1,2 +1,3 @@ -SHA256 (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 0e60ef0b75c9e0351d18e015c9a688a70d9c66d2ca3f6a44a7da7153e11e067d -SIZE (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 429931 +TIMESTAMP = 1514908590 +SHA256 (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = f78ee8a34492e266fc1b6b9d4003825659df672da1cf918120217a0ee0d14ed3 +SIZE (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = 171933 Copied: branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt (from r458045, head/www/libevhtp/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/libevhtp/files/patch-CMakeLists.txt Wed Jan 10 20:07:52 2018 (r458690, copy of r458045, head/www/libevhtp/files/patch-CMakeLists.txt) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-01-02 16:30:26 UTC ++++ CMakeLists.txt +@@ -196,7 +196,7 @@ add_library (evhtp ${EVHTP_LIBTYPE} ${LIBEVH + target_link_libraries (evhtp ${LIBEVHTP_EXTERNAL_LIBS}) + + if (EVHTP_BUILD_SHARED) +- set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" 0 OUTPUT_NAME "evhtp") ++ set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION 0 OUTPUT_NAME "evhtp") + endif() + + add_subdirectory(examples) Modified: branches/2018Q1/www/libevhtp/pkg-plist ============================================================================== --- branches/2018Q1/www/libevhtp/pkg-plist Wed Jan 10 20:04:04 2018 (r458689) +++ branches/2018Q1/www/libevhtp/pkg-plist Wed Jan 10 20:07:52 2018 (r458690) @@ -1,9 +1,10 @@ +include/evhtp.h +include/evhtp/config.h include/evhtp/evhtp.h -include/evhtp/evhtp-config.h -include/evhtp/htparse.h -libdata/pkgconfig/evhtp.pc +include/evhtp/parser.h +%%THREADS%%include/evhtp/thread.h %%NO_STATIC%%lib/libevhtp.so +%%NO_STATIC%%lib/libevhtp.so.0 %%NO_STATIC%%lib/libevhtp.so.%%PORTVERSION%% -include/evhtp/onigposix.h -%%THREADS%%include/evhtp/evthr.h %%STATIC%%lib/libevhtp.a +libdata/pkgconfig/evhtp.pc From owner-svn-ports-branches@freebsd.org Wed Jan 10 20:08:43 2018 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 462D1E73CB8; Wed, 10 Jan 2018 20:08:43 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 11F796955B; Wed, 10 Jan 2018 20:08:43 +0000 (UTC) (envelope-from ultima@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51BF4246E; Wed, 10 Jan 2018 20:08:42 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AK8g4Z091883; Wed, 10 Jan 2018 20:08:42 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AK8fG1091877; Wed, 10 Jan 2018 20:08:41 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201801102008.w0AK8fG1091877@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Wed, 10 Jan 2018 20:08:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458691 - in branches/2018Q1/net-mgmt/seafile-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in branches/2018Q1/net-mgmt/seafile-server: . files X-SVN-Commit-Revision: 458691 X-SVN-Commit-Repository: ports 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.25 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, 10 Jan 2018 20:08:43 -0000 Author: ultima Date: Wed Jan 10 20:08:41 2018 New Revision: 458691 URL: https://svnweb.freebsd.org/changeset/ports/458691 Log: MFH: r458046 * Revision bump for libevhtp * Fix build warnings / errors for updated libevhtp Approved by: ports-secteam (swills) Added: branches/2018Q1/net-mgmt/seafile-server/files/patch-server_Makefile.am - copied unchanged from r458046, head/net-mgmt/seafile-server/files/patch-server_Makefile.am branches/2018Q1/net-mgmt/seafile-server/files/patch-server_http-server.c - copied unchanged from r458046, head/net-mgmt/seafile-server/files/patch-server_http-server.c branches/2018Q1/net-mgmt/seafile-server/files/patch-server_upload-file.c - copied unchanged from r458046, head/net-mgmt/seafile-server/files/patch-server_upload-file.c Modified: branches/2018Q1/net-mgmt/seafile-server/Makefile branches/2018Q1/net-mgmt/seafile-server/files/patch-configure.ac branches/2018Q1/net-mgmt/seafile-server/files/patch-server_access-file.c Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/seafile-server/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/seafile-server/Makefile Wed Jan 10 20:07:52 2018 (r458690) +++ branches/2018Q1/net-mgmt/seafile-server/Makefile Wed Jan 10 20:08:41 2018 (r458691) @@ -4,6 +4,7 @@ PORTNAME= seafile-server DISTVERSIONPREFIX= v DISTVERSION= ${SEAFILE_VER} DISTVERSIONSUFFIX= -server +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org @@ -33,7 +34,6 @@ USES= autoreconf iconv libarchive libtool localbase m USE_GITHUB= yes GH_ACCOUNT= haiwen USE_GNOME= glib20 -USE_LDCONFIG= yes USE_RC_SUBR= seafile SHEBANG_FILES= scripts/*.sh scripts/upgrade/*.sh *.sh scripts/build/*.py \ @@ -73,8 +73,6 @@ post-patch: ${WRKSRC}/scripts/upgrade/regenerate_secret_key.sh ${REINPLACE_CMD} -e 's|^INSTALL.*|INSTALLPATH="${PREFIX}/${SEAFILE_SERVER}/seafile"|' \ ${WRKSRC}/scripts/seaf-cli-wrapper.sh - ${REINPLACE_CMD} 's///' ${WRKSRC}/server/upload-file.c \ - ${WRKSRC}/server/access-file.c ${WRKSRC}/server/http-server.c ${REINPLACE_CMD} -E 's/stat.+\$$/stat -f %Su $$/' ${WRKSRC}/scripts/seafile.sh ${REINPLACE_CMD} 's/%%SEAFILE_USER%%/${USERS:[1]}/ ; s/%%SEAFILE_GROUP%%/${GROUPS:[1]}/' \ ${WRKSRC}/scripts/setup-seafile.sh ${WRKSRC}/scripts/setup-seafile-mysql.py Modified: branches/2018Q1/net-mgmt/seafile-server/files/patch-configure.ac ============================================================================== --- branches/2018Q1/net-mgmt/seafile-server/files/patch-configure.ac Wed Jan 10 20:07:52 2018 (r458690) +++ branches/2018Q1/net-mgmt/seafile-server/files/patch-configure.ac Wed Jan 10 20:08:41 2018 (r458691) @@ -1,4 +1,4 @@ ---- configure.ac.orig 2016-12-27 07:02:58 UTC +--- configure.ac.orig 2017-11-03 09:11:19 UTC +++ configure.ac @@ -51,8 +51,16 @@ else AC_MSG_RESULT(no) @@ -30,7 +30,7 @@ AC_ARG_ENABLE(python, AC_HELP_STRING([--enable-python],[build seafile python binding]), [compile_python=$enableval], -@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ +@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}" AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) @@ -47,7 +47,7 @@ LIB_ICONV=-liconv elif test "$bmac" = true ; then LIB_WS32= -@@ -149,6 +166,24 @@ elif test "$bmac" = true ; then +@@ -149,6 +165,24 @@ elif test "$bmac" = true ; then LIB_MAC="-framework CoreServices" LIB_CRYPT32= LIB_ICONV=-liconv @@ -72,7 +72,7 @@ else LIB_WS32= LIB_GDI32= -@@ -162,6 +199,8 @@ else +@@ -162,6 +196,8 @@ else LIB_MAC= MSVC_CFLAGS= LIB_CRYPT32= @@ -81,7 +81,7 @@ fi AC_SUBST(LIB_WS32) -@@ -174,6 +214,8 @@ AC_SUBST(LIB_IPHLPAPI) +@@ -174,6 +210,8 @@ AC_SUBST(LIB_IPHLPAPI) AC_SUBST(LIB_SHELL32) AC_SUBST(LIB_PSAPI) AC_SUBST(LIB_MAC) @@ -90,3 +90,27 @@ AC_SUBST(MSVC_CFLAGS) AC_SUBST(LIB_CRYPT32) AC_SUBST(LIB_ICONV) +@@ -189,6 +227,8 @@ ZDB_REQUIRED=2.10 + CURL_REQUIRED=7.17 + FUSE_REQUIRED=2.7.3 + ZLIB_REQUIRED=1.2.0 ++LIBEVHTP_REQUIRED=1.2.10 ++ONIGURUMA_REQUIRED=5.9.2 + + PKG_CHECK_MODULES(SSL, [openssl]) + AC_SUBST(SSL_CFLAGS) +@@ -221,6 +261,14 @@ AC_SUBST(LIBEVENT_LIBS) + PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED]) + AC_SUBST(ZLIB_CFLAGS) + AC_SUBST(ZLIB_LIBS) ++ ++PKG_CHECK_MODULES(LIBEVHTP, [evhtp >= $LIBEVHTP_REQUIRED]) ++AC_SUBST(LIBEVHTP_CFLAGS) ++AC_SUBST(LIBEVHTP_LIBS) ++ ++PKG_CHECK_MODULES(ONIGURUMA, [oniguruma >= $ONIGURUMA_REQUIRED]) ++AC_SUBST(ONIGURUMA_CFLAGS) ++AC_SUBST(ONIGURUMA_LIBS) + + if test x${compile_python} = xyes; then + AM_PATH_PYTHON([2.6]) Copied: branches/2018Q1/net-mgmt/seafile-server/files/patch-server_Makefile.am (from r458046, head/net-mgmt/seafile-server/files/patch-server_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/seafile-server/files/patch-server_Makefile.am Wed Jan 10 20:08:41 2018 (r458691, copy of r458046, head/net-mgmt/seafile-server/files/patch-server_Makefile.am) @@ -0,0 +1,11 @@ +--- server/Makefile.am.orig 2018-01-04 05:04:59 UTC ++++ server/Makefile.am +@@ -114,7 +114,7 @@ seaf_server_SOURCES = \ + + seaf_server_LDADD = @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile_common.la \ +- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \ ++ @ONIGURUMA_LIBS@ @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/common/db-wrapper/libdbwrapper.la \ + @SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \ Modified: branches/2018Q1/net-mgmt/seafile-server/files/patch-server_access-file.c ============================================================================== --- branches/2018Q1/net-mgmt/seafile-server/files/patch-server_access-file.c Wed Jan 10 20:07:52 2018 (r458690) +++ branches/2018Q1/net-mgmt/seafile-server/files/patch-server_access-file.c Wed Jan 10 20:08:41 2018 (r458691) @@ -1,54 +1,38 @@ ---- server/access-file.c.orig 2016-10-09 09:30:49 UTC +--- server/access-file.c.orig 2018-01-04 08:07:23 UTC +++ server/access-file.c -@@ -224,10 +224,10 @@ write_block_data_cb (struct bufferevent - bev->cbarg = data->saved_cb_arg; +@@ -618,7 +618,7 @@ do_file(evhtp_request_t *req, SeafRepo *repo, const ch + /* Block any new request from this connection before finish + * handling this request. + */ +- evhtp_request_pause (req); ++ bufferevent_disable(bev, EV_READ); - /* Resume reading incomming requests. */ -- evhtp_request_resume (data->req); -- - evhtp_send_reply_end (data->req); + /* Kick start data transfer by sending out http headers. */ + evhtp_send_reply_start(req, EVHTP_RES_OK); +@@ -967,7 +967,7 @@ do_file_range (evhtp_request_t *req, SeafRepo *repo, c + /* Block any new request from this connection before finish + * handling this request. + */ +- evhtp_request_pause (req); ++ bufferevent_disable(bev, EV_READ); -+ evhtp_request_resume (data->req); -+ - free_sendblock_data (data); - return; - } -@@ -309,10 +309,10 @@ next: - bev->cbarg = data->saved_cb_arg; + /* Kick start data transfer by sending out http headers. */ + evhtp_send_reply_start(req, EVHTP_RES_PARTIAL); +@@ -1037,7 +1037,7 @@ start_download_zip_file (evhtp_request_t *req, const c + /* Block any new request from this connection before finish + * handling this request. + */ +- evhtp_request_pause (req); ++ bufferevent_disable(bev, EV_READ); - /* Resume reading incomming requests. */ -- evhtp_request_resume (data->req); -- - evhtp_send_reply_end (data->req); + /* Kick start data transfer by sending out http headers. */ + evhtp_send_reply_start(req, EVHTP_RES_OK); +@@ -1365,7 +1365,7 @@ do_block(evhtp_request_t *req, SeafRepo *repo, const c + /* Block any new request from this connection before finish + * handling this request. + */ +- evhtp_request_pause (req); ++ bufferevent_disable(bev, EV_READ); -+ evhtp_request_resume (data->req); -+ - free_sendfile_data (data); - return; - } -@@ -406,10 +406,10 @@ write_dir_data_cb (struct bufferevent *b - bev->cbarg = data->saved_cb_arg; - - /* Resume reading incomming requests. */ -- evhtp_request_resume (data->req); -- - evhtp_send_reply_end (data->req); - -+ evhtp_request_resume (data->req); -+ - free_senddir_data (data); - return; - } -@@ -697,10 +697,10 @@ finish_file_range_request (struct buffer - bev->cbarg = data->saved_cb_arg; - - /* Resume reading incomming requests. */ -- evhtp_request_resume (data->req); -- - evhtp_send_reply_end (data->req); - -+ evhtp_request_resume (data->req); -+ - free_send_file_range_data (data); - } - + /* Kick start data transfer by sending out http headers. */ + evhtp_send_reply_start(req, EVHTP_RES_OK); Copied: branches/2018Q1/net-mgmt/seafile-server/files/patch-server_http-server.c (from r458046, head/net-mgmt/seafile-server/files/patch-server_http-server.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/seafile-server/files/patch-server_http-server.c Wed Jan 10 20:08:41 2018 (r458691, copy of r458046, head/net-mgmt/seafile-server/files/patch-server_http-server.c) @@ -0,0 +1,11 @@ +--- server/http-server.c.orig 2018-01-03 02:47:07 UTC ++++ server/http-server.c +@@ -2122,7 +2122,7 @@ http_server_run (void *arg) + + http_request_init (server); + +- evhtp_use_threads (priv->evhtp, NULL, server->worker_threads, NULL); ++ evhtp_use_threads_wexit (priv->evhtp, NULL, NULL, server->worker_threads, NULL); + + struct timeval tv; + tv.tv_sec = CLEANING_INTERVAL_SEC; Copied: branches/2018Q1/net-mgmt/seafile-server/files/patch-server_upload-file.c (from r458046, head/net-mgmt/seafile-server/files/patch-server_upload-file.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/seafile-server/files/patch-server_upload-file.c Wed Jan 10 20:08:41 2018 (r458691, copy of r458046, head/net-mgmt/seafile-server/files/patch-server_upload-file.c) @@ -0,0 +1,93 @@ +--- server/upload-file.c.orig 2017-11-03 09:11:19 UTC ++++ server/upload-file.c +@@ -2048,12 +2048,12 @@ upload_read_cb (evhtp_request_t *req, evbuf_t *buf, vo + out: + if (res != EVHTP_RES_OK) { + /* Don't receive any data before the connection is closed. */ +- evhtp_request_pause (req); ++ bufferevent_disable(evhtp_request_get_bev(req), EV_READ); + + /* Set keepalive to 0. This will cause evhtp to close the + * connection after sending the reply. + */ +- req->keepalive = 0; ++ evhtp_request_set_keepalive(req, 0); + + fsm->state = RECV_ERROR; + } +@@ -2254,8 +2254,8 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers + } + + /* Set up per-request hooks, so that we can read file data piece by piece. */ +- evhtp_set_hook (&req->hooks, evhtp_hook_on_read, upload_read_cb, fsm); +- evhtp_set_hook (&req->hooks, evhtp_hook_on_request_fini, upload_finish_cb, fsm); ++ evhtp_request_set_hook (req, evhtp_hook_on_read, upload_read_cb, fsm); ++ evhtp_request_set_hook (req, evhtp_hook_on_request_fini, upload_finish_cb, fsm); + /* Set arg for upload_cb or update_cb. */ + req->cbarg = fsm; + +@@ -2265,12 +2265,12 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers + + err: + /* Don't receive any data before the connection is closed. */ +- evhtp_request_pause (req); ++ bufferevent_disable(evhtp_request_get_bev(req), EV_READ); + + /* Set keepalive to 0. This will cause evhtp to close the + * connection after sending the reply. + */ +- req->keepalive = 0; ++ evhtp_request_set_keepalive(req, 0); + send_error_reply (req, EVHTP_RES_BADREQ, err_msg); + + g_free (repo_id); +@@ -2339,38 +2339,38 @@ upload_file_init (evhtp_t *htp, const char *http_temp_ + + cb = evhtp_set_regex_cb (htp, "^/upload/.*", upload_cb, NULL); + /* upload_headers_cb() will be called after evhtp parsed all http headers. */ +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/upload-api/.*", upload_api_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/upload-raw-blks-api/.*", + upload_raw_blks_api_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/upload-blks-api/.*", upload_blks_api_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/upload-blks-aj/.*", upload_blks_ajax_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/upload-aj/.*", upload_ajax_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/update/.*", update_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/update-api/.*", update_api_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/update-blks-api/.*", update_blks_api_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/update-blks-aj/.*", update_blks_ajax_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + cb = evhtp_set_regex_cb (htp, "^/update-aj/.*", update_ajax_cb, NULL); +- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); ++ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); + + evhtp_set_regex_cb (htp, "^/upload_progress.*", upload_progress_cb, NULL); + From owner-svn-ports-branches@freebsd.org Thu Jan 11 00:54:18 2018 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 2F1A7EA4BA9; Thu, 11 Jan 2018 00:54:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B51175B52; Thu, 11 Jan 2018 00:54:18 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 548A85A75; Thu, 11 Jan 2018 00:54:17 +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 w0B0sHXm014366; Thu, 11 Jan 2018 00:54:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B0sHd8014364; Thu, 11 Jan 2018 00:54:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801110054.w0B0sHd8014364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Jan 2018 00:54:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458706 - branches/2018Q1/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/rpcs3 X-SVN-Commit-Revision: 458706 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 00:54:18 -0000 Author: jbeich Date: Thu Jan 11 00:54:16 2018 New Revision: 458706 URL: https://svnweb.freebsd.org/changeset/ports/458706 Log: MFH: r458702 emulators/rpcs3: update to 0.0.4.230 Changes: https://github.com/RPCS3/rpcs3/compare/19d181fa4...51a2b43d8 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Thu Jan 11 00:53:59 2018 (r458705) +++ branches/2018Q1/emulators/rpcs3/Makefile Thu Jan 11 00:54:16 2018 (r458706) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-225 -DISTVERSIONSUFFIX= -g19d181fa4 +DISTVERSION= 0.0.4-230 +DISTVERSIONSUFFIX= -g51a2b43d8 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Thu Jan 11 00:53:59 2018 (r458705) +++ branches/2018Q1/emulators/rpcs3/distinfo Thu Jan 11 00:54:16 2018 (r458706) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515109270 -SHA256 (RPCS3-rpcs3-v0.0.4-225-g19d181fa4_GH0.tar.gz) = f7b78a9fd1fb04d74d2905757e4f2b9eefc2d9e4ea393a06bf72f5b667522d9e -SIZE (RPCS3-rpcs3-v0.0.4-225-g19d181fa4_GH0.tar.gz) = 3614469 +TIMESTAMP = 1515539822 +SHA256 (RPCS3-rpcs3-v0.0.4-230-g51a2b43d8_GH0.tar.gz) = ce53bab234d9e948e735e572e10920d50b9973250776bbc4c93704d4c3735cad +SIZE (RPCS3-rpcs3-v0.0.4-230-g51a2b43d8_GH0.tar.gz) = 3616316 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 From owner-svn-ports-branches@freebsd.org Thu Jan 11 00:54:59 2018 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 306F1EA4CC6; Thu, 11 Jan 2018 00:54:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 043F775D36; Thu, 11 Jan 2018 00:54:59 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4011F5A78; Thu, 11 Jan 2018 00:54:58 +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 w0B0sw7k014690; Thu, 11 Jan 2018 00:54:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B0swgW014688; Thu, 11 Jan 2018 00:54:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801110054.w0B0swgW014688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Jan 2018 00:54:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458708 - branches/2018Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/citra X-SVN-Commit-Revision: 458708 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 00:54:59 -0000 Author: jbeich Date: Thu Jan 11 00:54:57 2018 New Revision: 458708 URL: https://svnweb.freebsd.org/changeset/ports/458708 Log: MFH: r458703 emulators/citra: update to s20180110 Changes: https://github.com/citra-emu/citra/compare/a66e4585...2e418106 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q1/emulators/citra/Makefile branches/2018Q1/emulators/citra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/citra/Makefile ============================================================================== --- branches/2018Q1/emulators/citra/Makefile Thu Jan 11 00:54:20 2018 (r458707) +++ branches/2018Q1/emulators/citra/Makefile Thu Jan 11 00:54:57 2018 (r458708) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180104 +PORTVERSION= s20180110 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= a66e4585 +GH_TAGNAME= 2e418106 GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:4110494:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Thu Jan 11 00:54:20 2018 (r458707) +++ branches/2018Q1/emulators/citra/distinfo Thu Jan 11 00:54:57 2018 (r458708) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515056697 -SHA256 (citra-emu-citra-s20180104-a66e4585_GH0.tar.gz) = 6b2fed7b33cc39ad26d587ed06580c51840ec943cdf0bc79ba0d92cfc5f3a8ee -SIZE (citra-emu-citra-s20180104-a66e4585_GH0.tar.gz) = 1650645 +TIMESTAMP = 1515604611 +SHA256 (citra-emu-citra-s20180110-2e418106_GH0.tar.gz) = 4a608d2f49e372ef3cbd42ada907fcded61b4903d8ecab9322076780b76a91d5 +SIZE (citra-emu-citra-s20180110-2e418106_GH0.tar.gz) = 1650781 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-4110494_GH0.tar.gz) = 97703cefc1bc325634b2b2c9abdbaffd6e2d1caaa751f8e38c74ee882af85cbe From owner-svn-ports-branches@freebsd.org Thu Jan 11 00:55:35 2018 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 B37CAEA4DD5; Thu, 11 Jan 2018 00:55:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8AE7A75F6E; Thu, 11 Jan 2018 00:55:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB9705A79; Thu, 11 Jan 2018 00:55:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0B0tY6v014903; Thu, 11 Jan 2018 00:55:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B0tYeL014898; Thu, 11 Jan 2018 00:55:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801110055.w0B0tYeL014898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Jan 2018 00:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458709 - in branches/2018Q1/www: firefox firefox/files waterfox waterfox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www: firefox firefox/files waterfox waterfox/files X-SVN-Commit-Revision: 458709 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 00:55:35 -0000 Author: jbeich Date: Thu Jan 11 00:55:34 2018 New Revision: 458709 URL: https://svnweb.freebsd.org/changeset/ports/458709 Log: MFH: r458705 www/firefox: work around crash on FreeBSD 10 PR: 224917 Suggested by: dim Approved by: ports-secteam blanket Added: branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp - copied unchanged from r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp - copied unchanged from r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp Modified: branches/2018Q1/www/firefox/Makefile branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/firefox/Makefile ============================================================================== --- branches/2018Q1/www/firefox/Makefile Thu Jan 11 00:54:57 2018 (r458708) +++ branches/2018Q1/www/firefox/Makefile Thu Jan 11 00:55:34 2018 (r458709) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 57.0.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied: branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp (from r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp Thu Jan 11 00:55:34 2018 (r458709, copy of r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp) @@ -0,0 +1,14 @@ +--- ipc/glue/MessageChannel.cpp.orig 2017-11-02 16:16:32 UTC ++++ ipc/glue/MessageChannel.cpp +@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop() + mWorkerLoop = nullptr; + } + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 ++// Work around UB in __tree crashing mPendingPromises.clear() ++// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 ++[[clang::optnone]] ++#endif + void + MessageChannel::Clear() + { Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Thu Jan 11 00:54:57 2018 (r458708) +++ branches/2018Q1/www/waterfox/Makefile Thu Jan 11 00:55:34 2018 (r458709) @@ -2,6 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.2 +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp (from r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp Thu Jan 11 00:55:34 2018 (r458709, copy of r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp) @@ -0,0 +1,14 @@ +--- ipc/glue/MessageChannel.cpp.orig 2017-11-02 16:16:32 UTC ++++ ipc/glue/MessageChannel.cpp +@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop() + mWorkerLoop = nullptr; + } + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 ++// Work around UB in __tree crashing mPendingPromises.clear() ++// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 ++[[clang::optnone]] ++#endif + void + MessageChannel::Clear() + { From owner-svn-ports-branches@freebsd.org Thu Jan 11 01:45:44 2018 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 472A1E602FF; Thu, 11 Jan 2018 01:45:44 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 130A77808B; Thu, 11 Jan 2018 01:45:44 +0000 (UTC) (envelope-from ultima@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BA27636C; Thu, 11 Jan 2018 01:45:43 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0B1jheO036803; Thu, 11 Jan 2018 01:45:43 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B1jbRm036740; Thu, 11 Jan 2018 01:45:37 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201801110145.w0B1jbRm036740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Thu, 11 Jan 2018 01:45:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458710 - in branches/2018Q1: audio/pianobar cad/solvespace databases/postgis20 databases/postgis21 databases/postgis22 databases/postgis23 devel/json-c devel/objecthash dns/bind9-devel... X-SVN-Group: ports-branches X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in branches/2018Q1: audio/pianobar cad/solvespace databases/postgis20 databases/postgis21 databases/postgis22 databases/postgis23 devel/json-c devel/objecthash dns/bind9-devel dns/bind910 dns/bind911 ... X-SVN-Commit-Revision: 458710 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 01:45:44 -0000 Author: ultima Date: Thu Jan 11 01:45:36 2018 New Revision: 458710 URL: https://svnweb.freebsd.org/changeset/ports/458710 Log: MFH: r457965 r458047 Update devel/json-c to 0.13 - Add TEST_TARGET - While I'm here, fix shebang for net/opensips - Bump PORTREVISION of dependent ports for shlib change Changes: https://github.com/json-c/json-c/blob/master/ChangeLog PR: 224675 Exp-run by: antoine * Revision bump for libevhtp * Fix build errors for updated libevhtp Approved by: ports-secteam (swills) Added: branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc - copied unchanged from r458047, head/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc - copied unchanged from r458047, head/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc Modified: branches/2018Q1/audio/pianobar/Makefile branches/2018Q1/cad/solvespace/Makefile branches/2018Q1/databases/postgis20/Makefile branches/2018Q1/databases/postgis21/Makefile branches/2018Q1/databases/postgis22/Makefile branches/2018Q1/databases/postgis23/Makefile branches/2018Q1/devel/json-c/Makefile branches/2018Q1/devel/json-c/distinfo branches/2018Q1/devel/json-c/pkg-plist branches/2018Q1/devel/objecthash/Makefile branches/2018Q1/dns/bind9-devel/Makefile branches/2018Q1/dns/bind910/Makefile branches/2018Q1/dns/bind911/Makefile branches/2018Q1/dns/bind912/Makefile branches/2018Q1/graphics/gdal/Makefile branches/2018Q1/graphics/mypaint/Makefile branches/2018Q1/multimedia/cx88/Makefile branches/2018Q1/net-mgmt/fastnetmon/Makefile branches/2018Q1/net-mgmt/riemann-c-client/Makefile branches/2018Q1/net/freeradius3/Makefile branches/2018Q1/net/frr/Makefile branches/2018Q1/net/grive/Makefile branches/2018Q1/net/ndpi/Makefile branches/2018Q1/net/ntopng/Makefile branches/2018Q1/net/opensips/Makefile branches/2018Q1/net/zmap/Makefile branches/2018Q1/security/certificate-transparency/Makefile branches/2018Q1/security/clamav/Makefile branches/2018Q1/security/fastd-devel/Makefile branches/2018Q1/security/fastd/Makefile branches/2018Q1/security/libu2f-host/Makefile branches/2018Q1/security/razorback-api/Makefile branches/2018Q1/security/razorback-api/files/patch-include__razorback__json_buffer.h branches/2018Q1/security/razorback-archiveInflate/Makefile branches/2018Q1/security/razorback-clamavNugget/Makefile branches/2018Q1/security/razorback-dispatcher/Makefile branches/2018Q1/security/razorback-fileInject/Makefile branches/2018Q1/security/razorback-fsMonitor/Makefile branches/2018Q1/security/razorback-fsWalk/Makefile branches/2018Q1/security/razorback-masterNugget/Makefile branches/2018Q1/security/razorback-officeCat/Makefile branches/2018Q1/security/razorback-pdfFox/Makefile branches/2018Q1/security/razorback-scriptNugget/Makefile branches/2018Q1/security/razorback-swfScanner/Makefile branches/2018Q1/security/razorback-syslogNugget/Makefile branches/2018Q1/security/razorback-virusTotal/Makefile branches/2018Q1/security/razorback-yaraNugget/Makefile branches/2018Q1/security/ykpers/Makefile branches/2018Q1/sysutils/slurm-wlm/Makefile branches/2018Q1/sysutils/syslog-ng310/Makefile branches/2018Q1/sysutils/syslog-ng311/Makefile branches/2018Q1/sysutils/syslog-ng312/Makefile branches/2018Q1/sysutils/syslog-ng313/Makefile branches/2018Q1/sysutils/syslog-ng36/Makefile branches/2018Q1/sysutils/syslog-ng37/Makefile branches/2018Q1/sysutils/syslog-ng39/Makefile branches/2018Q1/sysutils/ttyd/Makefile branches/2018Q1/www/newsboat/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/audio/pianobar/Makefile ============================================================================== --- branches/2018Q1/audio/pianobar/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/audio/pianobar/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= pianobar PORTVERSION= 2016.06.02 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://6xq.net/projects/${PORTNAME}/ Modified: branches/2018Q1/cad/solvespace/Makefile ============================================================================== --- branches/2018Q1/cad/solvespace/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/cad/solvespace/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ PORTNAME= solvespace PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= cad Modified: branches/2018Q1/databases/postgis20/Makefile ============================================================================== --- branches/2018Q1/databases/postgis20/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/databases/postgis20/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 20 Modified: branches/2018Q1/databases/postgis21/Makefile ============================================================================== --- branches/2018Q1/databases/postgis21/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/databases/postgis21/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,6 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.1.8 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 21 Modified: branches/2018Q1/databases/postgis22/Makefile ============================================================================== --- branches/2018Q1/databases/postgis22/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/databases/postgis22/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,6 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 22 Modified: branches/2018Q1/databases/postgis23/Makefile ============================================================================== --- branches/2018Q1/databases/postgis23/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/databases/postgis23/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= postgis PORTVERSION= 2.3.5 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 23 Modified: branches/2018Q1/devel/json-c/Makefile ============================================================================== --- branches/2018Q1/devel/json-c/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/devel/json-c/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= json-c -PORTVERSION= 0.12.1 +PORTVERSION= 0.13 CATEGORIES= devel MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ @@ -13,6 +13,7 @@ LICENSE= MIT GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +TEST_TARGET= check USE_LDCONFIG= yes USES= autoreconf cpe gmake libtool pathfix pkgconfig @@ -20,5 +21,8 @@ CPE_VENDOR= json-c_project post-patch: @${REINPLACE_CMD} -e 's| -Werror||g' ${WRKSRC}/Makefile.in + +post-install: + ${INSTALL_DATA} ${WRKSRC}/json_object_private.h ${STAGEDIR}${PREFIX}/include/json-c/ .include Modified: branches/2018Q1/devel/json-c/distinfo ============================================================================== --- branches/2018Q1/devel/json-c/distinfo Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/devel/json-c/distinfo Thu Jan 11 01:45:36 2018 (r458710) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480353678 -SHA256 (json-c-0.12.1.tar.gz) = 2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123 -SIZE (json-c-0.12.1.tar.gz) = 535086 +TIMESTAMP = 1513175168 +SHA256 (json-c-0.13.tar.gz) = 0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d +SIZE (json-c-0.13.tar.gz) = 634720 Modified: branches/2018Q1/devel/json-c/pkg-plist ============================================================================== --- branches/2018Q1/devel/json-c/pkg-plist Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/devel/json-c/pkg-plist Thu Jan 11 01:45:36 2018 (r458710) @@ -8,13 +8,14 @@ include/json-c/json_inttypes.h include/json-c/json_object.h include/json-c/json_object_iterator.h include/json-c/json_object_private.h +include/json-c/json_pointer.h include/json-c/json_tokener.h include/json-c/json_util.h +include/json-c/json_visit.h include/json-c/linkhash.h include/json-c/printbuf.h -include/json-c/random_seed.h lib/libjson-c.a lib/libjson-c.so -lib/libjson-c.so.2 -lib/libjson-c.so.2.0.2 +lib/libjson-c.so.3 +lib/libjson-c.so.3.0.1 libdata/pkgconfig/json-c.pc Modified: branches/2018Q1/devel/objecthash/Makefile ============================================================================== --- branches/2018Q1/devel/objecthash/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/devel/objecthash/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= objecthash PORTVERSION= 20160802 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= amutu@amutu.com Modified: branches/2018Q1/dns/bind9-devel/Makefile ============================================================================== --- branches/2018Q1/dns/bind9-devel/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/dns/bind9-devel/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind Modified: branches/2018Q1/dns/bind910/Makefile ============================================================================== --- branches/2018Q1/dns/bind910/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/dns/bind910/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 Modified: branches/2018Q1/dns/bind911/Makefile ============================================================================== --- branches/2018Q1/dns/bind911/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/dns/bind911/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -5,10 +5,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 2 .else # dns/bind911 here -PORTREVISION= 4 +PORTREVISION= 5 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} Modified: branches/2018Q1/dns/bind912/Makefile ============================================================================== --- branches/2018Q1/dns/bind912/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/dns/bind912/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind912 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} Modified: branches/2018Q1/graphics/gdal/Makefile ============================================================================== --- branches/2018Q1/graphics/gdal/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/graphics/gdal/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ Modified: branches/2018Q1/graphics/mypaint/Makefile ============================================================================== --- branches/2018Q1/graphics/mypaint/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/graphics/mypaint/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= mypaint PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/ Modified: branches/2018Q1/multimedia/cx88/Makefile ============================================================================== --- branches/2018Q1/multimedia/cx88/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/multimedia/cx88/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= cx88 PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://corona.homeunix.net/ports/cx88/ Modified: branches/2018Q1/net-mgmt/fastnetmon/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/fastnetmon/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net-mgmt/fastnetmon/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -4,7 +4,7 @@ PORTNAME= fastnetmon PORTVERSION= 1.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org Modified: branches/2018Q1/net-mgmt/riemann-c-client/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/riemann-c-client/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net-mgmt/riemann-c-client/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -4,6 +4,7 @@ PORTNAME= riemann-c-client PORTVERSION= 1.10.1 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dch@skunkwerks.at Modified: branches/2018Q1/net/freeradius3/Makefile ============================================================================== --- branches/2018Q1/net/freeradius3/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/freeradius3/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= freeradius DISTVERSION= 3.0.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ Modified: branches/2018Q1/net/frr/Makefile ============================================================================== --- branches/2018Q1/net/frr/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/frr/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= frr PORTVERSION= 3.0.2 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net ipv6 MAINTAINER= olivier@FreeBSD.org Modified: branches/2018Q1/net/grive/Makefile ============================================================================== --- branches/2018Q1/net/grive/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/grive/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= grive PORTVERSION= 0.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MAINTAINER= ktsin@acm.org Modified: branches/2018Q1/net/ndpi/Makefile ============================================================================== --- branches/2018Q1/net/ndpi/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/ndpi/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= ndpi PORTVERSION= 2.2.2017.12.05 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org Modified: branches/2018Q1/net/ntopng/Makefile ============================================================================== --- branches/2018Q1/net/ntopng/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/ntopng/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= ntopng PORTVERSION= 3.2.2017.12.06 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org Modified: branches/2018Q1/net/opensips/Makefile ============================================================================== --- branches/2018Q1/net/opensips/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/opensips/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= opensips PORTVERSION= 2.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/ @@ -144,6 +144,7 @@ SHEBANG_FILES= ccopts.sh \ test/9.sh \ utils/fifo_relay/fifo_server.php \ utils/profile/launch.sh +python_CMD= ${LOCALBASE}/bin/python2.7 .include @@ -188,6 +189,9 @@ EXTRA_MODULES+= db_sqlite .endif OPENSIPS_MAKE_ENV= CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" + +post-patch: + @${RM} ${WRKSRC}/modules/json/array_del.c do-configure: @(cp files/Makefile.conf ${WRKSRC}) Modified: branches/2018Q1/net/zmap/Makefile ============================================================================== --- branches/2018Q1/net/zmap/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/net/zmap/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -4,6 +4,7 @@ PORTNAME= zmap PORTVERSION= 2.1.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@rawbw.com Modified: branches/2018Q1/security/certificate-transparency/Makefile ============================================================================== --- branches/2018Q1/security/certificate-transparency/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/certificate-transparency/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 18 +PORTREVISION= 20 CATEGORIES= security MAINTAINER= ports@FreeBSD.org Copied: branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc (from r458047, head/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc Thu Jan 11 01:45:36 2018 (r458710, copy of r458047, head/security/certificate-transparency/files/patch-cpp_net_connection__pool.cc) @@ -0,0 +1,18 @@ +--- cpp/net/connection_pool.cc.orig 2018-01-04 08:45:06 UTC ++++ cpp/net/connection_pool.cc +@@ -454,12 +454,12 @@ unique_ptr ConnectionPool: + kZeroMillis}; + evhtp_connection_set_timeouts(handle->connection(), &read_timeout, + &write_timeout); +- evhtp_set_hook(&handle->connection()->hooks, evhtp_hook_on_conn_error, ++ evhtp_connection_set_hook(handle->connection(), evhtp_hook_on_conn_error, + reinterpret_cast( + EvConnection::ConnectionErrorHook), + reinterpret_cast(conn.get())); +- evhtp_set_hook( +- &handle->connection()->hooks, evhtp_hook_on_connection_fini, ++ evhtp_connection_set_hook( ++ handle->connection(), evhtp_hook_on_connection_fini, + reinterpret_cast(EvConnection::ConnectionFinishedHook), + // We'll hold on to another shared_ptr to the Connection + // until evhtp tells us that it's finished with the cnxn. Copied: branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc (from r458047, head/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc Thu Jan 11 01:45:36 2018 (r458710, copy of r458047, head/security/certificate-transparency/files/patch-cpp_net_url__fetcher.cc) @@ -0,0 +1,11 @@ +--- cpp/net/url_fetcher.cc.orig 2018-01-04 08:54:28 UTC ++++ cpp/net/url_fetcher.cc +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + + #include "net/connection_pool.h" + #include "util/thread_pool.h" Modified: branches/2018Q1/security/clamav/Makefile ============================================================================== --- branches/2018Q1/security/clamav/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/clamav/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.99.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MASTER_SITES= http://www.clamav.net/downloads/production/ Modified: branches/2018Q1/security/fastd-devel/Makefile ============================================================================== --- branches/2018Q1/security/fastd-devel/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/fastd-devel/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ PORTNAME= fastd PORTVERSION= 18.a.20151111 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security net MASTER_SITES= https://git.universe-factory.net/fastd/snapshot/ PKGNAMESUFFIX= -devel Modified: branches/2018Q1/security/fastd/Makefile ============================================================================== --- branches/2018Q1/security/fastd/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/fastd/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ PORTNAME= fastd PORTVERSION= 18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net MASTER_SITES= https://git.universe-factory.net/fastd/snapshot/ Modified: branches/2018Q1/security/libu2f-host/Makefile ============================================================================== --- branches/2018Q1/security/libu2f-host/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/libu2f-host/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= libu2f-host PORTVERSION= 1.1.4 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security devel MAINTAINER= cpm@FreeBSD.org Modified: branches/2018Q1/security/razorback-api/Makefile ============================================================================== --- branches/2018Q1/security/razorback-api/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-api/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,7 +2,7 @@ PORTNAME= api PORTVERSION= 0.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= SF/razorbacktm/API PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-api/files/patch-include__razorback__json_buffer.h ============================================================================== --- branches/2018Q1/security/razorback-api/files/patch-include__razorback__json_buffer.h Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-api/files/patch-include__razorback__json_buffer.h Thu Jan 11 01:45:36 2018 (r458710) @@ -1,11 +1,12 @@ ---- ./include/razorback/json_buffer.h.orig 2014-08-20 10:25:03.000000000 -0400 -+++ ./include/razorback/json_buffer.h 2014-08-20 10:25:26.000000000 -0400 -@@ -9,7 +9,7 @@ +--- include/razorback/json_buffer.h.orig 2012-01-09 19:40:46 UTC ++++ include/razorback/json_buffer.h +@@ -9,6 +9,7 @@ #include #include -#include +#include ++#include #ifdef __cplusplus extern "C" { Modified: branches/2018Q1/security/razorback-archiveInflate/Makefile ============================================================================== --- branches/2018Q1/security/razorback-archiveInflate/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-archiveInflate/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= archiveInflate PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-clamavNugget/Makefile ============================================================================== --- branches/2018Q1/security/razorback-clamavNugget/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-clamavNugget/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= clamavNugget PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-dispatcher/Makefile ============================================================================== --- branches/2018Q1/security/razorback-dispatcher/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-dispatcher/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= dispatcher PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Dispatcher PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-fileInject/Makefile ============================================================================== --- branches/2018Q1/security/razorback-fileInject/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-fileInject/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= fileInject PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-fsMonitor/Makefile ============================================================================== --- branches/2018Q1/security/razorback-fsMonitor/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-fsMonitor/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= fsMonitor PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-fsWalk/Makefile ============================================================================== --- branches/2018Q1/security/razorback-fsWalk/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-fsWalk/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= fsWalk PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-masterNugget/Makefile ============================================================================== --- branches/2018Q1/security/razorback-masterNugget/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-masterNugget/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= masterNugget PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-officeCat/Makefile ============================================================================== --- branches/2018Q1/security/razorback-officeCat/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-officeCat/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= officeCat PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-pdfFox/Makefile ============================================================================== --- branches/2018Q1/security/razorback-pdfFox/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-pdfFox/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= pdfFox PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-scriptNugget/Makefile ============================================================================== --- branches/2018Q1/security/razorback-scriptNugget/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-scriptNugget/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= scriptNugget PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-swfScanner/Makefile ============================================================================== --- branches/2018Q1/security/razorback-swfScanner/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-swfScanner/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= swfScanner PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-syslogNugget/Makefile ============================================================================== --- branches/2018Q1/security/razorback-syslogNugget/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-syslogNugget/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= syslogNugget PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-virusTotal/Makefile ============================================================================== --- branches/2018Q1/security/razorback-virusTotal/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-virusTotal/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= virusTotal PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/razorback-yaraNugget/Makefile ============================================================================== --- branches/2018Q1/security/razorback-yaraNugget/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/razorback-yaraNugget/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= yaraNugget PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- Modified: branches/2018Q1/security/ykpers/Makefile ============================================================================== --- branches/2018Q1/security/ykpers/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/security/ykpers/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,6 +2,7 @@ PORTNAME= ykpers PORTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://opensource.yubico.com/yubikey-personalization/releases/ Modified: branches/2018Q1/sysutils/slurm-wlm/Makefile ============================================================================== --- branches/2018Q1/sysutils/slurm-wlm/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/slurm-wlm/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= slurm DISTVERSION= 17.02.9 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.schedmd.com/download/latest/ \ http://www.schedmd.com/download/archive/ \ Modified: branches/2018Q1/sysutils/syslog-ng310/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng310/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng310/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.10.1 +PORTREVISION= 1 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/syslog-ng311/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng311/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng311/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/syslog-ng312/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng312/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng312/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.12.1 +PORTREVISION= 1 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/syslog-ng313/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng313/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng313/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.13.2 +PORTREVISION= 1 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/syslog-ng36/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng36/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng36/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \ http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \ Modified: branches/2018Q1/sysutils/syslog-ng37/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng37/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng37/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng PORTVERSION= 3.7.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils #MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ DISTNAME= syslog-ng-${DISTVERSION}_with_man Modified: branches/2018Q1/sysutils/syslog-ng39/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng39/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/syslog-ng39/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -3,6 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.9.1 +PORTREVISION= 1 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/ttyd/Makefile ============================================================================== --- branches/2018Q1/sysutils/ttyd/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/sysutils/ttyd/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -2,6 +2,7 @@ PORTNAME= ttyd PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= neel@neelc.org Modified: branches/2018Q1/www/newsboat/Makefile ============================================================================== --- branches/2018Q1/www/newsboat/Makefile Thu Jan 11 00:55:34 2018 (r458709) +++ branches/2018Q1/www/newsboat/Makefile Thu Jan 11 01:45:36 2018 (r458710) @@ -4,6 +4,7 @@ PORTNAME= newsboat PORTVERSION= 2.10.1 DISTVERSIONPREFIX= r +PORTREVISION= 1 CATEGORIES= www MAINTAINER= mt@markoturk.info From owner-svn-ports-branches@freebsd.org Thu Jan 11 09:14:00 2018 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 15CC2E7965A; Thu, 11 Jan 2018 09:14:00 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E403131DE; Thu, 11 Jan 2018 09:13:59 +0000 (UTC) (envelope-from lme@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CEA212E05; Thu, 11 Jan 2018 09:13:59 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0B9Dw2v023891; Thu, 11 Jan 2018 09:13:58 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B9DwQb023889; Thu, 11 Jan 2018 09:13:58 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201801110913.w0B9DwQb023889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Thu, 11 Jan 2018 09:13:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458718 - branches/2018Q1/net-mgmt/icingaweb2 X-SVN-Group: ports-branches X-SVN-Commit-Author: lme X-SVN-Commit-Paths: branches/2018Q1/net-mgmt/icingaweb2 X-SVN-Commit-Revision: 458718 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 09:14:00 -0000 Author: lme Date: Thu Jan 11 09:13:58 2018 New Revision: 458718 URL: https://svnweb.freebsd.org/changeset/ports/458718 Log: MFH: r457968 net-mgmt/icingaweb2: - Install icingacli to ${PREFIX}/bin and patch it to make it usable. Now you can configure Icinga Web 2 with it and can use the embedded PHP web server. - Bump PORTREVISION Approved by: portmgr (swills) Modified: branches/2018Q1/net-mgmt/icingaweb2/Makefile branches/2018Q1/net-mgmt/icingaweb2/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/icingaweb2/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/icingaweb2/Makefile Thu Jan 11 09:00:51 2018 (r458717) +++ branches/2018Q1/net-mgmt/icingaweb2/Makefile Thu Jan 11 09:13:58 2018 (r458718) @@ -3,6 +3,7 @@ PORTNAME= icingaweb2 DISTVERSIONPREFIX= v DISTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MAINTAINER= lme@FreeBSD.org @@ -42,6 +43,11 @@ MYSQL_USE= PHP=pdo_mysql LDAP_USE= PHP=ldap PDF_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick +post-patch: + ${REINPLACE_CMD} 's%\(/etc/icingaweb2\)%${PREFIX}\1%g' \ + ${WRKSRC}/library/Icinga/Application/ApplicationBootstrap.php + ${REINPLACE_CMD} 's%readlink[^)]*)%"${PREFIX}/bin/php"%g' \ + ${WRKSRC}/application/clicommands/WebCommand.php do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d/ ${INSTALL_DATA} ${WRKSRC}/etc/bash_completion.d/icingacli \ @@ -51,11 +57,16 @@ do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) - ${CHMOD} 755 ${STAGEDIR}/${WWWDIR}/bin/icingacli + ${CHMOD} 755 ${STAGEDIR}${WWWDIR}/bin/icingacli + ${RLN} ${STAGEDIR}${WWWDIR}/bin/icingacli ${STAGEDIR}${PREFIX}/bin/icingacli ${MKDIR} ${STAGEDIR}${ETCDIR} .for webserver in apache nginx ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${webserver} + # ICINGAWEB_CONFIGDIR is set to /nonexistent to allow staging as user. + # Once installed, ${ETCDIR} is not world-readable, so point icingacli to + # a non existing directory. The config files are generated correctly anyway. (cd ${STAGEDIR}${WWWDIR} && \ + ICINGAWEB_CONFIGDIR=/nonexistent \ ./bin/icingacli setup config webserver ${webserver} --path=/icingaweb2 \ --root=${WWWDIR}/public --config=${ETCDIR} \ --file=${STAGEDIR}${EXAMPLESDIR}/${webserver}/icingaweb2.conf) Modified: branches/2018Q1/net-mgmt/icingaweb2/pkg-plist ============================================================================== --- branches/2018Q1/net-mgmt/icingaweb2/pkg-plist Thu Jan 11 09:00:51 2018 (r458717) +++ branches/2018Q1/net-mgmt/icingaweb2/pkg-plist Thu Jan 11 09:13:58 2018 (r458718) @@ -1,3 +1,4 @@ +bin/icingacli %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/icingaweb2.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash_completion.d/icingacli %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx/icingaweb2.conf From owner-svn-ports-branches@freebsd.org Thu Jan 11 12:43:55 2018 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 5CFA8E5C991; Thu, 11 Jan 2018 12:43:55 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3953E6E4A5; Thu, 11 Jan 2018 12:43:55 +0000 (UTC) (envelope-from dbaio@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93870150B3; Thu, 11 Jan 2018 12:43:54 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BChshH012173; Thu, 11 Jan 2018 12:43:54 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BChssL012170; Thu, 11 Jan 2018 12:43:54 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201801111243.w0BChssL012170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Thu, 11 Jan 2018 12:43:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458726 - branches/2018Q1/irc/irssi X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2018Q1/irc/irssi X-SVN-Commit-Revision: 458726 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 12:43:55 -0000 Author: dbaio Date: Thu Jan 11 12:43:54 2018 New Revision: 458726 URL: https://svnweb.freebsd.org/changeset/ports/458726 Log: MFH: r458290 irc/irssi: Update to 1.0.6, Fixes multiple security vulnerabilities While here, update license and www. Changes: https://raw.githubusercontent.com/irssi/irssi/1.0.6/NEWS PR: 224954 Submitted by: David O'Rourke (maintainer) Reported by: tj@mrsk.me (email) Security: a3764767-f31e-11e7-95f2-005056925db4 Approved by: ports-secteam (swills) Modified: branches/2018Q1/irc/irssi/Makefile branches/2018Q1/irc/irssi/distinfo branches/2018Q1/irc/irssi/pkg-descr Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/irc/irssi/Makefile ============================================================================== --- branches/2018Q1/irc/irssi/Makefile Thu Jan 11 12:39:22 2018 (r458725) +++ branches/2018Q1/irc/irssi/Makefile Thu Jan 11 12:43:54 2018 (r458726) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.0.5 +PORTVERSION= 1.0.6 PORTEPOCH= 1 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ @@ -9,7 +9,8 @@ MASTER_SITES= https://github.com/irssi/irssi/releases/ MAINTAINER= dor.bsd@xm0.uk COMMENT= Modular IRC client with many features -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe gettext-runtime gmake libtool ncurses pkgconfig tar:xz GNU_CONFIGURE= yes Modified: branches/2018Q1/irc/irssi/distinfo ============================================================================== --- branches/2018Q1/irc/irssi/distinfo Thu Jan 11 12:39:22 2018 (r458725) +++ branches/2018Q1/irc/irssi/distinfo Thu Jan 11 12:43:54 2018 (r458726) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508693847 -SHA256 (irssi-1.0.5.tar.xz) = c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914 -SIZE (irssi-1.0.5.tar.xz) = 1032308 +TIMESTAMP = 1515269268 +SHA256 (irssi-1.0.6.tar.xz) = 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 +SIZE (irssi-1.0.6.tar.xz) = 1033428 Modified: branches/2018Q1/irc/irssi/pkg-descr ============================================================================== --- branches/2018Q1/irc/irssi/pkg-descr Thu Jan 11 12:39:22 2018 (r458725) +++ branches/2018Q1/irc/irssi/pkg-descr Thu Jan 11 12:43:54 2018 (r458726) @@ -4,4 +4,4 @@ be created pretty easily. Also, Irssi isn't really eve there's already a working SILC module available. Support for other protocols like ICQ could be created some day too. -WWW: http://www.irssi.org/ +WWW: https://irssi.org/ From owner-svn-ports-branches@freebsd.org Thu Jan 11 12:59:15 2018 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 D84E6E5D921; Thu, 11 Jan 2018 12:59:15 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B39016ED7B; Thu, 11 Jan 2018 12:59:15 +0000 (UTC) (envelope-from dbaio@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EABBC1524F; Thu, 11 Jan 2018 12:59:14 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BCxEPn016536; Thu, 11 Jan 2018 12:59:14 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BCxEK3016534; Thu, 11 Jan 2018 12:59:14 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201801111259.w0BCxEK3016534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Thu, 11 Jan 2018 12:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458727 - branches/2018Q1/www/awstats X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2018Q1/www/awstats X-SVN-Commit-Revision: 458727 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 12:59:15 -0000 Author: dbaio Date: Thu Jan 11 12:59:14 2018 New Revision: 458727 URL: https://svnweb.freebsd.org/changeset/ports/458727 Log: MFH: r458496 www/awstats: Update to 7.7, Fixes security vulnerability Pass MAINTAINER'ship to submitter. Changes: http://www.awstats.org/docs/awstats_changelog.txt PR: 225007 Submitted by: Vidar Karlsen Security: 4055aee5-f4c6-11e7-95f2-005056925db4 Approved by: ports-secteam (swills) Modified: branches/2018Q1/www/awstats/Makefile branches/2018Q1/www/awstats/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/awstats/Makefile ============================================================================== --- branches/2018Q1/www/awstats/Makefile Thu Jan 11 12:43:54 2018 (r458726) +++ branches/2018Q1/www/awstats/Makefile Thu Jan 11 12:59:14 2018 (r458727) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= awstats -PORTVERSION= 7.6 +PORTVERSION= 7.7 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= vidar@karlsen.tech COMMENT= Free real-time logfile analyzer to get advanced web statistics LICENSE= GPLv3 Modified: branches/2018Q1/www/awstats/distinfo ============================================================================== --- branches/2018Q1/www/awstats/distinfo Thu Jan 11 12:43:54 2018 (r458726) +++ branches/2018Q1/www/awstats/distinfo Thu Jan 11 12:59:14 2018 (r458727) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481140635 -SHA256 (awstats-7.6.tar.gz) = 4045501319bf99e223bdb492a68a8f08b8e814b0f144a008726d7bd59114167a -SIZE (awstats-7.6.tar.gz) = 2955876 +TIMESTAMP = 1515450406 +SHA256 (awstats-7.7.tar.gz) = 428e6dd01807c602d75b17e64db17ca10b453bca076d9fb45434ca6be539777c +SIZE (awstats-7.7.tar.gz) = 2956851 From owner-svn-ports-branches@freebsd.org Thu Jan 11 15:29:37 2018 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 6D5EDE69B9A; Thu, 11 Jan 2018 15:29:37 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F9487641F; Thu, 11 Jan 2018 15:29:37 +0000 (UTC) (envelope-from tz@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84C0E16BD9; Thu, 11 Jan 2018 15:29:36 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BFTaoV084528; Thu, 11 Jan 2018 15:29:36 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BFTacG084525; Thu, 11 Jan 2018 15:29:36 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201801111529.w0BFTacG084525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 11 Jan 2018 15:29:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458750 - branches/2018Q1/lang/php72 X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: branches/2018Q1/lang/php72 X-SVN-Commit-Revision: 458750 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 15:29:37 -0000 Author: tz Date: Thu Jan 11 15:29:36 2018 New Revision: 458750 URL: https://svnweb.freebsd.org/changeset/ports/458750 Log: MFH: r458659 lang/php72: Update from 7.2.0 to 7.2.1 Changelog: http://www.php.net/ChangeLog-7.php#7.2.1 PR: 224953 Approved by: ports-secteam (swills) Modified: branches/2018Q1/lang/php72/Makefile branches/2018Q1/lang/php72/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/lang/php72/Makefile ============================================================================== --- branches/2018Q1/lang/php72/Makefile Thu Jan 11 15:24:16 2018 (r458749) +++ branches/2018Q1/lang/php72/Makefile Thu Jan 11 15:29:36 2018 (r458750) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= php72 -DISTVERSION= 7.2.0 -PORTREVISION?= 1 +DISTVERSION= 7.2.1 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} Modified: branches/2018Q1/lang/php72/distinfo ============================================================================== --- branches/2018Q1/lang/php72/distinfo Thu Jan 11 15:24:16 2018 (r458749) +++ branches/2018Q1/lang/php72/distinfo Thu Jan 11 15:29:36 2018 (r458750) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512570641 -SHA256 (php-7.2.0.tar.xz) = 87572a6b924670a5d4aac276aaa4a94321936283df391d702c845ffc112db095 -SIZE (php-7.2.0.tar.xz) = 12014940 +TIMESTAMP = 1515408517 +SHA256 (php-7.2.1.tar.xz) = 6c6cf82fda6660ed963821eb0525214bb3547e8e29f447b9c15b2d8e6efd8822 +SIZE (php-7.2.1.tar.xz) = 12094840 From owner-svn-ports-branches@freebsd.org Thu Jan 11 18:59:11 2018 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 DA54AE75B64; Thu, 11 Jan 2018 18:59:11 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B41B4803A6; Thu, 11 Jan 2018 18:59:11 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED2D918F63; Thu, 11 Jan 2018 18:59:10 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BIxA3L076730; Thu, 11 Jan 2018 18:59:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BIxAAP076728; Thu, 11 Jan 2018 18:59:10 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201801111859.w0BIxAAP076728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 11 Jan 2018 18:59:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458778 - branches/2018Q1/net/traefik X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q1/net/traefik X-SVN-Commit-Revision: 458778 X-SVN-Commit-Repository: ports 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.25 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, 11 Jan 2018 18:59:12 -0000 Author: riggs Date: Thu Jan 11 18:59:10 2018 New Revision: 458778 URL: https://svnweb.freebsd.org/changeset/ports/458778 Log: MFH: r457963 Update to upstream release 1.4.6 (bug fixes) Approved by: ports-secteam (swills) Modified: branches/2018Q1/net/traefik/Makefile branches/2018Q1/net/traefik/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/traefik/Makefile ============================================================================== --- branches/2018Q1/net/traefik/Makefile Thu Jan 11 18:39:40 2018 (r458777) +++ branches/2018Q1/net/traefik/Makefile Thu Jan 11 18:59:10 2018 (r458778) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= traefik -PORTVERSION= 1.4.5 +PORTVERSION= 1.4.6 DISTVERSIONPREFIX= v CATEGORIES= net Modified: branches/2018Q1/net/traefik/distinfo ============================================================================== --- branches/2018Q1/net/traefik/distinfo Thu Jan 11 18:39:40 2018 (r458777) +++ branches/2018Q1/net/traefik/distinfo Thu Jan 11 18:59:10 2018 (r458778) @@ -1,5 +1,5 @@ -TIMESTAMP = 1512809132 -SHA256 (containous-traefik-v1.4.5_GH0.tar.gz) = 0400b611fab1179316abf348f9785d0a03b6dbdf33e7e2bb714d131c1e6b8f82 -SIZE (containous-traefik-v1.4.5_GH0.tar.gz) = 7430822 +TIMESTAMP = 1514981812 +SHA256 (containous-traefik-v1.4.6_GH0.tar.gz) = b6d5eeeef38d925d91b26a2be42609f9336590cac10115b2413eb938ba3fb10b +SIZE (containous-traefik-v1.4.6_GH0.tar.gz) = 7431119 SHA256 (jteeuwen-go-bindata-a0ff256_GH0.tar.gz) = 06c7bb64ab428a28eb3633ae19fafb6b7b241d384ef45ac0728b1c5fbec64961 SIZE (jteeuwen-go-bindata-a0ff256_GH0.tar.gz) = 17868 From owner-svn-ports-branches@freebsd.org Fri Jan 12 17:54:16 2018 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 98064E72F26; Fri, 12 Jan 2018 17:54:16 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C3BB8775C5; Fri, 12 Jan 2018 17:54:15 +0000 (UTC) (envelope-from feld@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08BD526FB0; Fri, 12 Jan 2018 17:54:15 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0CHsEOE059572; Fri, 12 Jan 2018 17:54:14 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0CHsEA8059563; Fri, 12 Jan 2018 17:54:14 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801121754.w0CHsEA8059563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 12 Jan 2018 17:54:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458862 - in branches/2018Q1/databases: percona57-client percona57-client/files percona57-pam-for-mysql percona57-server percona57-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/databases: percona57-client percona57-client/files percona57-pam-for-mysql percona57-server percona57-server/files X-SVN-Commit-Revision: 458862 X-SVN-Commit-Repository: ports 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.25 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, 12 Jan 2018 17:54:16 -0000 Author: feld Date: Fri Jan 12 17:54:13 2018 New Revision: 458862 URL: https://svnweb.freebsd.org/changeset/ports/458862 Log: MFH: r458861 databases/percona57: Fix build with SASL If SASL is detected at build time it assumes you want SASL and also errors due to assuming we're Linux. This was already patched in our tree for MySQL. Also enable SASL support by default for the databases/percona57-client. This is expected to be the default by upstream now. Special thanks to mmokhi for figuring this out for us. PR: 220865 Added: branches/2018Q1/databases/percona57-client/files/patch-cmake_plugin.cmake - copied unchanged from r458861, head/databases/percona57-client/files/patch-cmake_plugin.cmake branches/2018Q1/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt - copied unchanged from r458861, head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt branches/2018Q1/databases/percona57-server/files/patch-cmake_plugin.cmake - copied unchanged from r458861, head/databases/percona57-server/files/patch-cmake_plugin.cmake branches/2018Q1/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt - copied unchanged from r458861, head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Modified: branches/2018Q1/databases/percona57-client/Makefile branches/2018Q1/databases/percona57-client/pkg-plist branches/2018Q1/databases/percona57-pam-for-mysql/pkg-plist branches/2018Q1/databases/percona57-server/Makefile branches/2018Q1/databases/percona57-server/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/percona57-client/Makefile ============================================================================== --- branches/2018Q1/databases/percona57-client/Makefile Fri Jan 12 17:53:30 2018 (r458861) +++ branches/2018Q1/databases/percona57-client/Makefile Fri Jan 12 17:54:13 2018 (r458862) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 0 +PORTREVISION?= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) @@ -30,6 +30,16 @@ MANPAGES= comp_err.1 mysql.1 mysql_config.1 mysql_conf mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes + +OPTIONS_GROUP+= PLUGINS +PLUGINS_DESC= Default Client Plugins +OPTIONS_GROUP_PLUGINS= SASLCLIENT +SASLCLIENT_DESC= SASL client plugin module +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/sasl/sasl.h:net/openldap24-sasl-client +OPTIONS_DEFAULT+= SASLCLIENT +OPTIONS_SUB= yes # Percona renamed the libraries, until we decide how to deal with it create some symlinks # to prevent breaking installed ports. Copied: branches/2018Q1/databases/percona57-client/files/patch-cmake_plugin.cmake (from r458861, head/databases/percona57-client/files/patch-cmake_plugin.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/percona57-client/files/patch-cmake_plugin.cmake Fri Jan 12 17:54:13 2018 (r458862, copy of r458861, head/databases/percona57-client/files/patch-cmake_plugin.cmake) @@ -0,0 +1,43 @@ +--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC ++++ cmake/plugin.cmake +@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) + # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate + # an additional dependency. + # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. +- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ # ++ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. ++ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) + ENDIF() ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ SET_TARGET_PROPERTIES(${target} PROPERTIES ++ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " ++ ) ++ ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + + IF(NOT ARG_MODULE_ONLY) +@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Copied: branches/2018Q1/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (from r458861, head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Fri Jan 12 17:54:13 2018 (r458862, copy of r458861, head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt) @@ -0,0 +1,18 @@ +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC ++++ libmysql/authentication_ldap/CMakeLists.txt +@@ -52,8 +52,10 @@ ELSE () + SET(SASL_LIBRARY "sasl2") + ENDIF () + +-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client +- auth_ldap_sasl_client.cc log_client.cc +- LINK_LIBRARIES ${SASL_LIBRARY} +- MODULE_ONLY +- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++IF (WITH_AUTHENTICATION_LDAP) ++ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client ++ auth_ldap_sasl_client.cc log_client.cc ++ LINK_LIBRARIES ${SASL_LIBRARY} ++ MODULE_ONLY ++ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF() Modified: branches/2018Q1/databases/percona57-client/pkg-plist ============================================================================== --- branches/2018Q1/databases/percona57-client/pkg-plist Fri Jan 12 17:53:30 2018 (r458861) +++ branches/2018Q1/databases/percona57-client/pkg-plist Fri Jan 12 17:54:13 2018 (r458862) @@ -128,6 +128,7 @@ lib/mysql/libmysqlservices.a lib/mysql/libperconaserverclient.a lib/mysql/libperconaserverclient.so lib/mysql/libperconaserverclient.so.20 +%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so libdata/pkgconfig/perconaserverclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz Modified: branches/2018Q1/databases/percona57-pam-for-mysql/pkg-plist ============================================================================== --- branches/2018Q1/databases/percona57-pam-for-mysql/pkg-plist Fri Jan 12 17:53:30 2018 (r458861) +++ branches/2018Q1/databases/percona57-pam-for-mysql/pkg-plist Fri Jan 12 17:54:13 2018 (r458862) @@ -2,4 +2,3 @@ lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_compat.so lib/mysql/plugin/dialog.so -@dir lib/mysql/plugin/debug Modified: branches/2018Q1/databases/percona57-server/Makefile ============================================================================== --- branches/2018Q1/databases/percona57-server/Makefile Fri Jan 12 17:53:30 2018 (r458861) +++ branches/2018Q1/databases/percona57-server/Makefile Fri Jan 12 17:54:13 2018 (r458862) @@ -123,6 +123,9 @@ MANPAGES= my_print_defaults.1 myisam_ftdump.1 myisamch mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" +# issue 220865: Currently there's no source to be built with server-side support. +# But this keeps the pkg-plist not overlaping +CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 post-install: ${MKDIR} ${STAGEDIR}/var/db/mysql @@ -133,6 +136,9 @@ post-install: post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt + # issue 220865: MySQL developers forgot that FreeBSD != Linux + @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \ + ${WRKSRC}/cmake/plugin.cmake .include Copied: branches/2018Q1/databases/percona57-server/files/patch-cmake_plugin.cmake (from r458861, head/databases/percona57-server/files/patch-cmake_plugin.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/percona57-server/files/patch-cmake_plugin.cmake Fri Jan 12 17:54:13 2018 (r458862, copy of r458861, head/databases/percona57-server/files/patch-cmake_plugin.cmake) @@ -0,0 +1,43 @@ +--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC ++++ cmake/plugin.cmake +@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) + # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate + # an additional dependency. + # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. +- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ # ++ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. ++ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) + ENDIF() ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ SET_TARGET_PROPERTIES(${target} PROPERTIES ++ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " ++ ) ++ ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + + IF(NOT ARG_MODULE_ONLY) +@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Copied: branches/2018Q1/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt (from r458861, head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Fri Jan 12 17:54:13 2018 (r458862, copy of r458861, head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt) @@ -0,0 +1,18 @@ +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC ++++ libmysql/authentication_ldap/CMakeLists.txt +@@ -52,8 +52,10 @@ ELSE () + SET(SASL_LIBRARY "sasl2") + ENDIF () + +-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client +- auth_ldap_sasl_client.cc log_client.cc +- LINK_LIBRARIES ${SASL_LIBRARY} +- MODULE_ONLY +- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++IF (WITH_AUTHENTICATION_LDAP) ++ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client ++ auth_ldap_sasl_client.cc log_client.cc ++ LINK_LIBRARIES ${SASL_LIBRARY} ++ MODULE_ONLY ++ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF() Modified: branches/2018Q1/databases/percona57-server/pkg-plist ============================================================================== --- branches/2018Q1/databases/percona57-server/pkg-plist Fri Jan 12 17:53:30 2018 (r458861) +++ branches/2018Q1/databases/percona57-server/pkg-plist Fri Jan 12 17:54:13 2018 (r458862) @@ -90,7 +90,6 @@ bin/zlib_decompress include/mysql/mysqlx_ername.h include/mysql/mysqlx_error.h include/mysql/mysqlx_version.h -@dir lib/mysql/plugin/debug @dir(mysql,mysql,) /var/db/mysql %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so %%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so From owner-svn-ports-branches@freebsd.org Fri Jan 12 21:37:17 2018 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 92152E7D9F1; Fri, 12 Jan 2018 21:37:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14401812D8; Fri, 12 Jan 2018 21:37:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5901F1451; Fri, 12 Jan 2018 21:37:16 +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 w0CLbGm5052832; Fri, 12 Jan 2018 21:37:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0CLbFXL052822; Fri, 12 Jan 2018 21:37:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801122137.w0CLbFXL052822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 12 Jan 2018 21:37:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458874 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 458874 X-SVN-Commit-Repository: ports 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.25 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, 12 Jan 2018 21:37:17 -0000 Author: jbeich Date: Fri Jan 12 21:37:15 2018 New Revision: 458874 URL: https://svnweb.freebsd.org/changeset/ports/458874 Log: MFH: r458873 www/waterfox: update to 56.0.3 - Apply more FF58 fixes [1] Changes: https://github.com/MrAlex94/Waterfox/compare/56.0.2...56.0.3 Security: a891c5b4-3d7a-4de9-9c71-eef3fd698c77 [1] Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1246883 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1246883 branches/2018Q1/www/waterfox/files/patch-bug1387427 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1387427 branches/2018Q1/www/waterfox/files/patch-bug1395508 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1395508 branches/2018Q1/www/waterfox/files/patch-bug1402715 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1402715 branches/2018Q1/www/waterfox/files/patch-bug1408017 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1408017 branches/2018Q1/www/waterfox/files/patch-bug1408631 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1408631 branches/2018Q1/www/waterfox/files/patch-bug1409449 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1409449 branches/2018Q1/www/waterfox/files/patch-bug1411745 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1411745 branches/2018Q1/www/waterfox/files/patch-bug1412646 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1412646 branches/2018Q1/www/waterfox/files/patch-bug1418966 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1418966 branches/2018Q1/www/waterfox/files/patch-bug1419762 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1419762 branches/2018Q1/www/waterfox/files/patch-bug1420507 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1420507 branches/2018Q1/www/waterfox/files/patch-bug1421009 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1421009 branches/2018Q1/www/waterfox/files/patch-bug1422518 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1422518 branches/2018Q1/www/waterfox/files/patch-bug1422545 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1422545 branches/2018Q1/www/waterfox/files/patch-bug1423647 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1423647 branches/2018Q1/www/waterfox/files/patch-bug1425000 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1425000 branches/2018Q1/www/waterfox/files/patch-bug1425107 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1425107 branches/2018Q1/www/waterfox/files/patch-bug1425780 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1425780 branches/2018Q1/www/waterfox/files/patch-bug1426042 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1426042 branches/2018Q1/www/waterfox/files/patch-bug1426801 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1426801 branches/2018Q1/www/waterfox/files/patch-bug1426996 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1426996 branches/2018Q1/www/waterfox/files/patch-bug1427126 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1427126 branches/2018Q1/www/waterfox/files/patch-bug1428589 - copied unchanged from r458873, head/www/waterfox/files/patch-bug1428589 Modified: branches/2018Q1/www/waterfox/Makefile branches/2018Q1/www/waterfox/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Fri Jan 12 21:36:02 2018 (r458873) +++ branches/2018Q1/www/waterfox/Makefile Fri Jan 12 21:37:15 2018 (r458874) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.0.2 -PORTREVISION= 1 +DISTVERSION= 56.0.3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/www/waterfox/distinfo ============================================================================== --- branches/2018Q1/www/waterfox/distinfo Fri Jan 12 21:36:02 2018 (r458873) +++ branches/2018Q1/www/waterfox/distinfo Fri Jan 12 21:37:15 2018 (r458874) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515201685 -SHA256 (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = baf0717ed49005535cce646976c4d088a25033bd83960381388e7b2ba23389c9 -SIZE (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = 394203428 +TIMESTAMP = 1515710085 +SHA256 (MrAlex94-Waterfox-56.0.3_GH0.tar.gz) = 80d4bba90b2d8aac7223aa81302ea56e0dc226e29d01c206e2cbf375d471a9fa +SIZE (MrAlex94-Waterfox-56.0.3_GH0.tar.gz) = 394227402 Copied: branches/2018Q1/www/waterfox/files/patch-bug1246883 (from r458873, head/www/waterfox/files/patch-bug1246883) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1246883 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1246883) @@ -0,0 +1,56 @@ +commit b175b27efefd +Author: Mantaroh Yoshinaga +Date: Wed Dec 13 08:58:05 2017 +0900 + + Bug 1246883 - Load UA Stylesheet when printing the SVG document. r=jwatt, a=gchang + + Currently, Gecko load only minimal-xul.css if the document is the SVG[1]. + In the case of printing SVG document, gecko should load ua.css for using style + which related to print. + + This patch will load ua.css when printing the SVG document. + + [1] http://searchfox.org/mozilla-central/rev/67f38de2443e6b613d874fcf4d2cd1f2fc3d5e97/layout/base/nsDocumentViewer.cpp#2472 + + MozReview-Commit-ID: JtdaEvX8QTw + + --HG-- + extra : source : 727a90ad06e715b3a4457b2532e922d22a2469a2 +--- + layout/printing/nsPrintEngine.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git layout/printing/nsPrintEngine.cpp layout/printing/nsPrintEngine.cpp +index f8d8f1077ba5..3ac2211d159d 100644 +--- layout/printing/nsPrintEngine.cpp ++++ layout/printing/nsPrintEngine.cpp +@@ -75,6 +75,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro + #include "nsISupportsUtils.h" + #include "nsIScriptContext.h" + #include "nsIDOMDocument.h" ++#include "nsIDocumentObserver.h" + #include "nsISelectionListener.h" + #include "nsISelectionPrivate.h" + #include "nsIDOMRange.h" +@@ -82,6 +83,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro + #include "nsLayoutCID.h" + #include "nsContentUtils.h" + #include "nsIPresShell.h" ++#include "nsLayoutStylesheetCache.h" + #include "nsLayoutUtils.h" + #include "mozilla/Preferences.h" + +@@ -2267,6 +2269,13 @@ nsPrintEngine::ReflowPrintObject(const UniquePtr& aPO) + + StyleSetHandle styleSet = mDocViewerPrint->CreateStyleSet(aPO->mDocument); + ++ if (aPO->mDocument->IsSVGDocument()) { ++ // The SVG document only loads minimal-xul.css, so it doesn't apply other ++ // styles. We should add ua.css for applying style which related to print. ++ auto cache = nsLayoutStylesheetCache::For(aPO->mDocument->GetStyleBackendType()); ++ styleSet->PrependStyleSheet(SheetType::Agent, cache->UASheet()); ++ } ++ + aPO->mPresShell = aPO->mDocument->CreateShell(aPO->mPresContext, + aPO->mViewManager, styleSet); + if (!aPO->mPresShell) { Copied: branches/2018Q1/www/waterfox/files/patch-bug1387427 (from r458873, head/www/waterfox/files/patch-bug1387427) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1387427 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1387427) @@ -0,0 +1,499 @@ +commit ecb753bbae79 +Author: Peter Van der Beken +Date: Fri Nov 3 16:58:59 2017 +0100 + + Bug 1387427 - Don't insert source content into the document for XSLT transforms. r=smaug, a=gchang + + --HG-- + extra : source : b069f99a8ca9989f277645bbadc2116dcabd8ad0 +--- + dom/xml/nsXMLContentSink.cpp | 93 +++++++++++++++++--------------- + dom/xml/nsXMLContentSink.h | 8 ++- + dom/xslt/base/txURIUtils.cpp | 11 +--- + dom/xslt/base/txURIUtils.h | 4 +- + dom/xslt/nsIDocumentTransformer.h | 6 ++- + dom/xslt/xslt/txExecutionState.cpp | 15 ++++-- + dom/xslt/xslt/txExecutionState.h | 7 ++- + dom/xslt/xslt/txMozillaTextOutput.cpp | 2 +- + dom/xslt/xslt/txMozillaXMLOutput.cpp | 2 +- + dom/xslt/xslt/txMozillaXSLTProcessor.cpp | 37 +++++++------ + dom/xslt/xslt/txMozillaXSLTProcessor.h | 7 +-- + 11 files changed, 107 insertions(+), 85 deletions(-) + +diff --git dom/xml/nsXMLContentSink.cpp dom/xml/nsXMLContentSink.cpp +index 637939261be7..3d973f2bcf97 100644 +--- dom/xml/nsXMLContentSink.cpp ++++ dom/xml/nsXMLContentSink.cpp +@@ -152,6 +152,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXMLContentSink, + const StackNode& node = tmp->mContentStack.ElementAt(i); + cb.NoteXPCOMChild(node.mContent); + } ++ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocumentChildren) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END + + // nsIContentSink +@@ -293,8 +294,7 @@ nsXMLContentSink::DidBuildModel(bool aTerminated) + } + } + +- nsCOMPtr currentDOMDoc(do_QueryInterface(mDocument)); +- mXSLTProcessor->SetSourceContentModel(currentDOMDoc); ++ mXSLTProcessor->SetSourceContentModel(mDocument, mDocumentChildren); + // Since the processor now holds a reference to us we drop our reference + // to it to avoid owning cycles + mXSLTProcessor = nullptr; +@@ -358,8 +358,9 @@ NS_IMETHODIMP + nsXMLContentSink::OnTransformDone(nsresult aResult, + nsIDocument* aResultDocument) + { +- NS_ASSERTION(NS_FAILED(aResult) || aResultDocument, +- "Don't notify about transform success without a document."); ++ MOZ_ASSERT(aResultDocument, "Don't notify about transform end without a document."); ++ ++ mDocumentChildren.Clear(); + + nsCOMPtr domDoc = do_QueryInterface(aResultDocument); + +@@ -368,28 +369,17 @@ nsXMLContentSink::OnTransformDone(nsresult aResult, + + if (NS_FAILED(aResult) && contentViewer) { + // Transform failed. +- if (domDoc) { +- aResultDocument->SetMayStartLayout(false); +- // We have an error document. +- contentViewer->SetDOMDocument(domDoc); +- } +- else { +- // We don't have an error document, display the +- // untransformed source document. +- nsCOMPtr document = do_QueryInterface(mDocument); +- contentViewer->SetDOMDocument(document); +- } ++ aResultDocument->SetMayStartLayout(false); ++ // We have an error document. ++ contentViewer->SetDOMDocument(domDoc); + } + + nsCOMPtr originalDocument = mDocument; +- if (NS_SUCCEEDED(aResult) || aResultDocument) { +- // Transform succeeded or it failed and we have an error +- // document to display. +- mDocument = aResultDocument; +- nsCOMPtr htmlDoc = do_QueryInterface(mDocument); +- if (htmlDoc) { +- htmlDoc->SetDocWriteDisabled(false); +- } ++ // Transform succeeded, or it failed and we have an error document to display. ++ mDocument = aResultDocument; ++ nsCOMPtr htmlDoc = do_QueryInterface(mDocument); ++ if (htmlDoc) { ++ htmlDoc->SetDocWriteDisabled(false); + } + + // Notify document observers that all the content has been stuck +@@ -617,12 +607,17 @@ nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent) + { + nsresult result = NS_OK; + +- if ((eXMLContentSinkState_InProlog == mState) || +- (eXMLContentSinkState_InEpilog == mState)) { +- NS_ASSERTION(mDocument, "Fragments have no prolog or epilog"); +- mDocument->AppendChildTo(aContent, false); +- } +- else { ++ if (mState == eXMLContentSinkState_InProlog) { ++ NS_ASSERTION(mDocument, "Fragments have no prolog"); ++ mDocumentChildren.AppendElement(aContent); ++ } else if (mState == eXMLContentSinkState_InEpilog) { ++ NS_ASSERTION(mDocument, "Fragments have no epilog"); ++ if (mXSLTProcessor) { ++ mDocumentChildren.AppendElement(aContent); ++ } else { ++ mDocument->AppendChildTo(aContent, false); ++ } ++ } else { + nsCOMPtr parent = GetCurrentContent(); + + if (parent) { +@@ -875,6 +870,20 @@ nsXMLContentSink::SetDocElement(int32_t aNameSpaceID, + if (mDocElement) + return false; + ++ mDocElement = aContent; ++ ++ if (mXSLTProcessor) { ++ mDocumentChildren.AppendElement(aContent); ++ return true; ++ } ++ ++ if (!mDocumentChildren.IsEmpty()) { ++ for (nsIContent* child : mDocumentChildren) { ++ mDocument->AppendChildTo(child, false); ++ } ++ mDocumentChildren.Clear(); ++ } ++ + // check for root elements that needs special handling for + // prettyprinting + if ((aNameSpaceID == kNameSpaceID_XBL && +@@ -893,7 +902,6 @@ nsXMLContentSink::SetDocElement(int32_t aNameSpaceID, + } + } + +- mDocElement = aContent; + nsresult rv = mDocument->AppendChildTo(mDocElement, NotifyForDocElement()); + if (NS_FAILED(rv)) { + // If we return false here, the caller will bail out because it won't +@@ -1001,17 +1009,17 @@ nsXMLContentSink::HandleStartElement(const char16_t *aName, + mInMonolithicContainer++; + } + +- if (content != mDocElement && !mCurrentHead) { +- // This isn't the root and we're not inside an XHTML . +- // Might need to start layout +- MaybeStartLayout(false); +- } +- +- if (content == mDocElement) { +- NotifyDocElementCreated(mDocument); ++ if (!mXSLTProcessor) { ++ if (content == mDocElement) { ++ NotifyDocElementCreated(mDocument); + +- if (aInterruptable && NS_SUCCEEDED(result) && mParser && !mParser->IsParserEnabled()) { +- return NS_ERROR_HTMLPARSER_BLOCK; ++ if (aInterruptable && NS_SUCCEEDED(result) && mParser && !mParser->IsParserEnabled()) { ++ return NS_ERROR_HTMLPARSER_BLOCK; ++ } ++ } else if (!mCurrentHead) { ++ // This isn't the root and we're not inside an XHTML . ++ // Might need to start layout ++ MaybeStartLayout(false); + } + } + +@@ -1171,9 +1179,9 @@ nsXMLContentSink::HandleDoctypeDecl(const nsAString & aSubset, + nsCOMPtr content = do_QueryInterface(docType); + NS_ASSERTION(content, "doctype isn't content?"); + +- rv = mDocument->AppendChildTo(content, false); ++ mDocumentChildren.AppendElement(content); + DidAddContent(); +- return NS_SUCCEEDED(rv) ? DidProcessATokenImpl() : rv; ++ return DidProcessATokenImpl(); + } + + NS_IMETHODIMP +@@ -1321,6 +1329,7 @@ nsXMLContentSink::ReportError(const char16_t* aErrorText, + mIsDocumentObserver = false; + + // Clear the current content ++ mDocumentChildren.Clear(); + nsCOMPtr node(do_QueryInterface(mDocument)); + if (node) { + for (;;) { +diff --git dom/xml/nsXMLContentSink.h dom/xml/nsXMLContentSink.h +index a1a7fc8814e9..17ac940caa07 100644 +--- dom/xml/nsXMLContentSink.h ++++ dom/xml/nsXMLContentSink.h +@@ -139,7 +139,7 @@ protected: + + void DidAddContent() + { +- if (IsTimeToNotify()) { ++ if (!mXSLTProcessor && IsTimeToNotify()) { + FlushTags(); + } + } +@@ -190,6 +190,12 @@ protected: + + nsCOMPtr mXSLTProcessor; + ++ // Holds the children in the prolog until the root element is added, after which they're ++ // inserted in the document. However, if we're doing an XSLT transform this will ++ // actually hold all the children of the source document, until the transform is ++ // finished. After the transform is finished we'll just discard the children. ++ nsTArray> mDocumentChildren; ++ + static const int NS_ACCUMULATION_BUFFER_SIZE = 4096; + // Our currently accumulated text that we have not flushed to a textnode yet. + char16_t mText[NS_ACCUMULATION_BUFFER_SIZE]; +diff --git dom/xslt/base/txURIUtils.cpp dom/xslt/base/txURIUtils.cpp +index 2c0dec942b80..3f3556f80110 100644 +--- dom/xslt/base/txURIUtils.cpp ++++ dom/xslt/base/txURIUtils.cpp +@@ -43,16 +43,9 @@ void URIUtils::resolveHref(const nsAString& href, const nsAString& base, + + // static + void +-URIUtils::ResetWithSource(nsIDocument *aNewDoc, nsIDOMNode *aSourceNode) ++URIUtils::ResetWithSource(nsIDocument *aNewDoc, nsINode *aSourceNode) + { +- nsCOMPtr node = do_QueryInterface(aSourceNode); +- if (!node) { +- // XXXbz passing nullptr as the first arg to Reset is illegal +- aNewDoc->Reset(nullptr, nullptr); +- return; +- } +- +- nsCOMPtr sourceDoc = node->OwnerDoc(); ++ nsCOMPtr sourceDoc = aSourceNode->OwnerDoc(); + nsIPrincipal* sourcePrincipal = sourceDoc->NodePrincipal(); + + // Copy the channel and loadgroup from the source document. +diff --git dom/xslt/base/txURIUtils.h dom/xslt/base/txURIUtils.h +index ca38538a8b82..ad182a00a795 100644 +--- dom/xslt/base/txURIUtils.h ++++ dom/xslt/base/txURIUtils.h +@@ -9,7 +9,7 @@ + #include "txCore.h" + + class nsIDocument; +-class nsIDOMNode; ++class nsINode; + + /** + * A utility class for URI handling +@@ -22,7 +22,7 @@ public: + /** + * Reset the given document with the document of the source node + */ +- static void ResetWithSource(nsIDocument *aNewDoc, nsIDOMNode *aSourceNode); ++ static void ResetWithSource(nsIDocument *aNewDoc, nsINode *aSourceNode); + + /** + * Resolves the given href argument, using the given documentBase +diff --git dom/xslt/nsIDocumentTransformer.h dom/xslt/nsIDocumentTransformer.h +index a5df807ffe8c..34343e8e1a15 100644 +--- dom/xslt/nsIDocumentTransformer.h ++++ dom/xslt/nsIDocumentTransformer.h +@@ -7,10 +7,13 @@ + + #include "nsISupports.h" + ++template class nsCOMPtr; ++class nsIContent; + class nsIDocument; + class nsIDOMNode; + class nsIURI; + class nsString; ++template class nsTArray; + + #define NS_ITRANSFORMOBSERVER_IID \ + { 0x04b2d17c, 0xe98d, 0x45f5, \ +@@ -43,7 +46,8 @@ public: + + NS_IMETHOD SetTransformObserver(nsITransformObserver* aObserver) = 0; + NS_IMETHOD LoadStyleSheet(nsIURI* aUri, nsIDocument* aLoaderDocument) = 0; +- NS_IMETHOD SetSourceContentModel(nsIDOMNode* aSource) = 0; ++ NS_IMETHOD SetSourceContentModel(nsIDocument* aDocument, ++ const nsTArray>& aSource) = 0; + NS_IMETHOD CancelLoads() = 0; + + NS_IMETHOD AddXSLTParamNamespace(const nsString& aPrefix, +diff --git dom/xslt/xslt/txExecutionState.cpp dom/xslt/xslt/txExecutionState.cpp +index e1d714189ce7..2fc84971d2d3 100644 +--- dom/xslt/xslt/txExecutionState.cpp ++++ dom/xslt/xslt/txExecutionState.cpp +@@ -17,9 +17,9 @@ + const int32_t txExecutionState::kMaxRecursionDepth = 20000; + + nsresult +-txLoadedDocumentsHash::init(txXPathNode* aSourceDocument) ++txLoadedDocumentsHash::init(const txXPathNode& aSource) + { +- mSourceDocument = aSourceDocument; ++ mSourceDocument = txXPathNodeUtils::getOwnerDocument(aSource); + + nsAutoString baseURI; + nsresult rv = txXPathNodeUtils::getBaseURI(*mSourceDocument, baseURI); +@@ -27,7 +27,14 @@ txLoadedDocumentsHash::init(txXPathNode* aSourceDocument) + return rv; + } + +- PutEntry(baseURI)->mDocument = mSourceDocument; ++ // Technically the hash holds documents, but we allow any node that we're transforming ++ // from. In particular, the document() function uses this hash and it can return the ++ // source document, but if we're transforming from a document fragment (through ++ // txMozillaXSLTProcessor::SetSourceContentModel/txMozillaXSLTProcessor::DoTransform) ++ // or from another type of node (through txMozillaXSLTProcessor::TransformToDocument ++ // or txMozillaXSLTProcessor::TransformToFragment) it makes more sense to return the ++ // real root of the source tree, which is the node where the transform started. ++ PutEntry(baseURI)->mDocument = txXPathNativeNode::createXPathNode(txXPathNativeNode::getNode(aSource)); + return NS_OK; + } + +@@ -121,7 +128,7 @@ txExecutionState::init(const txXPathNode& aNode, + mOutputHandler->startDocument(); + + // Set up loaded-documents-hash +- rv = mLoadedDocuments.init(txXPathNodeUtils::getOwnerDocument(aNode)); ++ rv = mLoadedDocuments.init(aNode); + NS_ENSURE_SUCCESS(rv, rv); + + // Init members +diff --git dom/xslt/xslt/txExecutionState.h dom/xslt/xslt/txExecutionState.h +index 44f1918c86b0..300bcfed07e4 100644 +--- dom/xslt/xslt/txExecutionState.h ++++ dom/xslt/xslt/txExecutionState.h +@@ -56,16 +56,15 @@ class txLoadedDocumentsHash : public nsTHashtable + { + public: + txLoadedDocumentsHash() +- : nsTHashtable(4), +- mSourceDocument(nullptr) ++ : nsTHashtable(4) + { + } + ~txLoadedDocumentsHash(); +- MOZ_MUST_USE nsresult init(txXPathNode* aSourceDocument); ++ MOZ_MUST_USE nsresult init(const txXPathNode& aSource); + + private: + friend class txExecutionState; +- txXPathNode* mSourceDocument; ++ nsAutoPtr mSourceDocument; + }; + + +diff --git dom/xslt/xslt/txMozillaTextOutput.cpp dom/xslt/xslt/txMozillaTextOutput.cpp +index 9056bd8f2608..c2c6ba8757be 100644 +--- dom/xslt/xslt/txMozillaTextOutput.cpp ++++ dom/xslt/xslt/txMozillaTextOutput.cpp +@@ -153,7 +153,7 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument, + NS_ASSERTION(mDocument, "Need document"); + + // Reset and set up document +- URIUtils::ResetWithSource(mDocument, aSourceDocument); ++ URIUtils::ResetWithSource(mDocument, source); + // Only do this after resetting the document to ensure we have the + // correct principal. + mDocument->SetScriptHandlingObject(sgo); +diff --git dom/xslt/xslt/txMozillaXMLOutput.cpp dom/xslt/xslt/txMozillaXMLOutput.cpp +index 451f093682a4..5c254e22c0e9 100644 +--- dom/xslt/xslt/txMozillaXMLOutput.cpp ++++ dom/xslt/xslt/txMozillaXMLOutput.cpp +@@ -812,7 +812,7 @@ txMozillaXMLOutput::createResultDocument(const nsAString& aName, int32_t aNsID, + mNodeInfoManager = mDocument->NodeInfoManager(); + + // Reset and set up the document +- URIUtils::ResetWithSource(mDocument, aSourceDocument); ++ URIUtils::ResetWithSource(mDocument, source); + + // Make sure we set the script handling object after resetting with the + // source, so that we have the right principal. +diff --git dom/xslt/xslt/txMozillaXSLTProcessor.cpp dom/xslt/xslt/txMozillaXSLTProcessor.cpp +index bc554e54878e..54e7c2aed220 100644 +--- dom/xslt/xslt/txMozillaXSLTProcessor.cpp ++++ dom/xslt/xslt/txMozillaXSLTProcessor.cpp +@@ -377,15 +377,27 @@ txMozillaXSLTProcessor::SetTransformObserver(nsITransformObserver* aObserver) + } + + nsresult +-txMozillaXSLTProcessor::SetSourceContentModel(nsIDOMNode* aSourceDOM) ++txMozillaXSLTProcessor::SetSourceContentModel(nsIDocument* aDocument, ++ const nsTArray>& aSource) + { +- mSource = aSourceDOM; +- + if (NS_FAILED(mTransformResult)) { + notifyError(); + return NS_OK; + } + ++ mSource = aDocument->CreateDocumentFragment(); ++ ++ ErrorResult rv; ++ for (nsIContent* child : aSource) { ++ // XPath data model doesn't have DocumentType nodes. ++ if (child->NodeType() != nsIDOMNode::DOCUMENT_TYPE_NODE) { ++ mSource->AppendChild(*child, rv); ++ if (rv.Failed()) { ++ return rv.StealNSResult(); ++ } ++ } ++ } ++ + if (mStylesheet) { + return DoTransform(); + } +@@ -552,8 +564,7 @@ public: + + ~nsTransformBlockerEvent() + { +- nsCOMPtr document = +- do_QueryInterface(mProcessor->GetSourceContentModel()); ++ nsCOMPtr document = mProcessor->GetSourceContentModel()->OwnerDoc(); + document->UnblockOnload(true); + } + +@@ -572,13 +583,9 @@ txMozillaXSLTProcessor::DoTransform() + NS_ASSERTION(mObserver, "no observer"); + NS_ASSERTION(NS_IsMainThread(), "should only be on main thread"); + +- nsresult rv; +- nsCOMPtr document = do_QueryInterface(mSource, &rv); +- NS_ENSURE_SUCCESS(rv, rv); +- + nsCOMPtr event = new nsTransformBlockerEvent(this); +- document->BlockOnload(); +- rv = NS_DispatchToCurrentThread(event); ++ mSource->OwnerDoc()->BlockOnload(); ++ nsresult rv = NS_DispatchToCurrentThread(event); + if (NS_FAILED(rv)) { + // XXX Maybe we should just display the source document in this case? + // Also, set up context information, see bug 204655. +@@ -643,7 +650,7 @@ txMozillaXSLTProcessor::TransformToDocument(nsIDOMNode *aSource, + nsresult rv = ensureStylesheet(); + NS_ENSURE_SUCCESS(rv, rv); + +- mSource = aSource; ++ mSource = do_QueryInterface(aSource); + + return TransformToDoc(aResult, true); + } +@@ -657,11 +664,7 @@ txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument **aResult, + return NS_ERROR_OUT_OF_MEMORY; + } + +- nsCOMPtr sourceDOMDocument; +- mSource->GetOwnerDocument(getter_AddRefs(sourceDOMDocument)); +- if (!sourceDOMDocument) { +- sourceDOMDocument = do_QueryInterface(mSource); +- } ++ nsCOMPtr sourceDOMDocument = do_QueryInterface(mSource->OwnerDoc()); + + txExecutionState es(mStylesheet, IsLoadDisabled()); + +diff --git dom/xslt/xslt/txMozillaXSLTProcessor.h dom/xslt/xslt/txMozillaXSLTProcessor.h +index 569ca7adbf6e..b3c5420d6fee 100644 +--- dom/xslt/xslt/txMozillaXSLTProcessor.h ++++ dom/xslt/xslt/txMozillaXSLTProcessor.h +@@ -75,7 +75,8 @@ public: + // nsIDocumentTransformer interface + NS_IMETHOD SetTransformObserver(nsITransformObserver* aObserver) override; + NS_IMETHOD LoadStyleSheet(nsIURI* aUri, nsIDocument* aLoaderDocument) override; +- NS_IMETHOD SetSourceContentModel(nsIDOMNode* aSource) override; ++ NS_IMETHOD SetSourceContentModel(nsIDocument* aDocument, ++ const nsTArray>& aSource) override; + NS_IMETHOD CancelLoads() override {return NS_OK;} + NS_IMETHOD AddXSLTParamNamespace(const nsString& aPrefix, + const nsString& aNamespace) override; +@@ -136,7 +137,7 @@ public: + void reportError(nsresult aResult, const char16_t *aErrorText, + const char16_t *aSourceText); + +- nsIDOMNode *GetSourceContentModel() ++ nsINode *GetSourceContentModel() + { + return mSource; + } +@@ -169,7 +170,7 @@ private: + nsIDocument* mStylesheetDocument; // weak + nsCOMPtr mEmbeddedStylesheetRoot; + +- nsCOMPtr mSource; ++ nsCOMPtr mSource; + nsresult mTransformResult; + nsresult mCompileResult; + nsString mErrorText, mSourceText; Copied: branches/2018Q1/www/waterfox/files/patch-bug1395508 (from r458873, head/www/waterfox/files/patch-bug1395508) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1395508 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1395508) @@ -0,0 +1,35 @@ +commit e6d14191c530 +Author: Marco Bonardo +Date: Wed Nov 8 15:42:21 2017 +0100 + + Bug 1395508. r=dao, a=gchang + + MozReview-Commit-ID: 8jH9dyj5JZU + + --HG-- + extra : source : a14cc3bd9643311badcf1f8c00a58a493c2f5a2e +--- + browser/base/content/browser.js | 9 ++++++--- + .../content/test/urlbar/browser_urlbarCopying.js | 22 +++++++++++++++++++++- + 2 files changed, 27 insertions(+), 4 deletions(-) + +diff --git browser/base/content/browser.js browser/base/content/browser.js +index c4eb8b8c7e43..80c44f32dc38 100755 +--- browser/base/content/browser.js ++++ browser/base/content/browser.js +@@ -2763,9 +2763,12 @@ function losslessDecodeURI(aURI) { + // a sequence that survived decodeURI, i.e. one for: + // ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '#' + // (RFC 3987 section 3.2) +- // 2. Re-encode whitespace so that it doesn't get eaten away +- // by the location bar (bug 410726). +- .replace(/%(?!3B|2F|3F|3A|40|26|3D|2B|24|2C|23)|[\r\n\t]/ig, ++ // 2. Re-encode select whitespace so that it doesn't get eaten ++ // away by the location bar (bug 410726). Re-encode all ++ // adjacent whitespace, to prevent spoofing attempts where ++ // invisible characters would push part of the URL to ++ // overflow the location bar (bug 1395508). ++ .replace(/%(?!3B|2F|3F|3A|40|26|3D|2B|24|2C|23)|[\r\n\t]|\s(?=\s)|\s$/ig, + encodeURIComponent); + } catch (e) {} + } Copied: branches/2018Q1/www/waterfox/files/patch-bug1402715 (from r458873, head/www/waterfox/files/patch-bug1402715) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1402715 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1402715) @@ -0,0 +1,44 @@ +commit 6c7fb56e58c5 +Author: Mats Palmgren +Date: Wed Sep 27 14:12:01 2017 +0200 + + Bug 1402715 - Treat URL bar contents as raw text when copying. r=mak + + MozReview-Commit-ID: LuSvwRUVwAq +--- + browser/base/content/test/urlbar/browser_urlbarCopying.js | 5 +++++ + browser/base/content/urlbarBindings.xml | 5 ++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git browser/base/content/test/urlbar/browser_urlbarCopying.js browser/base/content/test/urlbar/browser_urlbarCopying.js +index 521dace780f2..9559b06b2ec6 100644 +--- browser/base/content/test/urlbar/browser_urlbarCopying.js ++++ browser/base/content/test/urlbar/browser_urlbarCopying.js +@@ -164,6 +164,11 @@ var tests = [ + copyVal: "\xf7", + copyExpected: "http://example.com/?\xf7" + }, ++ { ++ loadURL: "http://example.com/%20%20%20", ++ expectedURL: "example.com/ ", ++ copyExpected: "http://example.com/%20%20%20" ++ }, + + // data: and javsacript: URIs shouldn't be encoded + { +diff --git browser/base/content/urlbarBindings.xml browser/base/content/urlbarBindings.xml +index 8999ab379cb2..4a86ce38e893 100644 +--- browser/base/content/urlbarBindings.xml ++++ browser/base/content/urlbarBindings.xml +@@ -972,7 +972,10 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. + // Grab the actual input field's value, not our value, which could include moz-action: + var inputVal = this.inputField.value; + let selection = this.editor.selection; +- var selectedVal = selection.toString(); ++ const flags = Ci.nsIDocumentEncoder.OutputPreformatted | ++ Ci.nsIDocumentEncoder.OutputRaw; ++ let selectedVal = selection.QueryInterface(Ci.nsISelectionPrivate) ++ .toStringWithFormat("text/plain", flags, 0); + + // Handle multiple-range selection as a string for simplicity. + if (selection.rangeCount > 1) { Copied: branches/2018Q1/www/waterfox/files/patch-bug1408017 (from r458873, head/www/waterfox/files/patch-bug1408017) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1408017 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1408017) @@ -0,0 +1,40 @@ +commit 5738242a26f0 +Author: Andrew McCreight +Date: Thu Oct 26 16:47:27 2017 -0400 + + Bug 1408017 - Clear gStartupCacheWrapper in the dtor. r=froydnj +--- + startupcache/StartupCache.cpp | 6 ++++++ + startupcache/StartupCache.h | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git startupcache/StartupCache.cpp startupcache/StartupCache.cpp +index 895696d854eb..c84da5c16d41 100644 +--- startupcache/StartupCache.cpp ++++ startupcache/StartupCache.cpp +@@ -700,6 +700,12 @@ StartupCacheWrapper* StartupCacheWrapper::gStartupCach + + NS_IMPL_ISUPPORTS(StartupCacheWrapper, nsIStartupCache) + ++StartupCacheWrapper::~StartupCacheWrapper() ++{ ++ MOZ_ASSERT(gStartupCacheWrapper == this); ++ gStartupCacheWrapper = nullptr; ++} ++ + StartupCacheWrapper* StartupCacheWrapper::GetSingleton() + { + if (!gStartupCacheWrapper) +diff --git startupcache/StartupCache.h startupcache/StartupCache.h +index a7618415dd1f..f8994749aa5c 100644 +--- startupcache/StartupCache.h ++++ startupcache/StartupCache.h +@@ -209,7 +209,7 @@ class StartupCacheDebugOutputStream final + class StartupCacheWrapper final + : public nsIStartupCache + { +- ~StartupCacheWrapper() {} ++ ~StartupCacheWrapper(); + + NS_DECL_THREADSAFE_ISUPPORTS + NS_DECL_NSISTARTUPCACHE Copied: branches/2018Q1/www/waterfox/files/patch-bug1408631 (from r458873, head/www/waterfox/files/patch-bug1408631) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1408631 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1408631) @@ -0,0 +1,174 @@ +commit 48a63f5601f6 +Author: dimi +Date: Fri Oct 20 10:18:59 2017 +0800 + + Bug 1408631 - Release SafeBrowsing lookupcache in worker thread while shutdown. r=francois + + MozReview-Commit-ID: HuPUyIDFLPX + + --HG-- + extra : rebase_source : d6e4f5bbcf96c97541792e23447f0810150c5ac9 +--- + toolkit/components/url-classifier/Classifier.cpp | 13 +++++--- + .../url-classifier/nsUrlClassifierDBService.cpp | 37 ++++++++++++++++++++++ + .../url-classifier/nsUrlClassifierDBService.h | 5 +++ + .../url-classifier/nsUrlClassifierProxies.cpp | 10 ++++++ + .../url-classifier/nsUrlClassifierProxies.h | 1 + + 5 files changed, 62 insertions(+), 4 deletions(-) + +diff --git toolkit/components/url-classifier/Classifier.cpp toolkit/components/url-classifier/Classifier.cpp +index 404e31e2421e..9946469268fa 100644 +--- toolkit/components/url-classifier/Classifier.cpp ++++ toolkit/components/url-classifier/Classifier.cpp +@@ -267,6 +267,8 @@ Classifier::Open(nsIFile& aCacheDirectory) + void + Classifier::Close() + { ++ // Close will be called by PreShutdown, so it is important to note that ++ // things put here should not affect an ongoing update thread. + DropStores(); + } + +@@ -1428,10 +1430,8 @@ Classifier::UpdateCache(TableUpdate* aUpdate) + LookupCache * + Classifier::GetLookupCache(const nsACString& aTable, bool aForUpdate) + { +- if (aForUpdate) { +- MOZ_ASSERT(NS_GetCurrentThread() == mUpdateThread, +- "GetLookupCache(aForUpdate==true) can only be called on update thread."); +- } ++ // GetLookupCache(aForUpdate==true) can only be called on update thread. ++ MOZ_ASSERT_IF(aForUpdate, NS_GetCurrentThread() == mUpdateThread); + + nsTArray& lookupCaches = aForUpdate ? mNewLookupCaches + : mLookupCaches; +@@ -1444,6 +1444,11 @@ Classifier::GetLookupCache(const nsACString& aTable, bool aForUpdate) + } + } + ++ // We don't want to create lookupcache when shutdown is already happening. ++ if (nsUrlClassifierDBService::ShutdownHasStarted()) { ++ return nullptr; ++ } ++ + // TODO : Bug 1302600, It would be better if we have a more general non-main + // thread method to convert table name to protocol version. Currently + // we can only know this by checking if the table name ends with '-proto'. +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.cpp toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +index 78dbfaeaf046..e1a1be065aaf 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.cpp ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +@@ -817,6 +817,20 @@ nsUrlClassifierDBServiceWorker::CloseDb() + return NS_OK; + } + ++nsresult ++nsUrlClassifierDBServiceWorker::PreShutdown() ++{ ++ if (mClassifier) { ++ // Classifier close will release all lookup caches which may be a time-consuming job. ++ // See Bug 1408631. ++ mClassifier->Close(); ++ } ++ ++ // WARNING: nothing we put here should affect an ongoing update thread. When in doubt, ++ // put things in Shutdown() instead. ++ return NS_OK; ++} ++ + nsresult + nsUrlClassifierDBServiceWorker::CacheCompletions(CacheResultArray *results) + { +@@ -2427,6 +2441,13 @@ nsUrlClassifierDBService::Observe(nsISupports *aSubject, const char *aTopic, + } else if (!strcmp(aTopic, "quit-application")) { + // Tell the update thread to finish as soon as possible. + gShuttingDownThread = true; ++ ++ // The code in ::Shutdown() is run on a 'profile-before-change' event and ++ // ensures that objects are freed by blocking on this freeing. ++ // We can however speed up the shutdown time by using the worker thread to ++ // release, in an earlier event, any objects that cannot affect an ongoing ++ // update on the update thread. ++ PreShutdown(); + } else if (!strcmp(aTopic, "profile-before-change")) { + gShuttingDownThread = true; + Shutdown(); +@@ -2437,6 +2458,22 @@ nsUrlClassifierDBService::Observe(nsISupports *aSubject, const char *aTopic, + return NS_OK; + } + ++// Post a PreShutdown task to worker thread to release objects without blocking ++// main-thread. Notice that shutdown process may still be blocked by PreShutdown task ++// when ::Shutdown() is executed and synchronously waits for worker thread to finish ++// PreShutdown event. ++nsresult ++nsUrlClassifierDBService::PreShutdown() ++{ ++ MOZ_ASSERT(XRE_IsParentProcess()); ++ ++ if (mWorkerProxy) { ++ mWorkerProxy->PreShutdown(); ++ } ++ ++ return NS_OK; ++} ++ + // Join the background thread if it exists. + nsresult + nsUrlClassifierDBService::Shutdown() +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.h toolkit/components/url-classifier/nsUrlClassifierDBService.h +index a4c5952e91bb..9d9671d9d8fa 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.h ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.h +@@ -140,6 +140,9 @@ private: + nsIUrlClassifierCallback* c, + bool forceCheck, bool *didCheck); + ++ // Post an event to worker thread to release objects when receive 'quit-application' ++ nsresult PreShutdown(); ++ + // Close db connection and join the background thread if it exists. + nsresult Shutdown(); + +@@ -220,6 +223,8 @@ public: + // Provide a way to forcibly close the db connection. + nsresult GCC_MANGLING_WORKAROUND CloseDb(); + ++ nsresult GCC_MANGLING_WORKAROUND PreShutdown(); ++ + nsresult CacheCompletions(CacheResultArray * aEntries); + + // Used to probe the state of the worker thread. When the update begins, +diff --git toolkit/components/url-classifier/nsUrlClassifierProxies.cpp toolkit/components/url-classifier/nsUrlClassifierProxies.cpp +index 1af4f9266aeb..38e294df7320 100644 +--- toolkit/components/url-classifier/nsUrlClassifierProxies.cpp ++++ toolkit/components/url-classifier/nsUrlClassifierProxies.cpp +@@ -214,6 +214,16 @@ UrlClassifierDBServiceWorkerProxy::CloseDb() + return DispatchToWorkerThread(r); + } + ++nsresult ++UrlClassifierDBServiceWorkerProxy::PreShutdown() ++{ ++ nsCOMPtr r = ++ NewRunnableMethod("nsUrlClassifierDBServiceWorker::PreShutdown", ++ mTarget, ++ &nsUrlClassifierDBServiceWorker::PreShutdown); ++ return DispatchToWorkerThread(r); ++} ++ + nsresult + UrlClassifierDBServiceWorkerProxy::CacheCompletions(CacheResultArray * aEntries) + { +diff --git toolkit/components/url-classifier/nsUrlClassifierProxies.h toolkit/components/url-classifier/nsUrlClassifierProxies.h +index f8cf5229e1ca..39cf47f837a2 100644 +--- toolkit/components/url-classifier/nsUrlClassifierProxies.h ++++ toolkit/components/url-classifier/nsUrlClassifierProxies.h +@@ -229,6 +229,7 @@ public: + + nsresult OpenDb(); + nsresult CloseDb(); ++ nsresult PreShutdown(); + + nsresult CacheCompletions(mozilla::safebrowsing::CacheResultArray * aEntries); + Copied: branches/2018Q1/www/waterfox/files/patch-bug1409449 (from r458873, head/www/waterfox/files/patch-bug1409449) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1409449 Fri Jan 12 21:37:15 2018 (r458874, copy of r458873, head/www/waterfox/files/patch-bug1409449) @@ -0,0 +1,161 @@ +commit 0f648a99db03 +Author: Dragana Damjanovic +Date: Mon Jan 8 16:57:48 2018 +0200 + + Bug 1409449 - Do not show auth-dialog for triggeringPrincipal==SystemPrincipal. r=ckerschb r=valentin r=francois a=gchang + + --HG-- + extra : amend_source : ca9c12183a4c25d451bb6ec2cc4b6ed25327d1ff +--- + modules/libpref/init/all.js | 5 ++++ + .../protocol/http/nsHttpChannelAuthProvider.cpp | 35 +++++++++++++++++----- + netwerk/protocol/http/nsHttpChannelAuthProvider.h | 1 + + toolkit/components/telemetry/Histograms.json | 8 ++--- + 4 files changed, 38 insertions(+), 11 deletions(-) + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index c06f1d869c0f..a1e8e7054e4d 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -2229,6 +2229,11 @@ pref("network.auth.subresource-http-auth-allow", 2); + // have any effect. + pref("network.auth.subresource-img-cross-origin-http-auth-allow", true); + ++// Resources that are triggered by some non-web-content: ++// true - they are allow to present http auth. dialog ++// false - they are not allow to present http auth. dialog. ++pref("network.auth.non-web-content-triggered-resources-http-auth-allow", false); ++ + // This preference controls whether to allow sending default credentials (SSO) to + // NTLM/Negotiate servers allowed in the "trusted uri" list when navigating them + // in a Private Browsing window. +diff --git netwerk/protocol/http/nsHttpChannelAuthProvider.cpp netwerk/protocol/http/nsHttpChannelAuthProvider.cpp +index 92abed30355a..c70eb9455adb 100644 +--- netwerk/protocol/http/nsHttpChannelAuthProvider.cpp ++++ netwerk/protocol/http/nsHttpChannelAuthProvider.cpp +@@ -42,6 +42,7 @@ namespace net { + #define HTTP_AUTH_DIALOG_TOP_LEVEL_DOC 29 + #define HTTP_AUTH_DIALOG_SAME_ORIGIN_SUBRESOURCE 30 + #define HTTP_AUTH_DIALOG_SAME_ORIGIN_XHR 31 ++#define HTTP_AUTH_DIALOG_NON_WEB_CONTENT 32 + + #define HTTP_AUTH_BASIC_INSECURE 0 + #define HTTP_AUTH_BASIC_SECURE 1 +@@ -95,6 +96,7 @@ uint32_t nsHttpChannelAuthProvider::sAuthAllowPref = + SUBRESOURCE_AUTH_DIALOG_ALLOW_ALL; + + bool nsHttpChannelAuthProvider::sImgCrossOriginAuthAllowPref = true; ++bool nsHttpChannelAuthProvider::sNonWebContentTriggeredAuthAllow = false; + + void + nsHttpChannelAuthProvider::InitializePrefs() +@@ -106,6 +108,9 @@ nsHttpChannelAuthProvider::InitializePrefs() + mozilla::Preferences::AddBoolVarCache(&sImgCrossOriginAuthAllowPref, + "network.auth.subresource-img-cross-origin-http-auth-allow", + true); ++ mozilla::Preferences::AddBoolVarCache(&sNonWebContentTriggeredAuthAllow, ++ "network.auth.non-web-content-triggered-resources-http-auth-allow", ++ false); + } + + NS_IMETHODIMP +@@ -912,8 +917,10 @@ nsHttpChannelAuthProvider::GetCredentialsForChallenge(const char *challenge, + // BlockPrompt will set mCrossOrigin parameter as well. + if (BlockPrompt()) { + LOG(("nsHttpChannelAuthProvider::GetCredentialsForChallenge: " +- "Prompt is blocked [this=%p pref=%d img-pref=%d]\n", +- this, sAuthAllowPref, sImgCrossOriginAuthAllowPref)); ++ "Prompt is blocked [this=%p pref=%d img-pref=%d " ++ "non-web-content-triggered-pref=%d]\n", ++ this, sAuthAllowPref, sImgCrossOriginAuthAllowPref, ++ sNonWebContentTriggeredAuthAllow)); + return NS_ERROR_ABORT; + } + +@@ -983,8 +990,15 @@ nsHttpChannelAuthProvider::BlockPrompt() + // We will treat loads w/o loadInfo as a top level document. + bool topDoc = true; + bool xhr = false; ++ bool nonWebContent = false; + + if (loadInfo) { ++ nsCOMPtr triggeringPrinc = ++ loadInfo->TriggeringPrincipal(); ++ if (nsContentUtils::IsSystemPrincipal(triggeringPrinc)) { ++ nonWebContent = true; ++ } ++ + if (loadInfo->GetExternalContentPolicyType() != + nsIContentPolicy::TYPE_DOCUMENT) { + topDoc = false; +@@ -1013,23 +1027,30 @@ nsHttpChannelAuthProvider::BlockPrompt() + } + + if (gHttpHandler->IsTelemetryEnabled()) { +- if (topDoc) { +- Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_2, ++ if (nonWebContent) { ++ Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, ++ HTTP_AUTH_DIALOG_NON_WEB_CONTENT); ++ } else if (topDoc) { ++ Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, + HTTP_AUTH_DIALOG_TOP_LEVEL_DOC); + } else if (!mCrossOrigin) { + if (xhr) { +- Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_2, ++ Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, + HTTP_AUTH_DIALOG_SAME_ORIGIN_XHR); + } else { +- Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_2, ++ Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sat Jan 13 00:55:05 2018 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 B4627E62EB6; Sat, 13 Jan 2018 00:55:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F67A68F7D; Sat, 13 Jan 2018 00:55:05 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA5063873; Sat, 13 Jan 2018 00:55:04 +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 w0D0t4kw037254; Sat, 13 Jan 2018 00:55:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0D0t4oH037252; Sat, 13 Jan 2018 00:55:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801130055.w0D0t4oH037252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 13 Jan 2018 00:55:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458885 - branches/2018Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/citra X-SVN-Commit-Revision: 458885 X-SVN-Commit-Repository: ports 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.25 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, 13 Jan 2018 00:55:05 -0000 Author: jbeich Date: Sat Jan 13 00:55:04 2018 New Revision: 458885 URL: https://svnweb.freebsd.org/changeset/ports/458885 Log: MFH: r458883 emulators/citra: update to s20180111 Changes: https://github.com/citra-emu/citra/compare/2e418106...9b647d45 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q1/emulators/citra/Makefile branches/2018Q1/emulators/citra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/citra/Makefile ============================================================================== --- branches/2018Q1/emulators/citra/Makefile Sat Jan 13 00:52:36 2018 (r458884) +++ branches/2018Q1/emulators/citra/Makefile Sat Jan 13 00:55:04 2018 (r458885) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180110 +PORTVERSION= s20180111 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 2e418106 +GH_TAGNAME= 9b647d45 GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:4110494:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Sat Jan 13 00:52:36 2018 (r458884) +++ branches/2018Q1/emulators/citra/distinfo Sat Jan 13 00:55:04 2018 (r458885) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515604611 -SHA256 (citra-emu-citra-s20180110-2e418106_GH0.tar.gz) = 4a608d2f49e372ef3cbd42ada907fcded61b4903d8ecab9322076780b76a91d5 -SIZE (citra-emu-citra-s20180110-2e418106_GH0.tar.gz) = 1650781 +TIMESTAMP = 1515693826 +SHA256 (citra-emu-citra-s20180111-9b647d45_GH0.tar.gz) = 6dc48767ff251f983e0877095f37bfddcba350b19ac5a74bee3ff69b460ad1c6 +SIZE (citra-emu-citra-s20180111-9b647d45_GH0.tar.gz) = 1651806 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-4110494_GH0.tar.gz) = 97703cefc1bc325634b2b2c9abdbaffd6e2d1caaa751f8e38c74ee882af85cbe From owner-svn-ports-branches@freebsd.org Sat Jan 13 00:57:11 2018 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 87594E63075; Sat, 13 Jan 2018 00:57:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6376569099; Sat, 13 Jan 2018 00:57:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B32993874; Sat, 13 Jan 2018 00:57:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0D0vA7D037466; Sat, 13 Jan 2018 00:57:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0D0vAFC037464; Sat, 13 Jan 2018 00:57:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801130057.w0D0vAFC037464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 13 Jan 2018 00:57:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458886 - branches/2018Q1/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/rpcs3 X-SVN-Commit-Revision: 458886 X-SVN-Commit-Repository: ports 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.25 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, 13 Jan 2018 00:57:11 -0000 Author: jbeich Date: Sat Jan 13 00:57:10 2018 New Revision: 458886 URL: https://svnweb.freebsd.org/changeset/ports/458886 Log: MFH: r458884 emulators/rpcs3: update to 0.0.4.234 Changes: https://github.com/RPCS3/rpcs3/compare/51a2b43d8...c951601fa Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Sat Jan 13 00:55:04 2018 (r458885) +++ branches/2018Q1/emulators/rpcs3/Makefile Sat Jan 13 00:57:10 2018 (r458886) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-230 -DISTVERSIONSUFFIX= -g51a2b43d8 +DISTVERSION= 0.0.4-234 +DISTVERSIONSUFFIX= -gc951601fa CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Sat Jan 13 00:55:04 2018 (r458885) +++ branches/2018Q1/emulators/rpcs3/distinfo Sat Jan 13 00:57:10 2018 (r458886) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515539822 -SHA256 (RPCS3-rpcs3-v0.0.4-230-g51a2b43d8_GH0.tar.gz) = ce53bab234d9e948e735e572e10920d50b9973250776bbc4c93704d4c3735cad -SIZE (RPCS3-rpcs3-v0.0.4-230-g51a2b43d8_GH0.tar.gz) = 3616316 +TIMESTAMP = 1515803788 +SHA256 (RPCS3-rpcs3-v0.0.4-234-gc951601fa_GH0.tar.gz) = 52ac3653384c7a93253b2688b4cdc7516a3746d7953572712cc2ecacffda0136 +SIZE (RPCS3-rpcs3-v0.0.4-234-gc951601fa_GH0.tar.gz) = 3618290 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 From owner-svn-ports-branches@freebsd.org Sat Jan 13 07:47:12 2018 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 679D5E7AA58; Sat, 13 Jan 2018 07:47:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4221F78A5B; Sat, 13 Jan 2018 07:47:12 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F19D7FF8; Sat, 13 Jan 2018 07:47:11 +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 w0D7lBtA008698; Sat, 13 Jan 2018 07:47:11 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0D7lB5L008697; Sat, 13 Jan 2018 07:47:11 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801130747.w0D7lB5L008697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 13 Jan 2018 07:47:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458893 - branches/2018Q1/textproc/rubygem-liquid-tag-parser X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q1/textproc/rubygem-liquid-tag-parser X-SVN-Commit-Revision: 458893 X-SVN-Commit-Repository: ports 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.25 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, 13 Jan 2018 07:47:12 -0000 Author: sunpoet Date: Sat Jan 13 07:47:11 2018 New Revision: 458893 URL: https://svnweb.freebsd.org/changeset/ports/458893 Log: MFH: r457878 r457976 Fix build on Ruby prior to 2.5 Ruby 2.5 bundled RDoc 6.0.1. Due to unknown RDoc issue, RDoc prior to 6.0.0.beta1+ failed to parse the regex in lib/liquid/tag/parser.rb. Upstream also set "has_rdoc = false" in gemspec. Use OPTIONS_EXCLUDE=DOCS instead of NOPORTDOCS Suggested by: mat Approved by: ports-secteam (blanket) Modified: branches/2018Q1/textproc/rubygem-liquid-tag-parser/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/textproc/rubygem-liquid-tag-parser/Makefile ============================================================================== --- branches/2018Q1/textproc/rubygem-liquid-tag-parser/Makefile Sat Jan 13 07:18:01 2018 (r458892) +++ branches/2018Q1/textproc/rubygem-liquid-tag-parser/Makefile Sat Jan 13 07:47:11 2018 (r458893) @@ -18,4 +18,7 @@ NO_ARCH= yes USE_RUBY= yes USES= gem +# Disable rdoc +OPTIONS_EXCLUDE=DOCS + .include