From owner-svn-ports-branches@freebsd.org Sun Aug 14 03:05:58 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2E0BBB85B0; Sun, 14 Aug 2016 03:05:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B28B0129B; Sun, 14 Aug 2016 03:05: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 u7E35v4u089295; Sun, 14 Aug 2016 03:05:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7E35v4t089293; Sun, 14 Aug 2016 03:05:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201608140305.u7E35v4t089293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 14 Aug 2016 03:05:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420175 - branches/2016Q3/multimedia/libmtp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 03:05:59 -0000 Author: jbeich Date: Sun Aug 14 03:05:57 2016 New Revision: 420175 URL: https://svnweb.freebsd.org/changeset/ports/420175 Log: MFH: r420174 multimedia/libmtp: update to 1.1.12 Changes: https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/README/view ABI: https://people.freebsd.org/~jbeich/compat_reports/libmtp/1.1.11_to_1.1.12/compat_report.html Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/multimedia/libmtp/Makefile branches/2016Q3/multimedia/libmtp/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/multimedia/libmtp/Makefile ============================================================================== --- branches/2016Q3/multimedia/libmtp/Makefile Sun Aug 14 02:28:36 2016 (r420174) +++ branches/2016Q3/multimedia/libmtp/Makefile Sun Aug 14 03:05:57 2016 (r420175) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libmtp -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 CATEGORIES= multimedia audio MASTER_SITES= SF Modified: branches/2016Q3/multimedia/libmtp/distinfo ============================================================================== --- branches/2016Q3/multimedia/libmtp/distinfo Sun Aug 14 02:28:36 2016 (r420174) +++ branches/2016Q3/multimedia/libmtp/distinfo Sun Aug 14 03:05:57 2016 (r420175) @@ -1,2 +1,3 @@ -SHA256 (libmtp-1.1.11.tar.gz) = 15d96dff79a4f7ad14338894a4096d4ac584c6ad25fdcca955bc4726303287e9 -SIZE (libmtp-1.1.11.tar.gz) = 788911 +TIMESTAMP = 1471112087 +SHA256 (libmtp-1.1.12.tar.gz) = cdf59e816c6cda3e908a876c7fb42943f40b85669aea0029a1ca431c89afa1a0 +SIZE (libmtp-1.1.12.tar.gz) = 776555 From owner-svn-ports-branches@freebsd.org Mon Aug 15 09:38:28 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6ABF7BBA42E; Mon, 15 Aug 2016 09:38:28 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BB50192B; Mon, 15 Aug 2016 09:38: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 u7F9cRmv073791; Mon, 15 Aug 2016 09:38:27 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7F9cReU073785; Mon, 15 Aug 2016 09:38:27 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608150938.u7F9cReU073785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 15 Aug 2016 09:38:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420221 - in branches/2016Q3/lang: perl5.18 perl5.18/files perl5.20 perl5.20/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 09:38:28 -0000 Author: mat Date: Mon Aug 15 09:38:26 2016 New Revision: 420221 URL: https://svnweb.freebsd.org/changeset/ports/420221 Log: MFH: r420220 Fix the XSLoader thing in Perl 5.18 and 5.20. Security: CVE-2016-6185 Sponsored by: Absolight Added: branches/2016Q3/lang/perl5.18/files/patch-CVE-2016-6185 - copied unchanged from r420220, head/lang/perl5.18/files/patch-CVE-2016-6185 branches/2016Q3/lang/perl5.20/files/patch-CVE-2016-6185 - copied unchanged from r420220, head/lang/perl5.20/files/patch-CVE-2016-6185 Modified: branches/2016Q3/lang/perl5.18/Makefile branches/2016Q3/lang/perl5.20/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/perl5.18/Makefile ============================================================================== --- branches/2016Q3/lang/perl5.18/Makefile Mon Aug 15 09:33:39 2016 (r420220) +++ branches/2016Q3/lang/perl5.18/Makefile Mon Aug 15 09:38:26 2016 (r420221) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl Copied: branches/2016Q3/lang/perl5.18/files/patch-CVE-2016-6185 (from r420220, head/lang/perl5.18/files/patch-CVE-2016-6185) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/lang/perl5.18/files/patch-CVE-2016-6185 Mon Aug 15 09:38:26 2016 (r420221, copy of r420220, head/lang/perl5.18/files/patch-CVE-2016-6185) @@ -0,0 +1,90 @@ +diff --git dist/XSLoader/XSLoader_pm.PL dist/XSLoader/XSLoader_pm.PL +index 8a8852e..09f9d4b 100644 +--- dist/XSLoader/XSLoader_pm.PL ++++ dist/XSLoader/XSLoader_pm.PL +@@ -93,6 +93,43 @@ print OUT <<'EOT'; + $modlibname =~ s,[\\/][^\\/]+$,, while $c--; # Q&D basename + EOT + ++my $to_print = <<'EOT'; ++ # Does this look like a relative path? ++ if ($modlibname !~ m{regexp}) { ++EOT ++ ++$to_print =~ s~regexp~ ++ $^O eq 'MSWin32' || $^O eq 'os2' || $^O eq 'cygwin' || $^O eq 'amigaos' ++ ? '^(?:[A-Za-z]:)?[\\\/]' # Optional drive letter ++ : '^/' ++~e; ++ ++print OUT $to_print, <<'EOT'; ++ # Someone may have a #line directive that changes the file name, or ++ # may be calling XSLoader::load from inside a string eval. We cer- ++ # tainly do not want to go loading some code that is not in @INC, ++ # as it could be untrusted. ++ # ++ # We could just fall back to DynaLoader here, but then the rest of ++ # this function would go untested in the perl core, since all @INC ++ # paths are relative during testing. That would be a time bomb ++ # waiting to happen, since bugs could be introduced into the code. ++ # ++ # So look through @INC to see if $modlibname is in it. A rela- ++ # tive $modlibname is not a common occurrence, so this block is ++ # not hot code. ++ FOUND: { ++ for (@INC) { ++ if ($_ eq $modlibname) { ++ last FOUND; ++ } ++ } ++ # Not found. Fall back to DynaLoader. ++ goto \&XSLoader::bootstrap_inherit; ++ } ++ } ++EOT ++ + my $dl_dlext = quotemeta($Config::Config{'dlext'}); + + print OUT <<"EOT"; +diff --git dist/XSLoader/t/XSLoader.t dist/XSLoader/t/XSLoader.t +index 2ff11fe..1e86faa 100644 +--- dist/XSLoader/t/XSLoader.t ++++ dist/XSLoader/t/XSLoader.t +@@ -33,7 +33,7 @@ my %modules = ( + 'Time::HiRes'=> q| ::can_ok( 'Time::HiRes' => 'usleep' ) |, # 5.7.3 + ); + +-plan tests => keys(%modules) * 3 + 8; ++plan tests => keys(%modules) * 3 + 9; + + # Try to load the module + use_ok( 'XSLoader' ); +@@ -95,3 +95,28 @@ XSLoader::load("Devel::Peek"); + EOS + or ::diag $@; + } ++ ++SKIP: { ++ skip "File::Path not available", 1 ++ unless eval { require File::Path }; ++ my $name = "phooo$$"; ++ File::Path::make_path("$name/auto/Foo/Bar"); ++ open my $fh, ++ ">$name/auto/Foo/Bar/Bar.$Config::Config{'dlext'}"; ++ close $fh; ++ my $fell_back; ++ local *XSLoader::bootstrap_inherit = sub { ++ $fell_back++; ++ # Break out of the calling subs ++ goto the_test; ++ }; ++ eval < q| ::can_ok( 'Time::HiRes' => 'usleep' ) |, # 5.7.3 + ); + +-plan tests => keys(%modules) * 3 + 8; ++plan tests => keys(%modules) * 3 + 9; + + # Try to load the module + use_ok( 'XSLoader' ); +@@ -95,3 +95,28 @@ XSLoader::load("Devel::Peek"); + EOS + or ::diag $@; + } ++ ++SKIP: { ++ skip "File::Path not available", 1 ++ unless eval { require File::Path }; ++ my $name = "phooo$$"; ++ File::Path::make_path("$name/auto/Foo/Bar"); ++ open my $fh, ++ ">$name/auto/Foo/Bar/Bar.$Config::Config{'dlext'}"; ++ close $fh; ++ my $fell_back; ++ local *XSLoader::bootstrap_inherit = sub { ++ $fell_back++; ++ # Break out of the calling subs ++ goto the_test; ++ }; ++ eval < 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 3203EBBB759; Mon, 15 Aug 2016 12:02:42 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA0171FB2; Mon, 15 Aug 2016 12:02:41 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FC2f0K029973; Mon, 15 Aug 2016 12:02:41 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FC2eRX029970; Mon, 15 Aug 2016 12:02:40 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201608151202.u7FC2eRX029970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Mon, 15 Aug 2016 12:02:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420230 - branches/2016Q3/sysutils/ganglia-webfrontend X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 12:02:42 -0000 Author: brd Date: Mon Aug 15 12:02:40 2016 New Revision: 420230 URL: https://svnweb.freebsd.org/changeset/ports/420230 Log: MFH: r420217: Require the php session extension and switch to USE_GITHUB. PR: 211763 Submitted by: Joseph Mingrone (maintainer) Approved by: portmgr (bdrewery) Modified: branches/2016Q3/sysutils/ganglia-webfrontend/Makefile branches/2016Q3/sysutils/ganglia-webfrontend/distinfo branches/2016Q3/sysutils/ganglia-webfrontend/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/sysutils/ganglia-webfrontend/Makefile ============================================================================== --- branches/2016Q3/sysutils/ganglia-webfrontend/Makefile Mon Aug 15 12:00:40 2016 (r420229) +++ branches/2016Q3/sysutils/ganglia-webfrontend/Makefile Mon Aug 15 12:02:40 2016 (r420230) @@ -2,10 +2,9 @@ PORTNAME= ganglia PORTVERSION= 3.7.2 +PORTREVISION= 1 CATEGORIES= sysutils net parallel www -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-web/${PORTVERSION} PKGNAMESUFFIX= -webfrontend -DISTNAME= ${PORTNAME}-web-${PORTVERSION} MAINTAINER= jrm@ftfl.ca COMMENT= Ganglia cluster monitor, web frontend @@ -14,35 +13,40 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${LOCALBASE}/sbin/gmetad:sysutils/ganglia-monitor-core -USE_PHP= filter gd xml -NO_BUILD= YES -WANT_PHP_WEB= YES +USE_GITHUB= yes +GH_ACCOUNT= ganglia +GH_PROJECT= ganglia-web +NO_ARCH= yes +NO_BUILD= yes + +USES= php:web +USE_PHP= filter gd session xml WWWDIR= ${PREFIX}/www/ganglia +PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" WWWDIR="${WWWDIR}" SUB_FILES+= pkg-message -SUB_LIST+= WWWDIR="${WWWDIR}" - -PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" REINPLACE_ARGS= -i '' CONFIG_FILES= default.json event_color.json events.json view_default.json -NO_ARCH= yes - post-patch: @${REINPLACE_CMD} -e 's|@vargwebstatedir@|${DATADIR}|' \ -e 's|@vargmetadir@|/var/db/ganglia|' \ -e 's|/usr/bin/rrdtool|${LOCALBASE}/bin/rrdtool|' \ - ${WRKSRC}/conf_default.php.in + ${WRKSRC}/conf_default.php.in @${REINPLACE_CMD} -e 's|@GWEB_VERSION@|${PORTVERSION}|' \ - ${WRKSRC}/version.php.in - @${CP} ${WRKSRC}/version.php.in ${WRKSRC}/version.php - @${CP} ${WRKSRC}/conf_default.php.in ${WRKSRC}/conf_default.php + ${WRKSRC}/version.php.in do-install: - @cd ${WRKSRC} && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.in -o -name .gitignore -o -name Makefile -o -name apache.conf.in -o -name apache.conf -o -name conf -o -path \./conf/* -o -name debian -o -path \./debian/* -o -name ganglia-web\.spec )" + @${CP} ${WRKSRC}/conf_default.php.in ${WRKSRC}/conf_default.php + @${CP} ${WRKSRC}/version.php.in ${WRKSRC}/version.php + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} \ + "! ( -name .git -o -name \.gitignore -o -name \.travis.yml -o \ + -name AUTHORS -o -name COPYING -o -name Makefile -o -name \ + README -o -name TODO -o -name *\.in -o -name conf -o -path \ + \./conf/* -o -name debian -o -path \./debian/* -o -name \ + ganglia-web\.spec )") @${MKDIR} ${STAGEDIR}${DATADIR}/conf/sql @${MKDIR} ${STAGEDIR}${DATADIR}/dwoo/cache @${MKDIR} ${STAGEDIR}${DATADIR}/dwoo/compiled Modified: branches/2016Q3/sysutils/ganglia-webfrontend/distinfo ============================================================================== --- branches/2016Q3/sysutils/ganglia-webfrontend/distinfo Mon Aug 15 12:00:40 2016 (r420229) +++ branches/2016Q3/sysutils/ganglia-webfrontend/distinfo Mon Aug 15 12:02:40 2016 (r420230) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466016609 -SHA256 (ganglia-web-3.7.2.tar.gz) = 98820187c98d24d3645b92d31060623de696dad331a361a19874898339523628 -SIZE (ganglia-web-3.7.2.tar.gz) = 704632 +TIMESTAMP = 1470965544 +SHA256 (ganglia-ganglia-web-3.7.2_GH0.tar.gz) = a8f5fd8230b68d79089843aa11b89ae5b819d268573cc02b6c8a68f82abaaed2 +SIZE (ganglia-ganglia-web-3.7.2_GH0.tar.gz) = 693614 Modified: branches/2016Q3/sysutils/ganglia-webfrontend/pkg-plist ============================================================================== --- branches/2016Q3/sysutils/ganglia-webfrontend/pkg-plist Mon Aug 15 12:00:40 2016 (r420229) +++ branches/2016Q3/sysutils/ganglia-webfrontend/pkg-plist Mon Aug 15 12:02:40 2016 (r420230) @@ -3,11 +3,6 @@ @sample %%DATADIR%%/conf/events.json.sample %%DATADIR%%/conf/sql/ganglia.mysql @sample %%DATADIR%%/conf/view_default.json.sample -%%WWWDIR%%/.travis.yml -%%WWWDIR%%/AUTHORS -%%WWWDIR%%/COPYING -%%WWWDIR%%/README -%%WWWDIR%%/TODO %%WWWDIR%%/actions.php %%WWWDIR%%/aggregate_graphs.php %%WWWDIR%%/api/.htaccess @@ -71,12 +66,9 @@ %%WWWDIR%%/dwoo/Dwoo.compiled.php %%WWWDIR%%/dwoo/Dwoo.php %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/DwooRenderer.php -%%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/README %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php -%%WWWDIR%%/dwoo/Dwoo/Adapters/CakePHP/README %%WWWDIR%%/dwoo/Dwoo/Adapters/CakePHP/dwoo.php -%%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/README %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php @@ -84,7 +76,6 @@ %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/views/page.tpl %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/Dwoo.php %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/PluginProxy.php -%%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/README %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/View.php %%WWWDIR%%/dwoo/Dwoo/Block/Plugin.php %%WWWDIR%%/dwoo/Dwoo/Compilation/Exception.php From owner-svn-ports-branches@freebsd.org Mon Aug 15 13:28:36 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A61DBBA78E; Mon, 15 Aug 2016 13:28:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B4FA9139A; Mon, 15 Aug 2016 13:28:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FDSYb8060833; Mon, 15 Aug 2016 13:28:34 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FDSV4L060796; Mon, 15 Aug 2016 13:28:31 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201608151328.u7FDSV4L060796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 15 Aug 2016 13:28:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420231 - in branches/2016Q3/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 13:28:36 -0000 Author: rene Date: Mon Aug 15 13:28:31 2016 New Revision: 420231 URL: https://svnweb.freebsd.org/changeset/ports/420231 Log: MFH: r420138 www/chromium: update to 52.0.2743.116 Mark BROKEN on FreeBSD 9 for now, does not patch Submitted by: "LeFroid" via GitHub Security: https://vuxml.freebsd.org/freebsd/6fae9fe1-5048-11e6-8aa7-3065ec8fd3ec.html Approved by: ports-secteam (junovitch) Added: branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h - copied unchanged from r420138, head/www/chromium/files/patch-chrome_browser_platform__util.h branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py - copied unchanged from r420138, head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp - copied unchanged from r420138, head/www/chromium/files/patch-chrome_chrome__resources.gyp branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc - copied unchanged from r420138, head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc - copied unchanged from r420138, head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc - copied unchanged from r420138, head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc - copied unchanged from r420138, head/www/chromium/files/patch-services_shell_runner_init.cc branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp - copied unchanged from r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h - copied unchanged from r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi - copied unchanged from r420138, head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi branches/2016Q3/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h - copied unchanged from r420138, head/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h - copied unchanged from r420138, head/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc - copied unchanged from r420138, head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc - copied unchanged from r420138, head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_icon.js - copied unchanged from r420138, head/www/chromium/files/patch-ui_webui_resources_js_icon.js branches/2016Q3/www/chromium/files/patch-v8_src_profiler_sampler.cc - copied unchanged from r420138, head/www/chromium/files/patch-v8_src_profiler_sampler.cc Deleted: branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.cc branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.h branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc branches/2016Q3/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc branches/2016Q3/www/chromium/files/patch-mojo_shell_runner_init.cc branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp branches/2016Q3/www/chromium/files/patch-third__party_flac_flac.gyp branches/2016Q3/www/chromium/files/patch-third__party_libwebp_libwebp.gyp branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__center__view.cc branches/2016Q3/www/chromium/files/patch-ui_message__center_views_notification__view.cc branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc branches/2016Q3/www/chromium/files/patch-ui_views_controls_button_label__button.cc branches/2016Q3/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_util.js Modified: branches/2016Q3/www/chromium/Makefile branches/2016Q3/www/chromium/distinfo branches/2016Q3/www/chromium/files/extra-patch-clang branches/2016Q3/www/chromium/files/patch-base_base.gyp branches/2016Q3/www/chromium/files/patch-build_common.gypi branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp branches/2016Q3/www/chromium/files/patch-ui_base_ime_input__method__factory.cc branches/2016Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc branches/2016Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc branches/2016Q3/www/chromium/files/patch-ui_views_style_platform__style.cc branches/2016Q3/www/chromium/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/chromium/Makefile ============================================================================== --- branches/2016Q3/www/chromium/Makefile Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/Makefile Mon Aug 15 13:28:31 2016 (r420231) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 51.0.2704.106 +PORTVERSION= 52.0.2743.116 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -13,6 +13,8 @@ COMMENT= Google web browser based on Web LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi +BROKEN_FreeBSD_9=does not patch + CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ @@ -100,7 +102,7 @@ GYP_DEFINES+= \ enable_webrtc=1 \ werror= \ no_gc_sections=1 \ - OS=freebsd \ + OS=freebsd \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ python_ver=${PYTHON_VER} \ @@ -254,8 +256,8 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ ${WRKSRC}/crypto/crypto.gyp \ - ${WRKSRC}/v8/tools/gyp/v8.gyp \ - ${WRKSRC}/v8/build/toolchain.gypi + ${WRKSRC}/v8/src/v8.gyp \ + ${WRKSRC}/v8/gypfiles/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp @@ -278,7 +280,6 @@ pre-configure: 'chrome/third_party/mock4js' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ - 'crypto/third_party/nss' \ 'net/third_party/mozilla_security_manager' \ 'net/third_party/nss' \ 'third_party/WebKit' \ @@ -290,7 +291,7 @@ pre-configure: 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ - 'third_party/catapult/third_party/beautifulsoup' \ + 'third_party/catapult/third_party/beautifulsoup4' \ 'third_party/catapult/third_party/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ @@ -340,6 +341,8 @@ pre-configure: 'third_party/ply' \ 'third_party/polymer' \ 'third_party/protobuf' \ + 'third_party/protobuf/third_party' \ + 'third_party/protobuf/third_party/six' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ Modified: branches/2016Q3/www/chromium/distinfo ============================================================================== --- branches/2016Q3/www/chromium/distinfo Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/distinfo Mon Aug 15 13:28:31 2016 (r420231) @@ -1,5 +1,5 @@ -TIMESTAMP = 1466791065 -SHA256 (chromium-51.0.2704.106.tar.xz) = fb97a6a3119ec2c8cc4ad9a0bd6c4d306516769039a2633633f7d0c770012cfd -SIZE (chromium-51.0.2704.106.tar.xz) = 448656636 -SHA256 (chromium-51.0.2704.106-testdata.tar.xz) = 926b44fd0020922ce50b4b838391ae0c531ba4ee3fc6915c4c8b7fd95db765e5 -SIZE (chromium-51.0.2704.106-testdata.tar.xz) = 121454396 +TIMESTAMP = 1470404034 +SHA256 (chromium-52.0.2743.116.tar.xz) = a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 +SIZE (chromium-52.0.2743.116.tar.xz) = 458156660 +SHA256 (chromium-52.0.2743.116-testdata.tar.xz) = d3d059e1215702d8665f02b47a10e14458f54f423c323a9fcc987e6e43767c0b +SIZE (chromium-52.0.2743.116-testdata.tar.xz) = 122423496 Modified: branches/2016Q3/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2016Q3/www/chromium/files/extra-patch-clang Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/extra-patch-clang Mon Aug 15 13:28:31 2016 (r420231) @@ -62,22 +62,6 @@ GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } ---- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200 -+++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200 -@@ -315,11 +315,11 @@ - - gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (!guest_) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - - RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); - if (!rwhv) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - return rwhv->GetNativeViewId(); - } - --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ @@ -167,14 +151,3 @@ tasks_.erase(it, tasks_.end()); ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 -@@ -358,7 +358,7 @@ - { - RefPtr buffer; - -- SkFontTableTag tag = WTF::bswap32(table); -+ SkFontTableTag tag = bswap32(table); - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector tableBuffer(tableSize); Modified: branches/2016Q3/www/chromium/files/patch-base_base.gyp ============================================================================== --- branches/2016Q3/www/chromium/files/patch-base_base.gyp Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-base_base.gyp Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- base/base.gyp.orig 2016-05-11 19:02:11 UTC -+++ base/base.gyp -@@ -113,7 +113,7 @@ +--- ./base/base.gyp.orig 2016-07-22 00:06:49.000000000 -0400 ++++ ./base/base.gyp 2016-08-05 08:28:39.441243000 -0400 +@@ -114,7 +114,7 @@ ], 'link_settings': { 'libraries': [ @@ -9,7 +9,24 @@ ], }, }], -@@ -748,6 +748,11 @@ +@@ -286,13 +286,13 @@ + ], + }], + ['icu_use_data_file_flag==1', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=0'], + }, { # else icu_use_data_file_flag !=1 + 'conditions': [ + ['OS=="win"', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=1'], + }, { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=2'], + }], + ], + }], +@@ -773,6 +773,11 @@ 'sync_socket_unittest.cc', ], }], Modified: branches/2016Q3/www/chromium/files/patch-build_common.gypi ============================================================================== --- branches/2016Q3/www/chromium/files/patch-build_common.gypi Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-build_common.gypi Mon Aug 15 13:28:31 2016 (r420231) @@ -1,31 +1,6 @@ ---- build/common.gypi.orig 2016-05-11 19:02:12 UTC -+++ build/common.gypi -@@ -112,7 +112,7 @@ - - 'conditions': [ - # Windows and Linux use Aura, but not Ash. -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'use_aura%': 1, - }], - -@@ -254,13 +254,13 @@ - }], - - # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). -- ['OS=="mac" or OS=="win" or OS=="linux"', { -+ ['OS=="mac" or OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'enable_hidpi%': 1, - }], - - # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux, - # and Mac. -- ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', { -+ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { - 'enable_topchrome_md%': 1, - }], - -@@ -733,6 +733,12 @@ +--- build/common.gypi.orig 2016-07-22 00:06:49.000000000 -0400 ++++ build/common.gypi 2016-08-03 11:18:18.437811000 -0400 +@@ -726,6 +726,12 @@ 'os_bsd%': 0, }], @@ -38,34 +13,7 @@ # NSS usage. ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { 'use_nss_certs%': 1, -@@ -778,7 +784,7 @@ - }], - - # DBus usage. -- ['OS=="linux" and embedded==0', { -+ ['(OS=="linux" or OS=="freebsd") and embedded==0', { - 'use_dbus%': 1, - }, { - 'use_dbus%': 0, -@@ -881,7 +887,7 @@ - - # Use GPU accelerated cross process image transport by default - # on linux builds with the Aura window manager -- ['use_aura==1 and OS=="linux"', { -+ ['use_aura==1 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', { - 'ui_compositor_image_transport%': 1, - }, { - 'ui_compositor_image_transport%': 0, -@@ -1003,7 +1009,7 @@ - }, { - 'use_openmax_dl_fft%': 0, - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd"', { - 'enable_mdns%' : 1, - }], - -@@ -1300,6 +1306,10 @@ +@@ -1303,6 +1309,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -76,7 +24,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4715,6 +4725,13 @@ +@@ -4709,6 +4719,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-05-21 16:16:28 UTC -+++ chrome/browser/extensions/api/messaging/message_service.cc -@@ -118,7 +118,7 @@ MessageService::PolicyPermission Message +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-07-22 00:06:51.000000000 -0400 ++++ chrome/browser/extensions/api/messaging/message_service.cc 2016-08-03 11:20:56.579570000 -0400 +@@ -119,7 +119,7 @@ const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,12 +9,12 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNative +@@ -415,7 +415,7 @@ if (!source) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - Profile* profile = - Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext()); - ExtensionService* extension_service = + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = Copied: branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h (from r420138, head/www/chromium/files/patch-chrome_browser_platform__util.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-chrome_browser_platform__util.h) @@ -0,0 +1,11 @@ +--- chrome/browser/platform_util.h.orig 2016-08-04 11:19:03.775212000 -0400 ++++ chrome/browser/platform_util.h 2016-08-04 11:19:15.839097000 -0400 +@@ -40,7 +40,7 @@ + enum OpenItemType { + OPEN_FILE, + OPEN_FOLDER, +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SHOW_ITEM_IN_FOLDER + #endif + }; Copied: branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (from r420138, head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py) @@ -0,0 +1,19 @@ +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-04 11:13:17.290964000 -0400 ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-08-04 11:13:54.901432000 -0400 +@@ -39,6 +39,7 @@ + "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "freebsd": config_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": config_pb2.DownloadFileType.PLATFORM_MAC, + "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, + } +@@ -157,7 +158,7 @@ + 'fix for http://crbug.com/605592') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, freebsd, mac, win') + parser.add_option('-i', '--infile', + help='The ASCII DownloadFileType-proto file to read.') + parser.add_option('-o', '--outfile', Copied: branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp (from r420138, head/www/chromium/files/patch-chrome_chrome__resources.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-chrome_chrome__resources.gyp) @@ -0,0 +1,11 @@ +--- chrome/chrome_resources.gyp.orig 2016-08-04 11:15:29.707642000 -0400 ++++ chrome/chrome_resources.gyp 2016-08-04 11:17:02.866434000 -0400 +@@ -321,6 +321,8 @@ + 'platform': 'chromeos' + }, 'OS=="linux"', { + 'platform': 'linux' ++ }, 'OS=="freebsd"', { ++ 'platform': 'freebsd' + }, 'OS=="mac"', { + 'platform': 'mac' + }, 'OS=="win"', { Modified: branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,15 +1,15 @@ ---- components/dom_distiller/core/page_features.cc.orig 2016-05-25 15:00:59.000000000 -0400 -+++ components/dom_distiller/core/page_features.cc 2016-05-27 10:13:11.588307000 -0400 +--- components/dom_distiller/core/page_features.cc.orig 2016-07-22 00:06:53.000000000 -0400 ++++ components/dom_distiller/core/page_features.cc 2016-08-03 11:25:37.908892000 -0400 @@ -10,7 +10,11 @@ + #include #include "base/json/json_reader.h" - #include "base/memory/scoped_ptr.h" -#include "third_party/re2/src/re2/re2.h" -+#if defined(OS_BSD) ++#if defined(OS_FREEBSD) +# include +#else +# include "third_party/re2/src/re2/re2.h" -+#endif // defined(OS_BSD) ++#endif // defined(OS_FREEBSD) #include "url/gurl.h" namespace dom_distiller { Modified: branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h ============================================================================== --- branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-05-20 17:18:26 UTC -+++ components/storage_monitor/storage_monitor_freebsd.h -@@ -0,0 +1,46 @@ +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-08-04 10:46:30.556442000 -0400 ++++ components/storage_monitor/storage_monitor_freebsd.h 2016-08-04 14:57:59.255434000 -0400 +@@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -20,7 +20,6 @@ +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" -+#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" +#include "components/storage_monitor/storage_monitor.h" +#include "content/public/browser/browser_thread.h" Modified: branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,5 +1,5 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-05-20 17:18:26 UTC -+++ content/browser/geolocation/wifi_data_provider_freebsd.cc +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-08-04 10:46:30.800769000 -0400 ++++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2016-08-04 21:41:58.417450000 -0400 @@ -0,0 +1,201 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -187,7 +187,7 @@ + +WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() { + -+ scoped_ptr wlan_api(new AccessPointDataFreeBSD); ++ std::unique_ptr wlan_api(new AccessPointDataFreeBSD); + if (wlan_api->Init()) + return wlan_api.release(); + Modified: branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/gpu/gpu_internals_ui.cc -@@ -37,7 +37,7 @@ +--- content/browser/gpu/gpu_internals_ui.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/gpu/gpu_internals_ui.cc 2016-08-03 12:29:59.399353000 -0400 +@@ -39,7 +39,7 @@ #include "third_party/angle/src/common/version.h" #include "ui/gl/gpu_switching_manager.h" @@ -9,16 +9,16 @@ #include #endif #if defined(OS_WIN) -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #include "ui/gfx/win/physical_size.h" #endif -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) - #include "ui/base/x/x11_util.h" - #include "ui/gfx/x/x11_atom_cache.h" + #include "ui/base/x/x11_util.h" // nogncheck + #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -198,7 +198,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -200,7 +200,7 @@ gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); Modified: branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -107,7 +107,7 @@ - #include "ui/gfx/win/dpi.h" +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-08-03 12:34:00.357612000 -0400 +@@ -105,7 +105,7 @@ + #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,16 +9,7 @@ #include "content/common/input_messages.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -734,7 +734,7 @@ gfx::NativeViewId RenderWidgetHostViewAu - if (host) - return reinterpret_cast(host->GetAcceleratedWidget()); - #endif -- return static_cast(NULL); -+ return static_cast(0); - } - - gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { -@@ -2626,7 +2626,7 @@ bool RenderWidgetHostViewAura::NeedsInpu +@@ -2376,7 +2376,7 @@ } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -27,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2859,7 +2859,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2608,7 +2608,7 @@ if (!target_host) return; Modified: branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2016-05-11 19:02:21 UTC -+++ content/gpu/gpu_main.cc -@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI +--- content/gpu/gpu_main.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/gpu/gpu_main.cc 2016-08-03 12:37:05.590978000 -0400 +@@ -102,7 +102,7 @@ const base::CommandLine& command_line); bool WarmUpSandbox(const base::CommandLine& command_line); @@ -9,7 +9,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif -@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa +@@ -192,13 +192,13 @@ // Use a UI message loop because ANGLE and the desktop GL platform can // create child windows to render to. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); @@ -18,14 +18,14 @@ // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX // and https://crbug.com/326995. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - scoped_ptr event_source = + std::unique_ptr event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -309,7 +309,7 @@ // and we already registered them through SetGpuInfo() above. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); @@ -34,7 +34,7 @@ if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; -@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi +@@ -491,7 +491,7 @@ return true; } Copied: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc (from r420138, head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc) @@ -0,0 +1,11 @@ +--- content/renderer/media/webrtc_audio_renderer.cc.orig 2016-06-08 12:04:14.328279000 -0400 ++++ content/renderer/media/webrtc_audio_renderer.cc 2016-06-08 12:04:28.210758000 -0400 +@@ -162,7 +162,7 @@ + // Windows below. + int frames_per_buffer = hardware_buffer_size; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + // On Linux and MacOS, the low level IO implementations on the browser side + // supports all buffer size the clients want. We use the native peer + // connection buffer size (10ms) to achieve best possible performance. Copied: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (from r420138, head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc) @@ -0,0 +1,11 @@ +--- ./content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-08-03 12:48:04.721257000 -0400 ++++ ./content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-03 12:48:34.201210000 -0400 +@@ -269,7 +269,7 @@ + bool key_pressed) { + #if defined(OS_WIN) || defined(OS_MACOSX) + DCHECK_LE(volume, 1.0); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // We have a special situation on Linux where the microphone volume can be + // "higher than maximum". The input volume slider in the sound preference + // allows the user to set a scaling that is higher than 100%. It means that Modified: branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,11 +1,11 @@ ---- content/renderer/render_thread_impl.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ content/renderer/render_thread_impl.cc 2016-05-27 11:01:14.634236000 -0400 -@@ -1468,7 +1468,7 @@ - const bool enable_video_accelerator = - !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); - const bool enable_gpu_memory_buffer_video_frames = +--- content/renderer/render_thread_impl.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/renderer/render_thread_impl.cc 2016-08-03 14:17:16.736255000 -0400 +@@ -1424,7 +1424,7 @@ + const bool enable_video_accelerator = + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); + const bool enable_gpu_memory_buffer_video_frames = -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && - !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && - !gpu_channel_host->gpu_info().software_rendering; + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; Modified: branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,5 +1,5 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2016-05-11 19:02:22 UTC -+++ content/shell/browser/shell_browser_context.cc +--- content/shell/browser/shell_browser_context.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/shell/browser/shell_browser_context.cc 2016-08-03 15:17:20.501518000 -0400 @@ -24,7 +24,7 @@ #if defined(OS_WIN) @@ -9,12 +9,12 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -79,7 +79,7 @@ void ShellBrowserContext::InitWhileIOAll +@@ -80,7 +80,7 @@ #if defined(OS_WIN) CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - scoped_ptr env(base::Environment::Create()); + std::unique_ptr env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), Modified: branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,11 +1,11 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ extensions/browser/api/serial/serial_api.cc 2016-05-27 11:12:01.060235000 -0400 +--- extensions/browser/api/serial/serial_api.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ extensions/browser/api/serial/serial_api.cc 2016-08-03 15:23:41.022195000 -0400 @@ -86,11 +86,13 @@ void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); +#if !defined(OS_BSD) - scoped_ptr enumerator = + std::unique_ptr enumerator = device::SerialDeviceEnumerator::Create(); mojo::Array devices = enumerator->GetDevices(); results_ = serial::GetDevices::Results::Create( Modified: branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,16 +1,16 @@ ---- media/audio/audio_manager.cc.orig 2016-05-11 19:02:23 UTC -+++ media/audio/audio_manager.cc -@@ -193,7 +193,7 @@ class AudioManagerHelper : public base:: +--- media/audio/audio_manager.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/audio/audio_manager.cc 2016-08-03 15:25:47.683860000 -0400 +@@ -92,7 +92,7 @@ } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - void set_app_name(const std::string& app_name) { - app_name_ = app_name; - } -@@ -243,7 +243,7 @@ class AudioManagerHelper : public base:: - scoped_ptr com_initializer_for_testing_; + void set_app_name(const std::string& app_name) { app_name_ = app_name; } + const std::string& app_name() const { return app_name_; } + #endif +@@ -250,7 +250,7 @@ + std::unique_ptr com_initializer_for_testing_; #endif -#if defined(OS_LINUX) @@ -18,7 +18,7 @@ std::string app_name_; #endif -@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLogging +@@ -359,7 +359,7 @@ g_helper.Pointer()->enable_crash_key_logging(); } Modified: branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/linux/video_capture_device_linux.cc -@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/linux/video_capture_device_linux.cc 2016-08-04 15:59:29.808311000 -0400 +@@ -44,6 +44,7 @@ return true; } @@ -8,7 +8,7 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -57,6 +58,7 @@ std::list VideoCaptureDeviceLi +@@ -57,6 +58,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } @@ -16,29 +16,29 @@ const std::string VideoCaptureDevice::Name::GetModel() const { // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe +@@ -90,6 +92,7 @@ v4l2_thread_.Stop(); } +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr client) { -@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn + std::unique_ptr client) { +@@ -113,7 +116,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::AllocateAndStart( + const VideoCaptureParams& params, -+ scoped_ptr client) {} ++ std::unique_ptr client) {} +#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA +@@ -124,7 +133,11 @@ capture_impl_ = NULL; } @@ -50,7 +50,7 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.message_loop()->PostTask( -@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio +@@ -132,6 +145,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } Modified: branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,18 +1,18 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/video_capture_device_factory.cc -@@ -17,6 +17,10 @@ namespace media { - // static - scoped_ptr VideoCaptureDeviceFactory::CreateFactory( +--- media/capture/video/video_capture_device_factory.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/video_capture_device_factory.cc 2016-08-04 16:01:12.907434000 -0400 +@@ -18,6 +18,10 @@ + std::unique_ptr + VideoCaptureDeviceFactory::CreateFactory( scoped_refptr ui_task_runner) { +#if defined(OS_BSD) -+ return scoped_ptr(new ++ return std::unique_ptr(new + media::FakeVideoCaptureDeviceFactory()); +#else const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -35,6 +39,7 @@ scoped_ptr Vi - return scoped_ptr( +@@ -36,6 +40,7 @@ + return std::unique_ptr( CreateVideoCaptureDeviceFactory(ui_task_runner)); } +#endif Modified: branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h ============================================================================== --- branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h Mon Aug 15 13:28:31 2016 (r420231) @@ -1,10 +1,10 @@ ---- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400 -+++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400 +--- net/base/address_tracker_linux.h.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/base/address_tracker_linux.h 2016-08-04 16:22:00.122898000 -0400 @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ #include // Needed to include netlink. -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38. #define net net_kernel #include @@ -17,7 +17,7 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux : public base::MessageLoopForIO::Watcher { public: -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) typedef std::map AddressMap; - +#else Modified: branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc ============================================================================== --- branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc Mon Aug 15 13:28:31 2016 (r420231) @@ -1,6 +1,6 @@ ---- net/proxy/proxy_service.cc.orig 2016-05-11 19:02:24 UTC -+++ net/proxy/proxy_service.cc -@@ -47,7 +47,7 @@ +--- net/proxy/proxy_service.cc.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/proxy/proxy_service.cc 2016-08-03 15:29:21.017256000 -0400 +@@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_mac.h" @@ -9,12 +9,12 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1503,7 +1503,7 @@ scoped_ptr ProxyServ +@@ -1542,7 +1542,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; - return make_scoped_ptr(new UnsetProxyConfigService); + return base::WrapUnique(new UnsetProxyConfigService); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) - scoped_ptr linux_config_service( + std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); Copied: branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc (from r420138, head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc) @@ -0,0 +1,18 @@ +--- services/shell/public/cpp/lib/initialize_base_and_icu.cc.orig 2016-08-05 14:07:55.178818000 -0400 ++++ services/shell/public/cpp/lib/initialize_base_and_icu.cc 2016-08-05 14:08:22.862094000 -0400 +@@ -35,6 +35,7 @@ + base::SysInfo::MaxSharedMemorySize(); + #endif + ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE + // Initialize core ICU. We must perform the full initialization before we + // initialize icu::TimeZone subsystem because otherwise ICU gets in a state +@@ -42,6 +43,7 @@ + // cause crashes. + CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE ++#endif + + #if !defined(OS_ANDROID) + // ICU DateFormat class (used in base/time_format.cc) needs to get the Copied: branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc (from r420138, head/www/chromium/files/patch-services_shell_runner_init.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-services_shell_runner_init.cc) @@ -0,0 +1,18 @@ +--- services/shell/runner/init.cc.orig 2016-08-05 14:09:25.990401000 -0400 ++++ services/shell/runner/init.cc 2016-08-05 14:09:42.644514000 -0400 +@@ -77,6 +77,7 @@ + void CallLibraryEarlyInitialization(base::NativeLibrary app_library) { + // Do whatever warming that the mojo application wants. + ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE + typedef void (*LibraryEarlyInitFunction)(const uint8_t*); + LibraryEarlyInitFunction init_function = +@@ -90,6 +91,7 @@ + init_function(icu_data); + } + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE ++#endif + + // TODO(erg): All chromium binaries load base. We might want to make a + // general system for other people. Copied: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (from r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp) @@ -0,0 +1,47 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-08-04 11:20:01.382167000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2016-08-04 11:21:00.605035000 -0400 +@@ -93,7 +93,7 @@ + , m_syntheticBold(source.m_syntheticBold) + , m_syntheticItalic(source.m_syntheticItalic) + , m_orientation(source.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(source.m_style) + #endif + , m_harfBuzzFace(nullptr) +@@ -115,7 +115,7 @@ + , m_syntheticBold(src.m_syntheticBold) + , m_syntheticItalic(src.m_syntheticItalic) + , m_orientation(src.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_harfBuzzFace(nullptr) +@@ -142,7 +142,7 @@ + , m_syntheticBold(syntheticBold) + , m_syntheticItalic(syntheticItalic) + , m_orientation(orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_isHashTableDeletedValue(false) +@@ -188,7 +188,7 @@ + m_syntheticItalic = other.m_syntheticItalic; + m_harfBuzzFace = nullptr; + m_orientation = other.m_orientation; +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + m_style = other.m_style; + #endif + +@@ -216,7 +216,7 @@ + && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue + && m_syntheticBold == a.m_syntheticBold + && m_syntheticItalic == a.m_syntheticItalic +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + && m_style == a.m_style + #endif + && m_orientation == a.m_orientation; Copied: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (from r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h) @@ -0,0 +1,32 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-08-04 11:21:45.907982000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2016-08-04 11:22:32.571069000 -0400 +@@ -46,9 +46,9 @@ + #include "wtf/text/CString.h" + #include "wtf/text/StringImpl.h" + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + #include "platform/fonts/linux/FontRenderStyle.h" +-#endif // OS(LINUX) || OS(ANDROID) ++#endif // OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + + #if OS(MACOSX) + OBJC_CLASS NSFont; +@@ -126,7 +126,7 @@ + PassRefPtr verticalData() const; + PassRefPtr openTypeTable(SkFontTableTag) const; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // The returned styles are all actual styles without FontRenderStyle::NoPreference. + const FontRenderStyle& getFontRenderStyle() const { return m_style; } + #endif +@@ -152,7 +152,7 @@ + bool m_syntheticItalic; + FontOrientation m_orientation; + private: +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + FontRenderStyle m_style; + #endif + Modified: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp ============================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp Mon Aug 15 13:28:31 2016 (r420231) @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-05-25 15:01:11.000000000 -0400 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-05-27 11:26:01.202711000 -0400 +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-07-22 00:07:09.000000000 -0400 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-08-03 15:39:36.482884000 -0400 @@ -60,7 +60,7 @@ namespace blink { @@ -9,21 +9,12 @@ // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -171,7 +171,7 @@ - return fontDataFromFontPlatformData(fontPlatformData, shouldRetain); - } - --#if OS(WIN) || OS(LINUX) -+#if OS(WIN) || OS(LINUX) || OS(FREEBSD) - static inline SkFontStyle fontStyle(const FontDescription& fontDescription) - { - int width = static_cast(fontDescription.stretch()); -@@ -232,7 +232,7 @@ +@@ -183,7 +183,7 @@ } #endif --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) +-#if OS(LINUX) || OS(WIN) ++#if OS(LINUX) || OS(WIN) || OS(FREEBSD) // On linux if the fontManager has been overridden then we should be calling the embedder // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the // call to the default font Manager. Copied: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi (from r420138, head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi Mon Aug 15 13:28:31 2016 (r420231, copy of r420138, head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi) @@ -0,0 +1,38 @@ +--- third_party/pdfium/build_gyp/standalone.gypi.orig 2016-08-03 16:25:54.875923000 -0400 ++++ third_party/pdfium/build_gyp/standalone.gypi 2016-08-03 16:28:57.583883000 -0400 +@@ -19,7 +19,7 @@ + 'variables': { + 'variables': { + 'conditions': [ +- ['OS=="linux" or OS=="mac"', { ++ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { + # This handles the Unix platforms we generally deal with. + # Anything else gets passed through, which probably won't work + # very well; such hosts should pass an explicit target_arch +@@ -32,7 +32,7 @@ + s/aarch64/arm64/;\ + s/mips.*/mipsel/")', + }, { +- # OS!="linux" and OS!="mac" ++ # OS!="linux" and OS!="mac" and OS!="freebsd" + 'host_arch%': 'ia32', + }], + ], +@@ -59,7 +59,7 @@ + }, { + 'os_posix%': 1, + }], +- ['OS=="linux" or OS=="mac"', { ++ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { + 'clang%': 1, + 'host_clang%': 1, + }, { +@@ -141,7 +141,7 @@ + }, + }, + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'cflags': [ + '-fdata-sections', + '-ffunction-sections', Modified: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp ============================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp Mon Aug 15 12:02:40 2016 (r420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp Mon Aug 15 13:28:31 2016 (r420231) @@ -1,8 +1,8 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-05-27 13:05:16.571632000 -0400 -+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-05-27 13:32:36.441412000 -0400 -@@ -61,6 +61,103 @@ - L"May", L"June", L"July", L"August", - L"September", L"October", L"November", L"December"}; +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-22 00:09:02.000000000 -0400 ++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-03 16:33:48.931305000 -0400 +@@ -62,6 +62,103 @@ + L"July", L"August", L"September", + L"October", L"November", L"December"}; +#if defined(__FreeBSD__) +/* @@ -101,6 +101,6 @@ +} +#endif // defined(__FreeBSD__) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Tue Aug 16 20:03:21 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A76B1BBC6FF; Tue, 16 Aug 2016 20:03:21 +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 mx1.freebsd.org (Postfix) with ESMTPS id 73C05133A; Tue, 16 Aug 2016 20:03:21 +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 u7GK3K1j049198; Tue, 16 Aug 2016 20:03:20 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7GK3KQ6049197; Tue, 16 Aug 2016 20:03:20 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201608162003.u7GK3KQ6049197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 16 Aug 2016 20:03:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420301 - branches/2016Q3/net-mgmt/rancid3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2016 20:03:21 -0000 Author: feld Date: Tue Aug 16 20:03:20 2016 New Revision: 420301 URL: https://svnweb.freebsd.org/changeset/ports/420301 Log: MFH: r420300 net-mgmt/rancid3: Fix SSH on FreeBSD 11.0 RANCID by default attempts to ssh to devices with 3des as the cipher. This no longer works with OpenSSH in FreeBSD 11 as you need to be more specific. Changing this to 3des-cbc works for now, but future versions of OpenSSH will break this as well. Unfortunately this will break RANCID as many network devices do not support modern ciphers, but we will have to deal with that when the time comes. Approved by: ports-secteam (with hat) Modified: branches/2016Q3/net-mgmt/rancid3/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/rancid3/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/rancid3/Makefile Tue Aug 16 20:02:15 2016 (r420300) +++ branches/2016Q3/net-mgmt/rancid3/Makefile Tue Aug 16 20:03:20 2016 (r420301) @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -59,6 +59,8 @@ pre-everything:: post-patch: ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 + ${REINPLACE_CMD} "s|3des|3des-cbc|g" ${WRKSRC}/bin/*.in ${WRKSRC}/cloginrc.sample \ + ${WRKSRC}/man/cloginrc.5 ${WRKSRC}/man/clogin.1 post-install: ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin From owner-svn-ports-branches@freebsd.org Wed Aug 17 12:25:47 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B75F8BBDE2F; Wed, 17 Aug 2016 12:25:47 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89D4C1B21; Wed, 17 Aug 2016 12:25:47 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HCPkSS021381; Wed, 17 Aug 2016 12:25:46 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HCPkMa021379; Wed, 17 Aug 2016 12:25:46 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201608171225.u7HCPkMa021379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 17 Aug 2016 12:25:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420341 - branches/2016Q3/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 12:25:47 -0000 Author: matthew Date: Wed Aug 17 12:25:46 2016 New Revision: 420341 URL: https://svnweb.freebsd.org/changeset/ports/420341 Log: MFH: r420332 Security update to 4.6.4 This includes 26 security advisories of various severities up to 'critical', as well as bug-fix updates. ChangeLog: https://www.phpmyadmin.net/files/4.6.4/ Security: ef70b201-645d-11e6-9cdc-6805ca0b3d42 Approved by: portmgr (mat) Modified: branches/2016Q3/databases/phpmyadmin/Makefile branches/2016Q3/databases/phpmyadmin/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/phpmyadmin/Makefile ============================================================================== --- branches/2016Q3/databases/phpmyadmin/Makefile Wed Aug 17 12:16:24 2016 (r420340) +++ branches/2016Q3/databases/phpmyadmin/Makefile Wed Aug 17 12:25:46 2016 (r420341) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.6.3 +DISTVERSION= 4.6.4 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2016Q3/databases/phpmyadmin/distinfo ============================================================================== --- branches/2016Q3/databases/phpmyadmin/distinfo Wed Aug 17 12:16:24 2016 (r420340) +++ branches/2016Q3/databases/phpmyadmin/distinfo Wed Aug 17 12:25:46 2016 (r420341) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466666746 -SHA256 (phpMyAdmin-4.6.3-all-languages.tar.xz) = 943bad38a95f21bb015bdb78c9c067e0ea7510c1b35d4b8e757cb89c413e3bac -SIZE (phpMyAdmin-4.6.3-all-languages.tar.xz) = 6111852 +TIMESTAMP = 1471426358 +SHA256 (phpMyAdmin-4.6.4-all-languages.tar.xz) = f2ea32a2971efcab073ad41b6512475af1b6da70cf800a5586a12cf49797d319 +SIZE (phpMyAdmin-4.6.4-all-languages.tar.xz) = 6137016 From owner-svn-ports-branches@freebsd.org Wed Aug 17 13:11:49 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B24FBBD8FC; Wed, 17 Aug 2016 13:11:49 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E20D11380; Wed, 17 Aug 2016 13:11:48 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HDBmR1037405; Wed, 17 Aug 2016 13:11:48 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HDBmtB037404; Wed, 17 Aug 2016 13:11:48 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201608171311.u7HDBmtB037404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 17 Aug 2016 13:11:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420344 - branches/2016Q3/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 13:11:49 -0000 Author: matthew Date: Wed Aug 17 13:11:47 2016 New Revision: 420344 URL: https://svnweb.freebsd.org/changeset/ports/420344 Log: MFH: r420343 Fix build -- the shebang files have been removed[1]. Placate portlint Reported by: Walter Schwarzenfeld [1] Approved by: portmgr (mat) Modified: branches/2016Q3/databases/phpmyadmin/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/phpmyadmin/Makefile ============================================================================== --- branches/2016Q3/databases/phpmyadmin/Makefile Wed Aug 17 13:10:27 2016 (r420343) +++ branches/2016Q3/databases/phpmyadmin/Makefile Wed Aug 17 13:11:47 2016 (r420344) @@ -3,6 +3,7 @@ PORTNAME= phpMyAdmin DISTVERSION= 4.6.4 +PORTREVISION= 1 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages @@ -10,14 +11,14 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-all MAINTAINER= matthew@FreeBSD.org COMMENT= Set of PHP-scripts to manage MySQL over the web -NO_ARCH= yes LICENSE= GPLv2 BROKEN_powerpc64= Does not build -USES= cpe shebangfix tar:xz +USES= cpe php:web tar:xz CPE_PRODUCT= ${PORTNAME:tl} +NO_ARCH= yes NO_BUILD= yes .if !defined(WITHOUT_PHP_DEPENDS) IGNORE_WITH_PHP=5 54 @@ -42,8 +43,6 @@ ZLIB_DESC= PHP ZLIB support .include -WANT_PHP_WEB= yes - GROUPS?= ${WWWGRP} CFG_FILE= config.inc.php @@ -54,9 +53,6 @@ SUB_LIST+= PKGNAME=${PKGNAME} \ CFG_FILE=${WWWDIR}/${CFG_FILE} SUB_FILES+= pkg-message -SHEBANG_FILES= libraries/plugins/transformations/generator_main_class.sh \ - libraries/plugins/transformations/generator_plugin.sh - .if !defined(WITHOUT_PHP_DEPENDS) .for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect} From owner-svn-ports-branches@freebsd.org Wed Aug 17 19:00:26 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E60CBB5E9A; Wed, 17 Aug 2016 19:00:26 +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 mx1.freebsd.org (Postfix) with ESMTPS id 114001C94; Wed, 17 Aug 2016 19:00:26 +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 u7HJ0PJa068381; Wed, 17 Aug 2016 19:00:25 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HJ0PGm068380; Wed, 17 Aug 2016 19:00:25 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201608171900.u7HJ0PGm068380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 17 Aug 2016 19:00:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420367 - branches/2016Q3/net-mgmt/rancid X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 19:00:26 -0000 Author: feld Date: Wed Aug 17 19:00:25 2016 New Revision: 420367 URL: https://svnweb.freebsd.org/changeset/ports/420367 Log: MFH: r420366 net-mgmt/rancid: Mark DEPRECATED, provide an EXPIRATION_DATE PR: 211718 Approved by: ports-secteam (with hat) Modified: branches/2016Q3/net-mgmt/rancid/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/rancid/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/rancid/Makefile Wed Aug 17 18:59:30 2016 (r420366) +++ branches/2016Q3/net-mgmt/rancid/Makefile Wed Aug 17 19:00:25 2016 (r420367) @@ -34,6 +34,9 @@ OPTIONS_DEFINE= SVN SVN_DESC= Use Subversion instead of CVS +DEPRECATED= Not supported upstream. Please upgrade to net-mgmt/rancid3 +EXPIRATION_DATE= 2016-10-01 + .include .if ${PORT_OPTIONS:MSVN} From owner-svn-ports-branches@freebsd.org Fri Aug 19 17:23:35 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49585BBF543; Fri, 19 Aug 2016 17:23:35 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 197AD100D; Fri, 19 Aug 2016 17:23:35 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JHNYi7018267; Fri, 19 Aug 2016 17:23:34 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JHNY3B018266; Fri, 19 Aug 2016 17:23:34 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201608191723.u7JHNY3B018266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Fri, 19 Aug 2016 17:23:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420480 - branches/2016Q3/textproc/docproj X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 17:23:35 -0000 Author: wblock (doc committer) Date: Fri Aug 19 17:23:34 2016 New Revision: 420480 URL: https://svnweb.freebsd.org/changeset/ports/420480 Log: MFH: r420130 Add missing gettext-tools dependency. PR: 211597 Approved by: koobs Sponsored by: iXsystems Approved by: ports-secteam (blanket) Modified: branches/2016Q3/textproc/docproj/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/textproc/docproj/Makefile ============================================================================== --- branches/2016Q3/textproc/docproj/Makefile Fri Aug 19 17:19:26 2016 (r420479) +++ branches/2016Q3/textproc/docproj/Makefile Fri Aug 19 17:23:34 2016 (r420480) @@ -3,11 +3,11 @@ PORTNAME= docproj PORTVERSION= 2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MAINTAINER= doceng@FreeBSD.org -COMMENT= The "meta-port" for the FreeBSD Documentation Project +COMMENT= Meta-port for the FreeBSD Documentation Project RUN_DEPENDS= links:www/links1 \ pngtopnm:graphics/netpbm \ @@ -47,7 +47,8 @@ DBLATEX_RUN_DEPENDS= dblatex:textproc/db ${FONTS} DBLATEX_USE= TEX=xetex TRANSLATOR_DESC= Tools for translators -TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool +TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool \ + msgcat:devel/gettext-tools FONTS= ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:x11-fonts/gentium-plus \ ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \ @@ -61,9 +62,7 @@ FONTS_CJK=${LOCALBASE}/share/fonts/TrueT .if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX} ONLY_FOR_ARCHS= amd64 i386 -.if ${PORT_OPTIONS:MCJK} -RUN_DEPENDS+= ${FONTS_CJK} -.endif +CJK_RUN_DEPENDS= ${FONTS_CJK} .endif # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports. From owner-svn-ports-branches@freebsd.org Sat Aug 20 16:41:15 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5254EBC0D62; Sat, 20 Aug 2016 16:41:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AAE8163D; Sat, 20 Aug 2016 16:41:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7KGfEB0039680; Sat, 20 Aug 2016 16:41:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7KGfE69039678; Sat, 20 Aug 2016 16:41:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201608201641.u7KGfE69039678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 20 Aug 2016 16:41:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420519 - in branches/2016Q3/mail/dma: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2016 16:41:15 -0000 Author: bapt Date: Sat Aug 20 16:41:14 2016 New Revision: 420519 URL: https://svnweb.freebsd.org/changeset/ports/420519 Log: MFH: r420518 Incorporate a patch from upstream Affecting DragonFly 4.6 and earlier, Matt Dillon fixed this in base after finding out from BSDNow Episode 152. Comments following were from his commit which explains better than I. Just taking his change and putting it here as well. * dma makes an age-old mistake of not properly checking whether a file owned by a user is a symlink or not, a bug which the original mail.local also had. * Add O_NOFOLLOW to disallow symlinks. Thanks-to: BSDNow Episode 152, made me dive dma to check when they talked about the mail.local bug. Added: branches/2016Q3/mail/dma/files/fix-security-hole.patch - copied unchanged from r420518, head/mail/dma/files/fix-security-hole.patch Modified: branches/2016Q3/mail/dma/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/mail/dma/Makefile ============================================================================== --- branches/2016Q3/mail/dma/Makefile Sat Aug 20 16:39:51 2016 (r420518) +++ branches/2016Q3/mail/dma/Makefile Sat Aug 20 16:41:14 2016 (r420519) @@ -3,6 +3,7 @@ PORTNAME= dma PORTVERSION= 0.11 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= mail ipv6 @@ -31,6 +32,7 @@ MAKE_ENV= __MAKE_CONF=/dev/null SRCCONF= USE_RC_SUBR= dma_flushq SUB_FILES= pkg-message +EXTRA_PATCHES= ${FILESDIR}/fix-security-hole.patch:-p1 # Allow subports to extend. CONFFILES+= dma.conf auth.conf Copied: branches/2016Q3/mail/dma/files/fix-security-hole.patch (from r420518, head/mail/dma/files/fix-security-hole.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/mail/dma/files/fix-security-hole.patch Sat Aug 20 16:41:14 2016 (r420519, copy of r420518, head/mail/dma/files/fix-security-hole.patch) @@ -0,0 +1,34 @@ +From f249aa412dd4a09881cb450390d1003815bd0013 Mon Sep 17 00:00:00 2001 +From: Zach Crownover +Date: Fri, 5 Aug 2016 15:24:27 -0700 +Subject: [PATCH] dma - Fix security hole (#46) + +Affecting DragonFly 4.6 and earlier, Matt Dillon fixed this in base after +finding out from BSDNow Episode 152. Comments following were from his commit +which explains better than I. Just taking his change and putting it here as well. + +* dma makes an age-old mistake of not properly checking whether a file + owned by a user is a symlink or not, a bug which the original mail.local + also had. + +* Add O_NOFOLLOW to disallow symlinks. + +Thanks-to: BSDNow Episode 152, made me dive dma to check when they talked + about the mail.local bug. +--- + dma-mbox-create.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dma-mbox-create.c b/dma-mbox-create.c +index 532a7af..45a4792 100644 +--- a/dma-mbox-create.c ++++ b/dma-mbox-create.c +@@ -142,7 +142,7 @@ main(int argc, char **argv) + logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); + } + +- f = open(fn, O_RDONLY|O_CREAT, 0600); ++ f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); + if (f < 0) + logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); +