From owner-svn-ports-branches@freebsd.org Sun Jan 14 22:06:21 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 4F86CEBA7C1; Sun, 14 Jan 2018 22:06:21 +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 28F6E6F763; Sun, 14 Jan 2018 22:06:21 +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 5B324278E6; Sun, 14 Jan 2018 22:06:20 +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 w0EM6KDm075483; Sun, 14 Jan 2018 22:06:20 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0EM6Kpf075482; Sun, 14 Jan 2018 22:06:20 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201801142206.w0EM6Kpf075482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 14 Jan 2018 22:06:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459006 - branches/2018Q1/devel/m4 X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q1/devel/m4 X-SVN-Commit-Revision: 459006 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, 14 Jan 2018 22:06:21 -0000 Author: antoine Date: Sun Jan 14 22:06:20 2018 New Revision: 459006 URL: https://svnweb.freebsd.org/changeset/ports/459006 Log: MFH: r459001 Skip ENOMEM check for printf when building with qemu, this makes configure hang PR: 224740 Reported by: pkg-fallout With hat: portmgr Modified: branches/2018Q1/devel/m4/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/m4/Makefile ============================================================================== --- branches/2018Q1/devel/m4/Makefile Sun Jan 14 21:53:59 2018 (r459005) +++ branches/2018Q1/devel/m4/Makefile Sun Jan 14 22:06:20 2018 (r459006) @@ -18,6 +18,10 @@ LIBSIGSEGV_DESC=Use alternative page fault handler (GN CONFIGURE_ARGS= --program-prefix=g CONFIGURE_ENV= MAKEINFO="${MAKEINFO} --no-split" +.ifdef QEMU_EMULATING +# XXX bug 224740: configure hangs +CONFIGURE_ENV+= gl_cv_func_printf_enomem=no +.endif GNU_CONFIGURE= yes USES= makeinfo tar:xz From owner-svn-ports-branches@freebsd.org Mon Jan 15 08:18:51 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 56A67EB8081; Mon, 15 Jan 2018 08:18:51 +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 315372289; Mon, 15 Jan 2018 08:18:51 +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 6034D645F; Mon, 15 Jan 2018 08:18:50 +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 w0F8IoRc030015; Mon, 15 Jan 2018 08:18:50 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0F8IoWh030014; Mon, 15 Jan 2018 08:18:50 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201801150818.w0F8IoWh030014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 15 Jan 2018 08:18:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459022 - branches/2018Q1/devel/bison X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q1/devel/bison X-SVN-Commit-Revision: 459022 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, 15 Jan 2018 08:18:51 -0000 Author: antoine Date: Mon Jan 15 08:18:49 2018 New Revision: 459022 URL: https://svnweb.freebsd.org/changeset/ports/459022 Log: MFH: r459020 Skip ENOMEM check for printf when building with qemu, this makes configure hang PR: 224740 Reported by: pkg-fallout With hat: portmgr Modified: branches/2018Q1/devel/bison/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/bison/Makefile ============================================================================== --- branches/2018Q1/devel/bison/Makefile Mon Jan 15 07:40:42 2018 (r459021) +++ branches/2018Q1/devel/bison/Makefile Mon Jan 15 08:18:49 2018 (r459022) @@ -20,6 +20,10 @@ OPTIONS_DEFINE= DOCS EXAMPLES NLS OPTIONS_SUB= yes CONFIGURE_ARGS= --disable-yacc +.ifdef QEMU_EMULATING +# XXX bug 224740: configure hangs +CONFIGURE_ENV= gl_cv_func_printf_enomem=no +.endif GNU_CONFIGURE= yes TEST_TARGET= check USE_PERL5= build From owner-svn-ports-branches@freebsd.org Mon Jan 15 09:20: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 73255E64BB1; Mon, 15 Jan 2018 09:20:16 +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 4CA85681FC; Mon, 15 Jan 2018 09:20:16 +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 7E0BC6F29; Mon, 15 Jan 2018 09:20:15 +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 w0F9KFc9055257; Mon, 15 Jan 2018 09:20:15 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0F9KFp8055255; Mon, 15 Jan 2018 09:20:15 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201801150920.w0F9KFp8055255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Mon, 15 Jan 2018 09:20:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459025 - in branches/2018Q1/net-mgmt/aircrack-ng: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: lme X-SVN-Commit-Paths: in branches/2018Q1/net-mgmt/aircrack-ng: . files X-SVN-Commit-Revision: 459025 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, 15 Jan 2018 09:20:16 -0000 Author: lme Date: Mon Jan 15 09:20:15 2018 New Revision: 459025 URL: https://svnweb.freebsd.org/changeset/ports/459025 Log: MFH: r458808 net-mgmt/aircrack-ng: - Include pcap.h using a relative path. Some environments failed to find it. - Bump PORTREVISION This most probably also fixes 190725 PR: 225050 Submitted by: Walter Schwarzenfeld Approved by: portmgr (swills) Added: branches/2018Q1/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c - copied unchanged from r458808, head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c Modified: branches/2018Q1/net-mgmt/aircrack-ng/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/aircrack-ng/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/aircrack-ng/Makefile Mon Jan 15 09:18:52 2018 (r459024) +++ branches/2018Q1/net-mgmt/aircrack-ng/Makefile Mon Jan 15 09:20:15 2018 (r459025) @@ -3,6 +3,7 @@ PORTNAME= aircrack-ng DISTVERSION= 1.2-rc4 +PORTREVISION= 1 CATEGORIES= net-mgmt security MASTER_SITES= http://download.aircrack-ng.org/ Copied: branches/2018Q1/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c (from r458808, head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c Mon Jan 15 09:20:15 2018 (r459025, copy of r458808, head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c) @@ -0,0 +1,11 @@ +--- src/osdep/file.c.orig 2018-01-11 15:45:35 UTC ++++ src/osdep/file.c +@@ -33,7 +33,7 @@ + #include + + #include "osdep.h" +-#include "pcap.h" ++#include "../pcap.h" + #include "radiotap/radiotap_iter.h" + + struct priv_file { From owner-svn-ports-branches@freebsd.org Mon Jan 15 14:13: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 405F9E7F78C; Mon, 15 Jan 2018 14:13:17 +0000 (UTC) (envelope-from cy@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 1C57C76D23; Mon, 15 Jan 2018 14:13:17 +0000 (UTC) (envelope-from cy@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 5D5D81224D; Mon, 15 Jan 2018 14:13:16 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FEDGti082118; Mon, 15 Jan 2018 14:13:16 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FEDG5X082117; Mon, 15 Jan 2018 14:13:16 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201801151413.w0FEDG5X082117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 15 Jan 2018 14:13:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459045 - branches/2018Q1/graphics/xpdf4 X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: branches/2018Q1/graphics/xpdf4 X-SVN-Commit-Revision: 459045 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, 15 Jan 2018 14:13:17 -0000 Author: cy Date: Mon Jan 15 14:13:15 2018 New Revision: 459045 URL: https://svnweb.freebsd.org/changeset/ports/459045 Log: MFH: r459017 Some users have reported broken buttons. Make broken buttons work. Submitted by: John Hay Approved by: portmgr (swills) Modified: branches/2018Q1/graphics/xpdf4/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/graphics/xpdf4/Makefile ============================================================================== --- branches/2018Q1/graphics/xpdf4/Makefile Mon Jan 15 14:06:46 2018 (r459044) +++ branches/2018Q1/graphics/xpdf4/Makefile Mon Jan 15 14:13:15 2018 (r459045) @@ -2,7 +2,7 @@ PORTNAME= xpdf PORTVERSION= 4.02 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= http://www.xpdfreader.com/dl/ .if !defined(MASTERDIR) @@ -45,7 +45,7 @@ GUI_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE GUI_DESC= QT5 interface GUI_CMAKE_ARGS+= -DNO_TEXT_SELECT:BOOL=OFF -GUI_USE= QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport +GUI_USE= QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF From owner-svn-ports-branches@freebsd.org Mon Jan 15 15:02:03 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 08FE1EB28EE; Mon, 15 Jan 2018 15:02:02 +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 645147A29E; Mon, 15 Jan 2018 15:02:02 +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 8733112AF7; Mon, 15 Jan 2018 15:02:01 +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 w0FF21JB003513; Mon, 15 Jan 2018 15:02:01 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FF21rW003511; Mon, 15 Jan 2018 15:02:01 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201801151502.w0FF21rW003511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Jan 2018 15:02:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459060 - in branches/2018Q1/net/unison: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2018Q1/net/unison: . files X-SVN-Commit-Revision: 459060 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, 15 Jan 2018 15:02:03 -0000 Author: madpilot Date: Mon Jan 15 15:02:01 2018 New Revision: 459060 URL: https://svnweb.freebsd.org/changeset/ports/459060 Log: MFH: r458159 Import upstream patch to fix crash in certain situations. Obtained from: https://github.com/bcpierce00/unison/commit/ed12af1f890623b4aff8b08316ca473a00ebf45e#diff-b4c630fa7a766bd2e17a1838276ea339 Approved by: ports-secteam (swills) Added: branches/2018Q1/net/unison/files/patch-copy.ml - copied unchanged from r458159, head/net/unison/files/patch-copy.ml Modified: branches/2018Q1/net/unison/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/unison/Makefile ============================================================================== --- branches/2018Q1/net/unison/Makefile Mon Jan 15 14:57:33 2018 (r459059) +++ branches/2018Q1/net/unison/Makefile Mon Jan 15 15:02:01 2018 (r459060) @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.48.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} Copied: branches/2018Q1/net/unison/files/patch-copy.ml (from r458159, head/net/unison/files/patch-copy.ml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net/unison/files/patch-copy.ml Mon Jan 15 15:02:01 2018 (r459060, copy of r458159, head/net/unison/files/patch-copy.ml) @@ -0,0 +1,20 @@ +diff --git a/src/copy.ml b/src/copy.ml +index b9e10f6..19c2370 100644 +--- copy.ml ++++ copy.ml +@@ -1004,7 +1004,14 @@ let recursively fspathFrom pathFrom fspathTo pathTo = + let ch = Os.childrenOf fspathFrom pFrom in + Safelist.iter + (fun n -> copy (Path.child pFrom n) (Path.child pTo n)) ch +- | `ABSENT -> assert false in ++ | `ABSENT -> ++ (* BCP 4/16: Was "assert false", but this causes unison to ++ crash when (1) the copyonconflict preference is used, (2) ++ there is a conflict between a deletion and a change, and ++ (3) the change is propagated on top of the deletion. Seems ++ better to silently ignore the copy request. *) ++ () ++ in + debug (fun () -> Util.msg " Copying recursively %s / %s\n" + (Fspath.toDebugString fspathFrom) (Path.toString pathFrom)); + copy pathFrom pathTo; From owner-svn-ports-branches@freebsd.org Mon Jan 15 16:48:41 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 90BA3EB9B90; Mon, 15 Jan 2018 16:48:41 +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 685C48044B; Mon, 15 Jan 2018 16:48:41 +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 E7CE313C33; Mon, 15 Jan 2018 16:48:39 +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 w0FGmda1048834; Mon, 15 Jan 2018 16:48:39 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FGmdcZ048830; Mon, 15 Jan 2018 16:48:39 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201801151648.w0FGmdcZ048830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 15 Jan 2018 16:48:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459079 - in branches/2018Q1: archivers/php71-phar lang/php71 www/php71-opcache www/php71-opcache/files X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in branches/2018Q1: archivers/php71-phar lang/php71 www/php71-opcache www/php71-opcache/files X-SVN-Commit-Revision: 459079 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, 15 Jan 2018 16:48:41 -0000 Author: tz Date: Mon Jan 15 16:48:39 2018 New Revision: 459079 URL: https://svnweb.freebsd.org/changeset/ports/459079 Log: MFH: r458658 Update PHP 7.1 from 7.1.12 to 7.1.13 Changelog: http://www.php.net/ChangeLog-7.php#7.1.13 PR: 224955 Approved by: ports-secteam (swills) Deleted: branches/2018Q1/www/php71-opcache/files/patch-Optimizer_zend__inference.c Modified: branches/2018Q1/archivers/php71-phar/Makefile branches/2018Q1/lang/php71/Makefile branches/2018Q1/lang/php71/distinfo branches/2018Q1/www/php71-opcache/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/archivers/php71-phar/Makefile ============================================================================== --- branches/2018Q1/archivers/php71-phar/Makefile Mon Jan 15 16:34:36 2018 (r459078) +++ branches/2018Q1/archivers/php71-phar/Makefile Mon Jan 15 16:48:39 2018 (r459079) @@ -2,7 +2,6 @@ CATEGORIES= archivers -PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -phar Modified: branches/2018Q1/lang/php71/Makefile ============================================================================== --- branches/2018Q1/lang/php71/Makefile Mon Jan 15 16:34:36 2018 (r459078) +++ branches/2018Q1/lang/php71/Makefile Mon Jan 15 16:48:39 2018 (r459079) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= php71 -PORTVERSION= 7.1.12 -PORTREVISION?= 2 +PORTVERSION= 7.1.13 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Modified: branches/2018Q1/lang/php71/distinfo ============================================================================== --- branches/2018Q1/lang/php71/distinfo Mon Jan 15 16:34:36 2018 (r459078) +++ branches/2018Q1/lang/php71/distinfo Mon Jan 15 16:48:39 2018 (r459079) @@ -1,5 +1,5 @@ -TIMESTAMP = 1511442089 -SHA256 (php-7.1.12.tar.xz) = a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3 -SIZE (php-7.1.12.tar.xz) = 12194772 +TIMESTAMP = 1515408503 +SHA256 (php-7.1.13.tar.xz) = 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10 +SIZE (php-7.1.13.tar.xz) = 12194780 SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7 SIZE (php-7.1.x-mail-header.patch) = 4504 Modified: branches/2018Q1/www/php71-opcache/Makefile ============================================================================== --- branches/2018Q1/www/php71-opcache/Makefile Mon Jan 15 16:34:36 2018 (r459078) +++ branches/2018Q1/www/php71-opcache/Makefile Mon Jan 15 16:48:39 2018 (r459079) @@ -4,7 +4,6 @@ CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php71 -PORTREVISION= 2 PKGNAMESUFFIX= -opcache USES= php:zend From owner-svn-ports-branches@freebsd.org Mon Jan 15 16:50:31 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 CFEF9EB9DB0; Mon, 15 Jan 2018 16:50:31 +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 AABD28060A; Mon, 15 Jan 2018 16:50:31 +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 E85EA13C45; Mon, 15 Jan 2018 16:50:30 +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 w0FGoUaR049239; Mon, 15 Jan 2018 16:50:30 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FGoUqH049237; Mon, 15 Jan 2018 16:50:30 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201801151650.w0FGoUqH049237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 15 Jan 2018 16:50:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459081 - branches/2018Q1/lang/php70 X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: branches/2018Q1/lang/php70 X-SVN-Commit-Revision: 459081 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, 15 Jan 2018 16:50:31 -0000 Author: tz Date: Mon Jan 15 16:50:30 2018 New Revision: 459081 URL: https://svnweb.freebsd.org/changeset/ports/459081 Log: MFH: r458655 lang/php70: Update from 7.0.26 to 7.0.27 Changelog: http://www.php.net/ChangeLog-7.php#7.0.27 Approved by: ports-secteam (swills) Modified: branches/2018Q1/lang/php70/Makefile branches/2018Q1/lang/php70/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/lang/php70/Makefile ============================================================================== --- branches/2018Q1/lang/php70/Makefile Mon Jan 15 16:50:28 2018 (r459080) +++ branches/2018Q1/lang/php70/Makefile Mon Jan 15 16:50:30 2018 (r459081) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.26 -PORTREVISION?= 2 +PORTVERSION= 7.0.27 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Modified: branches/2018Q1/lang/php70/distinfo ============================================================================== --- branches/2018Q1/lang/php70/distinfo Mon Jan 15 16:50:28 2018 (r459080) +++ branches/2018Q1/lang/php70/distinfo Mon Jan 15 16:50:30 2018 (r459081) @@ -1,5 +1,5 @@ -TIMESTAMP = 1511442099 -SHA256 (php-7.0.26.tar.xz) = ed5cbb4bbb0ddef8985f100bba2e94002ad22a230b5da2dccfe148915df5f199 -SIZE (php-7.0.26.tar.xz) = 11966888 +TIMESTAMP = 1515408469 +SHA256 (php-7.0.27.tar.xz) = 4b2bc823e806dbf7b62fe0b92b0d14b0c6e03f88c3fc5d96278416c54ce11f6c +SIZE (php-7.0.27.tar.xz) = 11916824 SHA256 (php-7.0.x-mail-header.patch) = b78cd5a36a4709ea4e43e5babe73648ae6ace870cc0e34a5417177045834b4f0 SIZE (php-7.0.x-mail-header.patch) = 4504 From owner-svn-ports-branches@freebsd.org Mon Jan 15 17:28: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 13E1DEBCE6C; Mon, 15 Jan 2018 17:28:43 +0000 (UTC) (envelope-from swills@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 DF15183E16; Mon, 15 Jan 2018 17:28:42 +0000 (UTC) (envelope-from swills@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 25725142FD; Mon, 15 Jan 2018 17:28:42 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FHSgva068704; Mon, 15 Jan 2018 17:28:42 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FHSfFJ068698; Mon, 15 Jan 2018 17:28:41 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801151728.w0FHSfFJ068698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 15 Jan 2018 17:28:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459102 - in branches/2018Q1/sysutils/devcpu-data: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1/sysutils/devcpu-data: . files X-SVN-Commit-Revision: 459102 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, 15 Jan 2018 17:28:43 -0000 Author: swills Date: Mon Jan 15 17:28:41 2018 New Revision: 459102 URL: https://svnweb.freebsd.org/changeset/ports/459102 Log: sync up with HEAD MFH: r458664 r458792 r458943 r458987 r459084 sysutils/devcpu-data follow up commit to 20180108 Intel microcode update. Run cpucontrol -e after microcode update to refresh cpu flags. If running on an older system without -e, fail silently. Log any upgrade output via logger to /var/log/messages. Add an instructional pkg-message for users. Intel Release Notes: Intel Processor Microcode Package for Linux 20180108 Release -- Updates upon 20171117 release -- IVT C0 (06-3e-04:ed) 428->42a SKL-U/Y D0 (06-4e-03:c0) ba->c2 BDW-U/Y E/F (06-3d-04:c0) 25->28 HSW-ULT Cx/Dx (06-45-01:72) 20->21 Crystalwell Cx (06-46-01:32) 17->18 BDW-H E/G (06-47-01:22) 17->1b HSX-EX E0 (06-3f-04:80) 0f->10 SKL-H/S R0 (06-5e-03:36) ba->c2 HSW Cx/Dx (06-3c-03:32) 22->23 HSX C0 (06-3f-02:6f) 3a->3b BDX-DE V0/V1 (06-56-02:10) 0f->14 BDX-DE V2 (06-56-03:10) 700000d->7000011 KBL-U/Y H0 (06-8e-09:c0) 62->80 KBL Y0 / CFL D0 (06-8e-0a:c0) 70->80 KBL-H/S B0 (06-9e-09:2a) 5e->80 CFL U0 (06-9e-0a:22) 70->80 CFL B0 (06-9e-0b:02) 72->80 SKX H0 (06-55-04:b7) 2000035->200003c GLK B0 (06-7a-01:01) 1e->22 Reviewed by: A bunch of folks on the review Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D13815 Revert to previous Intel microcode archive (20171117). FreeBSD kernel changes to make use of the capabilities provided by the new microcode update have not yet been committed. Since we do not yet require them, allow more time for validation. Approved by: emaste Sponsored by: Limelight Networks sysutils/devcpu-data: Update AMD microcode, add cpu 17h microcode, drop malfunctioning individual "AMD-XXX" files. On the few machines that actually have microcode updates, chopping up the microcode is incorrect and results in a failure to update. Don't do that. I personally run this on my FX-8150 and this has been tested by a few others. Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D13832 sysutils/devcpu-data: Only run "cpucontrol -e" once. Submitted by: kib Sponsored by: Limelight Networks sysutils/devcpu-data: fix rc script PR: 225173 Reviewed by: sbruno Approved by: portmgr (implicit) Approved by: ports-secteam (implicit) Added: branches/2018Q1/sysutils/devcpu-data/pkg-message - copied unchanged from r458664, head/sysutils/devcpu-data/pkg-message Modified: branches/2018Q1/sysutils/devcpu-data/Makefile branches/2018Q1/sysutils/devcpu-data/distinfo branches/2018Q1/sysutils/devcpu-data/files/Makefile 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 Mon Jan 15 17:17:27 2018 (r459101) +++ branches/2018Q1/sysutils/devcpu-data/Makefile Mon Jan 15 17:28:41 2018 (r459102) @@ -2,12 +2,13 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 1.13 +PORTVERSION= 1.14 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://downloadmirror.intel.com/27431/eng/:intel \ LOCAL/sbruno:amd PKGNAMEPREFIX= devcpu- -DISTFILES= microcode-20180108.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd +DISTFILES= microcode-20171117.tgz:intel amd64-microcode_3.20171205.1.tar.xz: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 Mon Jan 15 17:17:27 2018 (r459101) +++ branches/2018Q1/sysutils/devcpu-data/distinfo Mon Jan 15 17:28:41 2018 (r459102) @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1515706070 +SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc +SIZE (microcode-20171117.tgz) = 3594762 +SHA256 (amd64-microcode_3.20171205.1.tar.xz) = a38bc072f535a3d3c1bf4e9e545197aa5114e979e94ef7e4a67e615df2f853a7 +SIZE (amd64-microcode_3.20171205.1.tar.xz) = 32584 Modified: branches/2018Q1/sysutils/devcpu-data/files/Makefile ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/files/Makefile Mon Jan 15 17:17:27 2018 (r459101) +++ branches/2018Q1/sysutils/devcpu-data/files/Makefile Mon Jan 15 17:28:41 2018 (r459102) @@ -1,14 +1,15 @@ -AMD_UCODE_DIR= amd-ucode +AMD_UCODE_DIR= amd64-microcode-3.20171205.1 AMD_UCODE= $(AMD_UCODE_DIR)/microcode_amd.bin \ $(AMD_UCODE_DIR)/microcode_amd_fam15h.bin \ - $(AMD_UCODE_DIR)/microcode_amd_fam16h.bin + $(AMD_UCODE_DIR)/microcode_amd_fam16h.bin \ + $(AMD_UCODE_DIR)/microcode_amd_fam17h.bin INTEL_UCODE= microcode.dat OUTPUT_DIR= mcodes all: ucode ucode: ucode-tool mkdir -p $(OUTPUT_DIR) ./ucode-tool -o $(OUTPUT_DIR) -i $(INTEL_UCODE) - ./ucode-tool -o $(OUTPUT_DIR) -a $(AMD_UCODE) + mv ${AMD_UCODE} $(OUTPUT_DIR) # Use the host cc to compile ucode-tool in case of cross-compile ucode-tool: ucode-tool.c Modified: branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Mon Jan 15 17:17:27 2018 (r459101) +++ branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Mon Jan 15 17:28:41 2018 (r459102) @@ -42,7 +42,7 @@ microcode_update_prepare() microcode_update_start() { - echo "Updating cpucodes..." + echo "Updating CPU Microcode..." if [ "${microcode_cpus}" = "ALL" ]; then ncpu=`/sbin/sysctl -n hw.ncpu` cpus=`jot ${ncpu} 0`; @@ -51,9 +51,22 @@ microcode_update_start() fi for i in ${cpus}; do ${CMT} -u ${microcode_update_flags} \ - -d "${microcode_update_datadir}" /dev/cpuctl${i} || \ - (echo "Failed." && exit 1) + -d "${microcode_update_datadir}" /dev/cpuctl${i} 2>&1 | \ + logger -p daemon.notice -t microcode_update || \ + (echo "Microcode Update Failed." && exit 1) done + if [ "${microcode_cpus}" = "ALL" ]; then + CPUCONTROL_UPDATED=$(cpucontrol -h 2>&1 | grep -q -- -e; echo $?) + if [ ${CPUCONTROL_UPDATED} -ne 0 ]; then + echo "Please update your system in order to update CPU microcode." + else + ${CMT} -e /dev/cpuctl0 >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Re-evalulation of CPU flags Failed." + exit 1 + fi + fi + fi echo "Done." } Copied: branches/2018Q1/sysutils/devcpu-data/pkg-message (from r458664, head/sysutils/devcpu-data/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/sysutils/devcpu-data/pkg-message Mon Jan 15 17:28:41 2018 (r459102, copy of r458664, head/sysutils/devcpu-data/pkg-message) @@ -0,0 +1,20 @@ +Installing this port will allow host startup to update the CPU microcode on +a FreeBSD system automatically. In order to enable this feature, add the +following to the system's /etc/rc.conf: + +microcode_update_enable="YES" + +To ensure the update is applied, reboot the system or start the microcode update +service via: + +# service microcode_update start + +If the CPU requires a microcode update, a console message such as the following +will appear: + +Updating CPU Microcode... +/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl0 from rev 0x17 to rev 0x22... done. +/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl2 from rev 0x17 to rev 0x22... done. +/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl4 from rev 0x17 to rev 0x22... done. +/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl6 from rev 0x17 to rev 0x22... done. +Done. Modified: branches/2018Q1/sysutils/devcpu-data/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/pkg-plist Mon Jan 15 17:17:27 2018 (r459101) +++ branches/2018Q1/sysutils/devcpu-data/pkg-plist Mon Jan 15 17:28:41 2018 (r459102) @@ -1,20 +1,4 @@ %%DATADIR%%/2f0708.fw -%%DATADIR%%/AMD-00001020-01000084.fw -%%DATADIR%%/AMD-00001022-01000083.fw -%%DATADIR%%/AMD-00001041-010000db.fw -%%DATADIR%%/AMD-00001043-010000c8.fw -%%DATADIR%%/AMD-00001062-010000c7.fw -%%DATADIR%%/AMD-00001080-010000da.fw -%%DATADIR%%/AMD-00001081-010000d9.fw -%%DATADIR%%/AMD-000010a0-010000dc.fw -%%DATADIR%%/AMD-00002031-02000032.fw -%%DATADIR%%/AMD-00003010-03000027.fw -%%DATADIR%%/AMD-00005010-05000029.fw -%%DATADIR%%/AMD-00005020-05000119.fw -%%DATADIR%%/AMD-00006012-0600063d.fw -%%DATADIR%%/AMD-00006020-06000832.fw -%%DATADIR%%/AMD-00006101-06001119.fw -%%DATADIR%%/AMD-00007001-0700010f.fw %%DATADIR%%/M01106C2217.fw %%DATADIR%%/M01106CA107.fw %%DATADIR%%/M0120661104.fw @@ -73,7 +57,7 @@ %%DATADIR%%/m01f6402.fw %%DATADIR%%/m01f6508.fw %%DATADIR%%/m021066142.fw -%%DATADIR%%/m02906eb_0000007f_00000080.fw +%%DATADIR%%/m02906eb_00000071_00000072.fw %%DATADIR%%/m02f0a15.fw %%DATADIR%%/m02f241f.fw %%DATADIR%%/m02f252a.fw @@ -102,8 +86,8 @@ %%DATADIR%%/m0df330c.fw %%DATADIR%%/m101067660F.fw %%DATADIR%%/m101067770A.fw -%%DATADIR%%/m1050662_00000014.fw -%%DATADIR%%/m1050663_07000011.fw +%%DATADIR%%/m1050662_0000000f.fw +%%DATADIR%%/m1050663_0700000d.fw %%DATADIR%%/m1050664_0f00000a.fw %%DATADIR%%/m1069507.fw %%DATADIR%%/m106f76a.fw @@ -127,14 +111,14 @@ %%DATADIR%%/m206f6d1.fw %%DATADIR%%/m206fbBA.fw %%DATADIR%%/m206fda4.fw -%%DATADIR%%/m2240671_0000001b.fw -%%DATADIR%%/m22906ea_00000080.fw +%%DATADIR%%/m2240671_00000017.fw +%%DATADIR%%/m22906ea_0000006f_00000070.fw %%DATADIR%%/m22f6809.fw -%%DATADIR%%/m2a906e9_0000007f_00000080.fw -%%DATADIR%%/m32306c3_00000023.fw -%%DATADIR%%/m3240661_00000018.fw +%%DATADIR%%/m2a906e9_0000005d_0000005e.fw +%%DATADIR%%/m32306c3_00000022.fw +%%DATADIR%%/m3240661_00000017.fw %%DATADIR%%/m34f6404.fw -%%DATADIR%%/m36506e3_000000c1_000000c2.fw +%%DATADIR%%/m36506e3_000000b9_000000ba.fw %%DATADIR%%/m401067660F.fw %%DATADIR%%/m406f76b.fw %%DATADIR%%/m406fbBC.fw @@ -145,11 +129,11 @@ %%DATADIR%%/m5ff4807.fw %%DATADIR%%/m6d206d6_00000619.fw %%DATADIR%%/m6d206d7_00000710.fw -%%DATADIR%%/m6f306f2_0000003b.fw -%%DATADIR%%/m7240651_00000021.fw +%%DATADIR%%/m6f306f2_0000003a.fw +%%DATADIR%%/m7240651_00000020.fw %%DATADIR%%/m801066144.fw %%DATADIR%%/m801067660F.fw -%%DATADIR%%/m80306f4_00000010.fw +%%DATADIR%%/m80306f4_0000000f.fw %%DATADIR%%/m8069547.fw %%DATADIR%%/m806ec59.fw %%DATADIR%%/m806fa95.fw @@ -160,19 +144,23 @@ %%DATADIR%%/m9df4406.fw %%DATADIR%%/m9df4703.fw %%DATADIR%%/mA01067AA0B.fw -%%DATADIR%%/m_01_706a1_00000022.fw +%%DATADIR%%/m_01_706a1_0000001e.fw %%DATADIR%%/m_03_506c9_0000002c.fw -%%DATADIR%%/mb750654_0200003c.fw +%%DATADIR%%/mb750654_02000035.fw %%DATADIR%%/mbdf4117.fw %%DATADIR%%/mbdf4903.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%%/mc0306d4_00000025.fw +%%DATADIR%%/mc0406e3_000000b9_000000ba.fw +%%DATADIR%%/mc0806e9_00000061_00000062.fw +%%DATADIR%%/mc0806ea_0000006f_00000070.fw +%%DATADIR%%/med306e4_00000428.fw %%DATADIR%%/med306e6_00000600.fw %%DATADIR%%/med306e7_0000070d.fw %%DATADIR%%/mef406f1_0b000021.fw +%%DATADIR%%/microcode_amd.bin +%%DATADIR%%/microcode_amd_fam15h.bin +%%DATADIR%%/microcode_amd_fam16h.bin +%%DATADIR%%/microcode_amd_fam17h.bin %%DATADIR%%/mu267114.fw %%DATADIR%%/mu267238.fw %%DATADIR%%/mu26732e.fw From owner-svn-ports-branches@freebsd.org Tue Jan 16 00:55: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 E9F6DEB2A4F; Tue, 16 Jan 2018 00:55: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 C4A617915E; Tue, 16 Jan 2018 00:55: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 0E36418D91; Tue, 16 Jan 2018 00:55:11 +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 w0G0tAP5061679; Tue, 16 Jan 2018 00:55:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0G0tAP8061677; Tue, 16 Jan 2018 00:55:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801160055.w0G0tAP8061677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 16 Jan 2018 00:55:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459145 - 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: 459145 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, 16 Jan 2018 00:55:12 -0000 Author: jbeich Date: Tue Jan 16 00:55:10 2018 New Revision: 459145 URL: https://svnweb.freebsd.org/changeset/ports/459145 Log: MFH: r459141 r459144 emulators/rpcs3: update to 0.0.4.252 Changes: https://github.com/RPCS3/rpcs3/compare/c951601fa...24e97b9e0 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 Tue Jan 16 00:52:35 2018 (r459144) +++ branches/2018Q1/emulators/rpcs3/Makefile Tue Jan 16 00:55:10 2018 (r459145) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-234 -DISTVERSIONSUFFIX= -gc951601fa +DISTVERSION= 0.0.4-252 +DISTVERSIONSUFFIX= -g24e97b9e0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Tue Jan 16 00:52:35 2018 (r459144) +++ branches/2018Q1/emulators/rpcs3/distinfo Tue Jan 16 00:55:10 2018 (r459145) @@ -1,6 +1,6 @@ -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 +TIMESTAMP = 1516033416 +SHA256 (RPCS3-rpcs3-v0.0.4-252-g24e97b9e0_GH0.tar.gz) = ebf5d9d125ff571cc80b431952f2aebd467b09fec5da7c86919a11964410e4c7 +SIZE (RPCS3-rpcs3-v0.0.4-252-g24e97b9e0_GH0.tar.gz) = 3619025 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 Tue Jan 16 00:55:56 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 EF6D2EB2ADE; Tue, 16 Jan 2018 00:55:56 +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 CBCD37927C; Tue, 16 Jan 2018 00:55:56 +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 311BC18D92; Tue, 16 Jan 2018 00:55:56 +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 w0G0tuWZ061827; Tue, 16 Jan 2018 00:55:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0G0ttrm061825; Tue, 16 Jan 2018 00:55:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801160055.w0G0ttrm061825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 16 Jan 2018 00:55:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459146 - 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: 459146 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, 16 Jan 2018 00:55:57 -0000 Author: jbeich Date: Tue Jan 16 00:55:55 2018 New Revision: 459146 URL: https://svnweb.freebsd.org/changeset/ports/459146 Log: MFH: r459140 emulators/citra: update to s20180113 Changes: https://github.com/citra-emu/citra/compare/9b647d45...79dca3d6 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 Tue Jan 16 00:55:10 2018 (r459145) +++ branches/2018Q1/emulators/citra/Makefile Tue Jan 16 00:55:55 2018 (r459146) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180111 +PORTVERSION= s20180113 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= 9b647d45 +GH_TAGNAME= 79dca3d6 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 Tue Jan 16 00:55:10 2018 (r459145) +++ branches/2018Q1/emulators/citra/distinfo Tue Jan 16 00:55:55 2018 (r459146) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515693826 -SHA256 (citra-emu-citra-s20180111-9b647d45_GH0.tar.gz) = 6dc48767ff251f983e0877095f37bfddcba350b19ac5a74bee3ff69b460ad1c6 -SIZE (citra-emu-citra-s20180111-9b647d45_GH0.tar.gz) = 1651806 +TIMESTAMP = 1515877519 +SHA256 (citra-emu-citra-s20180113-79dca3d6_GH0.tar.gz) = 7d26d3dd54bc0b6da02a80f889733641fb0fcf8e66007c81a50e29d6c9d4e0f8 +SIZE (citra-emu-citra-s20180113-79dca3d6_GH0.tar.gz) = 1651786 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 Tue Jan 16 13:32: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 9D5FAE6EA70; Tue, 16 Jan 2018 13:32:30 +0000 (UTC) (envelope-from tobik@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 78CF579B5B; Tue, 16 Jan 2018 13:32:30 +0000 (UTC) (envelope-from tobik@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 9C63F2113E; Tue, 16 Jan 2018 13:32:29 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0GDWTAx078861; Tue, 16 Jan 2018 13:32:29 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GDWTeu078859; Tue, 16 Jan 2018 13:32:29 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801161332.w0GDWTeu078859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 16 Jan 2018 13:32:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459169 - branches/2018Q1/www/palemoon X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2018Q1/www/palemoon X-SVN-Commit-Revision: 459169 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, 16 Jan 2018 13:32:30 -0000 Author: tobik Date: Tue Jan 16 13:32:29 2018 New Revision: 459169 URL: https://svnweb.freebsd.org/changeset/ports/459169 Log: MFH: r459164 www/palemoon: Update to 27.7.0 Changes: http://www.palemoon.org/releasenotes.shtml PR: 225210 Submitted by: lichray@gmail.com (maintainer) Approved by: ports-secteam blanket Modified: branches/2018Q1/www/palemoon/Makefile branches/2018Q1/www/palemoon/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/palemoon/Makefile ============================================================================== --- branches/2018Q1/www/palemoon/Makefile Tue Jan 16 13:29:46 2018 (r459168) +++ branches/2018Q1/www/palemoon/Makefile Tue Jan 16 13:32:29 2018 (r459169) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= palemoon -DISTVERSION= 27.6.2 +DISTVERSION= 27.7.0 DISTVERSIONSUFFIX=_Release -PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= lichray@gmail.com Modified: branches/2018Q1/www/palemoon/distinfo ============================================================================== --- branches/2018Q1/www/palemoon/distinfo Tue Jan 16 13:29:46 2018 (r459168) +++ branches/2018Q1/www/palemoon/distinfo Tue Jan 16 13:32:29 2018 (r459169) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511899017 -SHA256 (MoonchildProductions-Pale-Moon-27.6.2_Release_GH0.tar.gz) = 124bee1630cf56f120220cdcadde4e24831b472db49d18da6480b7a847785d19 -SIZE (MoonchildProductions-Pale-Moon-27.6.2_Release_GH0.tar.gz) = 179622196 +TIMESTAMP = 1516081122 +SHA256 (MoonchildProductions-Pale-Moon-27.7.0_Release_GH0.tar.gz) = 08c2e274f9f0a20eef92debeaae259c1fdf098f12a7c4a5c27a84567f40ef1bc +SIZE (MoonchildProductions-Pale-Moon-27.7.0_Release_GH0.tar.gz) = 179823754 From owner-svn-ports-branches@freebsd.org Tue Jan 16 20:57:52 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 4592DEB7E5F; Tue, 16 Jan 2018 20:57:52 +0000 (UTC) (envelope-from swills@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 1FD9B6C9E2; Tue, 16 Jan 2018 20:57:52 +0000 (UTC) (envelope-from swills@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 6FB4425A52; Tue, 16 Jan 2018 20:57:51 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0GKvpjI065474; Tue, 16 Jan 2018 20:57:51 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GKvpeM065473; Tue, 16 Jan 2018 20:57:51 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801162057.w0GKvpeM065473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 16 Jan 2018 20:57:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459206 - branches/2018Q1/sysutils/devcpu-data X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q1/sysutils/devcpu-data X-SVN-Commit-Revision: 459206 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, 16 Jan 2018 20:57:52 -0000 Author: swills Date: Tue Jan 16 20:57:51 2018 New Revision: 459206 URL: https://svnweb.freebsd.org/changeset/ports/459206 Log: Again sync up with HEAD MFH: r459205 Revert Intel URL to the correct location for microcode-20171117.tgz PR: 225224 Reported by: Gary Sponsored by: Limelight Networks Approved by: ports-secteam (implicit) Modified: branches/2018Q1/sysutils/devcpu-data/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/devcpu-data/Makefile ============================================================================== --- branches/2018Q1/sysutils/devcpu-data/Makefile Tue Jan 16 19:56:34 2018 (r459205) +++ branches/2018Q1/sysutils/devcpu-data/Makefile Tue Jan 16 20:57:51 2018 (r459206) @@ -3,9 +3,9 @@ PORTNAME= data PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils -MASTER_SITES= https://downloadmirror.intel.com/27431/eng/:intel \ +MASTER_SITES= https://downloadmirror.intel.com/27337/eng/:intel \ LOCAL/sbruno:amd PKGNAMEPREFIX= devcpu- DISTFILES= microcode-20171117.tgz:intel amd64-microcode_3.20171205.1.tar.xz:amd From owner-svn-ports-branches@freebsd.org Tue Jan 16 22:16: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 CF716EBBF51; Tue, 16 Jan 2018 22:16:29 +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 AB9176FF09; Tue, 16 Jan 2018 22:16:29 +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 10B822677D; Tue, 16 Jan 2018 22:16:29 +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 w0GMGSQ5099072; Tue, 16 Jan 2018 22:16:28 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GMGS2A099071; Tue, 16 Jan 2018 22:16:28 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801162216.w0GMGS2A099071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 16 Jan 2018 22:16:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459210 - branches/2018Q1/devel/libevent X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q1/devel/libevent X-SVN-Commit-Revision: 459210 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, 16 Jan 2018 22:16:29 -0000 Author: feld Date: Tue Jan 16 22:16:28 2018 New Revision: 459210 URL: https://svnweb.freebsd.org/changeset/ports/459210 Log: MFH: r459209 devel/libevent: Fix QA warning Need shebangfix for Python script, but we will consciously avoid adding Python as a build or run dependency for a script that is unlikely to be used. PR: 224575 Modified: branches/2018Q1/devel/libevent/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/libevent/Makefile ============================================================================== --- branches/2018Q1/devel/libevent/Makefile Tue Jan 16 22:15:05 2018 (r459209) +++ branches/2018Q1/devel/libevent/Makefile Tue Jan 16 22:16:28 2018 (r459210) @@ -3,6 +3,7 @@ PORTNAME= libevent PORTVERSION= 2.1.8 +PORTREVISION= 1 DISTVERSIONPREFIX= release- DISTVERSIONSUFFIX= -stable CATEGORIES= devel @@ -13,7 +14,8 @@ COMMENT= API for executing callback functions on event LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= autoreconf libtool pathfix +USES= autoreconf libtool pathfix python:2.7,env shebangfix +SHEBANG_FILES= event_rpcgen.py USE_GITHUB= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip From owner-svn-ports-branches@freebsd.org Wed Jan 17 08:06:04 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 02B07EB4908; Wed, 17 Jan 2018 08:06:04 +0000 (UTC) (envelope-from mat@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 CF93A82840; Wed, 17 Jan 2018 08:06:03 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 186184C45; Wed, 17 Jan 2018 08:06:03 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0H862cr046870; Wed, 17 Jan 2018 08:06:02 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0H861uX046857; Wed, 17 Jan 2018 08:06:01 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801170806.w0H861uX046857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 17 Jan 2018 08:06:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459223 - in branches/2018Q1/dns: bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2018Q1/dns: bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Commit-Revision: 459223 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, 17 Jan 2018 08:06:04 -0000 Author: mat Date: Wed Jan 17 08:06:01 2018 New Revision: 459223 URL: https://svnweb.freebsd.org/changeset/ports/459223 Log: MFH: r459221 Update BIND9* to 9.9.11-P1, 9.10.6-P1, 9.11.2-P1 and 9.12.0rc3 Security: CVE-2017-3145 Sponsored by: Absolight Modified: branches/2018Q1/dns/bind910/Makefile branches/2018Q1/dns/bind910/distinfo branches/2018Q1/dns/bind910/files/extrapatch-bind-min-override-ttl branches/2018Q1/dns/bind911/Makefile branches/2018Q1/dns/bind911/distinfo branches/2018Q1/dns/bind911/files/extrapatch-bind-min-override-ttl branches/2018Q1/dns/bind912/Makefile branches/2018Q1/dns/bind912/distinfo branches/2018Q1/dns/bind912/files/extrapatch-bind-min-override-ttl branches/2018Q1/dns/bind99/Makefile branches/2018Q1/dns/bind99/distinfo branches/2018Q1/dns/bind99/files/extrapatch-bind-min-override-ttl Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/dns/bind910/Makefile ============================================================================== --- branches/2018Q1/dns/bind910/Makefile Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind910/Makefile Wed Jan 17 08:06:01 2018 (r459223) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 5 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 @@ -19,7 +19,7 @@ DEPRECATED= Going out of support, please migrate to dn EXPIRATION_DATE= 2018-06-30 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.6 +ISCVERSION= 9.10.6-P1 USES= cpe libedit Modified: branches/2018Q1/dns/bind910/distinfo ============================================================================== --- branches/2018Q1/dns/bind910/distinfo Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind910/distinfo Wed Jan 17 08:06:01 2018 (r459223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501282039 -SHA256 (bind-9.10.6.tar.gz) = 17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d -SIZE (bind-9.10.6.tar.gz) = 9449394 +TIMESTAMP = 1516059365 +SHA256 (bind-9.10.6-P1.tar.gz) = 9b8b4f6ecfc82a491774bf713d8a888b954c427526035eb715544438f36a2334 +SIZE (bind-9.10.6-P1.tar.gz) = 9452495 Modified: branches/2018Q1/dns/bind910/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2018Q1/dns/bind910/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind910/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:06:01 2018 (r459223) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-04-14 03:54:11 UTC +--- bin/named/config.c.orig 2018-01-04 05:35:08 UTC +++ bin/named/config.c @@ -154,6 +154,8 @@ options {\n\ min-roots 2;\n\ @@ -9,7 +9,7 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 0;\n\ ---- bin/named/server.c.orig 2017-04-14 03:54:11 UTC +--- bin/named/server.c.orig 2018-01-04 05:35:08 UTC +++ bin/named/server.c @@ -2890,6 +2890,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-04-14 03:54:11 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-04 05:35:08 UTC +++ lib/dns/include/dns/view.h @@ -151,6 +151,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; dns_ttl_t prefetch_trigger; dns_ttl_t prefetch_eligible; ---- lib/dns/resolver.c.orig 2017-04-14 03:54:11 UTC +--- lib/dns/resolver.c.orig 2018-01-04 05:35:08 UTC +++ lib/dns/resolver.c -@@ -5378,6 +5378,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5387,6 +5387,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-04-14 03:54:11 UTC +--- lib/isccfg/namedconf.c.orig 2018-01-04 05:35:08 UTC +++ lib/isccfg/namedconf.c @@ -1591,6 +1591,8 @@ view_clauses[] = { #endif Modified: branches/2018Q1/dns/bind911/Makefile ============================================================================== --- branches/2018Q1/dns/bind911/Makefile Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind911/Makefile Wed Jan 17 08:06:01 2018 (r459223) @@ -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= 2 +PORTREVISION= 0 .else # dns/bind911 here -PORTREVISION= 5 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -30,7 +30,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.2 +ISCVERSION= 9.11.2-P1 USES= cpe libedit Modified: branches/2018Q1/dns/bind911/distinfo ============================================================================== --- branches/2018Q1/dns/bind911/distinfo Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind911/distinfo Wed Jan 17 08:06:01 2018 (r459223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501282074 -SHA256 (bind-9.11.2.tar.gz) = 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a -SIZE (bind-9.11.2.tar.gz) = 9782180 +TIMESTAMP = 1516059868 +SHA256 (bind-9.11.2-P1.tar.gz) = cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 +SIZE (bind-9.11.2-P1.tar.gz) = 9783329 Modified: branches/2018Q1/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2018Q1/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:06:01 2018 (r459223) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-07-24 05:36:50 UTC +--- bin/named/config.c.orig 2018-01-04 05:28:11 UTC +++ bin/named/config.c @@ -154,6 +154,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,7 +9,7 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2017-07-24 05:36:50 UTC +--- bin/named/server.c.orig 2018-01-04 05:28:11 UTC +++ bin/named/server.c @@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-07-24 05:36:50 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-04 05:28:11 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-07-24 05:36:50 UTC +--- lib/dns/resolver.c.orig 2018-01-04 05:28:11 UTC +++ lib/dns/resolver.c -@@ -5439,6 +5439,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5448,6 +5448,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-07-24 05:36:50 UTC +--- lib/isccfg/namedconf.c.orig 2018-01-04 05:28:11 UTC +++ lib/isccfg/namedconf.c @@ -1765,6 +1765,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, Modified: branches/2018Q1/dns/bind912/Makefile ============================================================================== --- branches/2018Q1/dns/bind912/Makefile Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind912/Makefile Wed Jan 17 08:06:01 2018 (r459223) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind912 here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -30,7 +30,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0rc1 +ISCVERSION= 9.12.0rc3 USES= cpe libedit Modified: branches/2018Q1/dns/bind912/distinfo ============================================================================== --- branches/2018Q1/dns/bind912/distinfo Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind912/distinfo Wed Jan 17 08:06:01 2018 (r459223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513610500 -SHA256 (bind-9.12.0rc1.tar.gz) = 523cd296138baaab9e301173873050ebfee833aac5a495cc34da6ccb7dd820d3 -SIZE (bind-9.12.0rc1.tar.gz) = 9282848 +TIMESTAMP = 1516175610 +SHA256 (bind-9.12.0rc3.tar.gz) = 2e9c35e9292fe0ef0dfbd68a4eba5ee4055e4299c0522e623b1dc31fe085d893 +SIZE (bind-9.12.0rc3.tar.gz) = 9288446 Modified: branches/2018Q1/dns/bind912/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2018Q1/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:06:01 2018 (r459223) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-12-06 17:32:49 UTC +--- bin/named/config.c.orig 2018-01-12 19:49:09 UTC +++ bin/named/config.c @@ -176,12 +176,14 @@ options {\n\ max-recursion-queries 75;\n\ @@ -15,7 +15,7 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2017-12-06 17:32:49 UTC +--- bin/named/server.c.orig 2018-01-12 19:49:09 UTC +++ bin/named/server.c @@ -4067,6 +4067,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -34,7 +34,7 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-12-06 17:32:49 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-12 19:49:09 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -45,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-12-06 17:32:49 UTC +--- lib/dns/resolver.c.orig 2018-01-12 19:49:09 UTC +++ lib/dns/resolver.c -@@ -5748,6 +5748,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -66,7 +66,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2017-12-06 17:32:49 UTC +--- lib/isccfg/namedconf.c.orig 2018-01-12 19:49:09 UTC +++ lib/isccfg/namedconf.c @@ -1909,6 +1909,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, Modified: branches/2018Q1/dns/bind99/Makefile ============================================================================== --- branches/2018Q1/dns/bind99/Makefile Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind99/Makefile Wed Jan 17 08:06:01 2018 (r459223) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -19,7 +19,7 @@ DEPRECATED= Going out of support, please migrate to dn EXPIRATION_DATE= 2018-06-30 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.11 +ISCVERSION= 9.9.11-P1 USES= cpe libedit Modified: branches/2018Q1/dns/bind99/distinfo ============================================================================== --- branches/2018Q1/dns/bind99/distinfo Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind99/distinfo Wed Jan 17 08:06:01 2018 (r459223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501282004 -SHA256 (bind-9.9.11.tar.gz) = 995395d540b6dd8eb77d737824f47dc10917c864ba4ab450a703b8c6179dc8ba -SIZE (bind-9.9.11.tar.gz) = 8867109 +TIMESTAMP = 1516059275 +SHA256 (bind-9.9.11-P1.tar.gz) = 40a8dd0eedf44236a77e4009c61daa065447b09461bffddab3b0aefcbf358fa8 +SIZE (bind-9.9.11-P1.tar.gz) = 8868987 Modified: branches/2018Q1/dns/bind99/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2018Q1/dns/bind99/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:04:27 2018 (r459222) +++ branches/2018Q1/dns/bind99/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:06:01 2018 (r459223) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-04-14 03:50:56 UTC +--- bin/named/config.c.orig 2018-01-04 05:41:15 UTC +++ bin/named/config.c @@ -141,6 +141,8 @@ options {\n\ min-roots 2;\n\ @@ -9,7 +9,7 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 0;\n\ ---- bin/named/server.c.orig 2017-04-14 03:50:56 UTC +--- bin/named/server.c.orig 2018-01-04 05:41:15 UTC +++ bin/named/server.c @@ -2647,6 +2647,16 @@ configure_view(dns_view_t *view, cfg_obj } @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-04-14 03:50:56 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-04 05:41:15 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,8 @@ struct dns_view { isc_boolean_t provideixfr; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; in_port_t dstport; dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2017-04-14 03:50:56 UTC +--- lib/dns/resolver.c.orig 2018-01-04 05:41:15 UTC +++ lib/dns/resolver.c -@@ -5117,6 +5117,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5126,6 +5126,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-04-14 03:50:56 UTC +--- lib/isccfg/namedconf.c.orig 2018-01-04 05:41:15 UTC +++ lib/isccfg/namedconf.c @@ -1475,6 +1475,8 @@ view_clauses[] = { { "lame-ttl", &cfg_type_uint32, 0 }, From owner-svn-ports-branches@freebsd.org Wed Jan 17 08:39:21 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 978D2EB6255; Wed, 17 Jan 2018 08:39:21 +0000 (UTC) (envelope-from mat@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 7248983B03; Wed, 17 Jan 2018 08:39:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3BF25110; Wed, 17 Jan 2018 08:39:20 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0H8dKXc059937; Wed, 17 Jan 2018 08:39:20 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0H8dKl9059934; Wed, 17 Jan 2018 08:39:20 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801170839.w0H8dKl9059934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 17 Jan 2018 08:39:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459225 - in branches/2018Q1/dns/bind9-devel: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2018Q1/dns/bind9-devel: . files X-SVN-Commit-Revision: 459225 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, 17 Jan 2018 08:39:21 -0000 Author: mat Date: Wed Jan 17 08:39:20 2018 New Revision: 459225 URL: https://svnweb.freebsd.org/changeset/ports/459225 Log: MFH: r459224 Update to latest commit. Security: CVE-2017-3145 Sponsored by: Absolight Modified: branches/2018Q1/dns/bind9-devel/Makefile branches/2018Q1/dns/bind9-devel/distinfo branches/2018Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/dns/bind9-devel/Makefile ============================================================================== --- branches/2018Q1/dns/bind9-devel/Makefile Wed Jan 17 08:33:29 2018 (r459224) +++ branches/2018Q1/dns/bind9-devel/Makefile Wed Jan 17 08:39:20 2018 (r459225) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind @@ -31,8 +31,8 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.0a0.2017.12.27 -HASH= 9bec7fa +ISCVERSION= 9.13.0a0.2018.01.16 +HASH= 3d2a6c9 USES= cpe libedit Modified: branches/2018Q1/dns/bind9-devel/distinfo ============================================================================== --- branches/2018Q1/dns/bind9-devel/distinfo Wed Jan 17 08:33:29 2018 (r459224) +++ branches/2018Q1/dns/bind9-devel/distinfo Wed Jan 17 08:39:20 2018 (r459225) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514384119 -SHA256 (bind9-9bec7fa.tar.gz) = 5fb0eea64291df84e24e0356fc3c7817a7b517e08f1e3395682f459ecc7d39fa -SIZE (bind9-9bec7fa.tar.gz) = 11349407 +TIMESTAMP = 1516176609 +SHA256 (bind9-3d2a6c9.tar.gz) = b988bc4397772c210f119e1979b4f41db497dbc281487372b1e1a833a898169b +SIZE (bind9-3d2a6c9.tar.gz) = 11352638 Modified: branches/2018Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2018Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:33:29 2018 (r459224) +++ branches/2018Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Wed Jan 17 08:39:20 2018 (r459225) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-12-16 01:09:51 UTC +--- bin/named/config.c.orig 2018-01-16 23:45:57 UTC +++ bin/named/config.c @@ -176,12 +176,14 @@ options {\n\ max-recursion-queries 75;\n\ @@ -15,9 +15,9 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2017-12-16 01:09:51 UTC +--- bin/named/server.c.orig 2018-01-16 23:45:57 UTC +++ bin/named/server.c -@@ -4067,6 +4067,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4073,6 +4073,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -34,7 +34,7 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-12-16 01:09:51 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-16 23:45:57 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -45,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-12-16 01:09:51 UTC +--- lib/dns/resolver.c.orig 2018-01-16 23:45:57 UTC +++ lib/dns/resolver.c -@@ -5748,6 +5748,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5744,6 +5744,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -66,7 +66,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2017-12-16 01:09:51 UTC +--- lib/isccfg/namedconf.c.orig 2018-01-16 23:45:57 UTC +++ lib/isccfg/namedconf.c @@ -1912,6 +1912,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, From owner-svn-ports-branches@freebsd.org Wed Jan 17 08:59: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 79181EB7322; Wed, 17 Jan 2018 08:59: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 535E8A9C; Wed, 17 Jan 2018 08:59: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 910EF5447; Wed, 17 Jan 2018 08:59: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 w0H8xwJ6068798; Wed, 17 Jan 2018 08:59:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0H8xw7H068796; Wed, 17 Jan 2018 08:59:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801170859.w0H8xw7H068796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 17 Jan 2018 08:59:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459227 - 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: 459227 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, 17 Jan 2018 08:59:59 -0000 Author: jbeich Date: Wed Jan 17 08:59:58 2018 New Revision: 459227 URL: https://svnweb.freebsd.org/changeset/ports/459227 Log: MFH: r459226 www/waterfox: unbreak HTTP auth dialog after r458873 PR: 225231 Reported by: Graham Perrin Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1425156 - copied unchanged from r459226, head/www/waterfox/files/patch-bug1425156 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Wed Jan 17 08:59:12 2018 (r459226) +++ branches/2018Q1/www/waterfox/Makefile Wed Jan 17 08:59:58 2018 (r459227) @@ -2,6 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.3 +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1425156 (from r459226, head/www/waterfox/files/patch-bug1425156) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1425156 Wed Jan 17 08:59:58 2018 (r459227, copy of r459226, head/www/waterfox/files/patch-bug1425156) @@ -0,0 +1,78 @@ +commit 38b712aab29c +Author: Dragana Damjanovic +Date: Thu Dec 14 20:22:56 2017 +0100 + + Bug 1425156 - Fix bug in the http-auth dialog blocking. r=ckerschb a=gchang + + --HG-- + extra : source : e098500c325d3aaddc9cc4166b8695f294b6a246 +--- + .../protocol/http/nsHttpChannelAuthProvider.cpp | 28 ++++++++++++---------- + 1 file changed, 16 insertions(+), 12 deletions(-) + +diff --git netwerk/protocol/http/nsHttpChannelAuthProvider.cpp netwerk/protocol/http/nsHttpChannelAuthProvider.cpp +index c70eb9455adb..d8d604d234ab 100644 +--- netwerk/protocol/http/nsHttpChannelAuthProvider.cpp ++++ netwerk/protocol/http/nsHttpChannelAuthProvider.cpp +@@ -993,16 +993,19 @@ nsHttpChannelAuthProvider::BlockPrompt() + bool nonWebContent = false; + + if (loadInfo) { +- nsCOMPtr triggeringPrinc = +- loadInfo->TriggeringPrincipal(); +- if (nsContentUtils::IsSystemPrincipal(triggeringPrinc)) { +- nonWebContent = true; +- } +- + if (loadInfo->GetExternalContentPolicyType() != + nsIContentPolicy::TYPE_DOCUMENT) { + topDoc = false; + } ++ ++ if (!topDoc) { ++ nsCOMPtr triggeringPrinc = ++ loadInfo->TriggeringPrincipal(); ++ if (nsContentUtils::IsSystemPrincipal(triggeringPrinc)) { ++ nonWebContent = true; ++ } ++ } ++ + if (loadInfo->GetExternalContentPolicyType() == + nsIContentPolicy::TYPE_XMLHTTPREQUEST) { + xhr = true; +@@ -1027,12 +1030,12 @@ nsHttpChannelAuthProvider::BlockPrompt() + } + + if (gHttpHandler->IsTelemetryEnabled()) { +- if (nonWebContent) { +- Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, +- HTTP_AUTH_DIALOG_NON_WEB_CONTENT); +- } else if (topDoc) { ++ if (topDoc) { + Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, + HTTP_AUTH_DIALOG_TOP_LEVEL_DOC); ++ } else if (nonWebContent) { ++ Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, ++ HTTP_AUTH_DIALOG_NON_WEB_CONTENT); + } else if (!mCrossOrigin) { + if (xhr) { + Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3, +@@ -1047,7 +1050,7 @@ nsHttpChannelAuthProvider::BlockPrompt() + } + } + +- if (!sNonWebContentTriggeredAuthAllow && nonWebContent) { ++ if (!topDoc && !sNonWebContentTriggeredAuthAllow && nonWebContent) { + return true; + } + +@@ -1065,7 +1068,8 @@ nsHttpChannelAuthProvider::BlockPrompt() + // If pref network.auth.subresource-img-cross-origin-http-auth-allow + // is set, http-authentication dialog for image subresources is + // blocked. +- if (!sImgCrossOriginAuthAllowPref && ++ if (mCrossOrigin && ++ !sImgCrossOriginAuthAllowPref && + loadInfo && + ((loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_IMAGE) || + (loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_IMAGESET))) { From owner-svn-ports-branches@freebsd.org Wed Jan 17 14:30:53 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 074BDE73B0B; Wed, 17 Jan 2018 14:30:53 +0000 (UTC) (envelope-from tobik@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 D3EB271CD9; Wed, 17 Jan 2018 14:30:52 +0000 (UTC) (envelope-from tobik@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 2985B10AC5; Wed, 17 Jan 2018 14:30:52 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HEUpxH013838; Wed, 17 Jan 2018 14:30:51 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HEUpQ6013837; Wed, 17 Jan 2018 14:30:51 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801171430.w0HEUpQ6013837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 17 Jan 2018 14:30:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459260 - in branches/2018Q1/ports-mgmt/fastest_sites: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2018Q1/ports-mgmt/fastest_sites: . files X-SVN-Commit-Revision: 459260 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, 17 Jan 2018 14:30:53 -0000 Author: tobik Date: Wed Jan 17 14:30:51 2018 New Revision: 459260 URL: https://svnweb.freebsd.org/changeset/ports/459260 Log: MFH: r459259 ports-mgmt/fastest_sites: Fix runtime with modern bsd.sites.mk fastest_sites currently can't parse entries like https://archives.fedoraproject.org/pub/archive/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE => Checking servers for MASTER_SITE_FEDORA_LINUX (6 servers) Traceback (most recent call last): File "/usr/local/bin/fastest_sites", line 164, in latency_list = FindFastest(varname, sitelist) File "/usr/local/bin/fastest_sites", line 110, in FindFastest AsyncConnect(url, callback) File "/usr/local/bin/fastest_sites", line 53, in __init__ self.ParseURL() File "/usr/local/bin/fastest_sites", line 64, in ParseURL (scheme, remainder) = self._url.split(":", 2) ValueError: too many values to unpack PR: 224854 Approved by: ports-secteam blanket Added: branches/2018Q1/ports-mgmt/fastest_sites/files/ - copied from r459259, head/ports-mgmt/fastest_sites/files/ Modified: branches/2018Q1/ports-mgmt/fastest_sites/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/ports-mgmt/fastest_sites/Makefile ============================================================================== --- branches/2018Q1/ports-mgmt/fastest_sites/Makefile Wed Jan 17 14:29:16 2018 (r459259) +++ branches/2018Q1/ports-mgmt/fastest_sites/Makefile Wed Jan 17 14:30:51 2018 (r459260) @@ -2,7 +2,7 @@ PORTNAME= fastest_sites PORTVERSION= 20110317 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= http://www.semicomplete.com/files/fastest_sites/ EXTRACT_SUFX= .py From owner-svn-ports-branches@freebsd.org Wed Jan 17 15:12: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 1F40DE761DE; Wed, 17 Jan 2018 15:12:47 +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 EF34873B6A; Wed, 17 Jan 2018 15:12:46 +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 41617111DD; Wed, 17 Jan 2018 15:12:46 +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 w0HFCkdX033022; Wed, 17 Jan 2018 15:12:46 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HFCkim033020; Wed, 17 Jan 2018 15:12:46 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801171512.w0HFCkim033020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 17 Jan 2018 15:12:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459264 - in branches/2018Q1/devel/arcanist: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/devel/arcanist: . files X-SVN-Commit-Revision: 459264 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, 17 Jan 2018 15:12:47 -0000 Author: feld Date: Wed Jan 17 15:12:45 2018 New Revision: 459264 URL: https://svnweb.freebsd.org/changeset/ports/459264 Log: MFH: r459263 devel/arcanist: Fix QA warnings - shebangfix - regen port patch - RUN_DEPENDS earlier for portlint Modified: branches/2018Q1/devel/arcanist/Makefile branches/2018Q1/devel/arcanist/files/patch-src-workflow-ArcanistVersionWorkflow.php Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/arcanist/Makefile ============================================================================== --- branches/2018Q1/devel/arcanist/Makefile Wed Jan 17 15:12:12 2018 (r459263) +++ branches/2018Q1/devel/arcanist/Makefile Wed Jan 17 15:12:45 2018 (r459264) @@ -12,11 +12,13 @@ COMMENT= Command line interface for Phabricator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= php-libphutil>0:devel/libphutil + CONFLICTS= arc-* PHP_DESTDIR= lib/php/arcanist -RUN_DEPENDS= php-libphutil>0:devel/libphutil -USES= php +USES= php python:2.7,env shebangfix +SHEBANG_FILES= scripts/breakout.py USE_PHP= curl dom hash json simplexml USE_GITHUB= yes NO_BUILD= yes Modified: branches/2018Q1/devel/arcanist/files/patch-src-workflow-ArcanistVersionWorkflow.php ============================================================================== --- branches/2018Q1/devel/arcanist/files/patch-src-workflow-ArcanistVersionWorkflow.php Wed Jan 17 15:12:12 2018 (r459263) +++ branches/2018Q1/devel/arcanist/files/patch-src-workflow-ArcanistVersionWorkflow.php Wed Jan 17 15:12:45 2018 (r459264) @@ -1,6 +1,6 @@ ---- src/workflow/ArcanistVersionWorkflow.php.orig 2015-07-14 00:07:20.409019999 +0200 -+++ src/workflow/ArcanistVersionWorkflow.php 2015-07-14 00:27:09.586063998 +0200 -@@ -27,6 +27,13 @@ +--- src/workflow/ArcanistVersionWorkflow.php.orig 2017-06-09 15:12:37 UTC ++++ src/workflow/ArcanistVersionWorkflow.php +@@ -27,6 +27,13 @@ EOTEXT public function run() { $console = PhutilConsole::getConsole(); From owner-svn-ports-branches@freebsd.org Wed Jan 17 17:28:41 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 6B8C7E7C89A; Wed, 17 Jan 2018 17:28:41 +0000 (UTC) (envelope-from tabthorpe@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 3F0DF792E9; Wed, 17 Jan 2018 17:28:41 +0000 (UTC) (envelope-from tabthorpe@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 747EC126EE; Wed, 17 Jan 2018 17:28:40 +0000 (UTC) (envelope-from tabthorpe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HHSe1Y088266; Wed, 17 Jan 2018 17:28:40 GMT (envelope-from tabthorpe@FreeBSD.org) Received: (from tabthorpe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HHSeH5088265; Wed, 17 Jan 2018 17:28:40 GMT (envelope-from tabthorpe@FreeBSD.org) Message-Id: <201801171728.w0HHSeH5088265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tabthorpe set sender to tabthorpe@FreeBSD.org using -f From: Thomas Abthorpe Date: Wed, 17 Jan 2018 17:28:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459275 - branches/2018Q1/misc/sword X-SVN-Group: ports-branches X-SVN-Commit-Author: tabthorpe X-SVN-Commit-Paths: branches/2018Q1/misc/sword X-SVN-Commit-Revision: 459275 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, 17 Jan 2018 17:28:41 -0000 Author: tabthorpe Date: Wed Jan 17 17:28:40 2018 New Revision: 459275 URL: https://svnweb.freebsd.org/changeset/ports/459275 Log: MFH: r459270 - Fix build for FreeBSD 11+ Approved by: portmgr (swills) Modified: branches/2018Q1/misc/sword/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/misc/sword/Makefile ============================================================================== --- branches/2018Q1/misc/sword/Makefile Wed Jan 17 17:25:44 2018 (r459274) +++ branches/2018Q1/misc/sword/Makefile Wed Jan 17 17:28:40 2018 (r459275) @@ -15,7 +15,11 @@ LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit -BROKEN_FreeBSD_12= does not build on 12.X +# Workaround for for FreeBSD_11+. +BUILD_DEPENDS+= clang38:lang/clang38 +CC= clang38 +CXX= clang++38 + BROKEN_powerpc64= does not compile: libicui18n.so: undefined reference to __cxa_throw_bad_array_new_length GNU_CONFIGURE= yes From owner-svn-ports-branches@freebsd.org Wed Jan 17 18:39:40 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 44B6AE7FDAD; Wed, 17 Jan 2018 18:39:40 +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 1ED8A7C11A; Wed, 17 Jan 2018 18:39:40 +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 66146132A4; Wed, 17 Jan 2018 18:39:39 +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 w0HIddIM017724; Wed, 17 Jan 2018 18:39:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HIdcCq017721; Wed, 17 Jan 2018 18:39:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801171839.w0HIdcCq017721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 17 Jan 2018 18:39:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459278 - 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: 459278 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, 17 Jan 2018 18:39:40 -0000 Author: jbeich Date: Wed Jan 17 18:39:38 2018 New Revision: 459278 URL: https://svnweb.freebsd.org/changeset/ports/459278 Log: MFH: r459277 www/waterfox: apply more FF58 fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1401459 - copied unchanged from r459277, head/www/waterfox/files/patch-bug1401459 branches/2018Q1/www/waterfox/files/patch-bug1429666 - copied unchanged from r459277, head/www/waterfox/files/patch-bug1429666 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Wed Jan 17 18:37:31 2018 (r459277) +++ branches/2018Q1/www/waterfox/Makefile Wed Jan 17 18:39:38 2018 (r459278) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1401459 (from r459277, head/www/waterfox/files/patch-bug1401459) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1401459 Wed Jan 17 18:39:38 2018 (r459278, copy of r459277, head/www/waterfox/files/patch-bug1401459) @@ -0,0 +1,36 @@ +commit 5d4e99313a0a +Author: Shih-Chiang Chien +Date: Thu Jan 11 10:40:29 2018 +0800 + + Bug 1401459 - always run HttpChannelChild::Release on main thread. r=mayhemer a=gchang + + --HG-- + extra : source : ce5f4fbbebc872f25557afa14342aad95adfa085 +--- + netwerk/protocol/http/HttpChannelChild.cpp | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git netwerk/protocol/http/HttpChannelChild.cpp netwerk/protocol/http/HttpChannelChild.cpp +index bde74561b6e1..21752ec27c83 100644 +--- netwerk/protocol/http/HttpChannelChild.cpp ++++ netwerk/protocol/http/HttpChannelChild.cpp +@@ -245,6 +245,19 @@ NS_IMPL_ADDREF(HttpChannelChild) + + NS_IMETHODIMP_(MozExternalRefCountType) HttpChannelChild::Release() + { ++ if (!NS_IsMainThread()) { ++ nsrefcnt count = mRefCnt; ++ nsresult rv = NS_DispatchToMainThread( ++ NewNonOwningRunnableMethod("HttpChannelChild::Release", ++ this, ++ &HttpChannelChild::Release)); ++ ++ // Continue Release procedure if failed to dispatch to main thread. ++ if (!NS_WARN_IF(NS_FAILED(rv))) { ++ return count - 1; ++ } ++ } ++ + nsrefcnt count = --mRefCnt; + MOZ_ASSERT(int32_t(count) >= 0, "dup release"); + NS_LOG_RELEASE(this, count, "HttpChannelChild"); Copied: branches/2018Q1/www/waterfox/files/patch-bug1429666 (from r459277, head/www/waterfox/files/patch-bug1429666) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1429666 Wed Jan 17 18:39:38 2018 (r459278, copy of r459277, head/www/waterfox/files/patch-bug1429666) @@ -0,0 +1,212 @@ +commit d16cbc0c61b1 +Author: Karl Tomlinson +Date: Thu Jan 11 13:30:24 2018 +1300 + + bug 1429666 cubeb_resampler_speex: don't call data callback while draining r=padenot a=gchang + + MozReview-Commit-ID: 1XEzZjPGai9 + + --HG-- + extra : source : 1ad55edca07d6706bdec5314724fd2361def43c3 +--- + media/libcubeb/README_MOZILLA | 8 +++-- + media/libcubeb/gtest/test_resampler.cpp | 15 ++++---- + media/libcubeb/src/cubeb_resampler.cpp | 51 +++++++++++++++++---------- + media/libcubeb/src/cubeb_resampler_internal.h | 9 ++--- + 4 files changed, 53 insertions(+), 30 deletions(-) + +diff --git media/libcubeb/README_MOZILLA media/libcubeb/README_MOZILLA +index 506d2dc5434b..44d36b45c500 100644 +--- media/libcubeb/README_MOZILLA ++++ media/libcubeb/README_MOZILLA +@@ -1,7 +1,11 @@ + The source from this directory was copied from the cubeb + git repository using the update.sh script. The only changes +-made were those applied by update.sh and the addition of +-Makefile.in build files for the Mozilla build system. ++made were those applied by update.sh, the addition of ++Makefile.in build files for the Mozilla build system, ++and the following patches, which may be overwritten when ++included upstream. ++https://github.com/kinetiknz/cubeb/pull/398/commits/c8e66dee61a35e6a6d54e3630e1668bdbd6984b4 ++https://github.com/kinetiknz/cubeb/pull/398/commits/2ed979bc891cf1a7822799947a357d4d3b625964 + + The cubeb git repository is: git://github.com/kinetiknz/cubeb.git + +diff --git media/libcubeb/gtest/test_resampler.cpp media/libcubeb/gtest/test_resampler.cpp +index 3eebce950845..1f5fb8f9e14c 100644 +--- media/libcubeb/gtest/test_resampler.cpp ++++ media/libcubeb/gtest/test_resampler.cpp +@@ -497,13 +497,15 @@ TEST(cubeb, resampler_output_only_noop) + cubeb_resampler_destroy(resampler); + } + +-long test_drain_data_cb(cubeb_stream * /*stm*/, void * /*user_ptr*/, ++long test_drain_data_cb(cubeb_stream * /*stm*/, void * user_ptr, + const void * input_buffer, + void * output_buffer, long frame_count) + { + EXPECT_TRUE(output_buffer); + EXPECT_TRUE(!input_buffer); +- return frame_count - 10; ++ auto cb_count = static_cast(user_ptr); ++ (*cb_count)++; ++ return frame_count - 1; + } + + TEST(cubeb, resampler_drain) +@@ -515,10 +517,11 @@ TEST(cubeb, resampler_drain) + output_params.channels = 1; + output_params.format = CUBEB_SAMPLE_FLOAT32NE; + target_rate = 48000; ++ int cb_count = 0; + + cubeb_resampler * resampler = + cubeb_resampler_create((cubeb_stream*)nullptr, nullptr, &output_params, target_rate, +- test_drain_data_cb, nullptr, ++ test_drain_data_cb, &cb_count, + CUBEB_RESAMPLER_QUALITY_VOIP); + + const long out_frames = 128; +@@ -530,9 +533,9 @@ TEST(cubeb, resampler_drain) + out_buffer, out_frames); + } while (got == out_frames); + +- /* If the above is not an infinite loop, the drain was a success, just mark +- * this test as such. */ +- ASSERT_TRUE(true); ++ /* The callback should be called once but not again after returning < ++ * frame_count. */ ++ ASSERT_EQ(cb_count, 1); + + cubeb_resampler_destroy(resampler); + } +diff --git media/libcubeb/src/cubeb_resampler.cpp media/libcubeb/src/cubeb_resampler.cpp +index 6002bd2161a9..fcccede28e2d 100644 +--- media/libcubeb/src/cubeb_resampler.cpp ++++ media/libcubeb/src/cubeb_resampler.cpp +@@ -145,26 +145,32 @@ cubeb_resampler_speex + assert(!input_buffer && (!input_frames_count || *input_frames_count == 0) && + output_buffer && output_frames_needed); + +- long got = 0; +- T * out_unprocessed = nullptr; +- long output_frames_before_processing = 0; ++ if (!draining) { ++ long got = 0; ++ T * out_unprocessed = nullptr; ++ long output_frames_before_processing = 0; + +- /* fill directly the input buffer of the output processor to save a copy */ +- output_frames_before_processing = +- output_processor->input_needed_for_output(output_frames_needed); ++ /* fill directly the input buffer of the output processor to save a copy */ ++ output_frames_before_processing = ++ output_processor->input_needed_for_output(output_frames_needed); + +- out_unprocessed = +- output_processor->input_buffer(output_frames_before_processing); ++ out_unprocessed = ++ output_processor->input_buffer(output_frames_before_processing); + +- got = data_callback(stream, user_ptr, +- nullptr, out_unprocessed, +- output_frames_before_processing); ++ got = data_callback(stream, user_ptr, ++ nullptr, out_unprocessed, ++ output_frames_before_processing); + +- if (got < 0) { +- return got; +- } ++ if (got < output_frames_before_processing) { ++ draining = true; + +- output_processor->written(got); ++ if (got < 0) { ++ return got; ++ } ++ } ++ ++ output_processor->written(got); ++ } + + /* Process the output. If not enough frames have been returned from the + * callback, drain the processors. */ +@@ -204,11 +210,16 @@ cubeb_resampler_speex + ::fill_internal_duplex(T * in_buffer, long * input_frames_count, + T * out_buffer, long output_frames_needed) + { ++ if (draining) { ++ // discard input and drain any signal remaining in the resampler. ++ return output_processor->output(out_buffer, output_frames_needed); ++ } ++ + /* The input data, after eventual resampling. This is passed to the callback. */ + T * resampled_input = nullptr; + /* The output buffer passed down in the callback, that might be resampled. */ + T * out_unprocessed = nullptr; +- size_t output_frames_before_processing = 0; ++ long output_frames_before_processing = 0; + /* The number of frames returned from the callback. */ + long got = 0; + +@@ -243,8 +254,12 @@ cubeb_resampler_speex + resampled_input, out_unprocessed, + output_frames_before_processing); + +- if (got < 0) { +- return got; ++ if (got < output_frames_before_processing) { ++ draining = true; ++ ++ if (got < 0) { ++ return got; ++ } + } + + output_processor->written(got); +diff --git media/libcubeb/src/cubeb_resampler_internal.h media/libcubeb/src/cubeb_resampler_internal.h +index ca08ec571422..fb69992ff159 100644 +--- media/libcubeb/src/cubeb_resampler_internal.h ++++ media/libcubeb/src/cubeb_resampler_internal.h +@@ -62,11 +62,11 @@ public: + : channels(channels) + {} + protected: +- size_t frames_to_samples(size_t frames) ++ size_t frames_to_samples(size_t frames) const + { + return frames * channels; + } +- size_t samples_to_frames(size_t samples) ++ size_t samples_to_frames(size_t samples) const + { + assert(!(samples % channels)); + return samples / channels; +@@ -157,6 +157,7 @@ private: + cubeb_stream * const stream; + const cubeb_data_callback data_callback; + void * const user_ptr; ++ bool draining = false; + }; + + /** Handles one way of a (possibly) duplex resampler, working on interleaved +@@ -282,7 +283,7 @@ public: + * exactly `output_frame_count` resampled frames. This can return a number + * slightly bigger than what is strictly necessary, but it guaranteed that the + * number of output frames will be exactly equal. */ +- uint32_t input_needed_for_output(uint32_t output_frame_count) ++ uint32_t input_needed_for_output(uint32_t output_frame_count) const + { + int32_t unresampled_frames_left = samples_to_frames(resampling_in_buffer.length()); + int32_t resampled_frames_left = samples_to_frames(resampling_out_buffer.length()); +@@ -461,7 +462,7 @@ public: + * @parameter frames_needed the number of frames one want to write into the + * delay_line + * @returns the number of frames one will get. */ +- size_t input_needed_for_output(uint32_t frames_needed) ++ size_t input_needed_for_output(uint32_t frames_needed) const + { + return frames_needed; + } From owner-svn-ports-branches@freebsd.org Wed Jan 17 23:30:07 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 BD911EBF3D2; Wed, 17 Jan 2018 23:30:07 +0000 (UTC) (envelope-from mmokhi@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 31F2A68076; Wed, 17 Jan 2018 23:30:07 +0000 (UTC) (envelope-from mmokhi@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 0DF991621D; Wed, 17 Jan 2018 23:30:06 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HNU5o8040340; Wed, 17 Jan 2018 23:30:05 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HNU5WL040336; Wed, 17 Jan 2018 23:30:05 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201801172330.w0HNU5WL040336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Wed, 17 Jan 2018 23:30:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459297 - in branches/2018Q1/databases: mysql56-client/files mysql56-server mysql56-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2018Q1/databases: mysql56-client/files mysql56-server mysql56-server/files X-SVN-Commit-Revision: 459297 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, 17 Jan 2018 23:30:08 -0000 Author: mmokhi Date: Wed Jan 17 23:30:05 2018 New Revision: 459297 URL: https://svnweb.freebsd.org/changeset/ports/459297 Log: MFH: r459293 databases/mysql56-{client, server}: Update to 5.6.39 This update fixes bugs like CVE-2018-2696, CVE-2018-2562, and CVE-2018-2583 in MySQL protocol by upstream PR: 225240 Sponsored by: Netzkommune GmbH Approved by: ports-secteam (feld) Modified: branches/2018Q1/databases/mysql56-client/files/patch-client_CMakeLists.txt branches/2018Q1/databases/mysql56-server/Makefile branches/2018Q1/databases/mysql56-server/distinfo branches/2018Q1/databases/mysql56-server/files/patch-client_CMakeLists.txt Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/mysql56-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2018Q1/databases/mysql56-client/files/patch-client_CMakeLists.txt Wed Jan 17 23:29:54 2018 (r459296) +++ branches/2018Q1/databases/mysql56-client/files/patch-client_CMakeLists.txt Wed Jan 17 23:30:05 2018 (r459297) @@ -8,8 +8,8 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + ADD_DEPENDENCIES(mysqltest GenError) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) @@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim Modified: branches/2018Q1/databases/mysql56-server/Makefile ============================================================================== --- branches/2018Q1/databases/mysql56-server/Makefile Wed Jan 17 23:29:54 2018 (r459296) +++ branches/2018Q1/databases/mysql56-server/Makefile Wed Jan 17 23:30:05 2018 (r459297) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.38 -PORTREVISION= 1 +PORTVERSION= 5.6.39 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Modified: branches/2018Q1/databases/mysql56-server/distinfo ============================================================================== --- branches/2018Q1/databases/mysql56-server/distinfo Wed Jan 17 23:29:54 2018 (r459296) +++ branches/2018Q1/databases/mysql56-server/distinfo Wed Jan 17 23:30:05 2018 (r459297) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508414750 -SHA256 (mysql-5.6.38.tar.gz) = 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3 -SIZE (mysql-5.6.38.tar.gz) = 32197625 +TIMESTAMP = 1516106681 +SHA256 (mysql-5.6.39.tar.gz) = ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d +SIZE (mysql-5.6.39.tar.gz) = 32110958 Modified: branches/2018Q1/databases/mysql56-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2018Q1/databases/mysql56-server/files/patch-client_CMakeLists.txt Wed Jan 17 23:29:54 2018 (r459296) +++ branches/2018Q1/databases/mysql56-server/files/patch-client_CMakeLists.txt Wed Jan 17 23:30:05 2018 (r459297) @@ -15,7 +15,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) - + ADD_DEPENDENCIES(mysqltest GenError) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) From owner-svn-ports-branches@freebsd.org Wed Jan 17 23:57: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 5D5A3EC0C0B; Wed, 17 Jan 2018 23:57:33 +0000 (UTC) (envelope-from mmokhi@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 1CAB8694DA; Wed, 17 Jan 2018 23:57:33 +0000 (UTC) (envelope-from mmokhi@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 52573166C6; Wed, 17 Jan 2018 23:57:32 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HNvWMU053609; Wed, 17 Jan 2018 23:57:32 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HNvVNk053601; Wed, 17 Jan 2018 23:57:31 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201801172357.w0HNvVNk053601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Wed, 17 Jan 2018 23:57:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459298 - in branches/2018Q1/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2018Q1/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Commit-Revision: 459298 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, 17 Jan 2018 23:57:33 -0000 Author: mmokhi Date: Wed Jan 17 23:57:31 2018 New Revision: 459298 URL: https://svnweb.freebsd.org/changeset/ports/459298 Log: MFH: r459295 databases/mysql56-{client, server}: Update to 5.7.21 This update fixes bugs like CVE-2018-2696, CVE-2018-2562, CVE-2018-2640, CVE-2018-2668, CVE-2017-3737 (and more) in MySQL protocol by upstream. Delete local patches (CMake plugin macros) that are merged by upstream. PR: 225195 Sponsored by: Netzkommune GmbH Approved by: ports-secteam (feld) Added: branches/2018Q1/databases/mysql57-client/files/patch-configure.cmake - copied unchanged from r459295, head/databases/mysql57-client/files/patch-configure.cmake Deleted: branches/2018Q1/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Modified: branches/2018Q1/databases/mysql57-client/files/patch-client_CMakeLists.txt branches/2018Q1/databases/mysql57-client/files/patch-cmake_plugin.cmake branches/2018Q1/databases/mysql57-client/pkg-plist branches/2018Q1/databases/mysql57-server/Makefile branches/2018Q1/databases/mysql57-server/distinfo branches/2018Q1/databases/mysql57-server/files/patch-cmake_plugin.cmake branches/2018Q1/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/mysql57-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2018Q1/databases/mysql57-client/files/patch-client_CMakeLists.txt Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-client/files/patch-client_CMakeLists.txt Wed Jan 17 23:57:31 2018 (r459298) @@ -18,10 +18,10 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + ADD_DEPENDENCIES(mysqltest GenError) +ENDIF() ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) Modified: branches/2018Q1/databases/mysql57-client/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2018Q1/databases/mysql57-client/files/patch-cmake_plugin.cmake Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-client/files/patch-cmake_plugin.cmake Wed Jan 17 23:57:31 2018 (r459298) @@ -1,24 +1,6 @@ --- 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) +@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) Copied: branches/2018Q1/databases/mysql57-client/files/patch-configure.cmake (from r459295, head/databases/mysql57-client/files/patch-configure.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/mysql57-client/files/patch-configure.cmake Wed Jan 17 23:57:31 2018 (r459298, copy of r459295, head/databases/mysql57-client/files/patch-configure.cmake) @@ -0,0 +1,15 @@ +--- configure.cmake.orig 2018-01-16 23:26:09 UTC ++++ configure.cmake +@@ -43,6 +43,12 @@ IF(UNIX) + ENDIF() + + ++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS ++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%") ++ENDIF() ++ ++ + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + ## We will be using gcc to generate .so files + ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS Modified: branches/2018Q1/databases/mysql57-client/pkg-plist ============================================================================== --- branches/2018Q1/databases/mysql57-client/pkg-plist Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-client/pkg-plist Wed Jan 17 23:57:31 2018 (r459298) @@ -121,7 +121,6 @@ include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.20 -lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.20 Modified: branches/2018Q1/databases/mysql57-server/Makefile ============================================================================== --- branches/2018Q1/databases/mysql57-server/Makefile Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-server/Makefile Wed Jan 17 23:57:31 2018 (r459298) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.20 -PORTREVISION= 2 +PORTVERSION= 5.7.21 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server @@ -157,7 +156,7 @@ post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${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 + ${WRKSRC}/configure.cmake .if !defined(CLIENT_ONLY) post-install: Modified: branches/2018Q1/databases/mysql57-server/distinfo ============================================================================== --- branches/2018Q1/databases/mysql57-server/distinfo Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-server/distinfo Wed Jan 17 23:57:31 2018 (r459298) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508434184 -SHA256 (mysql-boost-5.7.20.tar.gz) = 260582844ac18222ce2826f48b6c7ca387990b19ddb88331af26738b394e42a4 -SIZE (mysql-boost-5.7.20.tar.gz) = 48833145 +TIMESTAMP = 1516137476 +SHA256 (mysql-boost-5.7.21.tar.gz) = ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 +SIZE (mysql-boost-5.7.21.tar.gz) = 48931457 Modified: branches/2018Q1/databases/mysql57-server/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2018Q1/databases/mysql57-server/files/patch-cmake_plugin.cmake Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-server/files/patch-cmake_plugin.cmake Wed Jan 17 23:57:31 2018 (r459298) @@ -1,24 +1,6 @@ --- 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) +@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) Modified: branches/2018Q1/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2018Q1/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt Wed Jan 17 23:30:05 2018 (r459297) +++ branches/2018Q1/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt Wed Jan 17 23:57:31 2018 (r459298) @@ -1,11 +1,11 @@ --- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +++ libmysql/CMakeLists.txt -@@ -215,7 +215,7 @@ IF(WIN32) - ENDIF() +@@ -235,7 +235,7 @@ MESSAGE(STATUS + ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) @@ -14,7 +14,7 @@ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) ++ COMPONENT SharedLibraries SKIP_INSTALL) +IF(FALSE) IF(UNIX) # libtool compatability From owner-svn-ports-branches@freebsd.org Thu Jan 18 00:25: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 59155EC26E3; Thu, 18 Jan 2018 00:25:44 +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 34D6E6ACB9; Thu, 18 Jan 2018 00:25:44 +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 63F2016BA3; Thu, 18 Jan 2018 00:25:43 +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 w0I0PhPd066348; Thu, 18 Jan 2018 00:25:43 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0I0Phjn066346; Thu, 18 Jan 2018 00:25:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801180025.w0I0Phjn066346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 18 Jan 2018 00:25:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459302 - 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: 459302 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, 18 Jan 2018 00:25:44 -0000 Author: jbeich Date: Thu Jan 18 00:25:42 2018 New Revision: 459302 URL: https://svnweb.freebsd.org/changeset/ports/459302 Log: MFH: r459299 emulators/rpcs3: update to 0.0.4.259 Changes: https://github.com/RPCS3/rpcs3/compare/24e97b9e0...71f69d1d4 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 18 00:22:33 2018 (r459301) +++ branches/2018Q1/emulators/rpcs3/Makefile Thu Jan 18 00:25:42 2018 (r459302) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-252 -DISTVERSIONSUFFIX= -g24e97b9e0 +DISTVERSION= 0.0.4-259 +DISTVERSIONSUFFIX= -g71f69d1d4 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Thu Jan 18 00:22:33 2018 (r459301) +++ branches/2018Q1/emulators/rpcs3/distinfo Thu Jan 18 00:25:42 2018 (r459302) @@ -1,6 +1,6 @@ -TIMESTAMP = 1516033416 -SHA256 (RPCS3-rpcs3-v0.0.4-252-g24e97b9e0_GH0.tar.gz) = ebf5d9d125ff571cc80b431952f2aebd467b09fec5da7c86919a11964410e4c7 -SIZE (RPCS3-rpcs3-v0.0.4-252-g24e97b9e0_GH0.tar.gz) = 3619025 +TIMESTAMP = 1516205640 +SHA256 (RPCS3-rpcs3-v0.0.4-259-g71f69d1d4_GH0.tar.gz) = 98ed7f53c7f067c7bbafe04b58d9f9ddd90483869daa7a161a1349a9f687a4c7 +SIZE (RPCS3-rpcs3-v0.0.4-259-g71f69d1d4_GH0.tar.gz) = 3797583 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 18 00:59: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 63320EC3BDB; Thu, 18 Jan 2018 00:59:16 +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 3CCFC6BFF9; Thu, 18 Jan 2018 00:59:16 +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 6F1E817069; Thu, 18 Jan 2018 00:59:15 +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 w0I0xFb3079515; Thu, 18 Jan 2018 00:59:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0I0xFIi079513; Thu, 18 Jan 2018 00:59:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801180059.w0I0xFIi079513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 18 Jan 2018 00:59:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459307 - 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: 459307 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, 18 Jan 2018 00:59:16 -0000 Author: jbeich Date: Thu Jan 18 00:59:14 2018 New Revision: 459307 URL: https://svnweb.freebsd.org/changeset/ports/459307 Log: MFH: r459305 emulators/citra: update to s20180118 Changes: https://github.com/citra-emu/citra/compare/79dca3d6...93cca23d 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 18 00:58:23 2018 (r459306) +++ branches/2018Q1/emulators/citra/Makefile Thu Jan 18 00:59:14 2018 (r459307) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180113 +PORTVERSION= s20180118 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= 79dca3d6 +GH_TAGNAME= 93cca23d 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 18 00:58:23 2018 (r459306) +++ branches/2018Q1/emulators/citra/distinfo Thu Jan 18 00:59:14 2018 (r459307) @@ -1,6 +1,6 @@ -TIMESTAMP = 1515877519 -SHA256 (citra-emu-citra-s20180113-79dca3d6_GH0.tar.gz) = 7d26d3dd54bc0b6da02a80f889733641fb0fcf8e66007c81a50e29d6c9d4e0f8 -SIZE (citra-emu-citra-s20180113-79dca3d6_GH0.tar.gz) = 1651786 +TIMESTAMP = 1516228250 +SHA256 (citra-emu-citra-s20180118-93cca23d_GH0.tar.gz) = bb2d99de31030e5269f38e13b6b391554d4ee86e933ec76ad794357ff52feccb +SIZE (citra-emu-citra-s20180118-93cca23d_GH0.tar.gz) = 1654723 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 18 14:09: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 A817FE7C905; Thu, 18 Jan 2018 14:09:11 +0000 (UTC) (envelope-from dvl@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 840476EB71; Thu, 18 Jan 2018 14:09:11 +0000 (UTC) (envelope-from dvl@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 B2CAF1F843; Thu, 18 Jan 2018 14:09:10 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0IE9A44016712; Thu, 18 Jan 2018 14:09:10 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IE9A7o016711; Thu, 18 Jan 2018 14:09:10 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201801181409.w0IE9A7o016711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Thu, 18 Jan 2018 14:09:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459325 - branches/2018Q1/www/rubygem-passenger X-SVN-Group: ports-branches X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: branches/2018Q1/www/rubygem-passenger X-SVN-Commit-Revision: 459325 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, 18 Jan 2018 14:09:11 -0000 Author: dvl Date: Thu Jan 18 14:09:10 2018 New Revision: 459325 URL: https://svnweb.freebsd.org/changeset/ports/459325 Log: MFH: r459268 Fix build was failing with: Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'lib/ruby/gems/2.4/gems/passenger-5.1.12/dev/ci/tests/debian/run' Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'lib/ruby/gems/2.4/gems/passenger-5.1.12/dev/ci/tests/rpm/run' Error: '/usr/local/bin/python2' is an invalid shebang you need USES=shebangfix for 'lib/ruby/gems/2.4/gems/passenger-5.1.12/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py' Approved by: portmgr@ (blanket approval) Modified: branches/2018Q1/www/rubygem-passenger/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/rubygem-passenger/Makefile ============================================================================== --- branches/2018Q1/www/rubygem-passenger/Makefile Thu Jan 18 13:33:30 2018 (r459324) +++ branches/2018Q1/www/rubygem-passenger/Makefile Thu Jan 18 14:09:10 2018 (r459325) @@ -3,6 +3,7 @@ PORTNAME= passenger PORTVERSION= 5.1.12 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- @@ -28,12 +29,14 @@ OPTIONS_DEFAULT= APACHE22 USE_RUBY= yes RAKE_BIN= ${LOCALBASE}/bin/rake -USES= cpe gem libtool shebangfix ssl +USES= cpe gem libtool python:env shebangfix ssl SHEBANG_FILES= \ src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \ dev/vagrant/nginx_start \ dev/vagrant/provision.sh \ dev/ci/run-tests-with-docker \ + dev/ci/tests/debian/run \ + dev/ci/tests/rpm/run \ dev/ci/scripts/setup-host-natively.sh \ dev/ci/scripts/docker-entrypoint-stage2.sh \ dev/ci/scripts/inituidgid \ From owner-svn-ports-branches@freebsd.org Thu Jan 18 14:24: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 6DEABE7D507; Thu, 18 Jan 2018 14:24:37 +0000 (UTC) (envelope-from garga@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 47ACD6F6F3; Thu, 18 Jan 2018 14:24:37 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C5FA1FB8E; Thu, 18 Jan 2018 14:24:36 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0IEOaC5025072; Thu, 18 Jan 2018 14:24:36 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IEOaVU025069; Thu, 18 Jan 2018 14:24:36 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201801181424.w0IEOaVU025069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Thu, 18 Jan 2018 14:24:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459326 - branches/2018Q1/archivers/arj X-SVN-Group: ports-branches X-SVN-Commit-Author: garga X-SVN-Commit-Paths: branches/2018Q1/archivers/arj X-SVN-Commit-Revision: 459326 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, 18 Jan 2018 14:24:37 -0000 Author: garga Date: Thu Jan 18 14:24:36 2018 New Revision: 459326 URL: https://svnweb.freebsd.org/changeset/ports/459326 Log: MFH: r459324 Update debian patch collection to version 17 since 16 is not available anymore Reported by: David Martin Sponsored by: Rubicon Communications, LLC (Netgate) Approved by: ports-secteam (swills) Modified: branches/2018Q1/archivers/arj/Makefile branches/2018Q1/archivers/arj/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/archivers/arj/Makefile ============================================================================== --- branches/2018Q1/archivers/arj/Makefile Thu Jan 18 14:09:10 2018 (r459325) +++ branches/2018Q1/archivers/arj/Makefile Thu Jan 18 14:24:36 2018 (r459326) @@ -3,12 +3,12 @@ PORTNAME= arj PORTVERSION= 3.10.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= archivers MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022:source \ DEBIAN_POOL:patch DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:source \ - ${PORTNAME}_${PORTVERSION}-16.debian.tar.xz:patch + ${PORTNAME}_${PORTVERSION}-17.debian.tar.xz:patch MAINTAINER= garga@FreeBSD.org COMMENT= Open source implementation of the ARJ archiver Modified: branches/2018Q1/archivers/arj/distinfo ============================================================================== --- branches/2018Q1/archivers/arj/distinfo Thu Jan 18 14:09:10 2018 (r459325) +++ branches/2018Q1/archivers/arj/distinfo Thu Jan 18 14:24:36 2018 (r459326) @@ -1,5 +1,5 @@ -TIMESTAMP = 1508345026 +TIMESTAMP = 1516278521 SHA256 (arj-3.10.22.tar.gz) = 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db SIZE (arj-3.10.22.tar.gz) = 431467 -SHA256 (arj_3.10.22-16.debian.tar.xz) = 2d9cc5aeb2ac44d000d2e3399846f1c3ce468e17e3af4bfb505b9a6eaf88a502 -SIZE (arj_3.10.22-16.debian.tar.xz) = 19452 +SHA256 (arj_3.10.22-17.debian.tar.xz) = 9791db321ef8fb7237697ac0ad7fa9c18d5e53c43bb835953ef80aeeda809804 +SIZE (arj_3.10.22-17.debian.tar.xz) = 19548 From owner-svn-ports-branches@freebsd.org Thu Jan 18 20:23:34 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 00B83EC126A; Thu, 18 Jan 2018 20:23:34 +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 BBD0F7EF35; Thu, 18 Jan 2018 20:23:33 +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 DE11623713; Thu, 18 Jan 2018 20:23:32 +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 w0IKNWrw080296; Thu, 18 Jan 2018 20:23:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IKNV2O080288; Thu, 18 Jan 2018 20:23:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801182023.w0IKNV2O080288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 18 Jan 2018 20:23:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459374 - in branches/2018Q1/net-mgmt/librenms: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/net-mgmt/librenms: . files X-SVN-Commit-Revision: 459374 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, 18 Jan 2018 20:23:34 -0000 Author: feld Date: Thu Jan 18 20:23:31 2018 New Revision: 459374 URL: https://svnweb.freebsd.org/changeset/ports/459374 Log: MFH: r459372 net-mgmt/librenms: Update to 1.35, many improvements Improvements: - All files should be owned root:wheel except logs and rrd which need to be writable by the app - Add missing php posix extension - Do not install config.php by default. This breaks the install process which won't run if this file exists - Clean up automatic PLIST creation: don't install .orig or .bak files, don't add @dir as they aren't needed - Patch LibreNMS to make /validate/ page not produce warnings about files not being writable (for git updates) - Remove the Updates validation check altogether as we won't be using git to update - Patch the User validation check to only check the logs and rrd dir and ensure the correct user owns them - Change the default user in the generated config to "www" - Patch the File Lock code to put the lock file in /tmp and not in the WWWDIR which should not be writable - Update message in installer to use WWWDIR as suggested path for config.php - Use shebangfix instead of patch where applicable - Fix APACHEMOD port option and declaration of the USES=php PR: 225161 Differential Revision: https://reviews.freebsd.org/D13907 Added: branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php - copied unchanged from r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php - copied unchanged from r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php branches/2018Q1/net-mgmt/librenms/files/patch-html_install.php - copied unchanged from r459372, head/net-mgmt/librenms/files/patch-html_install.php Deleted: branches/2018Q1/net-mgmt/librenms/files/patch-poller.php Modified: branches/2018Q1/net-mgmt/librenms/Makefile branches/2018Q1/net-mgmt/librenms/distinfo branches/2018Q1/net-mgmt/librenms/files/patch-config.php.default branches/2018Q1/net-mgmt/librenms/files/patch-includes_defaults.inc.php branches/2018Q1/net-mgmt/librenms/files/patch-poller-wrapper.py Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/librenms/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:22:01 2018 (r459373) +++ branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:23:31 2018 (r459374) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.33.01 -PORTREVISION= 1 +PORTVERSION= 1.35 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net-mgmt @@ -40,9 +40,10 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-do vendor/ezyang/htmlpurifier/maintenance/rename-config.php \ vendor/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php \ vendor/ezyang/htmlpurifier/maintenance/update-config.php \ - vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php + vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php \ + poller.php poller-wrapper.py -USE_PHP= ctype curl filter gd hash json ldap mcrypt mysqli openssl session simplexml snmp tokenizer xml +USE_PHP= ctype curl filter gd hash json ldap mcrypt mysqli openssl posix session simplexml snmp tokenizer xml NO_BUILD= yes @@ -78,84 +79,72 @@ WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client MYSQLD_USES= mysql:server MYSQLD_USES_OFF= mysql:client -SUB_FILES+= pkg-message +SUB_FILES+= librenms.conf pkg-message SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ - billing-calculate.php \ - check-services.php composer.json config_to_json.php cronic daily.php daily.sh \ + billing-calculate.php check-services.php composer.json \ + config.php.default config_to_json.php cronic daily.php daily.sh \ delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \ mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \ poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \ snmptrap.php syslog.php validate.php -ROOT_DIRS= LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor +ROOT_DIRS= LibreNMS contrib doc html includes lib logs mibs misc rrd scripts sql-schema tests vendor DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md PORTDOCS= * PORTEXAMPLES= snmp.conf.example snmpd.conf.example NO_ARCH= yes -.if !defined(PACKAGE_BUILDING) -APACHEMOD_VARS_ON= WANT_PHP_MOD=yes +APACHEMOD_USES= php:mod +APACHEMOD_USES_OFF= php:web APACHEMOD_USE= APACHE_RUN=22+ -.else -# Package builder doesn't create php5 with module -USES+= php:web -.endif post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' \ ${WRKSRC}/includes/common.php + ${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' \ + ${WRKSRC}/html/install.php + ${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php do-install: - @${MKDIR} ${STAGEDIR}/${WWWDIR} + ${MKDIR} ${STAGEDIR}/${WWWDIR} .for dir in ${ROOT_DIRS} - @${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir} - @cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir} + ${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir} + (cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir}) .endfor .for f in ${ROOT_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor -# Create empty rrd dir writable by www - @${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd - @${CHMOD} 0775 ${STAGEDIR}/${WWWDIR}/rrd -# Create empty logs dir - @${MKDIR} ${STAGEDIR}/${WWWDIR}/logs # Make daily.sh executable - @${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh + ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh # Files in scripts dir should be executable - @${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; + ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable - @${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ + ${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ '*.php' -exec ${CHMOD} +x {} \; do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${MKDIR} ${STAGEDIR}/${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} .endfor - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} .endfor post-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST} + @${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' ')' -delete @${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} - @${FIND} -s ${STAGEDIR}${WWWDIR} -type d | \ - ${SED} -e 's#^${STAGEDIR}#@dir #' >> ${TMPPLIST} - ${INSTALL_DATA} ${WRKSRC}/config.php.default \ - ${STAGEDIR}/${WWWDIR}/config.php.sample - @${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST} - @${ECHO_CMD} "@group" >> ${TMPPLIST} - @${ECHO_CMD} "@owner" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/rrd" >> ${TMPPLIST} .include Modified: branches/2018Q1/net-mgmt/librenms/distinfo ============================================================================== --- branches/2018Q1/net-mgmt/librenms/distinfo Thu Jan 18 20:22:01 2018 (r459373) +++ branches/2018Q1/net-mgmt/librenms/distinfo Thu Jan 18 20:23:31 2018 (r459374) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511119483 -SHA256 (librenms-librenms-1.33.01_GH0.tar.gz) = ca5f3d5a606efd445291c14126c9216d1a595dc37f330cc00284d5d42f6bf5e9 -SIZE (librenms-librenms-1.33.01_GH0.tar.gz) = 60473613 +TIMESTAMP = 1515895316 +SHA256 (librenms-librenms-1.35_GH0.tar.gz) = 6ac5d1164642cdef589487a2d599b774081a6e82e59f5fffca2c566b69d98850 +SIZE (librenms-librenms-1.35_GH0.tar.gz) = 62664279 Copied: branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php (from r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php Thu Jan 18 20:23:31 2018 (r459374, copy of r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php) @@ -0,0 +1,11 @@ +--- LibreNMS/Util/FileLock.php.orig 2018-01-14 15:32:35 UTC ++++ LibreNMS/Util/FileLock.php +@@ -45,7 +45,7 @@ class FileLock implements Lock + global $config; + + $this->name = $lock_name; +- $this->file = "$config[install_dir]/.$lock_name.lock"; ++ $this->file = "/tmp/.$lock_name.lock"; + $this->handle = fopen($this->file, "w+"); + } + Copied: branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php (from r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php Thu Jan 18 20:23:31 2018 (r459374, copy of r459372, head/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php) @@ -0,0 +1,33 @@ +--- LibreNMS/Validations/User.php.orig 2017-12-31 20:48:36 UTC ++++ LibreNMS/Validations/User.php +@@ -62,29 +62,7 @@ class User implements ValidationGroup + + + // Let's test the user configured if we have it +- if (Config::has('user')) { +- $dir = Config::get('install_dir'); +- +- $find_result = rtrim(`find $dir \! -user $lnms_username -o \! -group $lnms_groupname &> /dev/null`); +- if (!empty($find_result)) { +- // Ignore the two logs that may be created by the +- $files = array_diff(explode(PHP_EOL, $find_result), array( +- "$dir/logs/error_log", +- "$dir/logs/access_log", +- )); +- +- if (!empty($files)) { +- $result = ValidationResult::fail( +- "We have found some files that are owned by a different user than $lnms_username, this " . +- 'will stop you updating automatically and / or rrd files being updated causing graphs to fail.' +- ) +- ->setFix("chown -R $lnms_username:$lnms_groupname $dir") +- ->setList('Files', $files); +- +- $validator->result($result); +- } +- } +- } else { ++ if (!Config::has('user')) { + $validator->warn("You don't have \$config['user'] set, this most likely needs to be set to librenms"); + } + Modified: branches/2018Q1/net-mgmt/librenms/files/patch-config.php.default ============================================================================== --- branches/2018Q1/net-mgmt/librenms/files/patch-config.php.default Thu Jan 18 20:22:01 2018 (r459373) +++ branches/2018Q1/net-mgmt/librenms/files/patch-config.php.default Thu Jan 18 20:23:31 2018 (r459374) @@ -1,4 +1,4 @@ ---- config.php.default.orig 2017-04-11 17:32:28 UTC +--- config.php.default.orig 2017-12-31 20:48:36 UTC +++ config.php.default @@ -10,7 +10,7 @@ $config['db_name'] = 'librenms'; Copied: branches/2018Q1/net-mgmt/librenms/files/patch-html_install.php (from r459372, head/net-mgmt/librenms/files/patch-html_install.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-mgmt/librenms/files/patch-html_install.php Thu Jan 18 20:23:31 2018 (r459374, copy of r459372, head/net-mgmt/librenms/files/patch-html_install.php) @@ -0,0 +1,20 @@ +--- html/install.php.orig 2017-12-31 20:48:36 UTC ++++ html/install.php +@@ -364,7 +364,7 @@ $config_file = <<<"EOD" + + // This is the user LibreNMS will run as + //Please ensure this user is created and has the correct permissions to your install +-\$config['user'] = 'librenms'; ++\$config['user'] = 'www'; + + ### Memcached config - We use this to store realtime usage + \$config\['memcached'\]\['enable'\] = FALSE; +@@ -395,7 +395,7 @@ $config_file = <<<"EOD" + #\$config\['nets'\]\[\] = "192.168.0.0/16"; + + # Uncomment the next line to disable daily updates +-#\$config\['update'\] = 0; ++\$config\['update'\] = 0; + EOD; + + if (!file_exists("../config.php")) { Modified: branches/2018Q1/net-mgmt/librenms/files/patch-includes_defaults.inc.php ============================================================================== --- branches/2018Q1/net-mgmt/librenms/files/patch-includes_defaults.inc.php Thu Jan 18 20:22:01 2018 (r459373) +++ branches/2018Q1/net-mgmt/librenms/files/patch-includes_defaults.inc.php Thu Jan 18 20:23:31 2018 (r459374) @@ -1,6 +1,6 @@ ---- includes/defaults.inc.php.orig 2017-11-01 17:55:06.000000000 +0000 -+++ includes/defaults.inc.php 2017-11-20 23:16:29.419902000 +0000 -@@ -48,19 +48,21 @@ +--- includes/defaults.inc.php.orig 2017-12-31 20:48:36 UTC ++++ includes/defaults.inc.php +@@ -48,19 +48,21 @@ $config['fping_options']['retries'] = 3; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3; $config['fping_options']['millisec'] = 200; @@ -30,5 +30,5 @@ +$config['dot'] = '/usr/local/bin/dot'; +$config['sfdp'] = '/usr/local/bin/sfdp'; - // Memcached - Keep immediate statistics - $config['memcached']['enable'] = false; + $config['slow_statistics'] = true; + // THIS WILL CHANGE TO FALSE IN FUTURE Modified: branches/2018Q1/net-mgmt/librenms/files/patch-poller-wrapper.py ============================================================================== --- branches/2018Q1/net-mgmt/librenms/files/patch-poller-wrapper.py Thu Jan 18 20:22:01 2018 (r459373) +++ branches/2018Q1/net-mgmt/librenms/files/patch-poller-wrapper.py Thu Jan 18 20:23:31 2018 (r459374) @@ -1,11 +1,5 @@ ---- poller-wrapper.py.orig 2017-05-28 21:54:20 UTC +--- poller-wrapper.py.orig 2018-01-14 15:32:19 UTC +++ poller-wrapper.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2 -+#! %%LOCALBASE%%/bin/python - """ - poller-wrapper A small tool which wraps around the poller and tries to - guide the polling process with a more modern approach with a @@ -36,6 +36,8 @@ except: print "threading, Queue, sys, subprocess, time, os, json" sys.exit(2) From owner-svn-ports-branches@freebsd.org Thu Jan 18 20:27:39 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 A9746EC1512; Thu, 18 Jan 2018 20:27:39 +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 69BB57F0D8; Thu, 18 Jan 2018 20:27:39 +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 B889B23721; Thu, 18 Jan 2018 20:27:38 +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 w0IKRc7J080766; Thu, 18 Jan 2018 20:27:38 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IKRblx080757; Thu, 18 Jan 2018 20:27:37 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801182027.w0IKRblx080757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 18 Jan 2018 20:27:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459375 - in branches/2018Q1: databases/py-peewee databases/py-sqlobject net-mgmt/librenms net-mgmt/observium www/py-django-devel www/py-django110 www/py-django111 www/py-django18 www/p... X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1: databases/py-peewee databases/py-sqlobject net-mgmt/librenms net-mgmt/observium www/py-django-devel www/py-django110 www/py-django111 www/py-django18 www/py-django20 X-SVN-Commit-Revision: 459375 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, 18 Jan 2018 20:27:39 -0000 Author: feld Date: Thu Jan 18 20:27:37 2018 New Revision: 459375 URL: https://svnweb.freebsd.org/changeset/ports/459375 Log: MFH: r458431 databases/py-MySQLdb only supports Python 2, restrict ports that uses it. Sponsored by: Absolight Modified: branches/2018Q1/databases/py-peewee/Makefile branches/2018Q1/databases/py-sqlobject/Makefile branches/2018Q1/net-mgmt/librenms/Makefile branches/2018Q1/net-mgmt/observium/Makefile branches/2018Q1/www/py-django-devel/Makefile branches/2018Q1/www/py-django110/Makefile branches/2018Q1/www/py-django111/Makefile branches/2018Q1/www/py-django18/Makefile branches/2018Q1/www/py-django20/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/py-peewee/Makefile ============================================================================== --- branches/2018Q1/databases/py-peewee/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/databases/py-peewee/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -17,11 +17,12 @@ OPTIONS_DEFINE= DOCS SQLITE MYSQL PGSQL OPTIONS_DEFAULT= SQLITE NO_ARCH= yes -USES= python +USES= python${PY_MYSQL} USE_PYTHON= autoplist distutils SQLITE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${FLAVOR} .include Modified: branches/2018Q1/databases/py-sqlobject/Makefile ============================================================================== --- branches/2018Q1/databases/py-sqlobject/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/databases/py-sqlobject/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2. RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes -USES= python +USES= python${PY_MYSQL} USE_PYTHON= autoplist distutils # currently MaxDB(SAP), ADODB are not supported @@ -27,6 +27,7 @@ SYBASE_DESC= sybase support PORTDOCS= * MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${FLAVOR} Modified: branches/2018Q1/net-mgmt/librenms/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -15,7 +15,7 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= librenms -USES= php:cli python shebangfix +USES= php:cli python${PY_MYSQL} shebangfix SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remove \ scripts/Migration/Standard_Conversion/convert_no_xml.sh \ scripts/Migration/Standard_Conversion/destwork_no_xml.sh \ @@ -70,6 +70,7 @@ LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb +PYPOLLER_VARS= PY_MYSQL=:2.7 X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick \ mtr:net/mtr X11_RUN_DEPENDS_OFF= Magick-config:graphics/ImageMagick-nox11 \ Modified: branches/2018Q1/net-mgmt/observium/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/observium/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/net-mgmt/observium/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -20,7 +20,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se WRKSRC= ${WRKDIR}/${PORTNAME} -USES= php:cli python shebangfix +USES= php:cli python${PY_MYSQL} shebangfix SHEBANG_FILES= \ mibs/process.pl \ poller-wrapper.py \ @@ -56,6 +56,7 @@ LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +PYPOLLER_VARS= PY_MYSQL=:2.7 SVN_RUN_DEPENDS= svn:devel/subversion WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client Modified: branches/2018Q1/www/py-django-devel/Makefile ============================================================================== --- branches/2018Q1/www/py-django-devel/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/www/py-django-devel/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-py SNAPSHOTDATE= 20150709 NO_ARCH= yes -USES= cpe gettext python shebangfix +USES= cpe gettext python${PY_MYSQL} shebangfix USE_GITHUB= yes USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ @@ -45,6 +45,7 @@ HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx> HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR} Modified: branches/2018Q1/www/py-django110/Makefile ============================================================================== --- branches/2018Q1/www/py-django110/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/www/py-django110/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -24,7 +24,7 @@ EXPIRATION_DATE=2018-01-31 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes -USES= cpe python shebangfix +USES= cpe python${PY_MYSQL} shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl @@ -49,6 +49,7 @@ HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx> HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} post-build-HTMLDOCS-on: Modified: branches/2018Q1/www/py-django111/Makefile ============================================================================== --- branches/2018Q1/www/py-django111/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/www/py-django111/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -23,7 +23,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes -USES= cpe python shebangfix +USES= cpe python${PY_MYSQL} shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl @@ -48,6 +48,7 @@ HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx> HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} post-build-HTMLDOCS-on: Modified: branches/2018Q1/www/py-django18/Makefile ============================================================================== --- branches/2018Q1/www/py-django18/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/www/py-django18/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes -USES= cpe python shebangfix +USES= cpe python${PY_MYSQL} shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py @@ -48,6 +48,7 @@ HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx> HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +MYSQL_VARS= PY_MYSQL=:2.7 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR} Modified: branches/2018Q1/www/py-django20/Makefile ============================================================================== --- branches/2018Q1/www/py-django20/Makefile Thu Jan 18 20:23:31 2018 (r459374) +++ branches/2018Q1/www/py-django20/Makefile Thu Jan 18 20:27:37 2018 (r459375) @@ -47,6 +47,7 @@ HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx> HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +MYSQL_BROKEN= MySQLdb only supports Python 2. SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} post-build-HTMLDOCS-on: From owner-svn-ports-branches@freebsd.org Thu Jan 18 20:47:50 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 66522EC235C; Thu, 18 Jan 2018 20:47:50 +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 419897FFEB; Thu, 18 Jan 2018 20:47:50 +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 90C6F23A60; Thu, 18 Jan 2018 20:47:49 +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 w0IKln9K089128; Thu, 18 Jan 2018 20:47:49 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IKlnlv089127; Thu, 18 Jan 2018 20:47:49 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801182047.w0IKlnlv089127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 18 Jan 2018 20:47:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459378 - branches/2018Q1/net-mgmt/librenms X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q1/net-mgmt/librenms X-SVN-Commit-Revision: 459378 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, 18 Jan 2018 20:47:50 -0000 Author: feld Date: Thu Jan 18 20:47:49 2018 New Revision: 459378 URL: https://svnweb.freebsd.org/changeset/ports/459378 Log: MFH: r459377 net-mgmt/librenms: Fix build Leftover change crept into last commit Modified: branches/2018Q1/net-mgmt/librenms/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/librenms/Makefile ============================================================================== --- branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:47:19 2018 (r459377) +++ branches/2018Q1/net-mgmt/librenms/Makefile Thu Jan 18 20:47:49 2018 (r459378) @@ -80,7 +80,7 @@ WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client MYSQLD_USES= mysql:server MYSQLD_USES_OFF= mysql:client -SUB_FILES+= librenms.conf pkg-message +SUB_FILES+= pkg-message SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ From owner-svn-ports-branches@freebsd.org Fri Jan 19 05:01:14 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 4ADF8EC29B8; Fri, 19 Jan 2018 05:01:14 +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 D5DEA7201B; Fri, 19 Jan 2018 05:01:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 12F199DE; Fri, 19 Jan 2018 05:01:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0J51DaK098643; Fri, 19 Jan 2018 05:01:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0J51CvZ098639; Fri, 19 Jan 2018 05:01:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801190501.w0J51CvZ098639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 19 Jan 2018 05:01:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459395 - 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: 459395 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, 19 Jan 2018 05:01:14 -0000 Author: jbeich Date: Fri Jan 19 05:01:12 2018 New Revision: 459395 URL: https://svnweb.freebsd.org/changeset/ports/459395 Log: MFH: r459394 www/waterfox: apply more FF58 fixes Security: a891c5b4-3d7a-4de9-9c71-eef3fd698c77 Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1331209 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1331209 branches/2018Q1/www/waterfox/files/patch-bug1389561 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1389561 branches/2018Q1/www/waterfox/files/patch-bug1425612 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1425612 branches/2018Q1/www/waterfox/files/patch-bug1426783 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1426783 branches/2018Q1/www/waterfox/files/patch-bug1429764 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1429764 branches/2018Q1/www/waterfox/files/patch-bug1430508 - copied unchanged from r459394, head/www/waterfox/files/patch-bug1430508 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Fri Jan 19 04:50:36 2018 (r459394) +++ branches/2018Q1/www/waterfox/Makefile Fri Jan 19 05:01:12 2018 (r459395) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1331209 (from r459394, head/www/waterfox/files/patch-bug1331209) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1331209 Fri Jan 19 05:01:12 2018 (r459395, copy of r459394, head/www/waterfox/files/patch-bug1331209) @@ -0,0 +1,571 @@ +commit b7088851d6e8 +Author: Jan Varga +Date: Sat Nov 4 23:13:20 2017 +0100 + + Bug 1331209 - Part 2: Fix incorrect FailOnNonOwningThread() calls; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 227bf80f2ac4..ec1e3531fb4f 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -560,13 +560,13 @@ private: + // If shutdown just started, the QuotaManager may have been deleted. + QuotaManager* qm = QuotaManager::Get(); + if (!qm) { +- FailOnNonOwningThread(); ++ Fail(); + return; + } + + nsresult rv = qm->IOThread()->Dispatch(this, NS_DISPATCH_NORMAL); + if (NS_FAILED(rv)) { +- FailOnNonOwningThread(); ++ Fail(); + return; + } + } + +commit ea39dafe977a +Author: Jan Varga +Date: Sat Nov 4 23:13:41 2017 +0100 + + Bug 1331209 - Part 3: Allow sending of the __delete__ message in one direction only; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 141 +++++++++++++++++++++++------------ + dom/asmjscache/PAsmJSCacheEntry.ipdl | 20 ++++- + 2 files changed, 111 insertions(+), 50 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index ec1e3531fb4f..2216149cd762 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -445,7 +445,6 @@ public: + mWriteParams(aWriteParams), + mState(eInitial), + mResult(JS::AsmJSCache_InternalError), +- mDeleteReceived(false), + mActorDestroyed(false), + mOpened(false) + { +@@ -493,12 +492,17 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState == eOpened); ++ MOZ_ASSERT(mResult == JS::AsmJSCache_Success); + + mState = eFinished; + + MOZ_ASSERT(mOpened); + + FinishOnOwningThread(); ++ ++ if (!mActorDestroyed) { ++ Unused << Send__delete__(this, mResult); ++ } + } + + // This method is called upon any failure that prevents the eventual opening +@@ -508,6 +512,7 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState != eFinished); ++ MOZ_ASSERT(mResult != JS::AsmJSCache_Success); + + mState = eFinished; + +@@ -515,7 +520,7 @@ private: + + FinishOnOwningThread(); + +- if (!mDeleteReceived && !mActorDestroyed) { ++ if (!mActorDestroyed) { + Unused << Send__delete__(this, mResult); + } + } +@@ -579,26 +584,6 @@ private: + DirectoryLockFailed() override; + + // IPDL methods. +- mozilla::ipc::IPCResult +- Recv__delete__(const JS::AsmJSCacheResult& aResult) override +- { +- AssertIsOnOwningThread(); +- MOZ_ASSERT(mState != eFinished); +- MOZ_ASSERT(!mDeleteReceived); +- +- mDeleteReceived = true; +- +- if (mOpened) { +- Close(); +- } else { +- Fail(); +- } +- +- MOZ_ASSERT(mState == eFinished); +- +- return IPC_OK(); +- } +- + void + ActorDestroy(ActorDestroyReason why) override + { +@@ -624,17 +609,59 @@ private: + } + + mozilla::ipc::IPCResult +- RecvSelectCacheFileToRead(const uint32_t& aModuleIndex) override ++ RecvSelectCacheFileToRead(const OpenMetadataForReadResponse& aResponse) ++ override + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState == eWaitingToOpenCacheFileForRead); + MOZ_ASSERT(mOpenMode == eOpenForRead); ++ MOZ_ASSERT(!mOpened); ++ ++ switch (aResponse.type()) { ++ case OpenMetadataForReadResponse::TAsmJSCacheResult: { ++ MOZ_ASSERT(aResponse.get_AsmJSCacheResult() != JS::AsmJSCache_Success); ++ ++ mResult = aResponse.get_AsmJSCacheResult(); ++ ++ // This ParentRunnable can only be held alive by the IPDL. Fail() ++ // clears that last reference. So we need to add a self reference here. ++ RefPtr kungFuDeathGrip = this; ++ ++ Fail(); ++ ++ break; ++ } ++ ++ case OpenMetadataForReadResponse::Tuint32_t: ++ // A cache entry has been selected to open. ++ mModuleIndex = aResponse.get_uint32_t(); ++ ++ mState = eReadyToOpenCacheFileForRead; ++ ++ DispatchToIOThread(); ++ ++ break; + +- // A cache entry has been selected to open. ++ default: ++ MOZ_CRASH("Should never get here!"); ++ } ++ ++ return IPC_OK(); ++ } ++ ++ mozilla::ipc::IPCResult ++ RecvClose() override ++ { ++ AssertIsOnOwningThread(); ++ MOZ_ASSERT(mState == eOpened); + +- mModuleIndex = aModuleIndex; +- mState = eReadyToOpenCacheFileForRead; +- DispatchToIOThread(); ++ // This ParentRunnable can only be held alive by the IPDL. Close() clears ++ // that last reference. So we need to add a self reference here. ++ RefPtr kungFuDeathGrip = this; ++ ++ Close(); ++ ++ MOZ_ASSERT(mState == eFinished); + + return IPC_OK(); + } +@@ -675,7 +702,6 @@ private: + State mState; + JS::AsmJSCacheResult mResult; + +- bool mDeleteReceived; + bool mActorDestroyed; + bool mOpened; + }; +@@ -1021,10 +1047,6 @@ ParentRunnable::Run() + + mState = eOpened; + +- // The entry is now open. +- MOZ_ASSERT(!mOpened); +- mOpened = true; +- + FileDescriptor::PlatformHandleType handle = + FileDescriptor::PlatformHandleType(PR_FileDesc2NativeHandle(mFileDesc)); + if (!SendOnOpenCacheFile(mFileSize, FileDescriptor(handle))) { +@@ -1032,6 +1054,12 @@ ParentRunnable::Run() + return NS_OK; + } + ++ // The entry is now open. ++ MOZ_ASSERT(!mOpened); ++ mOpened = true; ++ ++ mResult = JS::AsmJSCache_Success; ++ + return NS_OK; + } + +@@ -1291,15 +1319,16 @@ private: + MOZ_ASSERT(mState == eOpening); + + uint32_t moduleIndex; +- if (!FindHashMatch(aMetadata, mReadParams, &moduleIndex)) { +- Fail(JS::AsmJSCache_InternalError); +- Send__delete__(this, JS::AsmJSCache_InternalError); +- return IPC_OK(); ++ bool ok; ++ if (FindHashMatch(aMetadata, mReadParams, &moduleIndex)) { ++ ok = SendSelectCacheFileToRead(moduleIndex); ++ } else { ++ ok = SendSelectCacheFileToRead(JS::AsmJSCache_InternalError); + } +- +- if (!SendSelectCacheFileToRead(moduleIndex)) { ++ if (!ok) { + return IPC_FAIL_NO_REASON(this); + } ++ + return IPC_OK(); + } + +@@ -1327,9 +1356,20 @@ private: + Recv__delete__(const JS::AsmJSCacheResult& aResult) override + { + MOZ_ASSERT(NS_IsMainThread()); +- MOZ_ASSERT(mState == eOpening); ++ MOZ_ASSERT(mState == eOpening || mState == eFinishing); ++ MOZ_ASSERT_IF(mState == eOpening, aResult != JS::AsmJSCache_Success); ++ MOZ_ASSERT_IF(mState == eFinishing, aResult == JS::AsmJSCache_Success); + +- Fail(aResult); ++ if (mState == eOpening) { ++ Fail(aResult); ++ } else { ++ // Match the AddRef in BlockUntilOpen(). The IPDL still holds an ++ // outstanding ref which will keep 'this' alive until ActorDestroy() ++ // is executed. ++ Release(); ++ ++ mState = eFinished; ++ } + return IPC_OK(); + } + +@@ -1395,6 +1435,7 @@ private: + eOpening, // Waiting for the parent process to respond + eOpened, // Parent process opened the entry and sent it back + eClosing, // Waiting to be dispatched to the main thread to Send__delete__ ++ eFinishing, // Waiting for the parent process to close + eFinished // Terminal state + }; + State mState; +@@ -1454,28 +1495,32 @@ ChildRunnable::Run() + + // Per FileDescriptorHolder::Finish()'s comment, call before + // releasing the directory lock (which happens in the parent upon receipt +- // of the Send__delete__ message). ++ // of the Close message). + FileDescriptorHolder::Finish(); + + MOZ_ASSERT(mOpened); + mOpened = false; + +- // Match the AddRef in BlockUntilOpen(). The main thread event loop still +- // holds an outstanding ref which will keep 'this' alive until returning to +- // the event loop. +- Release(); ++ if (mActorDestroyed) { ++ // Match the AddRef in BlockUntilOpen(). The main thread event loop ++ // still holds an outstanding ref which will keep 'this' alive until ++ // returning to the event loop. ++ Release(); + +- if (!mActorDestroyed) { +- Unused << Send__delete__(this, JS::AsmJSCache_Success); ++ mState = eFinished; ++ } else { ++ Unused << SendClose(); ++ ++ mState = eFinishing; + } + +- mState = eFinished; + return NS_OK; + } + + case eBackgroundChildPending: + case eOpening: + case eOpened: ++ case eFinishing: + case eFinished: { + MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Shouldn't Run() in this state"); + } +diff --git dom/asmjscache/PAsmJSCacheEntry.ipdl dom/asmjscache/PAsmJSCacheEntry.ipdl +index d16c9284ff9d..bb88a25b5615 100644 +--- dom/asmjscache/PAsmJSCacheEntry.ipdl ++++ dom/asmjscache/PAsmJSCacheEntry.ipdl +@@ -11,6 +11,12 @@ namespace mozilla { + namespace dom { + namespace asmjscache { + ++union OpenMetadataForReadResponse ++{ ++ AsmJSCacheResult; ++ uint32_t; ++}; ++ + protocol PAsmJSCacheEntry + { + manager PBackground; +@@ -21,14 +27,24 @@ protocol PAsmJSCacheEntry + child: + async OnOpenMetadataForRead(Metadata metadata); + parent: +- async SelectCacheFileToRead(uint32_t moduleIndex); ++ async SelectCacheFileToRead(OpenMetadataForReadResponse response); + + child: + // Once the cache file has been opened, the child is notified and sent an + // open file descriptor. + async OnOpenCacheFile(int64_t fileSize, FileDescriptor fileDesc); + +-both: ++parent: ++ // When the child process is done with the cache entry, the parent process ++ // is notified (via Close). ++ async Close(); ++ ++child: ++ // When there's an error during the opening phase, the child process is ++ // notified (via __delete__) and sent an error result. ++ // When the parent process receives the Close message, it closes the cache ++ // entry on the parent side and the child is notified (via __delete__). ++ // The protocol is destroyed in both cases. + async __delete__(AsmJSCacheResult result); + }; + + +commit 04d80fd8932a +Author: Jan Varga +Date: Sat Nov 4 23:13:51 2017 +0100 + + Bug 1331209 - Part 4: Prevent the state machine from continuing if QM is shutting down or the actor has been destroyed; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 97 +++++++++++++++++++++++++++++++++++++------ + 1 file changed, 84 insertions(+), 13 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 2216149cd762..7c96bc71ac0a 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -443,6 +443,7 @@ public: + mPrincipalInfo(aPrincipalInfo), + mOpenMode(aOpenMode), + mWriteParams(aWriteParams), ++ mOperationMayProceed(true), + mState(eInitial), + mResult(JS::AsmJSCache_InternalError), + mActorDestroyed(false), +@@ -485,6 +486,22 @@ private: + MOZ_ASSERT(!IsOnOwningThread()); + } + ++ bool ++ IsActorDestroyed() const ++ { ++ AssertIsOnOwningThread(); ++ ++ return mActorDestroyed; ++ } ++ ++ // May be called on any thread, but you should call IsActorDestroyed() if ++ // you know you're on the background thread because it is slightly faster. ++ bool ++ OperationMayProceed() const ++ { ++ return mOperationMayProceed; ++ } ++ + // This method is called on the owning thread when the JS engine is finished + // reading/writing the cache entry. + void +@@ -497,6 +514,7 @@ private: + mState = eFinished; + + MOZ_ASSERT(mOpened); ++ mOpened = false; + + FinishOnOwningThread(); + +@@ -562,13 +580,15 @@ private: + { + AssertIsOnOwningThread(); + +- // If shutdown just started, the QuotaManager may have been deleted. +- QuotaManager* qm = QuotaManager::Get(); +- if (!qm) { ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { + Fail(); + return; + } + ++ QuotaManager* qm = QuotaManager::Get(); ++ MOZ_ASSERT(qm); ++ + nsresult rv = qm->IOThread()->Dispatch(this, NS_DISPATCH_NORMAL); + if (NS_FAILED(rv)) { + Fail(); +@@ -589,23 +609,30 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(!mActorDestroyed); ++ MOZ_ASSERT(mOperationMayProceed); + + mActorDestroyed = true; ++ mOperationMayProceed = false; + +- // Assume ActorDestroy can happen at any time, so probe the current state to +- // determine what needs to happen. +- +- if (mState == eFinished) { +- return; +- } ++ // Assume ActorDestroy can happen at any time, so we can't probe the ++ // current state since mState can be modified on any thread (only one ++ // thread at a time based on the state machine). ++ // However we can use mOpened which is only touched on the owning thread. ++ // If mOpened is true, we can also modify mState since we are guaranteed ++ // that there are no pending runnables which would probe mState to decide ++ // what code needs to run (there shouldn't be any running runnables on ++ // other threads either). + + if (mOpened) { + Close(); +- } else { +- Fail(); ++ ++ MOZ_ASSERT(mState == eFinished); + } + +- MOZ_ASSERT(mState == eFinished); ++ // We don't have to call Fail() if mOpened is not true since it means that ++ // either nothing has been initialized yet, so nothing to cleanup or there ++ // are pending runnables that will detect that the actor has been destroyed ++ // and call Fail(). + } + + mozilla::ipc::IPCResult +@@ -617,6 +644,11 @@ private: + MOZ_ASSERT(mOpenMode == eOpenForRead); + MOZ_ASSERT(!mOpened); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread())) { ++ Fail(); ++ return IPC_OK(); ++ } ++ + switch (aResponse.type()) { + case OpenMetadataForReadResponse::TAsmJSCacheResult: { + MOZ_ASSERT(aResponse.get_AsmJSCacheResult() != JS::AsmJSCache_Success); +@@ -682,6 +714,8 @@ private: + nsCOMPtr mMetadataFile; + Metadata mMetadata; + ++ Atomic mOperationMayProceed; ++ + // State initialized during eWaitingToOpenCacheFileForRead + unsigned mModuleIndex; + +@@ -942,6 +976,12 @@ ParentRunnable::Run() + case eInitial: { + MOZ_ASSERT(NS_IsMainThread()); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = InitOnMainThread(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -957,7 +997,8 @@ ParentRunnable::Run() + case eWaitingToFinishInit: { + AssertIsOnOwningThread(); + +- if (QuotaManager::IsShuttingDown()) { ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { + Fail(); + return NS_OK; + } +@@ -976,6 +1017,12 @@ ParentRunnable::Run() + case eWaitingToOpenDirectory: { + AssertIsOnOwningThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + if (NS_WARN_IF(!QuotaManager::Get())) { + Fail(); + return NS_OK; +@@ -988,6 +1035,12 @@ ParentRunnable::Run() + case eReadyToReadMetadata: { + AssertIsOnIOThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = ReadMetadata(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -1016,6 +1069,12 @@ ParentRunnable::Run() + AssertIsOnOwningThread(); + MOZ_ASSERT(mOpenMode == eOpenForRead); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + mState = eWaitingToOpenCacheFileForRead; + + // Metadata is now open. +@@ -1031,6 +1090,12 @@ ParentRunnable::Run() + AssertIsOnIOThread(); + MOZ_ASSERT(mOpenMode == eOpenForRead); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = OpenCacheFileForRead(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -1045,6 +1110,12 @@ ParentRunnable::Run() + case eSendingCacheFile: { + AssertIsOnOwningThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + mState = eOpened; + + FileDescriptor::PlatformHandleType handle = Copied: branches/2018Q1/www/waterfox/files/patch-bug1389561 (from r459394, head/www/waterfox/files/patch-bug1389561) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1389561 Fri Jan 19 05:01:12 2018 (r459395, copy of r459394, head/www/waterfox/files/patch-bug1389561) @@ -0,0 +1,758 @@ +commit 06e22a681925 +Author: Shawn Huang +Date: Thu Oct 26 16:59:18 2017 +0800 + + Bug 1389561 - Part 1: Ensure origin initialized in Maintenance::DirectoryWork. r=janv + + Make sure origins had been initialized in Maintenance::DirectoryWork before getting + QuotaObject. It's possible that DatabaseMaintenance::Run before origins initialized. +--- + dom/indexedDB/ActorsParent.cpp | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git dom/indexedDB/ActorsParent.cpp dom/indexedDB/ActorsParent.cpp +index de613cc4eec0..06ffc9df84fa 100644 +--- dom/indexedDB/ActorsParent.cpp ++++ dom/indexedDB/ActorsParent.cpp +@@ -18602,6 +18602,7 @@ Maintenance::DirectoryWork() + continue; + } + ++ nsCString suffix; + nsCString group; + nsCString origin; + nsTArray databasePaths; +@@ -18659,17 +18660,17 @@ Maintenance::DirectoryWork() + + // Found a database. + if (databasePaths.IsEmpty()) { ++ MOZ_ASSERT(suffix.IsEmpty()); + MOZ_ASSERT(group.IsEmpty()); + MOZ_ASSERT(origin.IsEmpty()); + + int64_t dummyTimeStamp; + bool dummyPersisted; +- nsCString dummySuffix; + if (NS_WARN_IF(NS_FAILED( + quotaManager->GetDirectoryMetadata2(originDir, + &dummyTimeStamp, + &dummyPersisted, +- dummySuffix, ++ suffix, + group, + origin)))) { + // Not much we can do here... +@@ -18687,6 +18688,21 @@ Maintenance::DirectoryWork() + group, + origin, + Move(databasePaths))); ++ ++ nsCOMPtr directory; ++ ++ // Idle maintenance may occur before origin is initailized. ++ // Ensure origin is initialized first. It will initialize all origins ++ // for temporary storage including IDB origins. ++ rv = quotaManager->EnsureOriginIsInitialized(persistenceType, ++ suffix, ++ group, ++ origin, ++ getter_AddRefs(directory)); ++ ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + } + } + } +commit a9f850009e15 +Author: Shawn Huang +Date: Thu Nov 2 14:54:07 2017 +0800 + + Bug 1389561 - Part 2: Wait for idle maintenance releasing DirectoryLock when finished. r=janv +--- + dom/indexedDB/ActorsParent.cpp | 68 +++++++++++++++++++++++++++++++----------- + 1 file changed, 51 insertions(+), 17 deletions(-) + +diff --git dom/indexedDB/ActorsParent.cpp dom/indexedDB/ActorsParent.cpp +index 47d621909119..cf3d32ef8fff 100644 +--- dom/indexedDB/ActorsParent.cpp ++++ dom/indexedDB/ActorsParent.cpp +@@ -17984,11 +17984,22 @@ QuotaClient::ShutdownWorkThreads() + + mShutdownRequested = true; + ++ // Shutdown maintenance thread pool (this spins the event loop until all ++ // threads are gone). This should release any maintenance related quota ++ // objects. + if (mMaintenanceThreadPool) { + mMaintenanceThreadPool->Shutdown(); + mMaintenanceThreadPool = nullptr; + } + ++ // Let any runnables dispatched from dying maintenance threads to be ++ // processed. This should release any maintenance related directory locks. ++ if (mCurrentMaintenance) { ++ MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { ++ return !mCurrentMaintenance; ++ })); ++ } ++ + RefPtr connectionPool = gConnectionPool.get(); + if (connectionPool) { + connectionPool->Shutdown(); +@@ -18312,7 +18323,8 @@ Maintenance::Start() + AssertIsOnBackgroundThread(); + MOZ_ASSERT(mState == State::Initial); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18336,7 +18348,8 @@ Maintenance::CreateIndexedDatabaseManager() + MOZ_ASSERT(NS_IsMainThread()); + MOZ_ASSERT(mState == State::CreateIndexedDatabaseManager); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18361,7 +18374,8 @@ Maintenance::OpenDirectory() + MOZ_ASSERT(!mDirectoryLock); + MOZ_ASSERT(QuotaManager::Get()); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18385,7 +18399,8 @@ Maintenance::DirectoryOpen() + MOZ_ASSERT(mState == State::DirectoryOpenPending); + MOZ_ASSERT(mDirectoryLock); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18415,7 +18430,8 @@ Maintenance::DirectoryWork() + // We have to find all database files that match any persistence type and any + // origin. We ignore anything out of the ordinary for now. + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18754,6 +18770,11 @@ Maintenance::BeginDatabaseMaintenance() + } + }; + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + RefPtr threadPool; + + for (DirectoryInfo& directoryInfo : mDirectoryInfos) { +@@ -18940,6 +18961,11 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + } + }; + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsCOMPtr databaseFile = GetFileForPath(mDatabasePath); + MOZ_ASSERT(databaseFile); + +@@ -18956,10 +18982,6 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + + AutoClose autoClose(connection); + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + AutoProgressHandler progressHandler(mMaintenance); + if (NS_WARN_IF(NS_FAILED(progressHandler.Register(connection)))) { + return; +@@ -18978,20 +19000,12 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + return; + } + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + MaintenanceAction maintenanceAction; + rv = DetermineMaintenanceAction(connection, databaseFile, &maintenanceAction); + if (NS_WARN_IF(NS_FAILED(rv))) { + return; + } + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + switch (maintenanceAction) { + case MaintenanceAction::Nothing: + break; +@@ -19018,6 +19032,11 @@ DatabaseMaintenance::CheckIntegrity(mozIStorageConnection* aConnection, + MOZ_ASSERT(aConnection); + MOZ_ASSERT(aOk); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + nsresult rv; + + // First do a full integrity_check. Scope statements tightly here because +@@ -19135,6 +19154,11 @@ DatabaseMaintenance::DetermineMaintenanceAction( + MOZ_ASSERT(aDatabaseFile); + MOZ_ASSERT(aMaintenanceAction); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + int32_t schemaVersion; + nsresult rv = aConnection->GetSchemaVersion(&schemaVersion); + if (NS_WARN_IF(NS_FAILED(rv))) { +@@ -19344,6 +19368,11 @@ DatabaseMaintenance::IncrementalVacuum(mozIStorageConnection* aConnection) + MOZ_ASSERT(!IsOnBackgroundThread()); + MOZ_ASSERT(aConnection); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "PRAGMA incremental_vacuum;" + )); +@@ -19361,6 +19390,11 @@ DatabaseMaintenance::FullVacuum(mozIStorageConnection* aConnection, + MOZ_ASSERT(aConnection); + MOZ_ASSERT(aDatabaseFile); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "VACUUM;" + )); +commit 5d30f2130fd9 +Author: Shawn Huang +Date: Wed Nov 1 11:14:20 2017 +0800 + + Bug 1389561 - Part 3: Wait for releasing all AsmJSCache parent actors in Client::ShutdownWorkThreads(). r=janv + + This patch implements Client::ShutdownWorkThreads for taking care of unreleased DirectoryLock and QuotaObject objects. +--- + dom/asmjscache/AsmJSCache.cpp | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 22ab3dbf0136..49a7d6974134 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -67,6 +67,8 @@ namespace asmjscache { + + namespace { + ++class ParentRunnable; ++ + // Anything smaller should compile fast enough that caching will just add + // overhead. + static const size_t sMinCachedModuleLength = 10000; +@@ -74,6 +76,10 @@ static const size_t sMinCachedModuleLength = 10000; + // The number of characters to hash into the Metadata::Entry::mFastHash. + static const unsigned sNumFastHashChars = 4096; + ++// Track all live parent actors. ++typedef nsTArray ParentActorArray; ++StaticAutoPtr sLiveParentActors; ++ + nsresult + WriteMetadataFile(nsIFile* aMetadataFile, const Metadata& aMetadata) + { +@@ -802,6 +808,13 @@ ParentRunnable::FinishOnOwningThread() + FileDescriptorHolder::Finish(); + + mDirectoryLock = nullptr; ++ ++ MOZ_ASSERT(sLiveParentActors); ++ sLiveParentActors->RemoveElement(this); ++ ++ if (sLiveParentActors->IsEmpty()) { ++ sLiveParentActors = nullptr; ++ } + } + + NS_IMETHODIMP +@@ -1039,6 +1052,12 @@ AllocEntryParent(OpenMode aOpenMode, + RefPtr runnable = + new ParentRunnable(aPrincipalInfo, aOpenMode, aWriteParams); + ++ if (!sLiveParentActors) { ++ sLiveParentActors = new ParentActorArray(); ++ } ++ ++ sLiveParentActors->AppendElement(runnable); ++ + nsresult rv = NS_DispatchToMainThread(runnable); + NS_ENSURE_SUCCESS(rv, nullptr); + +@@ -1687,7 +1706,15 @@ public: + + void + ShutdownWorkThreads() override +- { } ++ { ++ AssertIsOnBackgroundThread(); ++ ++ if (sLiveParentActors) { ++ MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { ++ return !sLiveParentActors; ++ })); ++ } ++ } + + private: + nsAutoRefCnt mRefCnt; +commit 0693fefe1317 +Author: Jan Varga +Date: Thu Nov 2 14:54:18 2017 +0800 + + Bug 1389561 - Part 4: Split AsmJSCache's Client implementation into declaration and definition; r=luke +--- + dom/asmjscache/AsmJSCache.cpp | 271 +++++++++++++++++++++++++----------------- + 1 file changed, 165 insertions(+), 106 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 49a7d6974134..1ba4f66085a1 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -240,6 +240,60 @@ EvictEntries(nsIFile* aDirectory, const nsACString& aGroup, + } + } + ++/******************************************************************************* ++ * Client ++ ******************************************************************************/ ++ ++class Client ++ : public quota::Client ++{ ++public: ++ NS_INLINE_DECL_REFCOUNTING(Client, override) ++ ++ Type ++ GetType() override; ++ ++ nsresult ++ InitOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) override; ++ ++ nsresult ++ GetUsageForOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) override; ++ ++ void ++ OnOriginClearCompleted(PersistenceType aPersistenceType, ++ const nsACString& aOrigin) ++ override; ++ ++ void ++ ReleaseIOThreadObjects() override; ++ ++ void ++ AbortOperations(const nsACString& aOrigin) override; ++ ++ void ++ AbortOperationsForProcess(ContentParentId aContentParentId) override; ++ ++ void ++ StartIdleMaintenance() override; ++ ++ void ++ StopIdleMaintenance() override; ++ ++ void ++ ShutdownWorkThreads() override; ++ ++private: ++ ~Client() override = default; ++}; ++ + // FileDescriptorHolder owns a file descriptor and its memory mapping. + // FileDescriptorHolder is derived by two runnable classes (that is, + // (Parent|Child)Runnable. +@@ -1593,136 +1647,141 @@ CloseEntryForWrite(size_t aSize, + } + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Jan 19 12:33: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 B2438ED3A20; Fri, 19 Jan 2018 12:33:29 +0000 (UTC) (envelope-from mat@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 7643E7F96E; Fri, 19 Jan 2018 12:33:29 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F79357E9; Fri, 19 Jan 2018 12:33:28 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JCXSTu086630; Fri, 19 Jan 2018 12:33:28 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JCXRLU086619; Fri, 19 Jan 2018 12:33:27 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801191233.w0JCXRLU086619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 19 Jan 2018 12:33:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459407 - in branches/2018Q1/dns: bind9-devel bind9-devel/files bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2018Q1/dns: bind9-devel bind9-devel/files bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Commit-Revision: 459407 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, 19 Jan 2018 12:33:29 -0000 Author: mat Date: Fri Jan 19 12:33:27 2018 New Revision: 459407 URL: https://svnweb.freebsd.org/changeset/ports/459407 Log: MFH: r459406 Update named.root. Sponsored by: People afraid of a nuclear holocaust. Modified: branches/2018Q1/dns/bind9-devel/Makefile branches/2018Q1/dns/bind9-devel/files/named.root branches/2018Q1/dns/bind910/Makefile branches/2018Q1/dns/bind910/files/named.root branches/2018Q1/dns/bind911/Makefile branches/2018Q1/dns/bind911/files/named.root branches/2018Q1/dns/bind912/Makefile branches/2018Q1/dns/bind912/files/named.root branches/2018Q1/dns/bind99/Makefile branches/2018Q1/dns/bind99/files/named.root Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/dns/bind9-devel/Makefile ============================================================================== --- branches/2018Q1/dns/bind9-devel/Makefile Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind9-devel/Makefile Fri Jan 19 12:33:27 2018 (r459407) @@ -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/bind9-devel/files/named.root ============================================================================== --- branches/2018Q1/dns/bind9-devel/files/named.root Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind9-devel/files/named.root Fri Jan 19 12:33:27 2018 (r459407) @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET -; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU ; -; FORMERLY NS1.ISI.EDU -; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; -; FORMERLY C.PSI.NET -; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU ; -; FORMERLY TERP.UMD.EDU -; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. Modified: branches/2018Q1/dns/bind910/Makefile ============================================================================== --- branches/2018Q1/dns/bind910/Makefile Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind910/Makefile Fri Jan 19 12:33:27 2018 (r459407) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 Modified: branches/2018Q1/dns/bind910/files/named.root ============================================================================== --- branches/2018Q1/dns/bind910/files/named.root Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind910/files/named.root Fri Jan 19 12:33:27 2018 (r459407) @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET -; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU ; -; FORMERLY NS1.ISI.EDU -; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; -; FORMERLY C.PSI.NET -; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU ; -; FORMERLY TERP.UMD.EDU -; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. Modified: branches/2018Q1/dns/bind911/Makefile ============================================================================== --- branches/2018Q1/dns/bind911/Makefile Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind911/Makefile Fri Jan 19 12:33:27 2018 (r459407) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind911 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} Modified: branches/2018Q1/dns/bind911/files/named.root ============================================================================== --- branches/2018Q1/dns/bind911/files/named.root Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind911/files/named.root Fri Jan 19 12:33:27 2018 (r459407) @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET -; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU ; -; FORMERLY NS1.ISI.EDU -; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; -; FORMERLY C.PSI.NET -; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU ; -; FORMERLY TERP.UMD.EDU -; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. Modified: branches/2018Q1/dns/bind912/Makefile ============================================================================== --- branches/2018Q1/dns/bind912/Makefile Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind912/Makefile Fri Jan 19 12:33:27 2018 (r459407) @@ -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/dns/bind912/files/named.root ============================================================================== --- branches/2018Q1/dns/bind912/files/named.root Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind912/files/named.root Fri Jan 19 12:33:27 2018 (r459407) @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET -; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU ; -; FORMERLY NS1.ISI.EDU -; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; -; FORMERLY C.PSI.NET -; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU ; -; FORMERLY TERP.UMD.EDU -; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. Modified: branches/2018Q1/dns/bind99/Makefile ============================================================================== --- branches/2018Q1/dns/bind99/Makefile Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind99/Makefile Fri Jan 19 12:33:27 2018 (r459407) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 Modified: branches/2018Q1/dns/bind99/files/named.root ============================================================================== --- branches/2018Q1/dns/bind99/files/named.root Fri Jan 19 12:32:34 2018 (r459406) +++ branches/2018Q1/dns/bind99/files/named.root Fri Jan 19 12:33:27 2018 (r459407) @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET -; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU ; -; FORMERLY NS1.ISI.EDU -; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; -; FORMERLY C.PSI.NET -; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU ; -; FORMERLY TERP.UMD.EDU -; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. From owner-svn-ports-branches@freebsd.org Fri Jan 19 14:26:49 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 0161FEB526E; Fri, 19 Jan 2018 14:26:49 +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 CE97D83B71; Fri, 19 Jan 2018 14:26:48 +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 E698F69D6; Fri, 19 Jan 2018 14:26:47 +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 w0JEQlVX036643; Fri, 19 Jan 2018 14:26:47 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JEQlYZ036642; Fri, 19 Jan 2018 14:26:47 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801191426.w0JEQlYZ036642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 19 Jan 2018 14:26:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459418 - branches/2018Q1/net-mgmt/librenms X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q1/net-mgmt/librenms X-SVN-Commit-Revision: 459418 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, 19 Jan 2018 14:26:49 -0000 Author: feld Date: Fri Jan 19 14:26:47 2018 New Revision: 459418 URL: https://svnweb.freebsd.org/changeset/ports/459418 Log: MFH: r459417 net-mgmt/librenms: Upstream re-rolled the distfile Only change is the doc/General/Changelog.md file which *removed* the entry for 1.35. Modified: branches/2018Q1/net-mgmt/librenms/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-mgmt/librenms/distinfo ============================================================================== --- branches/2018Q1/net-mgmt/librenms/distinfo Fri Jan 19 14:26:19 2018 (r459417) +++ branches/2018Q1/net-mgmt/librenms/distinfo Fri Jan 19 14:26:47 2018 (r459418) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515895316 -SHA256 (librenms-librenms-1.35_GH0.tar.gz) = 6ac5d1164642cdef589487a2d599b774081a6e82e59f5fffca2c566b69d98850 -SIZE (librenms-librenms-1.35_GH0.tar.gz) = 62664279 +TIMESTAMP = 1516371936 +SHA256 (librenms-librenms-1.35_GH0.tar.gz) = 6e685c0c34283fd69e51f437ca8ac392c8ab8430bfb883ea4b63bb7b1cae8cbd +SIZE (librenms-librenms-1.35_GH0.tar.gz) = 62667335 From owner-svn-ports-branches@freebsd.org Fri Jan 19 14:34:34 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 D48EEEB576D; Fri, 19 Jan 2018 14:34:34 +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 20581841B0; Fri, 19 Jan 2018 14:34:33 +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 3BEFB6B7C; Fri, 19 Jan 2018 14:34:32 +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 w0JEYWGQ041063; Fri, 19 Jan 2018 14:34:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JEYVrv041061; Fri, 19 Jan 2018 14:34:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801191434.w0JEYVrv041061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 19 Jan 2018 14:34:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459421 - in branches/2018Q1/databases/memcached: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/databases/memcached: . files X-SVN-Commit-Revision: 459421 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, 19 Jan 2018 14:34:35 -0000 Author: feld Date: Fri Jan 19 14:34:31 2018 New Revision: 459421 URL: https://svnweb.freebsd.org/changeset/ports/459421 Log: MFH: r459420 databases/memcached: Fix user/group handling for running process You can now set memcached_user and memcached_group in rc.conf and get expected results of running process and socket ownership. Differential Revision: https://reviews.freebsd.org/D13967 Modified: branches/2018Q1/databases/memcached/Makefile branches/2018Q1/databases/memcached/files/memcached.in Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/memcached/Makefile ============================================================================== --- branches/2018Q1/databases/memcached/Makefile Fri Jan 19 14:32:16 2018 (r459420) +++ branches/2018Q1/databases/memcached/Makefile Fri Jan 19 14:34:31 2018 (r459421) @@ -3,6 +3,7 @@ PORTNAME= memcached PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO Modified: branches/2018Q1/databases/memcached/files/memcached.in ============================================================================== --- branches/2018Q1/databases/memcached/files/memcached.in Fri Jan 19 14:32:16 2018 (r459420) +++ branches/2018Q1/databases/memcached/files/memcached.in Fri Jan 19 14:34:31 2018 (r459421) @@ -14,6 +14,8 @@ # Default is empty "". # memcached_user (user): Set user to run memcached. # Default is "nobody". +# memcached_group (group): Set group to run memcached. +# Default is "nobody". # memcached_profiles (str): Set to "" by default. # Define your profiles here. # memcached_post_start (str): Set extra commands that should be executed after memcached was successfully @@ -30,6 +32,7 @@ pidfile="${_piddir}/memcached.pid" : ${memcached_enable="NO"} : ${memcached_user="nobody"} +: ${memcached_group="nobody"} load_rc_config ${name} @@ -39,6 +42,7 @@ if [ -n "$2" ]; then pidfile="${_piddir}/memcached.${profile}.pid" eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}" eval memcached_user="\${memcached_${profile}_user:-${memcached_user}}" + eval memcached_group="\${memcached_${profile}_group:-${memcached_group}}" eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}" eval memcached_post_start="\${memcached_${profile}_post_start:-${memcached_post_start}}" else @@ -103,9 +107,8 @@ memcached_poststop() } command=%%PREFIX%%/bin/memcached -command_args="-d -u ${memcached_user} -P ${pidfile} " +command_args="-d -P ${pidfile} " -memcached_group=`id -gn $memcached_user` start_precmd="install -d -o $memcached_user -g $memcached_group -m 755 $_piddir" start_postcmd="${name}_poststart" stop_postcmd="${name}_poststop" From owner-svn-ports-branches@freebsd.org Fri Jan 19 15:49: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 138EFEB9190; Fri, 19 Jan 2018 15:49:16 +0000 (UTC) (envelope-from joneum@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 D6CDA2F11; Fri, 19 Jan 2018 15:49:15 +0000 (UTC) (envelope-from joneum@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 0D15D76CA; Fri, 19 Jan 2018 15:49:15 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JFnE9g071570; Fri, 19 Jan 2018 15:49:14 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JFnEv2071562; Fri, 19 Jan 2018 15:49:14 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201801191549.w0JFnEv2071562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 19 Jan 2018 15:49:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459432 - in branches/2018Q1: french/wordpress german/wordpress japanese/wordpress www/wordpress X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2018Q1: french/wordpress german/wordpress japanese/wordpress www/wordpress X-SVN-Commit-Revision: 459432 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, 19 Jan 2018 15:49:16 -0000 Author: joneum Date: Fri Jan 19 15:49:13 2018 New Revision: 459432 URL: https://svnweb.freebsd.org/changeset/ports/459432 Log: MFH: r459400 Securityupdate to 4.9.2: Changelog: https://codex.wordpress.org/Version_4.9.2 https://wordpress.org/news/2018/01/wordpress-4-9-2-security-and-maintenance-release/ Approved by: mentors (implicit) Security: c04dc18f-fcde-11e7-bdf6-00e04c1ea73d Approved by: ports-secteam (swills) Modified: branches/2018Q1/french/wordpress/Makefile branches/2018Q1/french/wordpress/distinfo branches/2018Q1/german/wordpress/Makefile branches/2018Q1/german/wordpress/distinfo branches/2018Q1/japanese/wordpress/Makefile branches/2018Q1/japanese/wordpress/distinfo branches/2018Q1/www/wordpress/Makefile branches/2018Q1/www/wordpress/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/french/wordpress/Makefile ============================================================================== --- branches/2018Q1/french/wordpress/Makefile Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/french/wordpress/Makefile Fri Jan 19 15:49:13 2018 (r459432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -fr_FR PORTEPOCH= 1 CATEGORIES= french www Modified: branches/2018Q1/french/wordpress/distinfo ============================================================================== --- branches/2018Q1/french/wordpress/distinfo Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/french/wordpress/distinfo Fri Jan 19 15:49:13 2018 (r459432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203685 -SHA256 (wordpress-4.9.1-fr_FR.tar.gz) = 981e36d4d9aff1f67f49f78ee904f1ac7e2f1d0e5e12bfa1dd219c0ebb2f09cb -SIZE (wordpress-4.9.1-fr_FR.tar.gz) = 10147920 +TIMESTAMP = 1516345612 +SHA256 (wordpress-4.9.2-fr_FR.tar.gz) = ca78c1aad69db1ab0dbcaeff82a9505c311554776ef98d056fe9e9ad4ef10a23 +SIZE (wordpress-4.9.2-fr_FR.tar.gz) = 9307544 Modified: branches/2018Q1/german/wordpress/Makefile ============================================================================== --- branches/2018Q1/german/wordpress/Makefile Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/german/wordpress/Makefile Fri Jan 19 15:49:13 2018 (r459432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ Modified: branches/2018Q1/german/wordpress/distinfo ============================================================================== --- branches/2018Q1/german/wordpress/distinfo Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/german/wordpress/distinfo Fri Jan 19 15:49:13 2018 (r459432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203646 -SHA256 (wordpress-4.9.1-de_DE.tar.gz) = 6a9374103a8e895b37ed4abf4b2a68d61434c440d0eaf8aa7fc2e388cf8f0e11 -SIZE (wordpress-4.9.1-de_DE.tar.gz) = 10151519 +TIMESTAMP = 1516345576 +SHA256 (wordpress-4.9.2-de_DE.tar.gz) = fcd2765701dfec50aa57c05d8942407f9e832dea6cf0067c7073b7d67c48290f +SIZE (wordpress-4.9.2-de_DE.tar.gz) = 9309673 Modified: branches/2018Q1/japanese/wordpress/Makefile ============================================================================== --- branches/2018Q1/japanese/wordpress/Makefile Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/japanese/wordpress/Makefile Fri Jan 19 15:49:13 2018 (r459432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ Modified: branches/2018Q1/japanese/wordpress/distinfo ============================================================================== --- branches/2018Q1/japanese/wordpress/distinfo Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/japanese/wordpress/distinfo Fri Jan 19 15:49:13 2018 (r459432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203598 -SHA256 (wordpress-4.9.1-ja.tar.gz) = 1f56744c660366c88499f74c682ef887622e355ca2320e5ae4db4f3c3558ce75 -SIZE (wordpress-4.9.1-ja.tar.gz) = 10141950 +TIMESTAMP = 1516345636 +SHA256 (wordpress-4.9.2-ja.tar.gz) = 521343d4c5da63832ed969976823349f3ee540c8c4626286f329cad7a36513cf +SIZE (wordpress-4.9.2-ja.tar.gz) = 9291158 Modified: branches/2018Q1/www/wordpress/Makefile ============================================================================== --- branches/2018Q1/www/wordpress/Makefile Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/www/wordpress/Makefile Fri Jan 19 15:49:13 2018 (r459432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2018Q1/www/wordpress/distinfo ============================================================================== --- branches/2018Q1/www/wordpress/distinfo Fri Jan 19 15:44:49 2018 (r459431) +++ branches/2018Q1/www/wordpress/distinfo Fri Jan 19 15:49:13 2018 (r459432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203392 -SHA256 (wordpress-4.9.1.tar.gz) = a94ae99cda7666bfd482b36f268ad240a3bde2a66724e1312dabf068a9555100 -SIZE (wordpress-4.9.1.tar.gz) = 9638827 +TIMESTAMP = 1516345663 +SHA256 (wordpress-4.9.2.tar.gz) = 1f6e9d16cb6b3cd77b754ad806ee67cd4b58a4c15b3a7ddf30b4237e359a437b +SIZE (wordpress-4.9.2.tar.gz) = 8807744 From owner-svn-ports-branches@freebsd.org Fri Jan 19 15:50:22 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 4BD8FEB93D7; Fri, 19 Jan 2018 15:50:22 +0000 (UTC) (envelope-from joneum@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 2784B30B4; Fri, 19 Jan 2018 15:50:22 +0000 (UTC) (envelope-from joneum@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 6FCD476D5; Fri, 19 Jan 2018 15:50:21 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JFoLhY071788; Fri, 19 Jan 2018 15:50:21 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JFoL3M071786; Fri, 19 Jan 2018 15:50:21 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201801191550.w0JFoL3M071786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 19 Jan 2018 15:50:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459433 - branches/2018Q1/russian/wordpress X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: branches/2018Q1/russian/wordpress X-SVN-Commit-Revision: 459433 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, 19 Jan 2018 15:50:22 -0000 Author: joneum Date: Fri Jan 19 15:50:21 2018 New Revision: 459433 URL: https://svnweb.freebsd.org/changeset/ports/459433 Log: MFH: r459399 Securityupdate to 4.9.2: Changelog: https://codex.wordpress.org/Version_4.9.2 https://wordpress.org/news/2018/01/wordpress-4-9-2-security-and-maintenance-release/ PR: 225243 Submitted by: Mikhail Timofeev <9267096@gmail.com> (maintainer) Approved by: mentors (implicit) Security: c04dc18f-fcde-11e7-bdf6-00e04c1ea73d Approved by: ports-secteam (swills) Modified: branches/2018Q1/russian/wordpress/Makefile branches/2018Q1/russian/wordpress/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/russian/wordpress/Makefile ============================================================================== --- branches/2018Q1/russian/wordpress/Makefile Fri Jan 19 15:49:13 2018 (r459432) +++ branches/2018Q1/russian/wordpress/Makefile Fri Jan 19 15:50:21 2018 (r459433) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2018Q1/russian/wordpress/distinfo ============================================================================== --- branches/2018Q1/russian/wordpress/distinfo Fri Jan 19 15:49:13 2018 (r459432) +++ branches/2018Q1/russian/wordpress/distinfo Fri Jan 19 15:50:21 2018 (r459433) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203474 -SHA256 (wordpress-4.9.1-ru_RU.tar.gz) = dd66717c5610fe4cee1701202bafa42cdb10873c9d9a63e6ac82585a4ccecd2f -SIZE (wordpress-4.9.1-ru_RU.tar.gz) = 10187859 +TIMESTAMP = 1516344183 +SHA256 (wordpress-4.9.2-ru_RU.tar.gz) = 5aa603105ed7e583ba1be6b6d75de4ef1fa9f69a7995a16f6027111d915895b2 +SIZE (wordpress-4.9.2-ru_RU.tar.gz) = 9348255 From owner-svn-ports-branches@freebsd.org Fri Jan 19 17:28:56 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 B10B1EBE023; Fri, 19 Jan 2018 17:28:56 +0000 (UTC) (envelope-from pi@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 8BE366AEBE; Fri, 19 Jan 2018 17:28:56 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7E2210757; Fri, 19 Jan 2018 17:28:55 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JHStZu015864; Fri, 19 Jan 2018 17:28:55 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JHStsm015862; Fri, 19 Jan 2018 17:28:55 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201801191728.w0JHStsm015862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 19 Jan 2018 17:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459452 - branches/2018Q1/security/trousers X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2018Q1/security/trousers X-SVN-Commit-Revision: 459452 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, 19 Jan 2018 17:28:56 -0000 Author: pi Date: Fri Jan 19 17:28:55 2018 New Revision: 459452 URL: https://svnweb.freebsd.org/changeset/ports/459452 Log: MFH: r458856 security/trousers: fix distinfo - see the PR for the diff between the two distfiles PR: 221105 Approved by: hrs (maintainer timeout) Approved by: portmgr Modified: branches/2018Q1/security/trousers/Makefile branches/2018Q1/security/trousers/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/trousers/Makefile ============================================================================== --- branches/2018Q1/security/trousers/Makefile Fri Jan 19 17:04:52 2018 (r459451) +++ branches/2018Q1/security/trousers/Makefile Fri Jan 19 17:28:55 2018 (r459452) @@ -3,7 +3,7 @@ PORTNAME= trousers PORTVERSION= 0.3.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF Modified: branches/2018Q1/security/trousers/distinfo ============================================================================== --- branches/2018Q1/security/trousers/distinfo Fri Jan 19 17:04:52 2018 (r459451) +++ branches/2018Q1/security/trousers/distinfo Fri Jan 19 17:28:55 2018 (r459452) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479521351 -SHA256 (trousers-0.3.14.tar.gz) = 95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b -SIZE (trousers-0.3.14.tar.gz) = 3462743 +TIMESTAMP = 1501436543 +SHA256 (trousers-0.3.14.tar.gz) = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 +SIZE (trousers-0.3.14.tar.gz) = 1378438 From owner-svn-ports-branches@freebsd.org Fri Jan 19 18:06: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 5CC17EBF834; Fri, 19 Jan 2018 18:06:13 +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 365256C578; Fri, 19 Jan 2018 18:06:13 +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 6120710DFC; Fri, 19 Jan 2018 18:06:12 +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 w0JI6Cli032610; Fri, 19 Jan 2018 18:06:12 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JI6BUo032607; Fri, 19 Jan 2018 18:06:11 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201801191806.w0JI6BUo032607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Fri, 19 Jan 2018 18:06:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459453 - branches/2018Q1/dns/unbound X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2018Q1/dns/unbound X-SVN-Commit-Revision: 459453 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, 19 Jan 2018 18:06:13 -0000 Author: dbaio Date: Fri Jan 19 18:06:11 2018 New Revision: 459453 URL: https://svnweb.freebsd.org/changeset/ports/459453 Log: MFH: r459435 dns/unbound: Update to 1.6.8, Fixes security vulnerability PR: 225313 Submitted by: jaap@NLnetLabs.nl (maintainer) Security: 8d3bae09-fd28-11e7-95f2-005056925db4 Approved by: ports-secteam (swills) Modified: branches/2018Q1/dns/unbound/Makefile branches/2018Q1/dns/unbound/distinfo branches/2018Q1/dns/unbound/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/dns/unbound/Makefile ============================================================================== --- branches/2018Q1/dns/unbound/Makefile Fri Jan 19 17:28:55 2018 (r459452) +++ branches/2018Q1/dns/unbound/Makefile Fri Jan 19 18:06:11 2018 (r459453) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= unbound -PORTVERSION= 1.6.7 -PORTREVISION= 1 +PORTVERSION= 1.6.8 CATEGORIES= dns MASTER_SITES= http://unbound.net/downloads/ Modified: branches/2018Q1/dns/unbound/distinfo ============================================================================== --- branches/2018Q1/dns/unbound/distinfo Fri Jan 19 17:28:55 2018 (r459452) +++ branches/2018Q1/dns/unbound/distinfo Fri Jan 19 18:06:11 2018 (r459453) @@ -1,3 +1,3 @@ -TIMESTAMP = 1507817488 -SHA256 (unbound-1.6.7.tar.gz) = 4e7bd43d827004c6d51bef73adf941798e4588bdb40de5e79d89034d69751c9f -SIZE (unbound-1.6.7.tar.gz) = 5466931 +TIMESTAMP = 1516376435 +SHA256 (unbound-1.6.8.tar.gz) = e3b428e33f56a45417107448418865fe08d58e0e7fea199b855515f60884dd49 +SIZE (unbound-1.6.8.tar.gz) = 5467536 Modified: branches/2018Q1/dns/unbound/pkg-plist ============================================================================== --- branches/2018Q1/dns/unbound/pkg-plist Fri Jan 19 17:28:55 2018 (r459452) +++ branches/2018Q1/dns/unbound/pkg-plist Fri Jan 19 18:06:11 2018 (r459453) @@ -4,7 +4,7 @@ include/unbound.h lib/libunbound.a lib/libunbound.so lib/libunbound.so.2 -lib/libunbound.so.2.5.6 +lib/libunbound.so.2.5.7 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py From owner-svn-ports-branches@freebsd.org Fri Jan 19 18:56: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 CFDC8EC1F6F; Fri, 19 Jan 2018 18:56:43 +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 AA0E26F323; Fri, 19 Jan 2018 18:56:43 +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 CEB6C1166F; Fri, 19 Jan 2018 18:56:42 +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 w0JIugZq053822; Fri, 19 Jan 2018 18:56:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JIug2G053818; Fri, 19 Jan 2018 18:56:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801191856.w0JIug2G053818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 19 Jan 2018 18:56:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459459 - in branches/2018Q1/devel: py-game_sdl2 renpy X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/devel: py-game_sdl2 renpy X-SVN-Commit-Revision: 459459 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, 19 Jan 2018 18:56:43 -0000 Author: jbeich Date: Fri Jan 19 18:56:42 2018 New Revision: 459459 URL: https://svnweb.freebsd.org/changeset/ports/459459 Log: MFH: r459037 devel/renpy: update to 6.99.14 Changes: https://www.renpy.org/doc/html/changelog.html#ren-py-6-99-14 Approved by: ports-secteam (swills) Modified: branches/2018Q1/devel/py-game_sdl2/Makefile branches/2018Q1/devel/py-game_sdl2/distinfo branches/2018Q1/devel/renpy/Makefile branches/2018Q1/devel/renpy/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/py-game_sdl2/Makefile ============================================================================== --- branches/2018Q1/devel/py-game_sdl2/Makefile Fri Jan 19 18:49:03 2018 (r459458) +++ branches/2018Q1/devel/py-game_sdl2/Makefile Fri Jan 19 18:56:42 2018 (r459459) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 6.99.13 +PORTVERSION= 6.99.14 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Modified: branches/2018Q1/devel/py-game_sdl2/distinfo ============================================================================== --- branches/2018Q1/devel/py-game_sdl2/distinfo Fri Jan 19 18:49:03 2018 (r459458) +++ branches/2018Q1/devel/py-game_sdl2/distinfo Fri Jan 19 18:56:42 2018 (r459459) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509293105 -SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.13.tar.gz) = 1553ae67a84185fddd84d9f64deaa1a2b1a82438b0f05122895b9f0fa0940c04 -SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.13.tar.gz) = 2295753 +TIMESTAMP = 1515956794 +SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.14.tar.gz) = 69990036a6b094f4238336e23af11beec2ac44d8313d57fbd39eaf1d975856ff +SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.14.tar.gz) = 2356568 Modified: branches/2018Q1/devel/renpy/Makefile ============================================================================== --- branches/2018Q1/devel/renpy/Makefile Fri Jan 19 18:49:03 2018 (r459458) +++ branches/2018Q1/devel/renpy/Makefile Fri Jan 19 18:56:42 2018 (r459459) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 6.99.13 +PORTVERSION?= 6.99.14 DISTVERSIONSUFFIX=-sdk -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES= devel games MASTER_SITES= https://www.renpy.org/dl/${PORTVERSION}/ @@ -35,11 +35,6 @@ USE_SDL?= sdl2 EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} SHEBANG_FILES= renpy.py launcher/game/tkaskdir.py -.ifndef PKGNAMESUFFIX -python3_CMD?= ${PYTHON_CMD} -SHEBANG_LANG= python3 -SHEBANG_FILES+= tutorial/recrop.py -.endif TARGET_ORDER_OVERRIDE=610:fix-shebang BUILD_WRKSRC= ${WRKSRC}/module INSTALL_WRKSRC= ${BUILD_WRKSRC} Modified: branches/2018Q1/devel/renpy/distinfo ============================================================================== --- branches/2018Q1/devel/renpy/distinfo Fri Jan 19 18:49:03 2018 (r459458) +++ branches/2018Q1/devel/renpy/distinfo Fri Jan 19 18:56:42 2018 (r459459) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509293060 -SHA256 (renpy-6.99.13-sdk.tar.bz2) = 2563297b79eaee67502ab27d0d88aebd9118b34efb331f389a0aaeb8c1827522 -SIZE (renpy-6.99.13-sdk.tar.bz2) = 92668389 +TIMESTAMP = 1515368837 +SHA256 (renpy-6.99.14-sdk.tar.bz2) = c2eb6d44ac7be116203664fb21317d9bd89671fabde69b9b2d756a3a98f6a698 +SIZE (renpy-6.99.14-sdk.tar.bz2) = 100505642 From owner-svn-ports-branches@freebsd.org Fri Jan 19 19:21:49 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 985A4EC3257; Fri, 19 Jan 2018 19:21:49 +0000 (UTC) (envelope-from tobik@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 72F8B7068D; Fri, 19 Jan 2018 19:21:49 +0000 (UTC) (envelope-from tobik@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 AE7E511B3F; Fri, 19 Jan 2018 19:21:48 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JJLmSB066390; Fri, 19 Jan 2018 19:21:48 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JJLmav066388; Fri, 19 Jan 2018 19:21:48 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801191921.w0JJLmav066388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 19 Jan 2018 19:21:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459461 - branches/2018Q1/www/youtube_dl X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2018Q1/www/youtube_dl X-SVN-Commit-Revision: 459461 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, 19 Jan 2018 19:21:49 -0000 Author: tobik Date: Fri Jan 19 19:21:48 2018 New Revision: 459461 URL: https://svnweb.freebsd.org/changeset/ports/459461 Log: MFH: r459034 www/youtube_dl: Update to 2018.01.14 PR: 225157 Approved by: araujo (maintainer) Approved by: ports-secteam (swills) Modified: branches/2018Q1/www/youtube_dl/Makefile branches/2018Q1/www/youtube_dl/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/youtube_dl/Makefile ============================================================================== --- branches/2018Q1/www/youtube_dl/Makefile Fri Jan 19 18:57:32 2018 (r459460) +++ branches/2018Q1/www/youtube_dl/Makefile Fri Jan 19 19:21:48 2018 (r459461) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2017.11.26 +PORTVERSION= 2018.01.14 CATEGORIES= www MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/ DISTNAME= youtube-dl-${PORTVERSION} Modified: branches/2018Q1/www/youtube_dl/distinfo ============================================================================== --- branches/2018Q1/www/youtube_dl/distinfo Fri Jan 19 18:57:32 2018 (r459460) +++ branches/2018Q1/www/youtube_dl/distinfo Fri Jan 19 19:21:48 2018 (r459461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511732238 -SHA256 (youtube-dl-2017.11.26.tar.gz) = 47d30aec89cd2456b7ee7026c66c0ee4f56ab7d2700c44af27be0e00627d2d5a -SIZE (youtube-dl-2017.11.26.tar.gz) = 2839867 +TIMESTAMP = 1515864172 +SHA256 (youtube-dl-2018.01.14.tar.gz) = 6bfddba076d4dbb4841d12d65e9ab1c9130cc928ad186d92b6f590d78f92875e +SIZE (youtube-dl-2018.01.14.tar.gz) = 2885608 From owner-svn-ports-branches@freebsd.org Fri Jan 19 19:23:06 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 F03A8EC333F; Fri, 19 Jan 2018 19:23:06 +0000 (UTC) (envelope-from tobik@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 CA292708E8; Fri, 19 Jan 2018 19:23:06 +0000 (UTC) (envelope-from tobik@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 07C2A11B7A; Fri, 19 Jan 2018 19:23:06 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JJN5nx066721; Fri, 19 Jan 2018 19:23:05 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JJN5Di066720; Fri, 19 Jan 2018 19:23:05 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801191923.w0JJN5Di066720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 19 Jan 2018 19:23:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459463 - branches/2018Q1/astro/viking X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2018Q1/astro/viking X-SVN-Commit-Revision: 459463 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, 19 Jan 2018 19:23:07 -0000 Author: tobik Date: Fri Jan 19 19:23:05 2018 New Revision: 459463 URL: https://svnweb.freebsd.org/changeset/ports/459463 Log: MFH: r458934 astro/viking: Fix LIB_DEPENDS and unbreak port - While here reset MAINTAINER: The port has been marked as broken since 2017-05-10 and the maintainer has a history of timeouts. PR: 224668 Submitted by: Ting-Wei Lan Approved by: koalative@gmail.com (maintainer timeout, 2 weeks) Approved by: ports-secteam (swills) Modified: branches/2018Q1/astro/viking/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/astro/viking/Makefile ============================================================================== --- branches/2018Q1/astro/viking/Makefile Fri Jan 19 19:22:32 2018 (r459462) +++ branches/2018Q1/astro/viking/Makefile Fri Jan 19 19:23:05 2018 (r459463) @@ -7,16 +7,12 @@ PORTREVISION= 5 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/ -MAINTAINER= koalative@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Program to manage GPS data (tracks, waypoints, etc.) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= wrong LIB_DEPENDS -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 - BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ @@ -65,7 +61,7 @@ NLS_USES= gettext GEOTAG_LIB_DEPENDS= libexif.so:graphics/libexif GEOTAG_CONFIGURE_ENABLE=geotag -GPSD_LIB_DEPENDS= libgpsd.so:astro/gpsd +GPSD_LIB_DEPENDS= libgps.so:astro/gpsd GPSD_CONFIGURE_ENABLE= realtime-gps-tracking MAPNIK_LIB_DEPENDS= libmapnik.so:graphics/mapnik From owner-svn-ports-branches@freebsd.org Fri Jan 19 19:54:10 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 D19FBEC4808; Fri, 19 Jan 2018 19:54:10 +0000 (UTC) (envelope-from joneum@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 96A5571B4C; Fri, 19 Jan 2018 19:54:10 +0000 (UTC) (envelope-from joneum@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 D3C341205A; Fri, 19 Jan 2018 19:54:09 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JJs9HH079773; Fri, 19 Jan 2018 19:54:09 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JJs97i079770; Fri, 19 Jan 2018 19:54:09 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201801191954.w0JJs97i079770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 19 Jan 2018 19:54:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459466 - branches/2018Q1/www/phpbb3 X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: branches/2018Q1/www/phpbb3 X-SVN-Commit-Revision: 459466 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, 19 Jan 2018 19:54:10 -0000 Author: joneum Date: Fri Jan 19 19:54:09 2018 New Revision: 459466 URL: https://svnweb.freebsd.org/changeset/ports/459466 Log: MFH: r459414 Securityupdate to 3.2.2: Changelog: https://wiki.phpbb.com/Release_Highlights/3.2.2 https://www.phpbb.com/community/viewtopic.php?f=14&t=2453381 Approved by: mentors (implicit) Security: 8e89a89a-fd15-11e7-bdf6-00e04c1ea73d Approved by: ports-secteam (swills) Modified: branches/2018Q1/www/phpbb3/Makefile branches/2018Q1/www/phpbb3/distinfo branches/2018Q1/www/phpbb3/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/phpbb3/Makefile ============================================================================== --- branches/2018Q1/www/phpbb3/Makefile Fri Jan 19 19:40:46 2018 (r459465) +++ branches/2018Q1/www/phpbb3/Makefile Fri Jan 19 19:54:09 2018 (r459466) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpbb -PORTVERSION= 3.2.1 +DISTVERSION= 3.2.2 CATEGORIES= www MASTER_SITES= https://www.phpbb.com/files/release/ PKGNAMESUFFIX= 3 Modified: branches/2018Q1/www/phpbb3/distinfo ============================================================================== --- branches/2018Q1/www/phpbb3/distinfo Fri Jan 19 19:40:46 2018 (r459465) +++ branches/2018Q1/www/phpbb3/distinfo Fri Jan 19 19:54:09 2018 (r459466) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500308139 -SHA256 (phpBB-3.2.1.tar.bz2) = ea1c7e08aa3466aa325deca5d8998a24d103bfecf23826ce61fe5390b6a09f71 -SIZE (phpBB-3.2.1.tar.bz2) = 4251107 +TIMESTAMP = 1516367024 +SHA256 (phpBB-3.2.2.tar.bz2) = bab64dbd79f6f1bf2c0c306b33cea460ffe58c56ff1e81aac87ee10545291302 +SIZE (phpBB-3.2.2.tar.bz2) = 4306763 Modified: branches/2018Q1/www/phpbb3/pkg-plist ============================================================================== --- branches/2018Q1/www/phpbb3/pkg-plist Fri Jan 19 19:40:46 2018 (r459465) +++ branches/2018Q1/www/phpbb3/pkg-plist Fri Jan 19 19:54:09 2018 (r459466) @@ -663,6 +663,7 @@ %%PHPBBDIR%%/phpbb/avatar/driver/upload.php %%PHPBBDIR%%/phpbb/avatar/manager.php %%PHPBBDIR%%/phpbb/cache/driver/apc.php +%%PHPBBDIR%%/phpbb/cache/driver/apcu.php %%PHPBBDIR%%/phpbb/cache/driver/base.php %%PHPBBDIR%%/phpbb/cache/driver/driver_interface.php %%PHPBBDIR%%/phpbb/cache/driver/dummy.php @@ -940,6 +941,7 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3110rc1.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3111.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3111rc1.php +%%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3112.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v312.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v312rc1.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v313.php @@ -985,7 +987,12 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v320/v320rc2.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/.htaccess %%PHPBBDIR%%/phpbb/db/migration/data/v32x/cookie_notice_p2.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/email_force_sender.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/fix_user_styles.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/load_user_activity_limit.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/update_prosilver_bitfield.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php @@ -995,6 +1002,8 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/v321.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/v321rc1.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/v322.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/v322rc1.php %%PHPBBDIR%%/phpbb/db/migration/exception.php %%PHPBBDIR%%/phpbb/db/migration/helper.php %%PHPBBDIR%%/phpbb/db/migration/migration.php @@ -1068,6 +1077,7 @@ %%PHPBBDIR%%/phpbb/feed/news.php %%PHPBBDIR%%/phpbb/feed/overall.php %%PHPBBDIR%%/phpbb/feed/post_base.php +%%PHPBBDIR%%/phpbb/feed/quote_helper.php %%PHPBBDIR%%/phpbb/feed/topic.php %%PHPBBDIR%%/phpbb/feed/topic_base.php %%PHPBBDIR%%/phpbb/feed/topics.php @@ -1356,6 +1366,7 @@ %%PHPBBDIR%%/phpbb/textformatter/data_access.php %%PHPBBDIR%%/phpbb/textformatter/parser_interface.php %%PHPBBDIR%%/phpbb/textformatter/renderer_interface.php +%%PHPBBDIR%%/phpbb/textformatter/s9e/bbcode_merger.php %%PHPBBDIR%%/phpbb/textformatter/s9e/factory.php %%PHPBBDIR%%/phpbb/textformatter/s9e/link_helper.php %%PHPBBDIR%%/phpbb/textformatter/s9e/parser.php @@ -1850,6 +1861,7 @@ %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypePsd.php %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeTif.php %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeWbmp.php +%%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeWebp.php %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.gitignore %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.scrutinizer.yml %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.travis.install.sh @@ -2421,6 +2433,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/RangeFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/RegexpFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/SimpletextFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/TimestampFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/UintFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributePreprocessor.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/TemplateDocument.php @@ -2436,10 +2449,8 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/ClosureCompilerApplication.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/ClosureCompilerService.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/FirstAvailable.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/HostedMinifier.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/MatthiasMullieMinify.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/Noop.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/RemoteCache.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/OnlineMinifier.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/RegexpConvertor.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/StylesheetCompressor.php @@ -2448,7 +2459,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/Unformatted.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/XSLT.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/XSLT/Optimizer.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/BlockElementsCloseFormattingElements.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/AllowAll.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/ManageParagraphs.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/TemplateChecks/DisallowElement.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/TemplateChecks/DisallowFlashFullScreen.php @@ -2464,8 +2475,24 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Validators/TemplateParameterName.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/BuiltInFilters.js -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/BuiltInFilters.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/EmailFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/EmailFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/FalseFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/FalseFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/HashmapFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/HashmapFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/MapFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/MapFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NetworkFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NetworkFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NumericFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NumericFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/RegexpFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/RegexpFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/TimestampFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/TimestampFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/UrlFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/UrlFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/Logger.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/Logger.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/NullLogger.js @@ -2525,8 +2552,34 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Keywords/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Keywords/Parser.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Configurator.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/LinkAttributesSetter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/LinkAttributesSetter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/ParsedText.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/ParsedText.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractPass.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractScript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractScript.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Blocks.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Blocks.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Emphasis.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Emphasis.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Images.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Images.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/InlineCode.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/InlineCode.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/LinkReferences.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/LinkReferences.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Links.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Links.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Strikethrough.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Strikethrough.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Subscript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Subscript.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Superscript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Superscript.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator/Collections/SiteCollection.php @@ -2549,6 +2602,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Preg/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Preg/Parser.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderer.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/PHP.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/Unformatted.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/XSLT.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Unparser.php @@ -2557,6 +2611,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Client.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Clients/Curl.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Clients/Native.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/XPath.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/render.js %%PHPBBDIR%%/vendor/symfony/config/ConfigCache.php %%PHPBBDIR%%/vendor/symfony/config/ConfigCacheFactory.php @@ -3091,7 +3146,10 @@ %%PHPBBDIR%%/vendor/symfony/polyfill-php55/bootstrap.php %%PHPBBDIR%%/vendor/symfony/polyfill-php55/composer.json %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LICENSE +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/LazyLoadingValueHolderFactoryV1.php +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/LazyLoadingValueHolderFactoryV2.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/RuntimeInstantiator.php +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/PhpDumper/ProxyDumper.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/composer.json %%PHPBBDIR%%/vendor/symfony/routing/Annotation/Route.php @@ -3346,6 +3404,7 @@ %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Parser.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/ParserInterface.php +%%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php @@ -3404,6 +3463,177 @@ %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/TokenStream.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/CacheInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/FilesystemCache.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/NullCache.php +%%PHPBBDIR%%/vendor/twig/twig/src/Compiler.php +%%PHPBBDIR%%/vendor/twig/twig/src/Environment.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/Error.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/LoaderError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/RuntimeError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/SyntaxError.php +%%PHPBBDIR%%/vendor/twig/twig/src/ExpressionParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/AbstractExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/CoreExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/DebugExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/EscaperExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/ExtensionInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/GlobalsInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/InitRuntimeInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/OptimizerExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/ProfilerExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/SandboxExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/StagingExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/StringLoaderExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/FileExtensionEscapingStrategy.php +%%PHPBBDIR%%/vendor/twig/twig/src/Lexer.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ArrayLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ChainLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/FilesystemLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/LoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Markup.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/AutoEscapeNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BlockNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BlockReferenceNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BodyNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/CheckSecurityNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/DoNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/EmbedNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/AbstractExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ArrayExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/CallExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ConstantExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/FilterExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/FunctionExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/NameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ParentExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/TempNameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/NullTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/OddTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/TestExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/FlushNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ForLoopNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ForNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/IfNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ImportNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/IncludeNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/MacroNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ModuleNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Node.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/NodeCaptureInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/NodeOutputInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/PrintNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SandboxNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SandboxedPrintNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SetNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SetTempNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SpacelessNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/TextNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/WithNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeTraverser.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/Parser.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Profile.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityPolicy.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Source.php +%%PHPBBDIR%%/vendor/twig/twig/src/Template.php +%%PHPBBDIR%%/vendor/twig/twig/src/TemplateWrapper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Test/IntegrationTestCase.php +%%PHPBBDIR%%/vendor/twig/twig/src/Test/NodeTestCase.php +%%PHPBBDIR%%/vendor/twig/twig/src/Token.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/BlockTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/DoTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FilterTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FlushTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ForTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FromTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/IfTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ImportTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/MacroTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SetTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SpacelessTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/TokenParserInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/UseTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/WithTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenStream.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigFilter.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigFunction.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Util/DeprecationCollector.php +%%PHPBBDIR%%/vendor/twig/twig/src/Util/TemplateDirIterator.php %%PHPBBDIR%%/vendor/zendframework/zend-code/LICENSE.md %%PHPBBDIR%%/vendor/zendframework/zend-code/composer.json %%PHPBBDIR%%/vendor/zendframework/zend-code/src/Annotation/AnnotationCollection.php From owner-svn-ports-branches@freebsd.org Fri Jan 19 20:18: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 3DB79EC58CF; Fri, 19 Jan 2018 20:18:00 +0000 (UTC) (envelope-from brnrd@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 0753E7293F; Fri, 19 Jan 2018 20:18:00 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B7EB1238C; Fri, 19 Jan 2018 20:17:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JKHxIY088099; Fri, 19 Jan 2018 20:17:59 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JKHxQG088097; Fri, 19 Jan 2018 20:17:59 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201801192017.w0JKHxQG088097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 19 Jan 2018 20:17:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459468 - branches/2018Q1/databases/mariadb55-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q1/databases/mariadb55-server X-SVN-Commit-Revision: 459468 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, 19 Jan 2018 20:18:00 -0000 Author: brnrd Date: Fri Jan 19 20:17:58 2018 New Revision: 459468 URL: https://svnweb.freebsd.org/changeset/ports/459468 Log: MFH: r459413 databases/mariadb55-server: Security update to 5.5.59 Security: e3445736-fd01-11e7-ac58-b499baebfeaf Security: CVE-2018-2562 Security: CVE-2018-2622 Security: CVE-2018-2640 Security: CVE-2018-2665 Security: CVE-2018-2668 Approved by: ports-secteam (swills) Modified: branches/2018Q1/databases/mariadb55-server/Makefile branches/2018Q1/databases/mariadb55-server/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/mariadb55-server/Makefile ============================================================================== --- branches/2018Q1/databases/mariadb55-server/Makefile Fri Jan 19 20:17:25 2018 (r459467) +++ branches/2018Q1/databases/mariadb55-server/Makefile Fri Jan 19 20:17:58 2018 (r459468) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.58 +PORTVERSION= 5.5.59 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ Modified: branches/2018Q1/databases/mariadb55-server/distinfo ============================================================================== --- branches/2018Q1/databases/mariadb55-server/distinfo Fri Jan 19 20:17:25 2018 (r459467) +++ branches/2018Q1/databases/mariadb55-server/distinfo Fri Jan 19 20:17:58 2018 (r459468) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508325537 -SHA256 (mariadb-5.5.58.tar.gz) = 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 -SIZE (mariadb-5.5.58.tar.gz) = 45784323 +TIMESTAMP = 1516351401 +SHA256 (mariadb-5.5.59.tar.gz) = c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110 +SIZE (mariadb-5.5.59.tar.gz) = 45804920 From owner-svn-ports-branches@freebsd.org Fri Jan 19 22:29: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 571A9ECC46A; Fri, 19 Jan 2018 22:29:55 +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 19A8579640; Fri, 19 Jan 2018 22:29:55 +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 4249513883; Fri, 19 Jan 2018 22:29:54 +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 w0JMTsYS043884; Fri, 19 Jan 2018 22:29:54 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JMTrrG043881; Fri, 19 Jan 2018 22:29:53 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201801192229.w0JMTrrG043881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 19 Jan 2018 22:29:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459476 - branches/2018Q1/textproc/p5-xmltv X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q1/textproc/p5-xmltv X-SVN-Commit-Revision: 459476 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, 19 Jan 2018 22:29:55 -0000 Author: riggs Date: Fri Jan 19 22:29:53 2018 New Revision: 459476 URL: https://svnweb.freebsd.org/changeset/ports/459476 Log: MFH: r458965 Update to upstream release 0.5.70 (update scrapers for several countries) PR: 225039 Submitted by: tad@vif.com Approved by: ports-secteam (swills) Modified: branches/2018Q1/textproc/p5-xmltv/Makefile branches/2018Q1/textproc/p5-xmltv/distinfo branches/2018Q1/textproc/p5-xmltv/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/textproc/p5-xmltv/Makefile ============================================================================== --- branches/2018Q1/textproc/p5-xmltv/Makefile Fri Jan 19 22:27:58 2018 (r459475) +++ branches/2018Q1/textproc/p5-xmltv/Makefile Fri Jan 19 22:29:53 2018 (r459476) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xmltv -PORTVERSION= 0.5.68 -PORTREVISION= 1 +PORTVERSION= 0.5.70 CATEGORIES= textproc perl5 MASTER_SITES= SF PKGNAMEPREFIX= p5- Modified: branches/2018Q1/textproc/p5-xmltv/distinfo ============================================================================== --- branches/2018Q1/textproc/p5-xmltv/distinfo Fri Jan 19 22:27:58 2018 (r459475) +++ branches/2018Q1/textproc/p5-xmltv/distinfo Fri Jan 19 22:29:53 2018 (r459476) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478375400 -SHA256 (xmltv-0.5.68.tar.bz2) = ed6589118943f1028b318dea2cd30c395c41b8abc9bbf106b3787f095d79919d -SIZE (xmltv-0.5.68.tar.bz2) = 1200116 +TIMESTAMP = 1515557086 +SHA256 (xmltv-0.5.70.tar.bz2) = 237b03dc33668c46ed2e275b91739ca01e7f5a5c2ee63679d9bbb7f8d0bd6b6d +SIZE (xmltv-0.5.70.tar.bz2) = 1274164 Modified: branches/2018Q1/textproc/p5-xmltv/pkg-plist ============================================================================== --- branches/2018Q1/textproc/p5-xmltv/pkg-plist Fri Jan 19 22:27:58 2018 (r459475) +++ branches/2018Q1/textproc/p5-xmltv/pkg-plist Fri Jan 19 22:29:53 2018 (r459476) @@ -13,13 +13,11 @@ bin/tv_grab_dk_dr bin/tv_grab_dtv_la bin/tv_grab_es_laguiatv bin/tv_grab_eu_dotmedia -bin/tv_grab_eu_egon bin/tv_grab_eu_epgdata bin/tv_grab_fi bin/tv_grab_fi_sv bin/tv_grab_fr bin/tv_grab_fr_kazer -bin/tv_grab_hr bin/tv_grab_huro bin/tv_grab_il bin/tv_grab_is @@ -29,16 +27,14 @@ bin/tv_grab_na_dd bin/tv_grab_na_dtv bin/tv_grab_na_tvmedia bin/tv_grab_nl -bin/tv_grab_pt bin/tv_grab_pt_meo -bin/tv_grab_sd_json bin/tv_grab_se_swedb bin/tv_grab_se_tvzon bin/tv_grab_tr -bin/tv_grab_uk_atlas bin/tv_grab_uk_bleb -bin/tv_grab_uk_rt bin/tv_grab_uk_tvguide +bin/tv_grab_zz_sdjson +bin/tv_grab_zz_sdjson_sqlite bin/tv_grep bin/tv_imdb bin/tv_merge @@ -100,13 +96,11 @@ bin/tv_validate_grabber %%PERL5_MAN1%%/tv_grab_dtv_la.1.gz %%PERL5_MAN1%%/tv_grab_es_laguiatv.1.gz %%PERL5_MAN1%%/tv_grab_eu_dotmedia.1.gz -%%PERL5_MAN1%%/tv_grab_eu_egon.1.gz %%PERL5_MAN1%%/tv_grab_eu_epgdata.1.gz %%PERL5_MAN1%%/tv_grab_fi.1.gz %%PERL5_MAN1%%/tv_grab_fi_sv.1.gz %%PERL5_MAN1%%/tv_grab_fr.1.gz %%PERL5_MAN1%%/tv_grab_fr_kazer.1.gz -%%PERL5_MAN1%%/tv_grab_hr.1.gz %%PERL5_MAN1%%/tv_grab_huro.1.gz %%PERL5_MAN1%%/tv_grab_il.1.gz %%PERL5_MAN1%%/tv_grab_is.1.gz @@ -116,16 +110,14 @@ bin/tv_validate_grabber %%PERL5_MAN1%%/tv_grab_na_dtv.1.gz %%PERL5_MAN1%%/tv_grab_na_tvmedia.1.gz %%PERL5_MAN1%%/tv_grab_nl.1.gz -%%PERL5_MAN1%%/tv_grab_pt.1.gz %%PERL5_MAN1%%/tv_grab_pt_meo.1.gz -%%PERL5_MAN1%%/tv_grab_sd_json.1.gz %%PERL5_MAN1%%/tv_grab_se_swedb.1.gz %%PERL5_MAN1%%/tv_grab_se_tvzon.1.gz %%PERL5_MAN1%%/tv_grab_tr.1.gz -%%PERL5_MAN1%%/tv_grab_uk_atlas.1.gz %%PERL5_MAN1%%/tv_grab_uk_bleb.1.gz -%%PERL5_MAN1%%/tv_grab_uk_rt.1.gz %%PERL5_MAN1%%/tv_grab_uk_tvguide.1.gz +%%PERL5_MAN1%%/tv_grab_zz_sdjson.1.gz +%%PERL5_MAN1%%/tv_grab_zz_sdjson_sqlite.1.gz %%PERL5_MAN1%%/tv_grep.1.gz %%PERL5_MAN1%%/tv_imdb.1.gz %%PERL5_MAN1%%/tv_merge.1.gz @@ -166,35 +158,7 @@ bin/tv_validate_grabber %%DATADIR%%/tv_grab_it_dvb/channel_ids %%DATADIR%%/tv_grab_it_dvb/sky_it.dict %%DATADIR%%/tv_grab_it_dvb/sky_it.themes -%%DATADIR%%/tv_grab_uk_atlas/cgi-bin/getatlas.pl -%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.map.channels.conf -%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.map.genres.conf -%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.pa.genres.conf -%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.user.map.conf %%DATADIR%%/tv_grab_uk_bleb/icon_urls -%%DATADIR%%/tv_grab_uk_rt/channel_icons -%%DATADIR%%/tv_grab_uk_rt/channel_ids -%%DATADIR%%/tv_grab_uk_rt/channels_platforms -%%DATADIR%%/tv_grab_uk_rt/lineups/freesat.map -%%DATADIR%%/tv_grab_uk_rt/lineups/freesat.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/freesatfromsky.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/freesathd.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/freeview.map -%%DATADIR%%/tv_grab_uk_rt/lineups/freeview.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/freeviewhd.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/lineups.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/saorview.map -%%DATADIR%%/tv_grab_uk_rt/lineups/saorview.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/sky.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/skyhd.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/upcireland.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/upcirelandhd.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/virgin.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/virginhd.xml -%%DATADIR%%/tv_grab_uk_rt/lineups/xmltv-lineups.xsl -%%DATADIR%%/tv_grab_uk_rt/prog_titles_to_process -%%DATADIR%%/tv_grab_uk_rt/regional_channels_by_postcode -%%DATADIR%%/tv_grab_uk_rt/utf8_fixups %%DATADIR%%/tv_grab_uk_tvguide/tv_grab_uk_tvguide.map.conf %%DATADIR%%/xmltv-lineups.xsd %%DATADIR%%/xmltv.dtd From owner-svn-ports-branches@freebsd.org Fri Jan 19 22:32: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 EEE2DECC7CA; Fri, 19 Jan 2018 22:32:35 +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 C96E679A42; Fri, 19 Jan 2018 22:32:35 +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 178E713A27; Fri, 19 Jan 2018 22:32:35 +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 w0JMWYeo047782; Fri, 19 Jan 2018 22:32:34 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JMWYFw047780; Fri, 19 Jan 2018 22:32:34 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201801192232.w0JMWYFw047780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 19 Jan 2018 22:32:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459477 - branches/2018Q1/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q1/audio/musicpd X-SVN-Commit-Revision: 459477 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, 19 Jan 2018 22:32:36 -0000 Author: riggs Date: Fri Jan 19 22:32:34 2018 New Revision: 459477 URL: https://svnweb.freebsd.org/changeset/ports/459477 Log: MFH: r458963 Update to upstream version 0.20.15 (bug fix release) Detailed changelog: http://git.musicpd.org/cgit/master/mpd.git/plain/NEWS?h=v0.20.15 PR: 225115 Submitted by: dg@syrec.org Approved by: ports-secteam (swills) Modified: branches/2018Q1/audio/musicpd/Makefile branches/2018Q1/audio/musicpd/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/audio/musicpd/Makefile ============================================================================== --- branches/2018Q1/audio/musicpd/Makefile Fri Jan 19 22:29:53 2018 (r459476) +++ branches/2018Q1/audio/musicpd/Makefile Fri Jan 19 22:32:34 2018 (r459477) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.13 -PORTREVISION= 1 +PORTVERSION= 0.20.15 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2018Q1/audio/musicpd/distinfo ============================================================================== --- branches/2018Q1/audio/musicpd/distinfo Fri Jan 19 22:29:53 2018 (r459476) +++ branches/2018Q1/audio/musicpd/distinfo Fri Jan 19 22:32:34 2018 (r459477) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513757795 -SHA256 (mpd-0.20.13.tar.xz) = 46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40 -SIZE (mpd-0.20.13.tar.xz) = 788036 +TIMESTAMP = 1515925875 +SHA256 (mpd-0.20.15.tar.xz) = c69c4f67e665380ea3bbde6cff8958edc85f7cd40e7918ae5ce0a2184ca9eb40 +SIZE (mpd-0.20.15.tar.xz) = 790096 From owner-svn-ports-branches@freebsd.org Fri Jan 19 23:03: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 7D2E7ECE012; Fri, 19 Jan 2018 23:03:44 +0000 (UTC) (envelope-from swills@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 16BBC7B48D; Fri, 19 Jan 2018 23:03:44 +0000 (UTC) (envelope-from swills@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 1FCB013F34; Fri, 19 Jan 2018 23:03:43 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JN3hFp062748; Fri, 19 Jan 2018 23:03:43 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JN3faV062727; Fri, 19 Jan 2018 23:03:41 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801192303.w0JN3faV062727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 19 Jan 2018 23:03:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459482 - in branches/2018Q1: databases databases/rubygem-redis databases/rubygem-redis3 devel devel/rubygem-licensee devel/rubygem-licensee8 security/rubygem-rbnacl textproc textproc/r... X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1: databases databases/rubygem-redis databases/rubygem-redis3 devel devel/rubygem-licensee devel/rubygem-licensee8 security/rubygem-rbnacl textproc textproc/rubygem-rouge textproc/rub... X-SVN-Commit-Revision: 459482 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, 19 Jan 2018 23:03:44 -0000 Author: swills Date: Fri Jan 19 23:03:40 2018 New Revision: 459482 URL: https://svnweb.freebsd.org/changeset/ports/459482 Log: Pull in GitLab security update and all commits needed for it to run properly Approved by: ports-secteam (implicit) MFH: r457863 r457866 r457872 r457873 r457876 r457879 r457890 r457898 r457899 r458098 r458142 r458267 r458333 r458634 r458650 r458652 r459076 r459170 r459191 r459256 r459284 r459288 r459346 textproc/rubygem-twitter-text: add required dependency on rubygem-idn-ruby PR: 224838 Submitted by: Matthias Fechner www/gitlab: fix Gemfile for updated dependencies PR: 224836 Submitted by: Matthias Fechner (maintainer) Add rubygem-redis3 3.3.5 (copied from rubygem-redis) - Add PORTSCOUT Add rubygem-jwt1 1.5.6 (copied from rubygem-jwt) - Add PORTSCOUT Update to 4.0.1 Changes: https://github.com/redis/redis-rb/blob/master/CHANGELOG.md Update to 2.1.0 Changes: https://github.com/jwt/ruby-jwt/releases Change RUN_DEPENDS from rubygem-redis and rubygem-jwt to rubygem-redis3 and rubygem-jwt1 - Bump PORTREVISION for dependency change devel/rubygem-licensee: update to 9.6.0 PR: 224758 Approved by: Matthias Fechner (maintainer www/gitlab: remove spurious newline Reported by: sunpoet Pointyhat to: swills security/rubygem-rbnacl: update to 5.0.0 www/gitlab: fix Gemfile for updated dependencies PR: 224932 Submitted by: Matthias Fechner (maintainer) Fix Gemfile for rubygem-fog-core 2.0.0 update - Bump PORTREVISION for package change Fix Gemfile for rubygem-jquery-atwho-rails 1.5.4 update - Bump PORTREVISION for package change Fix Gemfile for rubygem-fog-google 1.0.0 update - Bump PORTREVISION for package change Fix gitlab issue by creating rubygem-licensee8 PR: 225047 Submitted by: Matthias Fechner (maintainer) devel/rubygem-licensee: update to 9.7.0 PR: 224999 Approved by: Matthias Fechner (maintainer) textproc/rubygem-rouge: update to 3.1.0 PR: 224785 Approved by: maintainer timeout (kuriyama, > 2 weeks) textproc/rubygem-rouge2: create port for 2.x ver Needed by GitLab textproc/rubygem-rouge2: add missing PKGNAMESUFFIX Pointyhat to: swills Reported by: antoine textproc/rubygem-rouge2: add conflict www/rubygem-gollum-lib: depend on 2.x version of rouge This version is required by gollum-lib www/gitlab: update to 10.1.6 Approved by: idefix@fechner.net (maintainer, via private email) Obtained from: http://gitlab.toco-domains.de/FreeBSD/GitLab/commits/10.1 Security: 65fab89f-2231-46db-8541-978f4e87f32a Mark CONFLICTS_INSTALL with rubygems-rouge2 Added: branches/2018Q1/databases/rubygem-redis3/ - copied from r457872, head/databases/rubygem-redis3/ branches/2018Q1/devel/rubygem-licensee8/ - copied from r458650, head/devel/rubygem-licensee8/ branches/2018Q1/textproc/rubygem-rouge2/ - copied from r459170, head/textproc/rubygem-rouge2/ branches/2018Q1/www/rubygem-jwt1/ - copied from r457873, head/www/rubygem-jwt1/ Modified: branches/2018Q1/databases/Makefile branches/2018Q1/databases/rubygem-redis/Makefile branches/2018Q1/databases/rubygem-redis/distinfo branches/2018Q1/devel/Makefile branches/2018Q1/devel/rubygem-licensee/Makefile branches/2018Q1/devel/rubygem-licensee/distinfo branches/2018Q1/security/rubygem-rbnacl/Makefile branches/2018Q1/security/rubygem-rbnacl/distinfo (contents, props changed) branches/2018Q1/textproc/Makefile branches/2018Q1/textproc/rubygem-rouge/Makefile branches/2018Q1/textproc/rubygem-rouge/distinfo branches/2018Q1/textproc/rubygem-rouge2/Makefile branches/2018Q1/textproc/rubygem-twitter-text/Makefile branches/2018Q1/www/Makefile branches/2018Q1/www/gitlab/Makefile branches/2018Q1/www/gitlab/distinfo branches/2018Q1/www/gitlab/files/patch-Gemfile branches/2018Q1/www/gitlab/pkg-plist branches/2018Q1/www/rubygem-gollum-lib/Makefile branches/2018Q1/www/rubygem-jwt/Makefile branches/2018Q1/www/rubygem-jwt/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/Makefile ============================================================================== --- branches/2018Q1/databases/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/databases/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -985,6 +985,7 @@ SUBDIR += rubygem-redis-actionpack-rails5 SUBDIR += rubygem-redis-actionpack-rails50 SUBDIR += rubygem-redis-namespace + SUBDIR += rubygem-redis3 SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 SUBDIR += rubygem-sqlite3-ruby Modified: branches/2018Q1/databases/rubygem-redis/Makefile ============================================================================== --- branches/2018Q1/databases/rubygem-redis/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/databases/rubygem-redis/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -PORTVERSION= 3.3.5 +PORTVERSION= 4.0.1 CATEGORIES= databases rubygems MASTER_SITES= RG Modified: branches/2018Q1/databases/rubygem-redis/distinfo ============================================================================== --- branches/2018Q1/databases/rubygem-redis/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/databases/rubygem-redis/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1507043292 -SHA256 (rubygem/redis-3.3.5.gem) = 3b47205af551f81623da98160550270c3aa365e97b46e3a3de8581f8502f8144 -SIZE (rubygem/redis-3.3.5.gem) = 92672 +TIMESTAMP = 1514824406 +SHA256 (rubygem/redis-4.0.1.gem) = 8f7f5eaaeb0f96e4adacfe05aef265d67e229780f20c5bdf4e22121bea1334f8 +SIZE (rubygem/redis-4.0.1.gem) = 91648 Modified: branches/2018Q1/devel/Makefile ============================================================================== --- branches/2018Q1/devel/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/devel/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -5520,6 +5520,7 @@ SUBDIR += rubygem-librarianp SUBDIR += rubygem-libyajl2 SUBDIR += rubygem-licensee + SUBDIR += rubygem-licensee8 SUBDIR += rubygem-listen SUBDIR += rubygem-little-plugger SUBDIR += rubygem-local_time Modified: branches/2018Q1/devel/rubygem-licensee/Makefile ============================================================================== --- branches/2018Q1/devel/rubygem-licensee/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/devel/rubygem-licensee/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= licensee -PORTVERSION= 8.7.0 +PORTVERSION= 9.7.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +12,8 @@ COMMENT= Detects under what license a project is distr LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged +RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged \ + rubygem-octokit>=4.8.0:net/rubygem-octokit NO_ARCH= yes USE_RUBY= yes Modified: branches/2018Q1/devel/rubygem-licensee/distinfo ============================================================================== --- branches/2018Q1/devel/rubygem-licensee/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/devel/rubygem-licensee/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497437247 -SHA256 (rubygem/licensee-8.7.0.gem) = 42992036a97e20bc1b80284d44f098f2f6e45fae7c8982cff2985230fa0612da -SIZE (rubygem/licensee-8.7.0.gem) = 129024 +TIMESTAMP = 1515424194 +SHA256 (rubygem/licensee-9.7.0.gem) = 2de9ae98e23e4c6e883ab199135474b72c23f8cb45cb0e85ce973d1ae68b00dc +SIZE (rubygem/licensee-9.7.0.gem) = 199168 Modified: branches/2018Q1/security/rubygem-rbnacl/Makefile ============================================================================== --- branches/2018Q1/security/rubygem-rbnacl/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/security/rubygem-rbnacl/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rbnacl -PORTVERSION= 4.0.2 +PORTVERSION= 5.0.0 CATEGORIES= security rubygems MASTER_SITES= RG Modified: branches/2018Q1/security/rubygem-rbnacl/distinfo ============================================================================== --- branches/2018Q1/security/rubygem-rbnacl/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/security/rubygem-rbnacl/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509621492 -SHA256 (rubygem/rbnacl-4.0.2.gem) = 885c5f5dfa23007132df6d34992067f867968fcef8071e371ca5378ef88bb321 -SIZE (rubygem/rbnacl-4.0.2.gem) = 220160 +TIMESTAMP = 1514155105 +SHA256 (rubygem/rbnacl-5.0.0.gem) = 3364b6bcd50d716c15d692bcd9e77d22e15927b9e442b496a5a7e1e4f3d2bb76 +SIZE (rubygem/rbnacl-5.0.0.gem) = 221184 Modified: branches/2018Q1/textproc/Makefile ============================================================================== --- branches/2018Q1/textproc/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/textproc/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -1558,6 +1558,7 @@ SUBDIR += rubygem-rmmseg-cpp SUBDIR += rubygem-ronn SUBDIR += rubygem-rouge + SUBDIR += rubygem-rouge2 SUBDIR += rubygem-rttool SUBDIR += rubygem-ruby-augeas SUBDIR += rubygem-ruby-xslt Modified: branches/2018Q1/textproc/rubygem-rouge/Makefile ============================================================================== --- branches/2018Q1/textproc/rubygem-rouge/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/textproc/rubygem-rouge/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rouge -PORTVERSION= 2.2.1 +PORTVERSION= 3.1.0 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,6 +11,8 @@ COMMENT= Simple, easy-to-extend drop-in replacement fo LICENSE= BSD2CLAUSE MIT LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE + +CONFLICTS_INSTALL= rubygems-rouge2 NO_ARCH= yes USES= gem Modified: branches/2018Q1/textproc/rubygem-rouge/distinfo ============================================================================== --- branches/2018Q1/textproc/rubygem-rouge/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/textproc/rubygem-rouge/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506009272 -SHA256 (rubygem/rouge-2.2.1.gem) = 9a6dfba66fd686449eff227fb5f938e0abfe6722a61c6bbb1f834d5b2654770a -SIZE (rubygem/rouge-2.2.1.gem) = 281088 +TIMESTAMP = 1514155083 +SHA256 (rubygem/rouge-3.1.0.gem) = 856739590f995f79abbf7511939a1de7681e08bfead899d024c62bae1c1a7cc5 +SIZE (rubygem/rouge-3.1.0.gem) = 282624 Modified: branches/2018Q1/textproc/rubygem-rouge2/Makefile ============================================================================== --- head/textproc/rubygem-rouge2/Makefile Tue Jan 16 13:38:05 2018 (r459170) +++ branches/2018Q1/textproc/rubygem-rouge2/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -4,6 +4,7 @@ PORTNAME= rouge PORTVERSION= 2.2.1 CATEGORIES= textproc rubygems MASTER_SITES= RG +PKGNAMESUFFIX= 2 MAINTAINER= ruby@FreeBSD.org COMMENT= Simple, easy-to-extend drop-in replacement for pygments @@ -11,6 +12,8 @@ COMMENT= Simple, easy-to-extend drop-in replacement fo LICENSE= BSD2CLAUSE MIT LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE + +CONFLICTS_INSTALL= rubygems-rouge NO_ARCH= yes USES= gem Modified: branches/2018Q1/textproc/rubygem-twitter-text/Makefile ============================================================================== --- branches/2018Q1/textproc/rubygem-twitter-text/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/textproc/rubygem-twitter-text/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2,6 +2,7 @@ PORTNAME= twitter-text PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,7 +12,8 @@ COMMENT= Ruby gem for handling of Twitter texts LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-unf>=0.1.0:textproc/rubygem-unf +RUN_DEPENDS= rubygem-unf>=0.1.0:textproc/rubygem-unf \ + rubygem-idn-ruby>=0:dns/rubygem-idn-ruby NO_ARCH= yes USE_RUBY= yes Modified: branches/2018Q1/www/Makefile ============================================================================== --- branches/2018Q1/www/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2059,6 +2059,7 @@ SUBDIR += rubygem-jsobfu SUBDIR += rubygem-json-jwt SUBDIR += rubygem-jwt + SUBDIR += rubygem-jwt1 SUBDIR += rubygem-kaminari SUBDIR += rubygem-kaminari-actionview SUBDIR += rubygem-kaminari-actionview-rails5 Modified: branches/2018Q1/www/gitlab/Makefile ============================================================================== --- branches/2018Q1/www/gitlab/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/gitlab/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.1.5 +PORTVERSION= 10.1.6 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -58,7 +57,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \ rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \ rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \ - rubygem-jwt>=1.5.6:www/rubygem-jwt \ + rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ @@ -102,7 +101,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \ rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \ - rubygem-rouge>=2.0:textproc/rubygem-rouge \ + rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \ @@ -122,7 +121,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ rubygem-version_sorter>=2.1.0:textproc/rubygem-version_sorter \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ - rubygem-redis>=3.2:databases/rubygem-redis \ + rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ @@ -136,7 +135,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.0.3:textproc/rubygem-loofah \ - rubygem-licensee>=8.7:devel/rubygem-licensee \ + rubygem-licensee8>=8.7:devel/rubygem-licensee8 \ rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ @@ -185,7 +184,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \ - rubygem-rbnacl>=4.0:security/rubygem-rbnacl \ + rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \ rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \ Modified: branches/2018Q1/www/gitlab/distinfo ============================================================================== --- branches/2018Q1/www/gitlab/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/gitlab/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512812405 -SHA256 (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 8b8f8d88757bb7cc4f204c31f3d67fe4f4191fb25d1e4df81cf2c4361e10a725 -SIZE (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 41727928 +TIMESTAMP = 1516175210 +SHA256 (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = b01bd5e10adb5b21c4cafc5e9fe5fa388c52fe7546708d0ed58f57644bc76b9c +SIZE (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = 41739152 Modified: branches/2018Q1/www/gitlab/files/patch-Gemfile ============================================================================== --- branches/2018Q1/www/gitlab/files/patch-Gemfile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/gitlab/files/patch-Gemfile Fri Jan 19 23:03:40 2018 (r459482) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2017-11-14 20:51:25 UTC +--- Gemfile.orig 2018-01-11 16:23:59 UTC +++ Gemfile @@ -1,49 +1,49 @@ source 'https://rubygems.org' @@ -33,8 +33,9 @@ gem 'doorkeeper', '~> 4.2.0' gem 'doorkeeper-openid_connect', '~> 1.2.0' -gem 'omniauth', '~> 1.4.2' +-gem 'omniauth-auth0', '~> 1.4.1' +gem 'omniauth', '>= 1.4.2' - gem 'omniauth-auth0', '~> 1.4.1' ++gem 'omniauth-auth0', '>= 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' @@ -44,12 +45,14 @@ +gem 'omniauth-google-oauth2', '>= 0.5.2' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' - gem 'omniauth-saml', '~> 1.7.0' +-gem 'omniauth-saml', '~> 1.7.0' -gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +-gem 'omniauth_crowd', '~> 2.2.0' ++gem 'omniauth-saml', '>= 1.7.0' +gem 'omniauth-shibboleth', '>= 1.2.0' +gem 'omniauth-twitter', '>= 1.2.0' - gem 'omniauth_crowd', '~> 2.2.0' ++gem 'omniauth_crowd', '>= 2.2.0' gem 'omniauth-authentiq', '~> 0.3.1' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '>= 1.2.1' @@ -70,7 +73,7 @@ # API gem 'grape', '~> 1.0' -@@ -87,13 +87,13 @@ gem 'hashie-forbidden_attributes' +@@ -87,25 +87,25 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML @@ -87,7 +90,10 @@ # for backups gem 'fog-aws', '~> 1.4' -@@ -102,10 +102,10 @@ gem 'fog-google', '~> 0.5' +-gem 'fog-core', '~> 1.44' +-gem 'fog-google', '~> 0.5' ++gem 'fog-core', '>= 1.44' ++gem 'fog-google', '>= 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' @@ -161,7 +167,7 @@ # GitLab settings gem 'settingslogic', '~> 2.0.9' -@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1' +@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1' # Misc @@ -169,8 +175,11 @@ +gem 'version_sorter', '>= 2.1.0' # Cache - gem 'redis-rails', '~> 5.0.1' -@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2' + gem 'redis-rails', '~> 5.0.2' + + # Redis +-gem 'redis', '~> 3.2' ++gem 'redis', '>= 3.2' gem 'connection_pool', '~> 2.0' # HipChat integration @@ -183,7 +192,7 @@ # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0' +@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration @@ -199,7 +208,10 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3' +-gem 'loofah', '~> 2.0.3' ++gem 'loofah', '>= 2.0.3' + + # Working with license gem 'licensee', '~> 8.7.0' # Protect against bruteforcing @@ -208,7 +220,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2' +@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.10' @@ -225,10 +237,11 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' -gem 'gon', '~> 6.1.0' -+gem 'gon', '>= 6.1.0' - gem 'jquery-atwho-rails', '~> 1.3.2' +-gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.1.0' -gem 'request_store', '~> 1.3' ++gem 'gon', '>= 6.1.0' ++gem 'jquery-atwho-rails', '>= 1.3.2' +gem 'jquery-rails', '>= 4.1.0' +gem 'request_store', '>= 1.3' gem 'select2-rails', '~> 3.5.9' @@ -239,9 +252,10 @@ -gem 'sentry-raven', '~> 2.5.3' +gem 'sentry-raven', '>= 2.5.3' - gem 'premailer-rails', '~> 1.9.7' +-gem 'premailer-rails', '~> 1.9.7' ++gem 'premailer-rails', '>= 1.9.7' -@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7' + # I18n gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 4.0.9' gem 'gettext_i18n_rails', '~> 1.8.0' @@ -363,7 +377,8 @@ +gem 'email_reply_trimmer', '>= 0.1' gem 'html2text' - gem 'ruby-prof', '~> 0.16.2' +-gem 'ruby-prof', '~> 0.16.2' ++gem 'ruby-prof', '>= 0.16.2' # OAuth -gem 'oauth2', '~> 1.4' @@ -387,7 +402,10 @@ # Required for ED25519 SSH host key support group :ed25519 do -@@ -398,9 +314,9 @@ group :ed25519 do + gem 'rbnacl-libsodium' +- gem 'rbnacl', '~> 4.0' ++ gem 'rbnacl', '~> 4.0.2' + gem 'bcrypt_pbkdf', '~> 1.0' end # Gitaly GRPC client Modified: branches/2018Q1/www/gitlab/pkg-plist ============================================================================== --- branches/2018Q1/www/gitlab/pkg-plist Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/gitlab/pkg-plist Fri Jan 19 23:03:40 2018 (r459482) @@ -3434,6 +3434,7 @@ %%WWWDIR%%/app/serializers/container_tags_serializer.rb %%WWWDIR%%/app/serializers/deploy_key_entity.rb %%WWWDIR%%/app/serializers/deploy_key_serializer.rb +%%WWWDIR%%/app/serializers/deploy_keys_project_entity.rb %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb %%WWWDIR%%/app/serializers/discussion_entity.rb @@ -5851,6 +5852,8 @@ %%WWWDIR%%/db/migrate/20171006091000_add_name_foreign_key_to_ci_build_trace_sections.rb %%WWWDIR%%/db/migrate/20171012101043_add_circuit_breaker_properties_to_application_settings.rb %%WWWDIR%%/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb +%%WWWDIR%%/db/migrate/20171211145425_add_can_push_to_deploy_keys_projects.rb +%%WWWDIR%%/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb %%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb @@ -5938,6 +5941,8 @@ %%WWWDIR%%/db/post_migrate/20170927112318_update_legacy_diff_notes_type_for_import.rb %%WWWDIR%%/db/post_migrate/20170927112319_update_notes_type_for_import.rb %%WWWDIR%%/db/post_migrate/20171005130944_schedule_create_gpg_key_subkeys_from_gpg_keys.rb +%%WWWDIR%%/db/post_migrate/20171215121205_post_populate_can_push_from_deploy_keys_projects.rb +%%WWWDIR%%/db/post_migrate/20171215121259_remove_can_push_from_keys.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -8096,6 +8101,7 @@ %%WWWDIR%%/lib/gitlab/middleware/read_only.rb %%WWWDIR%%/lib/gitlab/middleware/static.rb %%WWWDIR%%/lib/gitlab/middleware/webpack_proxy.rb +%%WWWDIR%%/lib/gitlab/o_auth.rb %%WWWDIR%%/lib/gitlab/o_auth/auth_hash.rb %%WWWDIR%%/lib/gitlab/o_auth/provider.rb %%WWWDIR%%/lib/gitlab/o_auth/session.rb @@ -8519,12 +8525,14 @@ %%WWWDIR%%/spec/controllers/import/gitea_controller_spec.rb %%WWWDIR%%/spec/controllers/import/github_controller_spec.rb %%WWWDIR%%/spec/controllers/import/gitlab_controller_spec.rb +%%WWWDIR%%/spec/controllers/import/gitlab_projects_controller_spec.rb %%WWWDIR%%/spec/controllers/import/google_code_controller_spec.rb %%WWWDIR%%/spec/controllers/invites_controller_spec.rb %%WWWDIR%%/spec/controllers/metrics_controller_spec.rb %%WWWDIR%%/spec/controllers/notification_settings_controller_spec.rb %%WWWDIR%%/spec/controllers/oauth/applications_controller_spec.rb %%WWWDIR%%/spec/controllers/oauth/authorizations_controller_spec.rb +%%WWWDIR%%/spec/controllers/omniauth_callbacks_controller_spec.rb %%WWWDIR%%/spec/controllers/passwords_controller_spec.rb %%WWWDIR%%/spec/controllers/profiles/accounts_controller_spec.rb %%WWWDIR%%/spec/controllers/profiles/avatars_controller_spec.rb @@ -9570,6 +9578,8 @@ %%WWWDIR%%/spec/javascripts/new_branch_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/code_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/markdown_spec.js +%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_sanitize_tests.js +%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/output/index_spec.js %%WWWDIR%%/spec/javascripts/notebook/cells/prompt_spec.js %%WWWDIR%%/spec/javascripts/notebook/index_spec.js @@ -10869,6 +10879,7 @@ %%WWWDIR%%/spec/services/projects/enable_deploy_key_service_spec.rb %%WWWDIR%%/spec/services/projects/fork_service_spec.rb %%WWWDIR%%/spec/services/projects/forks_count_service_spec.rb +%%WWWDIR%%/spec/services/projects/gitlab_projects_import_service_spec.rb %%WWWDIR%%/spec/services/projects/hashed_storage_migration_service_spec.rb %%WWWDIR%%/spec/services/projects/housekeeping_service_spec.rb %%WWWDIR%%/spec/services/projects/import_service_spec.rb Modified: branches/2018Q1/www/rubygem-gollum-lib/Makefile ============================================================================== --- branches/2018Q1/www/rubygem-gollum-lib/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/rubygem-gollum-lib/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -3,6 +3,7 @@ PORTNAME= gollum-lib PORTVERSION= 4.2.7 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=3.2:graphics/rubygem-gemojione \ rubygem-gollum-grit_adapter>=1.0:www/rubygem-gollum-grit_adapter \ rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri \ - rubygem-rouge>=2.1:textproc/rubygem-rouge \ + rubygem-rouge2>=2.1:textproc/rubygem-rouge2 \ rubygem-sanitize>=2.1:textproc/rubygem-sanitize \ rubygem-stringex>=2.6:devel/rubygem-stringex Modified: branches/2018Q1/www/rubygem-jwt/Makefile ============================================================================== --- branches/2018Q1/www/rubygem-jwt/Makefile Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/rubygem-jwt/Makefile Fri Jan 19 23:03:40 2018 (r459482) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jwt -PORTVERSION= 1.5.6 +PORTVERSION= 2.1.0 CATEGORIES= www devel rubygems MASTER_SITES= RG Modified: branches/2018Q1/www/rubygem-jwt/distinfo ============================================================================== --- branches/2018Q1/www/rubygem-jwt/distinfo Fri Jan 19 22:57:06 2018 (r459481) +++ branches/2018Q1/www/rubygem-jwt/distinfo Fri Jan 19 23:03:40 2018 (r459482) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480754982 -SHA256 (rubygem/jwt-1.5.6.gem) = 842b43dbc2dc605113556a96ec59241b325e15cbec160a8f8b222e4142f89f88 -SIZE (rubygem/jwt-1.5.6.gem) = 32768 +TIMESTAMP = 1507365146 +SHA256 (rubygem/jwt-2.1.0.gem) = 7e7e7ffc1a5ebce628ac7da428341c50615a3a10ac47bb74c22c1cba325613f0 +SIZE (rubygem/jwt-2.1.0.gem) = 37888 From owner-svn-ports-branches@freebsd.org Fri Jan 19 23:32:31 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 5EAB7ECF5F4; Fri, 19 Jan 2018 23:32:31 +0000 (UTC) (envelope-from swills@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 384FB7C9D6; Fri, 19 Jan 2018 23:32:31 +0000 (UTC) (envelope-from swills@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 87A0814418; Fri, 19 Jan 2018 23:32:30 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JNWUbS075548; Fri, 19 Jan 2018 23:32:30 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JNWU3O075547; Fri, 19 Jan 2018 23:32:30 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801192332.w0JNWU3O075547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 19 Jan 2018 23:32:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459484 - in branches/2018Q1/security: . rubygem-rbnacl4 X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1/security: . rubygem-rbnacl4 X-SVN-Commit-Revision: 459484 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, 19 Jan 2018 23:32:31 -0000 Author: swills Date: Fri Jan 19 23:32:30 2018 New Revision: 459484 URL: https://svnweb.freebsd.org/changeset/ports/459484 Log: Merge missed commit needed by r459482 MFH: r458139 security/rubygem-rbnacl4: create port 4.x version required by gitlab PR: 224931 Submitted by: Matthias Fechner (maintainer) Approved by: ports-secteam (implicit) Added: branches/2018Q1/security/rubygem-rbnacl4/ - copied from r458139, head/security/rubygem-rbnacl4/ Modified: branches/2018Q1/security/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/Makefile ============================================================================== --- branches/2018Q1/security/Makefile Fri Jan 19 23:30:47 2018 (r459483) +++ branches/2018Q1/security/Makefile Fri Jan 19 23:32:30 2018 (r459484) @@ -1094,6 +1094,7 @@ SUBDIR += rubygem-rack-oauth2 SUBDIR += rubygem-razorback-scriptNugget SUBDIR += rubygem-rbnacl + SUBDIR += rubygem-rbnacl4 SUBDIR += rubygem-rbnacl-libsodium SUBDIR += rubygem-recog SUBDIR += rubygem-rex-arch From owner-svn-ports-branches@freebsd.org Sat Jan 20 00:24: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 4F880ED1B33; Sat, 20 Jan 2018 00:24:00 +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 257A47E7C9; Sat, 20 Jan 2018 00:24:00 +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 3CE8314C13; Sat, 20 Jan 2018 00:23:59 +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 w0K0Nx6f096775; Sat, 20 Jan 2018 00:23:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0K0Nwco096772; Sat, 20 Jan 2018 00:23:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801200023.w0K0Nwco096772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 20 Jan 2018 00:23:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459489 - 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: 459489 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, 20 Jan 2018 00:24:00 -0000 Author: jbeich Date: Sat Jan 20 00:23:58 2018 New Revision: 459489 URL: https://svnweb.freebsd.org/changeset/ports/459489 Log: MFH: r459488 emulators/rpcs3: update to 0.0.4.270 Changes: https://github.com/RPCS3/rpcs3/compare/71f69d1d4...f908daf32 Approved by: ports-secteam (junovitch, implicit for snapshots) Added: branches/2018Q1/emulators/rpcs3/pkg-plist - copied unchanged from r459488, head/emulators/rpcs3/pkg-plist 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 20 00:22:48 2018 (r459488) +++ branches/2018Q1/emulators/rpcs3/Makefile Sat Jan 20 00:23:58 2018 (r459489) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-259 -DISTVERSIONSUFFIX= -g71f69d1d4 +DISTVERSION= 0.0.4-270 +DISTVERSIONSUFFIX= -gf908daf32 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -44,10 +44,6 @@ CMAKE_ARGS+= -DCMAKE_SKIP_RPATH=on -DUSE_SYSTEM_LIBPNG CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config LDFLAGS+= -Wl,--as-needed # GLU -PLIST_FILES= bin/${PORTNAME} \ - share/applications/${PORTNAME}.desktop \ - share/icons/hicolor/48x48/apps/${PORTNAME}.png \ - share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=ALSA LLVM VULKAN Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Sat Jan 20 00:22:48 2018 (r459488) +++ branches/2018Q1/emulators/rpcs3/distinfo Sat Jan 20 00:23:58 2018 (r459489) @@ -1,6 +1,6 @@ -TIMESTAMP = 1516205640 -SHA256 (RPCS3-rpcs3-v0.0.4-259-g71f69d1d4_GH0.tar.gz) = 98ed7f53c7f067c7bbafe04b58d9f9ddd90483869daa7a161a1349a9f687a4c7 -SIZE (RPCS3-rpcs3-v0.0.4-259-g71f69d1d4_GH0.tar.gz) = 3797583 +TIMESTAMP = 1516404768 +SHA256 (RPCS3-rpcs3-v0.0.4-270-gf908daf32_GH0.tar.gz) = 649c017a34cf52a76cc70e2d2dce529a135e9870982d748995fbffbfe61f0236 +SIZE (RPCS3-rpcs3-v0.0.4-270-gf908daf32_GH0.tar.gz) = 3800581 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 Copied: branches/2018Q1/emulators/rpcs3/pkg-plist (from r459488, head/emulators/rpcs3/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/rpcs3/pkg-plist Sat Jan 20 00:23:58 2018 (r459489, copy of r459488, head/emulators/rpcs3/pkg-plist) @@ -0,0 +1,28 @@ +bin/rpcs3 +share/applications/rpcs3.desktop +share/icons/hicolor/48x48/apps/rpcs3.png +share/icons/hicolor/scalable/apps/rpcs3.svg +%%DATADIR%%/GuiConfigs/Darker Style by TheMitoSan.qss +%%DATADIR%%/GuiConfigs/Kuroi (Dark) by Ani.qss +%%DATADIR%%/GuiConfigs/ModernBlue Theme by TheMitoSan.qss +%%DATADIR%%/Icons/ui/L1.png +%%DATADIR%%/Icons/ui/L2.png +%%DATADIR%%/Icons/ui/R1.png +%%DATADIR%%/Icons/ui/R2.png +%%DATADIR%%/Icons/ui/circle.png +%%DATADIR%%/Icons/ui/cross.png +%%DATADIR%%/Icons/ui/dpad.png +%%DATADIR%%/Icons/ui/dpad_down.png +%%DATADIR%%/Icons/ui/dpad_left.png +%%DATADIR%%/Icons/ui/dpad_right.png +%%DATADIR%%/Icons/ui/dpad_up.png +%%DATADIR%%/Icons/ui/fade_bottom.png +%%DATADIR%%/Icons/ui/fade_top.png +%%DATADIR%%/Icons/ui/left_stick.png +%%DATADIR%%/Icons/ui/new.png +%%DATADIR%%/Icons/ui/right_stick.png +%%DATADIR%%/Icons/ui/save.png +%%DATADIR%%/Icons/ui/select.png +%%DATADIR%%/Icons/ui/square.png +%%DATADIR%%/Icons/ui/start.png +%%DATADIR%%/Icons/ui/triangle.png From owner-svn-ports-branches@freebsd.org Sat Jan 20 00:25:21 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 40463ED1BFD; Sat, 20 Jan 2018 00:25:21 +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 021627E8EB; Sat, 20 Jan 2018 00:25:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FAC414C14; Sat, 20 Jan 2018 00:25:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0K0PKR7096951; Sat, 20 Jan 2018 00:25:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0K0PKwt096949; Sat, 20 Jan 2018 00:25:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801200025.w0K0PKwt096949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 20 Jan 2018 00:25:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459490 - 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: 459490 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, 20 Jan 2018 00:25:21 -0000 Author: jbeich Date: Sat Jan 20 00:25:19 2018 New Revision: 459490 URL: https://svnweb.freebsd.org/changeset/ports/459490 Log: MFH: r459487 emulators/citra: update to s20180119 Changes: https://github.com/citra-emu/citra/compare/93cca23d...bf4e35b9 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 20 00:23:58 2018 (r459489) +++ branches/2018Q1/emulators/citra/Makefile Sat Jan 20 00:25:19 2018 (r459490) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180118 +PORTVERSION= s20180119 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,15 +26,15 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 93cca23d +GH_TAGNAME= bf4e35b9 GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:4110494:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ - catchorg:Catch2:v2.0.1:catch/externals/catch \ + catchorg:Catch2:v2.1.0:catch/externals/catch \ fmtlib:fmt:4.0.0:fmt/externals/fmt \ herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ - lsalzman:enet:a84c120:enet/externals/enet \ - neobrain:nihstro:7e24743:nihstro/externals/nihstro \ + lsalzman:enet:39a72ab:enet/externals/enet \ + neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ weidai11:cryptopp:CRYPTOPP_5_6_5-610-g24bc2b8:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Sat Jan 20 00:23:58 2018 (r459489) +++ branches/2018Q1/emulators/citra/distinfo Sat Jan 20 00:25:19 2018 (r459490) @@ -1,22 +1,22 @@ -TIMESTAMP = 1516228250 -SHA256 (citra-emu-citra-s20180118-93cca23d_GH0.tar.gz) = bb2d99de31030e5269f38e13b6b391554d4ee86e933ec76ad794357ff52feccb -SIZE (citra-emu-citra-s20180118-93cca23d_GH0.tar.gz) = 1654723 +TIMESTAMP = 1516375060 +SHA256 (citra-emu-citra-s20180119-bf4e35b9_GH0.tar.gz) = 3818b618ab6b6038e7d83caacba88578144a9a902748f1af2d18b4ff4531d2f8 +SIZE (citra-emu-citra-s20180119-bf4e35b9_GH0.tar.gz) = 1657038 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 SIZE (MerryMage-dynarmic-4110494_GH0.tar.gz) = 1246775 SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340 SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436 -SHA256 (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 5f31b93712e65d363f257ad0f0c02cfbed7a3988979d5f320ad7771e513d4cc8 -SIZE (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 397154 +SHA256 (catchorg-Catch2-v2.1.0_GH0.tar.gz) = a8f9805174916c23bf59ed45f72c21ce092e2848c139f4c6d396aeeb5ce2dfb3 +SIZE (catchorg-Catch2-v2.1.0_GH0.tar.gz) = 475638 SHA256 (fmtlib-fmt-4.0.0_GH0.tar.gz) = 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a SIZE (fmtlib-fmt-4.0.0_GH0.tar.gz) = 617818 SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a SIZE (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 206888 -SHA256 (lsalzman-enet-a84c120_GH0.tar.gz) = 409d458f2da9d8bba49191ab6abaeb6bcf89193cd5eff07382c1d7b5f3fb06f0 -SIZE (lsalzman-enet-a84c120_GH0.tar.gz) = 79369 -SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650 -SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273 +SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1 +SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471 +SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a +SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417 SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 9f3f59538ba0515307e142ab404d65270da709aa3ac906770ec658e47a277ec2 SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 7008104 SHA256 (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 84ea509dc08766d7182b867b78ba6dd16f3352d85b18b0654661079b8617dae4 From owner-svn-ports-branches@freebsd.org Sat Jan 20 01:28:58 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 05A82ED4993; Sat, 20 Jan 2018 01:28:58 +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 D30EF80D0B; Sat, 20 Jan 2018 01:28:57 +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 1F2631562D; Sat, 20 Jan 2018 01:28:57 +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 w0K1SvuU022517; Sat, 20 Jan 2018 01:28:57 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0K1SuA1022513; Sat, 20 Jan 2018 01:28:56 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201801200128.w0K1SuA1022513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 20 Jan 2018 01:28:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459493 - in branches/2018Q1: . net-p2p/transmission-cli/files net-p2p/transmission-daemon X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2018Q1: . net-p2p/transmission-cli/files net-p2p/transmission-daemon X-SVN-Commit-Revision: 459493 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, 20 Jan 2018 01:28:58 -0000 Author: woodsb02 Date: Sat Jan 20 01:28:56 2018 New Revision: 459493 URL: https://svnweb.freebsd.org/changeset/ports/459493 Log: MFH: r459011 r459013 r459492 net-p2p/transmission-daemon: Mitigate DNS rebinding attack Incorporate upstream pull request 468, proposed by Tavis Ormandy from Google Project Zero, which mitigates this attack by requiring a host whitelist for requests that cannot be proven to be secure, but it can be disabled if a user does not want security. PR: 225150 Submitted by: Tavis Ormandy Approved by: crees (maintainer) Obtained from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126 Security: https://www.vuxml.org/freebsd/3e5b8bd3-0c32-452f-a60e-beab7b762351.html Add note to UPDATING for net-p2p/transmission-daemon explaining how to allow client access with the new DNS rebinding mitigations. PR: 225150 Security: https://www.vuxml.org/freebsd/3e5b8bd3-0c32-452f-a60e-beab7b762351.html net-p2p/transmission-daemon: Improve UPDATING entry and add pkg-message This will ensure users who do not read UPDATING are still presented with the message about how to allow clients to connect to the daemon using DNS when they upgrade the package. PR: 225150 Reported by: swills Security: https://www.vuxml.org/freebsd/3e5b8bd3-0c32-452f-a60e-beab7b762351.html Approved by: ports-secteam (swills) Added: branches/2018Q1/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln - copied unchanged from r459011, head/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln branches/2018Q1/net-p2p/transmission-daemon/pkg-message - copied unchanged from r459492, head/net-p2p/transmission-daemon/pkg-message Modified: branches/2018Q1/UPDATING branches/2018Q1/net-p2p/transmission-daemon/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/UPDATING ============================================================================== --- branches/2018Q1/UPDATING Sat Jan 20 01:20:19 2018 (r459492) +++ branches/2018Q1/UPDATING Sat Jan 20 01:28:56 2018 (r459493) @@ -5,6 +5,30 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20180115 + AFFECTS: users of net-p2p/transmission-daemon + AUTHOR: woodsb02@FreeBSD.org + + The transmission-daemon port has been updated to 2.92_4 to incorporate + a patch which mitigates DNS rebinding attacks. This will prevent + clients from being able to connect to the transmission daemon using + DNS with any hostname other than localhost, unless one of the + following is done: + - Enable password authentication, then any hostname is allowed. + This can be achieved by either: + - setting rpc-authentication-required to true, and adding + credentials to the rpc-username and rpc-password fields in + settings.json (must be done whilst the transmission service is + stopped); or + - running transmission-daemon with the following arguments + (these can be set with transmission_flags in /etc/rc.conf): + -t -u USERNAME -v PASSWORD + OR + - Add the allowed server hostnames to the rpc-host-whitelist setting + in settings.json (must be done whilst the transmission service is + stopped). Note that this value is NOT a list of allowed CLIENTS, + but instead a list of allowed SERVER hostnames. + 20171230: AFFECTS: users of net-im/ejabberd AUTHOR: ashish@FreeBSD.org Copied: branches/2018Q1/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln (from r459011, head/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln Sat Jan 20 01:28:56 2018 (r459493, copy of r459011, head/net-p2p/transmission-cli/files/patch-fix_dns_rebinding_vuln) @@ -0,0 +1,302 @@ +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +diff --git a/libtransmission/quark.c b/libtransmission/quark.c +index 30cc2bca4..b4fd7aabd 100644 +--- libtransmission/quark.c.orig ++++ libtransmission/quark.c +@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] = + { "rpc-authentication-required", 27 }, + { "rpc-bind-address", 16 }, + { "rpc-enabled", 11 }, ++ { "rpc-host-whitelist", 18 }, ++ { "rpc-host-whitelist-enabled", 26 }, + { "rpc-password", 12 }, + { "rpc-port", 8 }, + { "rpc-url", 7 }, +diff --git a/libtransmission/quark.h b/libtransmission/quark.h +index 7f5212733..17464be8f 100644 +--- libtransmission/quark.h.orig ++++ libtransmission/quark.h +@@ -291,6 +291,8 @@ enum + TR_KEY_rpc_authentication_required, + TR_KEY_rpc_bind_address, + TR_KEY_rpc_enabled, ++ TR_KEY_rpc_host_whitelist, ++ TR_KEY_rpc_host_whitelist_enabled, + TR_KEY_rpc_password, + TR_KEY_rpc_port, + TR_KEY_rpc_url, +diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c +index a3485f3fa..292cd5fce 100644 +--- libtransmission/rpc-server.c.orig ++++ libtransmission/rpc-server.c +@@ -52,6 +52,7 @@ struct tr_rpc_server + bool isEnabled; + bool isPasswordEnabled; + bool isWhitelistEnabled; ++ bool isHostWhitelistEnabled; + tr_port port; + char * url; + struct in_addr bindAddress; +@@ -63,6 +64,7 @@ struct tr_rpc_server + char * password; + char * whitelistStr; + tr_list * whitelist; ++ tr_list * hostWhitelist; + + char * sessionId; + time_t sessionIdExpiresAt; +@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address) + return false; + } + ++static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req) ++{ ++ /* If password auth is enabled, any hostname is permitted. */ ++ if (server->isPasswordEnabled) ++ { ++ return true; ++ } ++ ++ char const* const host = evhttp_find_header(req->input_headers, "Host"); ++ ++ // If whitelist is disabled, no restrictions. ++ if (!server->isHostWhitelistEnabled) ++ return true; ++ ++ /* No host header, invalid request. */ ++ if (host == NULL) ++ { ++ return false; ++ } ++ ++ /* Host header might include the port. */ ++ char* const hostname = tr_strndup(host, strcspn(host, ":")); ++ ++ /* localhost or ipaddress is always acceptable. */ ++ if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname)) ++ { ++ tr_free(hostname); ++ return true; ++ } ++ ++ /* Otherwise, hostname must be whitelisted. */ ++ for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) { ++ if (tr_wildmat(hostname, l->data)) ++ { ++ tr_free(hostname); ++ return true; ++ } ++ } ++ ++ tr_free(hostname); ++ return false; ++} ++ + static bool + test_session_id (struct tr_rpc_server * server, struct evhttp_request * req) + { +@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg) + handle_upload (req, server); + } + #ifdef REQUIRE_SESSION_ID ++ else if (!isHostnameAllowed(server, req)) ++ { ++ char* tmp = tr_strdup_printf( ++ "

Transmission received your request, but the hostname was unrecognized.

" ++ "

To fix this, choose one of the following options:" ++ "

    " ++ "
  • Enable password authentication, then any hostname is allowed.
    • " ++ "
  • Add the hostname you want to use to the whitelist in settings.
    • " ++ "

" ++ "

If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.

" ++ "

This requirement has been added to help prevent " ++ "DNS Rebinding " ++ "attacks.

"); ++ send_simple_response(req, 421, tmp); ++ tr_free(tmp); ++ } ++ + else if (!test_session_id (server, req)) + { + const char * sessionId = get_current_session_id (server); +@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg) + "
  • When you get this 409 error message, resend your request with the updated header" + "

    " + "

    This requirement has been added to help prevent " +- "CSRF " ++ "CSRF " + "attacks.

    " + "

    %s: %s

    ", + TR_RPC_SESSION_ID_HEADER, sessionId); +@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server) + return server->url ? server->url : ""; + } + +-void +-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) ++static void ++tr_rpcSetList (char const* whitelistStr, tr_list** list) + { + void * tmp; + const char * walk; + +- /* keep the string */ +- tmp = server->whitelistStr; +- server->whitelistStr = tr_strdup (whitelistStr); +- tr_free (tmp); +- + /* clear out the old whitelist entries */ +- while ((tmp = tr_list_pop_front (&server->whitelist))) ++ while ((tmp = tr_list_pop_front (list)) != NULL) + tr_free (tmp); + + /* build the new whitelist entries */ +@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) + const char * delimiters = " ,;"; + const size_t len = strcspn (walk, delimiters); + char * token = tr_strndup (walk, len); +- tr_list_append (&server->whitelist, token); ++ tr_list_append (list, token); + if (strcspn (token, "+-") < len) + tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'! Are you using an old ACL by mistake?)", token); + else +@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) + } + } + ++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr) ++{ ++ tr_rpcSetList(whitelistStr, &server->hostWhitelist); ++} ++ ++void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr) ++{ ++ /* keep the string */ ++ char* const tmp = server->whitelistStr; ++ server->whitelistStr = tr_strdup(whitelistStr); ++ tr_free(tmp); ++ ++ tr_rpcSetList(whitelistStr, &server->whitelist); ++} ++ + const char* + tr_rpcGetWhitelist (const tr_rpc_server * server) + { +@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server) + return server->isWhitelistEnabled; + } + ++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled) ++{ ++ server->isHostWhitelistEnabled = isEnabled; ++} ++ + /**** + ***** PASSWORD + ****/ +@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session * session, tr_variant * settings) + else + tr_rpcSetWhitelistEnabled (s, boolVal); + ++ key = TR_KEY_rpc_host_whitelist_enabled; ++ ++ if (!tr_variantDictFindBool(settings, key, &boolVal)) ++ { ++ missing_settings_key(key); ++ } ++ else ++ { ++ tr_rpcSetHostWhitelistEnabled(s, boolVal); ++ } ++ ++ key = TR_KEY_rpc_host_whitelist; ++ ++ if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL) ++ { ++ missing_settings_key(key); ++ } ++ else ++ { ++ tr_rpcSetHostWhitelist(s, str); ++ } ++ + key = TR_KEY_rpc_authentication_required; + if (!tr_variantDictFindBool (settings, key, &boolVal)) + missing_settings_key (key); +diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h +index e0302c5ea..8c9e6b24e 100644 +--- libtransmission/rpc-server.h.orig ++++ libtransmission/rpc-server.h +@@ -49,6 +49,10 @@ void tr_rpcSetWhitelist (tr_rpc_server * server, + + const char* tr_rpcGetWhitelist (const tr_rpc_server * server); + ++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled); ++ ++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist); ++ + void tr_rpcSetPassword (tr_rpc_server * server, + const char * password); + +diff --git a/libtransmission/session.c b/libtransmission/session.c +index 844cadba8..58b717913 100644 +--- libtransmission/session.c.orig ++++ libtransmission/session.c +@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d) + tr_variantDictAddStr (d, TR_KEY_rpc_username, ""); + tr_variantDictAddStr (d, TR_KEY_rpc_whitelist, TR_DEFAULT_RPC_WHITELIST); + tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled, true); ++ tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST); ++ tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true); + tr_variantDictAddInt (d, TR_KEY_rpc_port, atoi (TR_DEFAULT_RPC_PORT_STR)); + tr_variantDictAddStr (d, TR_KEY_rpc_url, TR_DEFAULT_RPC_URL_STR); + tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled, true); +diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h +index 4f76adfd6..e213a8f4e 100644 +--- libtransmission/transmission.h.orig ++++ libtransmission/transmission.h +@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void); + #define TR_DEFAULT_BIND_ADDRESS_IPV4 "0.0.0.0" + #define TR_DEFAULT_BIND_ADDRESS_IPV6 "::" + #define TR_DEFAULT_RPC_WHITELIST "127.0.0.1" ++#define TR_DEFAULT_RPC_HOST_WHITELIST "" + #define TR_DEFAULT_RPC_PORT_STR "9091" + #define TR_DEFAULT_RPC_URL_STR "/transmission/" + #define TR_DEFAULT_PEER_PORT_STR "51413" +diff --git a/libtransmission/web.c b/libtransmission/web.c +index ee495e9fc..c7f062730 100644 +--- libtransmission/web.c.orig ++++ libtransmission/web.c +@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code) + case 415: return "Unsupported Media Type"; + case 416: return "Requested Range Not Satisfiable"; + case 417: return "Expectation Failed"; ++ case 421: return "Misdirected Request"; + case 500: return "Internal Server Error"; + case 501: return "Not Implemented"; + case 502: return "Bad Gateway"; Modified: branches/2018Q1/net-p2p/transmission-daemon/Makefile ============================================================================== --- branches/2018Q1/net-p2p/transmission-daemon/Makefile Sat Jan 20 01:20:19 2018 (r459492) +++ branches/2018Q1/net-p2p/transmission-daemon/Makefile Sat Jan 20 01:28:56 2018 (r459493) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= -daemon MAINTAINER= crees@FreeBSD.org @@ -12,6 +12,7 @@ DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= daemon +PKGMESSAGE= ${.CURDIR}/pkg-message USE_RC_SUBR= transmission USERS= transmission Copied: branches/2018Q1/net-p2p/transmission-daemon/pkg-message (from r459492, head/net-p2p/transmission-daemon/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net-p2p/transmission-daemon/pkg-message Sat Jan 20 01:28:56 2018 (r459493, copy of r459492, head/net-p2p/transmission-daemon/pkg-message) @@ -0,0 +1,18 @@ +------------------------------------------------------------------------ +To allow clients to connect to the transmission daemon using DNS with +any hostname other than localhost, do one of the following: + - Enable password authentication, then any hostname is allowed. + This can be achieved by either: + - setting rpc-authentication-required to true, and adding + credentials to the rpc-username and rpc-password fields in + settings.json (must be done whilst the transmission service is + stopped); or + - running transmission-daemon with the following arguments + (these can be set with transmission_flags in /etc/rc.conf): + -t -u USERNAME -v PASSWORD + OR + - Add the allowed server hostnames to the rpc-host-whitelist setting + in settings.json (must be done whilst the transmission service is + stopped). Note that this value is NOT a list of allowed CLIENTS, + but instead a list of allowed SERVER hostnames. +------------------------------------------------------------------------ From owner-svn-ports-branches@freebsd.org Sat Jan 20 08:34: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 91FE6EC2B83; Sat, 20 Jan 2018 08:34:33 +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 6D3B56E8FF; Sat, 20 Jan 2018 08:34:33 +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 B5EE719FD4; Sat, 20 Jan 2018 08:34:32 +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 w0K8YWJC000863; Sat, 20 Jan 2018 08:34:32 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0K8YWSQ000862; Sat, 20 Jan 2018 08:34:32 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801200834.w0K8YWSQ000862@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, 20 Jan 2018 08:34:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459495 - branches/2018Q1/games/balazar X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q1/games/balazar X-SVN-Commit-Revision: 459495 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, 20 Jan 2018 08:34:33 -0000 Author: sunpoet Date: Sat Jan 20 08:34:32 2018 New Revision: 459495 URL: https://svnweb.freebsd.org/changeset/ports/459495 Log: MFH: r459349 Remove BROKEN, DEPRECATED and EXPIRATION_DATE This port builds fine in poudriere. This port depends on py-twisted and py-twistedCore has been removed from ports tree. Approved by: ports-secteam (swills) Modified: branches/2018Q1/games/balazar/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/balazar/Makefile ============================================================================== --- branches/2018Q1/games/balazar/Makefile Sat Jan 20 07:41:40 2018 (r459494) +++ branches/2018Q1/games/balazar/Makefile Sat Jan 20 08:34:32 2018 (r459495) @@ -22,9 +22,6 @@ RUN_DEPENDS= soya_editor:graphics/py-soya3d@${FLAVOR} ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} -BROKEN= fails to package: pkg-static: py27-twisted-17.5.0_1 conflicts with py27-twistedCore-15.2.1 (installs files into the same place) -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 NO_ARCH= yes USES= gettext python:2.7 tar:bzip2