From owner-svn-ports-branches@FreeBSD.ORG Mon Nov 17 11:35:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9802D516; Mon, 17 Nov 2014 11:35:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 841D0858; Mon, 17 Nov 2014 11:35:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHBZouV007469; Mon, 17 Nov 2014 11:35:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHBZoLM007468; Mon, 17 Nov 2014 11:35:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411171135.sAHBZoLM007468@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Nov 2014 11:35:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372663 - branches/2014Q4/misc/sloccount 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.18-1 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, 17 Nov 2014 11:35:50 -0000 Author: amdmi3 Date: Mon Nov 17 11:35:49 2014 New Revision: 372663 URL: https://svnweb.freebsd.org/changeset/ports/372663 QAT: https://qat.redports.org/buildarchive/r372663/ Log: MFH: r372652 - Fix shebangs Approved by: portmgr (rea) Modified: branches/2014Q4/misc/sloccount/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/misc/sloccount/Makefile ============================================================================== --- branches/2014Q4/misc/sloccount/Makefile Mon Nov 17 10:12:08 2014 (r372662) +++ branches/2014Q4/misc/sloccount/Makefile Mon Nov 17 11:35:49 2014 (r372663) @@ -3,13 +3,18 @@ PORTNAME= sloccount PORTVERSION= 2.26 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.dwheeler.com/sloccount/ MAINTAINER= freaky@aagh.net COMMENT= Counts physical Source Lines of Code (SLOC) -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= asm_count break_filelist cobol_count count_extensions \ + f90_count fortran_count generic_count get_sloc \ + get_sloc_details haskell_count lex_count modula3_count \ + objc_count perl_count print_sum python_count sql_count MAKEFILE= makefile INSTALL_TARGET= install_programs install_man From owner-svn-ports-branches@FreeBSD.ORG Mon Nov 17 21:25:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AEAEB6EA; Mon, 17 Nov 2014 21:25:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8FE3F909; Mon, 17 Nov 2014 21:25:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHLPSTw084763; Mon, 17 Nov 2014 21:25:28 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHLPSl4084761; Mon, 17 Nov 2014 21:25:28 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201411172125.sAHLPSl4084761@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 17 Nov 2014 21:25:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372689 - in branches/2014Q4/x11/kde4-workspace: . 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.18-1 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, 17 Nov 2014 21:25:28 -0000 Author: rakuco Date: Mon Nov 17 21:25:27 2014 New Revision: 372689 URL: https://svnweb.freebsd.org/changeset/ports/372689 QAT: https://qat.redports.org/buildarchive/r372689/ Log: MFH: r372687 Add patch for CVE-2014-8651 (privilege escalation). Security: dafa13a8-6e9b-11e4-8ef7-5453ed2e2b49 Approved by: ports-secteam (delphij) Added: branches/2014Q4/x11/kde4-workspace/files/patch-CVE-2014-8651 - copied unchanged from r372687, head/x11/kde4-workspace/files/patch-CVE-2014-8651 Modified: branches/2014Q4/x11/kde4-workspace/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/x11/kde4-workspace/Makefile ============================================================================== --- branches/2014Q4/x11/kde4-workspace/Makefile Mon Nov 17 21:08:28 2014 (r372688) +++ branches/2014Q4/x11/kde4-workspace/Makefile Mon Nov 17 21:25:27 2014 (r372689) @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2014Q4/x11/kde4-workspace/files/patch-CVE-2014-8651 (from r372687, head/x11/kde4-workspace/files/patch-CVE-2014-8651) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11/kde4-workspace/files/patch-CVE-2014-8651 Mon Nov 17 21:25:27 2014 (r372689, copy of r372687, head/x11/kde4-workspace/files/patch-CVE-2014-8651) @@ -0,0 +1,113 @@ +commit eebcb17746d9fa86ea8c5a7344709ef6750781cf +Author: David Edmundson +Date: Tue Nov 4 13:57:59 2014 +0100 + + Do not pass ntpUtility as an argument to datetime helper + + Passing the name of a binary to run to a polkit helper is a security + risk as it allows any arbitrary process to be executed. + + This patch moves the detection of ntp utility location into the helper + function. + + REVIEW: 120977 + +--- kcontrol/dateandtime/dtime.cpp ++++ kcontrol/dateandtime/dtime.cpp +@@ -142,27 +142,15 @@ void Dtime::serverTimeCheck() { + //kclock->setEnabled(enabled); + } + +-void Dtime::findNTPutility(){ +- QByteArray envpath = qgetenv("PATH"); +- if (!envpath.isEmpty() && envpath[0] == ':') { +- envpath = envpath.mid(1); +- } +- +- QString path = "/sbin:/usr/sbin:"; +- if (!envpath.isEmpty()) { +- path += QString::fromLocal8Bit(envpath); +- } else { +- path += QLatin1String("/bin:/usr/bin"); +- } +- +- foreach(const QString &possible_ntputility, QStringList() << "ntpdate" << "rdate" ) { +- if( !((ntpUtility = KStandardDirs::findExe(possible_ntputility, path)).isEmpty()) ) { +- kDebug() << "ntpUtility = " << ntpUtility; +- return; ++void Dtime::findNTPutility() ++{ ++ const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); ++ foreach(const QString &possible_ntputility, QStringList() << "ntpdate" << "rdate" ) { ++ ntpUtility = KStandardDirs::findExe(possible_ntputility, exePath); ++ if (!ntpUtility.isEmpty()) { ++ return; ++ } + } +- } +- +- kDebug() << "ntpUtility not found!"; + } + + void Dtime::set_time() +@@ -238,7 +226,6 @@ void Dtime::save( QVariantMap& helperargs ) + helperargs["ntp"] = true; + helperargs["ntpServers"] = list; + helperargs["ntpEnabled"] = setDateTimeAuto->isChecked(); +- helperargs["ntpUtility"] = ntpUtility; + + if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){ + // NTP Time setting - done in helper +--- kcontrol/dateandtime/helper.cpp ++++ kcontrol/dateandtime/helper.cpp +@@ -52,8 +52,18 @@ + // clears it. So we have to use a reasonable default. + static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); + +-int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled, +- const QString& ntpUtility ) ++static QString findNtpUtility() ++{ ++ foreach(const QString &possible_ntputility, QStringList() << "ntpdate" << "rdate" ) { ++ const QString ntpUtility = KStandardDirs::findExe(possible_ntputility, exePath); ++ if (!ntpUtility.isEmpty()) { ++ return ntpUtility; ++ } ++ } ++ return QString(); ++} ++ ++int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) + { + int ret = 0; + +@@ -69,6 +79,8 @@ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled, + config.writeEntry("servers", ntpServers ); + config.writeEntry("enabled", ntpEnabled ); + ++ QString ntpUtility(findNtpUtility()); ++ + if ( ntpEnabled && !ntpUtility.isEmpty() ) { + // NTP Time setting + QString timeServer = ntpServers.first(); +@@ -227,7 +239,7 @@ ActionReply ClockHelper::save(const QVariantMap &args) + int ret = 0; // error code + // The order here is important + if( _ntp ) +- ret |= ntp( args.value("ntpServers").toStringList(), args.value("ntpEnabled").toBool(), args.value("ntpUtility").toString() ); ++ ret |= ntp( args.value("ntpServers").toStringList(), args.value("ntpEnabled").toBool()); + if( _date ) + ret |= date( args.value("newdate").toString(), args.value("olddate").toString() ); + if( _tz ) +--- kcontrol/dateandtime/helper.h ++++ kcontrol/dateandtime/helper.h +@@ -42,8 +42,7 @@ class ClockHelper : public QObject + ActionReply save(const QVariantMap &map); + + private: +- int ntp(const QStringList& ntpServers, bool ntpEnabled, +- const QString& ntpUtility); ++ int ntp(const QStringList& ntpServers, bool ntpEnabled); + int date(const QString& newdate, const QString& olddate); + int tz(const QString& selectedzone); + int tzreset(); From owner-svn-ports-branches@FreeBSD.ORG Tue Nov 18 16:08:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E68CB72; Tue, 18 Nov 2014 16:08:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7F698AE5; Tue, 18 Nov 2014 16:08:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIG8DqX022800; Tue, 18 Nov 2014 16:08:13 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIG8DuM022798; Tue, 18 Nov 2014 16:08:13 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201411181608.sAIG8DuM022798@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Tue, 18 Nov 2014 16:08:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372727 - in branches/2014Q4/print/lout: . 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.18-1 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, 18 Nov 2014 16:08:13 -0000 Author: danilo Date: Tue Nov 18 16:08:12 2014 New Revision: 372727 URL: https://svnweb.freebsd.org/changeset/ports/372727 QAT: https://qat.redports.org/buildarchive/r372727/ Log: MFH: r372719 - Fix an incorrect usage of stagedir. The program was looking for its files in stagedir. PR: 195109 Reported by: Nils M. Holm Tested by: Nils M. Holm Approved by: portmgr (rea) Modified: branches/2014Q4/print/lout/Makefile branches/2014Q4/print/lout/files/patch-makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/print/lout/Makefile ============================================================================== --- branches/2014Q4/print/lout/Makefile Tue Nov 18 16:03:40 2014 (r372726) +++ branches/2014Q4/print/lout/Makefile Tue Nov 18 16:08:12 2014 (r372727) @@ -3,6 +3,7 @@ PORTNAME= lout PORTVERSION= 3.40 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SAVANNAH @@ -15,7 +16,6 @@ OPTIONS_DEFINE= DOCS USES= gmake MAKEFILE= makefile -MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} ALL_TARGET= lout prg2lout INSTALL_TARGET= install installman installdoc Modified: branches/2014Q4/print/lout/files/patch-makefile ============================================================================== --- branches/2014Q4/print/lout/files/patch-makefile Tue Nov 18 16:03:40 2014 (r372726) +++ branches/2014Q4/print/lout/files/patch-makefile Tue Nov 18 16:08:12 2014 (r372727) @@ -1,6 +1,6 @@ ---- ./makefile.orig 2012-02-08 05:28:03.000000000 -0200 -+++ ./makefile 2013-09-29 13:31:07.000000000 -0300 -@@ -269,11 +269,10 @@ +--- makefile.orig 2012-02-08 07:28:03 UTC ++++ makefile +@@ -269,11 +269,10 @@ TRACING = # DEBUGGING = 1 # TRACING = -g @@ -15,7 +15,7 @@ LIBFONT = font LIBMAPS = maps -@@ -285,23 +284,23 @@ +@@ -285,23 +284,23 @@ LIBLOCA = locale CHARIN = 1 CHAROUT = 0 @@ -46,7 +46,7 @@ -DOS_DOS=$(OSDOS) \ -DOS_MAC=$(OSMAC) \ -DDB_FIX=$(DBFIX) \ -@@ -349,42 +348,41 @@ +@@ -349,93 +348,96 @@ all: lout prg2lout install: lout prg2lout @echo "" @echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)" @@ -54,80 +54,147 @@ - chmod 755 $(BINDIR)/lout - cp prg2lout $(BINDIR)/prg2lout - chmod 755 $(BINDIR)/prg2lout -+ install -c -s lout $(BINDIR)/lout -+ install -c -s prg2lout $(BINDIR)/prg2lout ++ install -c -s lout $(DESTDIR)$(BINDIR)/lout ++ install -c -s prg2lout $(DESTDIR)$(BINDIR)/prg2lout @echo "" @echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)" - mkdir $(LOUTLIBDIR) -+ -mkdir $(LOUTLIBDIR) - chmod 755 $(LOUTLIBDIR) +- chmod 755 $(LOUTLIBDIR) ++ -mkdir $(DESTDIR)$(LOUTLIBDIR) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR) @echo "" - mkdir $(LOUTLIBDIR)/$(LIBINCL) -+ -mkdir $(LOUTLIBDIR)/$(LIBINCL) - chmod 755 $(LOUTLIBDIR)/$(LIBINCL) - cp include/* $(LOUTLIBDIR)/$(LIBINCL) - chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/* +- chmod 755 $(LOUTLIBDIR)/$(LIBINCL) +- cp include/* $(LOUTLIBDIR)/$(LIBINCL) +- chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL) ++ cp include/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/* @echo "" - mkdir $(LOUTLIBDIR)/$(LIBDATA) -+ -mkdir $(LOUTLIBDIR)/$(LIBDATA) - chmod 755 $(LOUTLIBDIR)/$(LIBDATA) - cp data/* $(LOUTLIBDIR)/$(LIBDATA) - chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* +- chmod 755 $(LOUTLIBDIR)/$(LIBDATA) +- cp data/* $(LOUTLIBDIR)/$(LIBDATA) +- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA) ++ cp data/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/* @echo "" - mkdir $(LOUTLIBDIR)/$(LIBHYPH) -+ -mkdir $(LOUTLIBDIR)/$(LIBHYPH) - chmod 755 $(LOUTLIBDIR)/$(LIBHYPH) - cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH) - chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/* +- chmod 755 $(LOUTLIBDIR)/$(LIBHYPH) +- cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH) +- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH) ++ cp hyph/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/* @echo "" - mkdir $(LOUTLIBDIR)/$(LIBFONT) -+ -mkdir $(LOUTLIBDIR)/$(LIBFONT) - chmod 755 $(LOUTLIBDIR)/$(LIBFONT) - cp font/* $(LOUTLIBDIR)/$(LIBFONT) - chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/* +- chmod 755 $(LOUTLIBDIR)/$(LIBFONT) +- cp font/* $(LOUTLIBDIR)/$(LIBFONT) +- chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT) ++ cp font/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBFONT)/* @echo "" - mkdir $(LOUTLIBDIR)/$(LIBMAPS) -+ -mkdir $(LOUTLIBDIR)/$(LIBMAPS) - chmod 755 $(LOUTLIBDIR)/$(LIBMAPS) - cp maps/* $(LOUTLIBDIR)/$(LIBMAPS) - chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/* +- chmod 755 $(LOUTLIBDIR)/$(LIBMAPS) +- cp maps/* $(LOUTLIBDIR)/$(LIBMAPS) +- chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS) ++ cp maps/* $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBMAPS)/* @echo "" - mkdir $(LOUTLIBDIR)/$(LIBLOCA) -+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA) - chmod 755 $(LOUTLIBDIR)/$(LIBLOCA) -+ touch $(LOUTLIBDIR)/$(LIBLOCA)/.place_holder +- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA) ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA) ++ touch $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/.place_holder @echo "" @echo "(c) Initializing run (should be silent, no errors expected)" - $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init -@@ -406,6 +404,7 @@ +- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init ++ $(DESTDIR)$(BINDIR)/lout -s -x -D $(DESTDIR)$(LOUTLIBDIR)/data \ ++ -H $(DESTDIR)$(LOUTLIBDIR)/hyph \ ++ -I $(DESTDIR)$(LOUTLIBDIR)/include \ ++ $(DESTDIR)$(LOUTLIBDIR)/$(LIBINCL)/init + @echo "" + @echo "(d) Changing mode of files just created by initializing run" +- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* +- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/* ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBDATA)/* ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBHYPH)/* + + installman: + @echo "" + @echo "Installing manual entries into MANDIR $(MANDIR)" + sed -e "s@@$(BINDIR)@" -e "s@@$(LOUTLIBDIR)@" \ + -e "s@@$(LOUTDOCDIR)@" -e "s@@$(MANDIR)@" \ +- man/lout.1 > $(MANDIR)/lout.1 +- chmod 644 $(MANDIR)/lout.1 +- cp man/prg2lout.1 $(MANDIR)/prg2lout.1 +- chmod 644 $(MANDIR)/prg2lout.1 ++ man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1 ++ chmod 644 $(DESTDIR)$(MANDIR)/lout.1 ++ cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1 ++ chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1 + installdoc: @echo "" @echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it" -+ -mkdir -p $(LOUTDOCDIR) - $(RCOPY) doc/* $(LOUTDOCDIR) - chmod 755 $(LOUTDOCDIR) - chmod 755 $(LOUTDOCDIR)/* -@@ -416,9 +415,9 @@ +- $(RCOPY) doc/* $(LOUTDOCDIR) +- chmod 755 $(LOUTDOCDIR) +- chmod 755 $(LOUTDOCDIR)/* +- chmod 644 $(LOUTDOCDIR)/*/* ++ -mkdir -p $(DESTDIR)$(LOUTDOCDIR) ++ $(RCOPY) doc/* $(DESTDIR)$(LOUTDOCDIR) ++ chmod 755 $(DESTDIR)$(LOUTDOCDIR) ++ chmod 755 $(DESTDIR)$(LOUTDOCDIR)/* ++ chmod 644 $(DESTDIR)$(LOUTDOCDIR)/*/* + + allinstall: install installman installdoc + installfr: @echo "" @echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)" - mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) -+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) - chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) +- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) - mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES -+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) - gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ -@@ -428,9 +427,9 @@ +- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES +- cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) +- gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ +- $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) +- chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES ++ cp locale/msgs.fr $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) ++ gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ ++ $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* + installde: @echo "" @echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)" - mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) -+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) - chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) +- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) - mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES -+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) - gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ +- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES +- cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) +- gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ +- $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) +- chmod 644 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) ++ -mkdir $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES ++ chmod 755 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES ++ cp locale/msgs.de $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) ++ gencat $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ ++ $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) ++ chmod 644 $(DESTDIR)$(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* + + uninstall: + -rm -f $(BINDIR)/lout $(BINDIR)/prg2lout From owner-svn-ports-branches@FreeBSD.ORG Thu Nov 20 12:45:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F52BC59; Thu, 20 Nov 2014 12:45:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 18E462EF; Thu, 20 Nov 2014 12:45:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKCjrg6069625; Thu, 20 Nov 2014 12:45:53 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKCjYCi069513; Thu, 20 Nov 2014 12:45:34 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201411201245.sAKCjYCi069513@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 20 Nov 2014 12:45:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372912 - in branches/2014Q4/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.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 12:45:53 -0000 Author: rene Date: Thu Nov 20 12:45:33 2014 New Revision: 372912 URL: https://svnweb.freebsd.org/changeset/ports/372912 QAT: https://qat.redports.org/buildarchive/r372912/ Log: MFH: r372849 www/chromium: update to 39.0.2171.65 Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee Approved by: portmgr (erwin) Added: branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc - copied unchanged from r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc branches/2014Q4/www/chromium/files/patch-chrome__chrome_tests_unit.gypi - copied unchanged from r372849, head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi branches/2014Q4/www/chromium/files/patch-device__hid__hid_service.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__hid__hid_service.cc branches/2014Q4/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h - copied unchanged from r372849, head/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h branches/2014Q4/www/chromium/files/patch-device__usb__usb.gyp - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb.gyp branches/2014Q4/www/chromium/files/patch-device__usb__usb_context.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_context.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_context_unittest.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_context_unittest.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_handle_impl.h - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_handle_impl.h branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_impl.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_error.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_error.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_service_impl.cc Deleted: branches/2014Q4/www/chromium/files/patch-chrome__app__generated_resources.grd branches/2014Q4/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc branches/2014Q4/www/chromium/files/patch-chrome__common__localized_error.cc branches/2014Q4/www/chromium/files/patch-components__usb_service.gypi branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_error.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_service_impl.cc branches/2014Q4/www/chromium/files/patch-net__base__net_error_list.h branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.h branches/2014Q4/www/chromium/files/patch-tools__metrics__histograms__histograms.xml branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/distinfo branches/2014Q4/www/chromium/files/extra-patch-clang branches/2014Q4/www/chromium/files/extra-patch-gcc branches/2014Q4/www/chromium/files/patch-base__base.gyp branches/2014Q4/www/chromium/files/patch-base__base.gypi branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q4/www/chromium/files/patch-base__process__launch.cc branches/2014Q4/www/chromium/files/patch-base__process__launch.h branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q4/www/chromium/files/patch-build__common.gypi branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h branches/2014Q4/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q4/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q4/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q4/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc branches/2014Q4/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q4/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc branches/2014Q4/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q4/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q4/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q4/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q4/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q4/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc branches/2014Q4/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q4/www/chromium/files/patch-content__content_browser.gypi branches/2014Q4/www/chromium/files/patch-content__content_common.gypi branches/2014Q4/www/chromium/files/patch-content__content_tests.gypi branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h branches/2014Q4/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q4/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q4/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q4/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q4/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q4/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc branches/2014Q4/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q4/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q4/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q4/www/chromium/files/patch-media__media.gyp branches/2014Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2014Q4/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q4/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux.h branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc branches/2014Q4/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q4/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q4/www/chromium/files/patch-net__base__net_util.h branches/2014Q4/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q4/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q4/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q4/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h branches/2014Q4/www/chromium/files/patch-net__net.gyp branches/2014Q4/www/chromium/files/patch-net__net.gypi branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q4/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2014Q4/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q4/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q4/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q4/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q4/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q4/www/chromium/files/patch-printing__printing.gyp branches/2014Q4/www/chromium/files/patch-remoting__remoting_host.gypi branches/2014Q4/www/chromium/files/patch-skia__skia_chrome.gypi branches/2014Q4/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q4/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q4/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q4/www/chromium/files/patch-third_party__khronos__khronos.gyp branches/2014Q4/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q4/www/chromium/files/patch-third_party__libexif__libexif.gyp branches/2014Q4/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q4/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q4/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp branches/2014Q4/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q4/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q4/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi branches/2014Q4/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__pdfium.gyp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h branches/2014Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2014Q4/www/chromium/files/patch-third_party__sqlite__sqlite.gyp branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__stringutils.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q4/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q4/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q4/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.cc branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.h branches/2014Q4/www/chromium/files/patch-ui__base__ui_base.gyp branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q4/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd branches/2014Q4/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc branches/2014Q4/www/chromium/files/patch-ui__views__views.gyp branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.cc branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.h branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h branches/2014Q4/www/chromium/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/Makefile Thu Nov 20 12:45:33 2014 (r372912) @@ -1,8 +1,9 @@ # Created by: Florent Thoumie # $FreeBSD$ +#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium -PORTVERSION= 38.0.2125.122 +PORTVERSION= 39.0.2171.65 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,7 +14,7 @@ COMMENT= Google web browser based on Web LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -CFLAGS+= -fno-stack-protector -isystem${LOCALBASE}/include +CFLAGS+= -isystem${LOCALBASE}/include BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -264,6 +265,7 @@ pre-configure: 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ + 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ Modified: branches/2014Q4/www/chromium/distinfo ============================================================================== --- branches/2014Q4/www/chromium/distinfo Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/distinfo Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ -SHA256 (chromium-38.0.2125.122.tar.xz) = 3ea94fb3151f59c2d5088f832f8e894897489922a63bfa04f0068ee2fc0e36f3 -SIZE (chromium-38.0.2125.122.tar.xz) = 248207688 -SHA256 (chromium-38.0.2125.122-testdata.tar.xz) = 75f55ee898c3d3dbd2cb8701bb94d2ce6dee13e050df38610c66e99830f1bae6 -SIZE (chromium-38.0.2125.122-testdata.tar.xz) = 115344076 +SHA256 (chromium-39.0.2171.65.tar.xz) = b15746316f2abef40792395d9a0da28ef17713289b9bd334a8ad3ee8b764f451 +SIZE (chromium-39.0.2171.65.tar.xz) = 253057636 +SHA256 (chromium-39.0.2171.65-testdata.tar.xz) = 4be2e8909268a9901ab714b57eabd53329580f83b7525c7dace7a36fbb3e7ea5 +SIZE (chromium-39.0.2171.65-testdata.tar.xz) = 115238768 Modified: branches/2014Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-clang Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/extra-patch-clang Thu Nov 20 12:45:33 2014 (r372912) @@ -217,17 +217,6 @@ #if defined(__GCC__) #pragma GCC diagnostic pop #endif ---- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100 -+++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100 -@@ -130,7 +130,7 @@ - - // TODO(titzer): this is a hack to migrate to Unique incrementally. - static Unique CreateUninitialized(Handle handle) { -- return Unique(reinterpret_cast
(NULL), handle); -+ return Unique(static_cast
(NULL), handle); - } - - static Unique CreateImmovable(Handle handle) { --- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 @@ -258,11 +258,11 @@ @@ -256,14 +245,14 @@ tasks_.erase(it, tasks_.end()); ---- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 -+++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 -@@ -167,7 +167,7 @@ +--- v8/src/unique.h.orig 2014-10-10 11:16:50.000000000 +0200 ++++ v8/src/unique.h 2014-10-13 18:55:35.000000000 +0200 +@@ -110,7 +110,7 @@ // TODO(titzer): this is a hack to migrate to Unique incrementally. - static PrintableUnique CreateUninitialized(Zone* zone, Handle handle) { -- return PrintableUnique(zone, reinterpret_cast
(NULL), handle); -+ return PrintableUnique(zone, static_cast
(NULL), handle); + static Unique CreateUninitialized(Handle handle) { +- return Unique(reinterpret_cast
(NULL), handle); ++ return Unique(static_cast
(NULL), handle); } - static PrintableUnique CreateImmovable(Zone* zone, Handle handle) { + static Unique CreateImmovable(Handle handle) { Modified: branches/2014Q4/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-gcc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/extra-patch-gcc Thu Nov 20 12:45:33 2014 (r372912) @@ -66,13 +66,13 @@ #include #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" ---- media/cast/logging/encoding_event_subscriber.cc.orig 2014-10-02 19:39:47.000000000 +0200 -+++ media/cast/logging/encoding_event_subscriber.cc 2014-10-06 10:38:30.000000000 +0200 -@@ -4,6 +4,7 @@ +--- third_party/webrtc/common_audio/wav_writer.h.orig 2014-10-17 02:57:34.000000000 +0200 ++++ third_party/webrtc/common_audio/wav_writer.h 2014-10-18 12:04:03.000000000 +0200 +@@ -14,6 +14,7 @@ + #ifdef __cplusplus - #include "media/cast/logging/encoding_event_subscriber.h" - -+#include - #include - #include + #include ++#include + #include + #include Modified: branches/2014Q4/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__base.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/base.gyp.orig 2014-10-02 21:05:31 UTC +--- base/base.gyp.orig 2014-10-10 09:15:29 UTC +++ base/base.gyp @@ -129,7 +129,7 @@ ], @@ -9,7 +9,7 @@ ], }, }], -@@ -784,6 +784,11 @@ +@@ -803,6 +803,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], Modified: branches/2014Q4/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__base.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/base.gypi.orig 2014-10-02 17:39:45 UTC +--- base/base.gypi.orig 2014-10-10 09:15:29 UTC +++ base/base.gypi @@ -945,11 +945,16 @@ 'process/memory_stubs.cc', Modified: branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2014-10-02 17:18:52 UTC +--- base/debug/stack_trace_posix.cc.orig 2014-10-10 09:15:29 UTC +++ base/debug/stack_trace_posix.cc @@ -588,6 +588,10 @@ // for the modules that are loaded in the current process. Modified: branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2014-10-02 17:18:52 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2014-10-10 09:15:29 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ Modified: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" Modified: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be Modified: branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2014-10-02 17:18:52 UTC +--- base/process/internal_linux.h.orig 2014-10-10 08:54:09 UTC +++ base/process/internal_linux.h @@ -12,6 +12,8 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.cc @@ -24,10 +24,10 @@ fds_to_remap(NULL), Modified: branches/2014Q4/www/chromium/files/patch-base__process__launch.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.h.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.h @@ -113,14 +113,14 @@ // will be the same as its pid. Modified: branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/memory_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/process/memory_unittest.cc @@ -160,9 +160,9 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_iterator_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_iterator_freebsd.cc @@ -8,6 +8,10 @@ #include Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2014-10-02 17:39:45 UTC +--- base/process/process_metrics.h.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics.h @@ -17,6 +17,13 @@ #include "base/time/time.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include #endif -@@ -240,13 +247,17 @@ +@@ -246,13 +253,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_metrics_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics_freebsd.cc @@ -10,6 +10,9 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/security_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/security_unittest.cc @@ -160,7 +160,7 @@ // FAILS_ is too clunky. Modified: branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/strings/safe_sprintf.cc.orig 2014-10-02 17:18:52 UTC +--- base/strings/safe_sprintf.cc.orig 2014-10-10 08:54:09 UTC +++ base/strings/safe_sprintf.cc @@ -107,15 +107,16 @@ : buffer_(buffer), Modified: branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/sys_info_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_freebsd.cc @@ -4,6 +4,7 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- base/sys_info_posix.cc.orig 2014-10-02 17:39:45 UTC +--- base/sys_info_posix.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_posix.cc -@@ -64,7 +64,7 @@ +@@ -75,7 +75,7 @@ namespace base { Modified: branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/test/expectations/expectation.cc.orig 2014-10-02 17:18:52 UTC +--- base/test/expectations/expectation.cc.orig 2014-10-10 08:54:09 UTC +++ base/test/expectations/expectation.cc @@ -60,6 +60,7 @@ variant != "64") { Modified: branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2014-10-02 17:39:45 UTC +--- base/test/launcher/test_launcher.cc.orig 2014-10-10 09:15:29 UTC +++ base/test/launcher/test_launcher.cc @@ -45,6 +45,10 @@ #include "base/win/windows_version.h" @@ -10,4 +10,4 @@ + namespace base { - // Launches a child process using |command_line|. If the child process is still + // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . Modified: branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2014-10-02 17:39:45 UTC +--- base/threading/platform_thread_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/threading/platform_thread_linux.cc @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" Modified: branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- breakpad/breakpad.gyp.orig 2014-10-02 17:39:45 UTC +--- breakpad/breakpad.gyp.orig 2014-10-10 09:15:29 UTC +++ breakpad/breakpad.gyp -@@ -349,7 +349,7 @@ +@@ -353,7 +353,7 @@ }, ], }], Modified: branches/2014Q4/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__common.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__common.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/common.gypi.orig 2014-10-02 17:39:45 UTC +--- build/common.gypi.orig 2014-10-10 09:15:29 UTC +++ build/common.gypi @@ -91,7 +91,7 @@ @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -676,7 +676,7 @@ +@@ -702,7 +702,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -931,7 +931,7 @@ +@@ -952,7 +952,7 @@ }, { 'use_openmax_dl_fft%': 0, }], @@ -27,7 +27,7 @@ 'enable_mdns%' : 1, }], -@@ -954,7 +954,7 @@ +@@ -975,7 +975,7 @@ # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -36,7 +36,7 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1193,6 +1193,10 @@ +@@ -1228,6 +1228,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -47,7 +47,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. -@@ -4280,6 +4284,13 @@ +@@ -4391,6 +4395,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/filename_rules.gypi.orig 2014-10-02 17:18:52 UTC +--- build/filename_rules.gypi.orig 2014-10-10 08:54:09 UTC +++ build/filename_rules.gypi @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { Modified: branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- build/linux/system.gyp.orig 2014-10-02 17:39:45 UTC +--- build/linux/system.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/system.gyp -@@ -890,6 +890,13 @@ +@@ -866,6 +866,13 @@ 'include_dirs': [ '../..', ], Modified: branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libwebp.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/libwebp.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/libwebp.gyp @@ -14,13 +14,7 @@ }, Modified: branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/linux/unbundle/openssl.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/openssl.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/openssl.gyp @@ -9,15 +9,15 @@ 'type': 'none', Modified: branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- cc/layers/layer_impl.cc.orig 2014-10-02 17:39:45 UTC +--- cc/layers/layer_impl.cc.orig 2014-10-10 09:15:29 UTC +++ cc/layers/layer_impl.cc -@@ -1201,21 +1201,23 @@ +@@ -1202,21 +1202,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,33 +1,15 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -94,7 +94,7 @@ +@@ -97,7 +97,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "components/breakpad/app/breakpad_linux.h" + #include "components/crash/app/breakpad_linux.h" #endif -@@ -124,7 +124,7 @@ - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; - #endif - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance::Leaky - g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; - #endif -@@ -225,7 +225,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || - #endif --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -441,7 +441,7 @@ +@@ -449,7 +449,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +18,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -492,7 +492,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,16 +27,16 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -640,7 +640,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) - breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); + crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -759,7 +759,7 @@ +@@ -767,7 +767,7 @@ #endif } @@ -63,7 +45,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -771,7 +771,7 @@ +@@ -779,7 +779,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +54,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -863,7 +863,7 @@ +@@ -875,7 +875,7 @@ #endif return process_type == switches::kRelauncherProcess; } Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-10-02 17:18:53 UTC +--- chrome/app/chrome_main_delegate.h.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.h @@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chromium_strings.grd.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chromium_strings.grd -@@ -1115,7 +1115,7 @@ +@@ -1136,7 +1136,7 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/app/resources/locale_settings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/resources/locale_settings.grd.orig 2014-10-10 09:15:30 UTC +++ chrome/app/resources/locale_settings.grd @@ -264,7 +264,7 @@ 55 Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/about_flags.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/about_flags.cc -@@ -2278,7 +2278,7 @@ +@@ -2260,7 +2260,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_browser_main.cc @@ -947,7 +947,7 @@ } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/chrome_browser_main_posix.cc @@ -270,6 +270,11 @@ g_pipe_pid = getpid(); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -430,7 +430,7 @@ +@@ -434,7 +434,7 @@ return false; } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -487,7 +487,7 @@ +@@ -491,7 +491,7 @@ return -1; } @@ -18,7 +18,7 @@ #if !defined(OS_CHROMEOS) GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1196,7 +1196,7 @@ +@@ -1194,7 +1194,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { scoped_ptr client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -1204,7 +1204,7 @@ +@@ -1202,7 +1202,7 @@ client_info ? client_info->client_id : std::string()); } @@ -36,7 +36,7 @@ if (logging::DialogsAreSuppressed()) command_line->AppendSwitch(switches::kNoErrorDialogs); -@@ -2447,7 +2447,7 @@ +@@ -2408,7 +2408,7 @@ } } @@ -45,7 +45,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2513,7 +2513,7 @@ +@@ -2474,7 +2474,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -287,7 +287,7 @@ +@@ -278,7 +278,7 @@ virtual net::CookieStore* OverrideCookieStoreForRenderProcess( int render_process_id) OVERRIDE; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -266,7 +266,7 @@ console_->SetColor(color); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -18,7 +18,7 @@ public: Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc @@ -167,10 +167,12 @@ } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gl_string_manager.cc @@ -25,7 +25,7 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gpu_feature_checker.cc @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media/webrtc_log_uploader.cc @@ -233,6 +233,8 @@ const char product[] = "Chrome_Android"; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -734,7 +734,10 @@ +@@ -738,7 +738,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/media_folder_finder.cc @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,7 +1,7 @@ ---- chrome/browser/memory_details.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/memory_details.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/memory_details.cc -@@ -27,7 +27,7 @@ - #include "grit/generated_resources.h" +@@ -26,7 +26,7 @@ + #include "content/public/common/bindings_policy.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -248,7 +248,7 @@ +@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -18,7 +18,7 @@ const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -390,7 +390,7 @@ +@@ -389,7 +389,7 @@ } } Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc (from r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc Thu Nov 20 12:45:33 2014 (r372912, copy of r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc) @@ -0,0 +1,18 @@ +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -27,12 +27,14 @@ + + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) + #include ++#endif + ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "base/version.h" + #if defined(USE_X11) + #include "ui/base/x/x11_util.h" + #endif +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif + + #if defined(OS_WIN) + #include "chrome/installer/util/google_update_settings.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/net/connection_tester.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/net/connection_tester.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/net/connection_tester.cc @@ -219,7 +219,7 @@ // Otherwise returns a network error code. Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-09-10 01:47:12.000000000 +0200 -+++ chrome/browser/notifications/message_center_notification_manager.cc 2014-09-18 14:21:16.000000000 +0200 -@@ -84,7 +84,7 @@ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/notifications/message_center_notification_manager.cc +@@ -82,7 +82,7 @@ blockers_.push_back(new FullscreenNotificationBlocker(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -33,7 +33,7 @@ std::string filename; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -169,6 +169,8 @@ const std::string os("chromeos"); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -260,7 +260,7 @@ +@@ -234,7 +234,7 @@ // settings. Weird. TODO(palmer): Do something more graceful than ignoring // the user's click! crbug.com/394993 return; @@ -9,7 +9,7 @@ struct ClockCommand { const char* pathname; const char* argument; -@@ -310,7 +310,7 @@ +@@ -284,7 +284,7 @@ #if !defined(OS_CHROMEOS) base::LaunchOptions options; options.wait = false; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-06 09:19:40.000000000 +0200 -+++ chrome/browser/ui/browser_view_prefs.cc 2014-10-06 09:24:45.000000000 +0200 +--- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/browser_view_prefs.cc @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ #include "components/user_manager/user_manager.h" #endif Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-06 09:32:59.000000000 +0200 -+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc 2014-10-06 09:40:11.000000000 +0200 +--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -29,7 +29,7 @@ #include "ui/wm/core/easy_resize_window_targeter.h" #include "ui/wm/core/shadow_types.h" -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif -@@ -217,7 +217,7 @@ - init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; - init_params.keep_on_top = create_params.always_on_top; +@@ -219,7 +219,7 @@ + init_params.visible_on_all_workspaces = + create_params.visible_on_all_workspaces; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Set up a custom WM_CLASS for app windows. This allows task switchers in // X11 environments to distinguish them from main browser windows. init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-06 09:19:23.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.cc 2014-10-06 09:22:54.000000000 +0200 -@@ -44,7 +44,7 @@ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.cc +@@ -45,7 +45,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif @@ -9,16 +9,16 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -234,7 +234,7 @@ +@@ -235,7 +235,7 @@ return chrome::IsNativeViewInAsh(window); } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -373,7 +373,7 @@ +@@ -374,7 +374,7 @@ #endif } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-06 09:19:31.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.h 2014-10-06 09:23:19.000000000 +0200 +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.h @@ -36,7 +36,7 @@ #if defined(OS_WIN) virtual HICON GetDefaultWindowIcon() const OVERRIDE; virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; #endif @@ -14,7 +14,7 @@ views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) OVERRIDE; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; #endif #if defined(USE_AURA) Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -124,12 +124,16 @@ +@@ -118,12 +118,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-06 09:37:47.000000000 +0200 -+++ chrome/browser/ui/views/frame/browser_frame.cc 2014-10-06 09:37:33.000000000 +0200 +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/frame/browser_frame.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/native_widget.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-06 09:39:10.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2014-10-06 09:39:57.000000000 +0200 -@@ -53,7 +53,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +@@ -52,7 +52,7 @@ #include "ui/views/window/frame_background.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -78,7 +78,7 @@ +@@ -77,7 +77,7 @@ // The icon never shrinks below 16 px on a side. const int kIconMinimumSize = 16; @@ -18,7 +18,7 @@ // The number of pixels to move the frame background image upwards when using // the GTK+ theme and the titlebar is condensed. const int kGTKThemeCondensedFrameTopInset = 15; -@@ -316,7 +316,7 @@ +@@ -318,7 +318,7 @@ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { @@ -27,7 +27,7 @@ views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), -@@ -569,7 +569,7 @@ +@@ -571,7 +571,7 @@ } bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { @@ -36,7 +36,7 @@ // Do not show the custom title bar if the system title bar option is enabled. if (!frame()->UseCustomFrame()) return false; -@@ -614,7 +614,7 @@ +@@ -616,7 +616,7 @@ frame_background_->set_theme_image(GetFrameImage()); frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); frame_background_->set_top_area_height(GetTopAreaHeight()); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-06 09:41:06.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2014-10-06 09:40:51.000000000 +0200 -@@ -81,7 +81,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +@@ -82,7 +82,7 @@ // is no avatar icon. const int kTabStripIndent = -6; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Thu Nov 20 13:43:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7758157F; Thu, 20 Nov 2014 13:43:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 62E38BA7; Thu, 20 Nov 2014 13:43:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKDhIfQ004005; Thu, 20 Nov 2014 13:43:18 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKDhHAo003972; Thu, 20 Nov 2014 13:43:17 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411201343.sAKDhHAo003972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 20 Nov 2014 13:43:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372928 - branches/2014Q4/www/yii 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.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 13:43:18 -0000 Author: madpilot Date: Thu Nov 20 13:43:17 2014 New Revision: 372928 URL: https://svnweb.freebsd.org/changeset/ports/372928 QAT: https://qat.redports.org/buildarchive/r372928/ Log: MFH: r372883, r372920 r372883: - Update to 1.1.15 - fixes CVE-2014-4672 - Fix LICENSE - Cleanup plist Security: 5a35bc56-7027-11e4-a4a3-001999f8d30b MFH: 2014Q4 r372920: Add CPE information Suggested by: rea Approved by: ports-secteam (rea) Modified: branches/2014Q4/www/yii/Makefile branches/2014Q4/www/yii/distinfo branches/2014Q4/www/yii/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/yii/Makefile ============================================================================== --- branches/2014Q4/www/yii/Makefile Thu Nov 20 13:37:29 2014 (r372927) +++ branches/2014Q4/www/yii/Makefile Thu Nov 20 13:43:17 2014 (r372928) @@ -2,23 +2,26 @@ # $FreeBSD$ PORTNAME= yii -PORTVERSION= 1.1.14 -DISTVERSIONSUFFIX= .f0fee9 +PORTVERSION= 1.1.15 +DISTVERSIONSUFFIX= .022a51 CATEGORIES= www MAINTAINER= ports@FreeBSD.org COMMENT= High-performance component-based PHP framework -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_GITHUB= yes GH_ACCOUNT= yiisoft GH_PROJECT= ${PORTNAME} -GH_COMMIT= f0fee9 +GH_COMMIT= 022a51 -WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-72100b6 +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-65ddd44 NO_BUILD= yes +USES= cpe +CPE_VENDOR= yiiframework +CPE_PRODUCT= yiiframework USE_PHP= pcre spl WANT_PHP_WEB= yes @@ -52,10 +55,10 @@ post-patch: @${SED} -i "" -e "s,dirname(__FILE__),'${DATADIR}/framework'," ${WRKSRC}/framework/yiic do-install: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "${INSTALL_DIRS}" ${STAGEDIR}${DATADIR}) - @${INSTALL_SCRIPT} ${WRKSRC}/framework/yiic ${STAGEDIR}${PREFIX}/bin - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "demos requirements" ${STAGEDIR}${EXAMPLESDIR}) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} "${INSTALL_DIRS}" ${STAGEDIR}${DATADIR}) + ${INSTALL_SCRIPT} ${WRKSRC}/framework/yiic ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC} && ${COPYTREE_SHARE} "demos requirements" ${STAGEDIR}${EXAMPLESDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q4/www/yii/distinfo ============================================================================== --- branches/2014Q4/www/yii/distinfo Thu Nov 20 13:37:29 2014 (r372927) +++ branches/2014Q4/www/yii/distinfo Thu Nov 20 13:43:17 2014 (r372928) @@ -1,2 +1,2 @@ -SHA256 (yii-1.1.14.f0fee9.tar.gz) = de780d7ae184919cda5840b4224af676ba63f56a3265e830ff944e2ce58dd6e1 -SIZE (yii-1.1.14.f0fee9.tar.gz) = 6933849 +SHA256 (yii-1.1.15.022a51.tar.gz) = bd14988ba992e4e2a1e533a14eb6effa6a34115be86d4709d44693ba8623601e +SIZE (yii-1.1.15.022a51.tar.gz) = 6934682 Modified: branches/2014Q4/www/yii/pkg-plist ============================================================================== --- branches/2014Q4/www/yii/pkg-plist Thu Nov 20 13:37:29 2014 (r372927) +++ branches/2014Q4/www/yii/pkg-plist Thu Nov 20 13:43:17 2014 (r372928) @@ -2072,372 +2072,5 @@ bin/yiic %%DATADIR%%/framework/zii/widgets/jui/CJuiTabs.php %%DATADIR%%/framework/zii/widgets/jui/CJuiWidget.php @mode -@mode 755 -@dirrmtry %%DATADIR%%/framework/zii/widgets/jui -@dirrmtry %%DATADIR%%/framework/zii/widgets/grid -@dirrmtry %%DATADIR%%/framework/zii/widgets/assets/listview -@dirrmtry %%DATADIR%%/framework/zii/widgets/assets/gridview -@dirrmtry %%DATADIR%%/framework/zii/widgets/assets/detailview -@dirrmtry %%DATADIR%%/framework/zii/widgets/assets -@dirrmtry %%DATADIR%%/framework/zii/widgets -@dirrmtry %%DATADIR%%/framework/zii/behaviors -@dirrmtry %%DATADIR%%/framework/zii -@dirrmtry %%DATADIR%%/framework/web/widgets/views -@dirrmtry %%DATADIR%%/framework/web/widgets/pagers -@dirrmtry %%DATADIR%%/framework/web/widgets/captcha -@dirrmtry %%DATADIR%%/framework/web/widgets -@dirrmtry %%DATADIR%%/framework/web/services -@dirrmtry %%DATADIR%%/framework/web/renderers -@dirrmtry %%DATADIR%%/framework/web/js/source/yiitab -@dirrmtry %%DATADIR%%/framework/web/js/source/treeview/images -@dirrmtry %%DATADIR%%/framework/web/js/source/treeview -@dirrmtry %%DATADIR%%/framework/web/js/source/rating -@dirrmtry %%DATADIR%%/framework/web/js/source/jui/js -@dirrmtry %%DATADIR%%/framework/web/js/source/jui/css/base/images -@dirrmtry %%DATADIR%%/framework/web/js/source/jui/css/base -@dirrmtry %%DATADIR%%/framework/web/js/source/jui/css -@dirrmtry %%DATADIR%%/framework/web/js/source/jui -@dirrmtry %%DATADIR%%/framework/web/js/source/autocomplete -@dirrmtry %%DATADIR%%/framework/web/js/source -@dirrmtry %%DATADIR%%/framework/web/js -@dirrmtry %%DATADIR%%/framework/web/helpers -@dirrmtry %%DATADIR%%/framework/web/form -@dirrmtry %%DATADIR%%/framework/web/filters -@dirrmtry %%DATADIR%%/framework/web/auth -@dirrmtry %%DATADIR%%/framework/web/actions -@dirrmtry %%DATADIR%%/framework/web -@dirrmtry %%DATADIR%%/framework/views/zh_tw -@dirrmtry %%DATADIR%%/framework/views/zh_cn -@dirrmtry %%DATADIR%%/framework/views/vi -@dirrmtry %%DATADIR%%/framework/views/uk -@dirrmtry %%DATADIR%%/framework/views/sv -@dirrmtry %%DATADIR%%/framework/views/sk -@dirrmtry %%DATADIR%%/framework/views/ru -@dirrmtry %%DATADIR%%/framework/views/ro -@dirrmtry %%DATADIR%%/framework/views/pt_br -@dirrmtry %%DATADIR%%/framework/views/pt -@dirrmtry %%DATADIR%%/framework/views/pl -@dirrmtry %%DATADIR%%/framework/views/no -@dirrmtry %%DATADIR%%/framework/views/nl -@dirrmtry %%DATADIR%%/framework/views/lv -@dirrmtry %%DATADIR%%/framework/views/lt -@dirrmtry %%DATADIR%%/framework/views/ko -@dirrmtry %%DATADIR%%/framework/views/ja -@dirrmtry %%DATADIR%%/framework/views/it -@dirrmtry %%DATADIR%%/framework/views/id -@dirrmtry %%DATADIR%%/framework/views/hr -@dirrmtry %%DATADIR%%/framework/views/he -@dirrmtry %%DATADIR%%/framework/views/fr -@dirrmtry %%DATADIR%%/framework/views/fi -@dirrmtry %%DATADIR%%/framework/views/es -@dirrmtry %%DATADIR%%/framework/views/el -@dirrmtry %%DATADIR%%/framework/views/de -@dirrmtry %%DATADIR%%/framework/views/ca -@dirrmtry %%DATADIR%%/framework/views/bg -@dirrmtry %%DATADIR%%/framework/views/ar -@dirrmtry %%DATADIR%%/framework/views -@dirrmtry %%DATADIR%%/framework/vendors/punycode -@dirrmtry %%DATADIR%%/framework/vendors/markdown -@dirrmtry %%DATADIR%%/framework/vendors/json -@dirrmtry %%DATADIR%%/framework/vendors/jqueryui -@dirrmtry %%DATADIR%%/framework/vendors/jquery/treeview -@dirrmtry %%DATADIR%%/framework/vendors/jquery/maskedinput -@dirrmtry %%DATADIR%%/framework/vendors/jquery/autocomplete -@dirrmtry %%DATADIR%%/framework/vendors/jquery -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Printer -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Lexer -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Language/messages -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Language/classes -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Language -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/Filter -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/EntityLookup -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Builder -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier/ConfigSchema -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone/HTMLPurifier -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier/standalone -@dirrmtry %%DATADIR%%/framework/vendors/htmlpurifier -@dirrmtry %%DATADIR%%/framework/vendors/history -@dirrmtry %%DATADIR%%/framework/vendors/gettext -@dirrmtry %%DATADIR%%/framework/vendors/console-normalizer -@dirrmtry %%DATADIR%%/framework/vendors/cldr -@dirrmtry %%DATADIR%%/framework/vendors/bbq -@dirrmtry %%DATADIR%%/framework/vendors/adodb -@dirrmtry %%DATADIR%%/framework/vendors/TextHighlighter/Text/Highlighter/Renderer -@dirrmtry %%DATADIR%%/framework/vendors/TextHighlighter/Text/Highlighter -@dirrmtry %%DATADIR%%/framework/vendors/TextHighlighter/Text -@dirrmtry %%DATADIR%%/framework/vendors/TextHighlighter -@dirrmtry %%DATADIR%%/framework/vendors/Net_IDNA2/Net/IDNA2/Exception -@dirrmtry %%DATADIR%%/framework/vendors/Net_IDNA2/Net/IDNA2 -@dirrmtry %%DATADIR%%/framework/vendors/Net_IDNA2/Net -@dirrmtry %%DATADIR%%/framework/vendors/Net_IDNA2 -@dirrmtry %%DATADIR%%/framework/vendors -@dirrmtry %%DATADIR%%/framework/validators -@dirrmtry %%DATADIR%%/framework/utils -@dirrmtry %%DATADIR%%/framework/test -@dirrmtry %%DATADIR%%/framework/messages/zh_tw -@dirrmtry %%DATADIR%%/framework/messages/zh_cn -@dirrmtry %%DATADIR%%/framework/messages/vi -@dirrmtry %%DATADIR%%/framework/messages/uk -@dirrmtry %%DATADIR%%/framework/messages/tr -@dirrmtry %%DATADIR%%/framework/messages/th -@dirrmtry %%DATADIR%%/framework/messages/ta_in -@dirrmtry %%DATADIR%%/framework/messages/sv -@dirrmtry %%DATADIR%%/framework/messages/sr_yu -@dirrmtry %%DATADIR%%/framework/messages/sr_sr -@dirrmtry %%DATADIR%%/framework/messages/sk -@dirrmtry %%DATADIR%%/framework/messages/ru -@dirrmtry %%DATADIR%%/framework/messages/ro -@dirrmtry %%DATADIR%%/framework/messages/pt_br -@dirrmtry %%DATADIR%%/framework/messages/pt -@dirrmtry %%DATADIR%%/framework/messages/pl -@dirrmtry %%DATADIR%%/framework/messages/no -@dirrmtry %%DATADIR%%/framework/messages/nl -@dirrmtry %%DATADIR%%/framework/messages/lv -@dirrmtry %%DATADIR%%/framework/messages/lt -@dirrmtry %%DATADIR%%/framework/messages/ko_kr -@dirrmtry %%DATADIR%%/framework/messages/kk -@dirrmtry %%DATADIR%%/framework/messages/ja -@dirrmtry %%DATADIR%%/framework/messages/it -@dirrmtry %%DATADIR%%/framework/messages/id -@dirrmtry %%DATADIR%%/framework/messages/hu -@dirrmtry %%DATADIR%%/framework/messages/he -@dirrmtry %%DATADIR%%/framework/messages/fr -@dirrmtry %%DATADIR%%/framework/messages/fi -@dirrmtry %%DATADIR%%/framework/messages/fa_ir -@dirrmtry %%DATADIR%%/framework/messages/es -@dirrmtry %%DATADIR%%/framework/messages/el -@dirrmtry %%DATADIR%%/framework/messages/de -@dirrmtry %%DATADIR%%/framework/messages/cs -@dirrmtry %%DATADIR%%/framework/messages/ca -@dirrmtry %%DATADIR%%/framework/messages/bs -@dirrmtry %%DATADIR%%/framework/messages/bg -@dirrmtry %%DATADIR%%/framework/messages/ar -@dirrmtry %%DATADIR%%/framework/messages -@dirrmtry %%DATADIR%%/framework/logging -@dirrmtry %%DATADIR%%/framework/i18n/gettext -@dirrmtry %%DATADIR%%/framework/i18n/data -@dirrmtry %%DATADIR%%/framework/i18n -@dirrmtry %%DATADIR%%/framework/gii/views/layouts -@dirrmtry %%DATADIR%%/framework/gii/views/default -@dirrmtry %%DATADIR%%/framework/gii/views/common -@dirrmtry %%DATADIR%%/framework/gii/views -@dirrmtry %%DATADIR%%/framework/gii/models -@dirrmtry %%DATADIR%%/framework/gii/generators/module/views -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/views/layouts -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/views/default -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/views -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/models -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/messages -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/controllers -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default/components -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates/default -@dirrmtry %%DATADIR%%/framework/gii/generators/module/templates -@dirrmtry %%DATADIR%%/framework/gii/generators/module -@dirrmtry %%DATADIR%%/framework/gii/generators/model/views -@dirrmtry %%DATADIR%%/framework/gii/generators/model/templates/default -@dirrmtry %%DATADIR%%/framework/gii/generators/model/templates -@dirrmtry %%DATADIR%%/framework/gii/generators/model -@dirrmtry %%DATADIR%%/framework/gii/generators/form/views -@dirrmtry %%DATADIR%%/framework/gii/generators/form/templates/default -@dirrmtry %%DATADIR%%/framework/gii/generators/form/templates -@dirrmtry %%DATADIR%%/framework/gii/generators/form -@dirrmtry %%DATADIR%%/framework/gii/generators/crud/views -@dirrmtry %%DATADIR%%/framework/gii/generators/crud/templates/default -@dirrmtry %%DATADIR%%/framework/gii/generators/crud/templates -@dirrmtry %%DATADIR%%/framework/gii/generators/crud -@dirrmtry %%DATADIR%%/framework/gii/generators/controller/views -@dirrmtry %%DATADIR%%/framework/gii/generators/controller/templates/default -@dirrmtry %%DATADIR%%/framework/gii/generators/controller/templates -@dirrmtry %%DATADIR%%/framework/gii/generators/controller -@dirrmtry %%DATADIR%%/framework/gii/generators -@dirrmtry %%DATADIR%%/framework/gii/controllers -@dirrmtry %%DATADIR%%/framework/gii/components/Pear/Text/Diff/Renderer -@dirrmtry %%DATADIR%%/framework/gii/components/Pear/Text/Diff/Engine -@dirrmtry %%DATADIR%%/framework/gii/components/Pear/Text/Diff -@dirrmtry %%DATADIR%%/framework/gii/components/Pear/Text -@dirrmtry %%DATADIR%%/framework/gii/components/Pear -@dirrmtry %%DATADIR%%/framework/gii/components -@dirrmtry %%DATADIR%%/framework/gii/assets/js/fancybox -@dirrmtry %%DATADIR%%/framework/gii/assets/js -@dirrmtry %%DATADIR%%/framework/gii/assets/images -@dirrmtry %%DATADIR%%/framework/gii/assets/css -@dirrmtry %%DATADIR%%/framework/gii/assets -@dirrmtry %%DATADIR%%/framework/gii -@dirrmtry %%DATADIR%%/framework/db/schema/sqlite -@dirrmtry %%DATADIR%%/framework/db/schema/pgsql -@dirrmtry %%DATADIR%%/framework/db/schema/oci -@dirrmtry %%DATADIR%%/framework/db/schema/mysql -@dirrmtry %%DATADIR%%/framework/db/schema/mssql -@dirrmtry %%DATADIR%%/framework/db/schema -@dirrmtry %%DATADIR%%/framework/db/ar -@dirrmtry %%DATADIR%%/framework/db -@dirrmtry %%DATADIR%%/framework/console -@dirrmtry %%DATADIR%%/framework/collections -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes/classic/views/system -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes/classic/views/site -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes/classic/views/layouts -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes/classic/views -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes/classic -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/themes -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/views/site/pages -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/views/site -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/views/layouts -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/views -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/vendor -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/tests/unit -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/tests/report -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/tests/functional -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/tests/fixtures -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/tests -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/runtime -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/models -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/migrations -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/messages -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/extensions -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/data -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/controllers -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/config -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/components -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/commands/shell -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected/commands -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/protected -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/images -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/css -@dirrmtry %%DATADIR%%/framework/cli/views/webapp/assets -@dirrmtry %%DATADIR%%/framework/cli/views/webapp -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/views/layouts -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/views/default -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/views -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/models -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/messages -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/controllers -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module/components -@dirrmtry %%DATADIR%%/framework/cli/views/shell/module -@dirrmtry %%DATADIR%%/framework/cli/views/shell/model -@dirrmtry %%DATADIR%%/framework/cli/views/shell/form -@dirrmtry %%DATADIR%%/framework/cli/views/shell/crud -@dirrmtry %%DATADIR%%/framework/cli/views/shell/controller -@dirrmtry %%DATADIR%%/framework/cli/views/shell -@dirrmtry %%DATADIR%%/framework/cli/views -@dirrmtry %%DATADIR%%/framework/cli/runtime -@dirrmtry %%DATADIR%%/framework/cli/commands/shell -@dirrmtry %%DATADIR%%/framework/cli/commands -@dirrmtry %%DATADIR%%/framework/cli -@dirrmtry %%DATADIR%%/framework/caching/dependencies -@dirrmtry %%DATADIR%%/framework/caching -@dirrmtry %%DATADIR%%/framework/base -@dirrmtry %%DATADIR%%/framework -@dirrmtry %%DATADIR%% -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/zh_tw -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/zh_cn -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/zh -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/uk -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/sv -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/sk -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/ru -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/ro -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/pt_br -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/pt -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/pl -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/no -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/ja -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/it -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/he -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/fr -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/es -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/el -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/de_de -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/de -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/ca -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/bg -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views/ar -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/zh_tw -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/zh_cn -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/vi -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/uk -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ta_in -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/sv -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/sk -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ru -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ro -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/pt_br -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/pt -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/pl -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/no -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/nl -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ja -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/it -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/id -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/hu -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/he -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/fr -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/es -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/el -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/de_de -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/de -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/cs -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ca -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/bg -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages/ar -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/messages -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements/css -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/requirements -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/views/site -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/models -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/data -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/controllers -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/config -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected/components -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/protected -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex/html-template/history -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex/html-template -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex/bin/history -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex/bin -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex/.settings -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook/flex -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/phonebook -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/helloworld/protected/controllers -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/helloworld/protected -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/helloworld -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/views/layouts -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/views/game -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/runtime -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/controllers -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected/config -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/protected -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman/assets -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/hangman -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/themes/classic/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/themes/classic -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/themes -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views/site/pages -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views/site -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views/post -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views/layouts -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views/comment -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/tests/unit -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/tests/functional -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/tests/fixtures -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/tests -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/runtime -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/models -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/data -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/controllers -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/config -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/components/views -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected/components -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/protected -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/css -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog/assets -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos/blog -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/demos -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% -@mode @owner @group From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 08:18:10 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFB09B98; Fri, 21 Nov 2014 08:18:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BBD7DAC5; Fri, 21 Nov 2014 08:18:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL8IAmD047411; Fri, 21 Nov 2014 08:18:10 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL8IAPc047409; Fri, 21 Nov 2014 08:18:10 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201411210818.sAL8IAPc047409@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 21 Nov 2014 08:18:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372981 - in branches/2014Q4/www/kwebkitpart: . 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.18-1 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, 21 Nov 2014 08:18:10 -0000 Author: rakuco Date: Fri Nov 21 08:18:09 2014 New Revision: 372981 URL: https://svnweb.freebsd.org/changeset/ports/372981 QAT: https://qat.redports.org/buildarchive/r372981/ Log: MFH: r372965 Add upstream patch for CVE-2014-8600 (insufficient input validation). Security: 890b6b22-70fa-11e4-91ae-5453ed2e2b49 Approved by: ports-secteam (rea) Added: branches/2014Q4/www/kwebkitpart/files/ - copied from r372965, head/www/kwebkitpart/files/ Modified: branches/2014Q4/www/kwebkitpart/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/kwebkitpart/Makefile ============================================================================== --- branches/2014Q4/www/kwebkitpart/Makefile Fri Nov 21 08:15:11 2014 (r372980) +++ branches/2014Q4/www/kwebkitpart/Makefile Fri Nov 21 08:18:09 2014 (r372981) @@ -2,7 +2,7 @@ PORTNAME= kwebkitpart PORTVERSION= 1.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www kde MASTER_SITES= LOCAL/makc From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 08:20:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 341E8C93; Fri, 21 Nov 2014 08:20:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 20A7EADB; Fri, 21 Nov 2014 08:20:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL8K26H048810; Fri, 21 Nov 2014 08:20:02 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL8K1M3048808; Fri, 21 Nov 2014 08:20:01 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201411210820.sAL8K1M3048808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 21 Nov 2014 08:20:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372982 - branches/2014Q4/www/kwebkitpart 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.18-1 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, 21 Nov 2014 08:20:02 -0000 Author: rakuco Date: Fri Nov 21 08:20:01 2014 New Revision: 372982 URL: https://svnweb.freebsd.org/changeset/ports/372982 QAT: https://qat.redports.org/buildarchive/r372982/ Log: MFH: r372980 Set CPE information, as requested by rea. Approved by: ports-secteam (rea) Modified: branches/2014Q4/www/kwebkitpart/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/kwebkitpart/Makefile ============================================================================== --- branches/2014Q4/www/kwebkitpart/Makefile Fri Nov 21 08:18:09 2014 (r372981) +++ branches/2014Q4/www/kwebkitpart/Makefile Fri Nov 21 08:20:01 2014 (r372982) @@ -12,6 +12,8 @@ COMMENT= Web browser component for KDE S USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_QT4= designer gui webkit \ moc_build qmake_build rcc_build uic_build -USES= cmake tar:xz +USES= cmake cpe tar:xz + +CPE_VENDOR= urs_wolfer .include From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 08:24:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1320DEF7; Fri, 21 Nov 2014 08:24:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D9635B8E; Fri, 21 Nov 2014 08:24:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL8OkiW055500; Fri, 21 Nov 2014 08:24:46 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL8OkGF055496; Fri, 21 Nov 2014 08:24:46 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201411210824.sAL8OkGF055496@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 21 Nov 2014 08:24:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372983 - in branches/2014Q4/x11/kde4-runtime: . 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.18-1 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, 21 Nov 2014 08:24:47 -0000 Author: rakuco Date: Fri Nov 21 08:24:45 2014 New Revision: 372983 URL: https://svnweb.freebsd.org/changeset/ports/372983 QAT: https://qat.redports.org/buildarchive/r372983/ Log: MFH: r372966 Add upstream patch for CVE-2014-8600 (insufficient input validation). Security: 890b6b22-70fa-11e4-91ae-5453ed2e2b49 Approved by: ports-secteam (rea) Added: branches/2014Q4/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp - copied unchanged from r372966, head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp Modified: branches/2014Q4/x11/kde4-runtime/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/x11/kde4-runtime/Makefile ============================================================================== --- branches/2014Q4/x11/kde4-runtime/Makefile Fri Nov 21 08:20:01 2014 (r372982) +++ branches/2014Q4/x11/kde4-runtime/Makefile Fri Nov 21 08:24:45 2014 (r372983) @@ -2,7 +2,7 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2014Q4/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp (from r372966, head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp Fri Nov 21 08:24:45 2014 (r372983, copy of r372966, head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp) @@ -0,0 +1,25 @@ +commit d68703900edc8416fbcd2550cd336cbbb76decb9 +Author: Martin Sandsmark +Date: Thu Nov 13 13:29:01 2014 +0100 + + Sanitize path + +--- kioslave/bookmarks/kio_bookmarks.cpp ++++ kioslave/bookmarks/kio_bookmarks.cpp +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + #include +@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& url ) + echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); + } else { + echoHead(); +- echo("

" + i18n("Wrong request: %1",path) + "

"); ++ echo("

" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "

"); + } + finished(); + } From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 10:06:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A501D15; Fri, 21 Nov 2014 10:06:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 267668B4; Fri, 21 Nov 2014 10:06:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALA6daE053627; Fri, 21 Nov 2014 10:06:39 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALA6coe053623; Fri, 21 Nov 2014 10:06:38 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201411211006.sALA6coe053623@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Fri, 21 Nov 2014 10:06:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372985 - branches/2014Q4/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.18-1 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, 21 Nov 2014 10:06:39 -0000 Author: matthew Date: Fri Nov 21 10:06:38 2014 New Revision: 372985 URL: https://svnweb.freebsd.org/changeset/ports/372985 QAT: https://qat.redports.org/buildarchive/r372985/ Log: MFH: r372979 Security update to 4.2.12 - 4 security advisories covering XSS and information disclosure vulnerabilities Security: a5d4a82a-7153-11e4-88c7-6805ca0b3d42 Approved by: portmgr (rea) Modified: branches/2014Q4/databases/phpmyadmin/Makefile branches/2014Q4/databases/phpmyadmin/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q4/databases/phpmyadmin/Makefile Fri Nov 21 09:45:59 2014 (r372984) +++ branches/2014Q4/databases/phpmyadmin/Makefile Fri Nov 21 10:06:38 2014 (r372985) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.2.10.1 +DISTVERSION= 4.2.12 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2014Q4/databases/phpmyadmin/distinfo ============================================================================== --- branches/2014Q4/databases/phpmyadmin/distinfo Fri Nov 21 09:45:59 2014 (r372984) +++ branches/2014Q4/databases/phpmyadmin/distinfo Fri Nov 21 10:06:38 2014 (r372985) @@ -1,3 +1,2 @@ -SHA256 (phpMyAdmin-4.2.10.1-all-languages.tar.xz) = e27dfe93970543a6f4332bae576feb534c80cf8d046cd0626b6a019fe6f6fd96 -SIZE (phpMyAdmin-4.2.10.1-all-languages.tar.xz) = 5211604 - +SHA256 (phpMyAdmin-4.2.12-all-languages.tar.xz) = 29a5d980ca16f0ee20437f3e01e2ab553041ccf422221ebe26fb18f11261d74a +SIZE (phpMyAdmin-4.2.12-all-languages.tar.xz) = 5203736 From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 17:39:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFC3F454; Fri, 21 Nov 2014 17:39:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BAE1EFF5; Fri, 21 Nov 2014 17:39:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALHdUKF061914; Fri, 21 Nov 2014 17:39:30 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALHdTZs061897; Fri, 21 Nov 2014 17:39:29 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411211739.sALHdTZs061897@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 21 Nov 2014 17:39:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373005 - in branches/2014Q4/net: asterisk asterisk/files asterisk11 asterisk11/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.18-1 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, 21 Nov 2014 17:39:30 -0000 Author: madpilot Date: Fri Nov 21 17:39:28 2014 New Revision: 373005 URL: https://svnweb.freebsd.org/changeset/ports/373005 QAT: https://qat.redports.org/buildarchive/r373005/ Log: MFH: r372448 - Update net/asterisk to 1.8.32.0 - Update net/asterisk11 to 11.14.0 - Allow customizing startup options used by rc script [1] - While here, fix some rclint warnings Reported/Requested by: Emmanuel Coulon [1] Approved by: ports-secteam (rea) Modified: branches/2014Q4/net/asterisk/Makefile branches/2014Q4/net/asterisk/distinfo branches/2014Q4/net/asterisk/files/asterisk.in branches/2014Q4/net/asterisk11/Makefile branches/2014Q4/net/asterisk11/distinfo branches/2014Q4/net/asterisk11/files/asterisk.in Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/asterisk/Makefile ============================================================================== --- branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:39:28 2014 (r373005) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.31.1 +PORTVERSION= 1.8.32.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk/distinfo ============================================================================== --- branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:39:28 2014 (r373005) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.31.1.tar.gz) = 430e095e937a29ec13e58c2cab6b8299caec5bbe7a6af0f396a9f29fbc926e7d -SIZE (asterisk-1.8.31.1.tar.gz) = 29630590 +SHA256 (asterisk-1.8.32.0.tar.gz) = 37dee258431baf3ef726fb89f5d590b3e5498654f5080afed649697a0a227a8f +SIZE (asterisk-1.8.32.0.tar.gz) = 29639709 Modified: branches/2014Q4/net/asterisk/files/asterisk.in ============================================================================== --- branches/2014Q4/net/asterisk/files/asterisk.in Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/files/asterisk.in Fri Nov 21 17:39:28 2014 (r373005) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1" Modified: branches/2014Q4/net/asterisk11/Makefile ============================================================================== --- branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:39:28 2014 (r373005) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.13.1 +PORTVERSION= 11.14.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk11/distinfo ============================================================================== --- branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:39:28 2014 (r373005) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.13.1.tar.gz) = 382e914f3025f746d3a36cd218bc35f6a0f335b58226f35eaf4cc664b228d351 -SIZE (asterisk-11.13.1.tar.gz) = 34959077 +SHA256 (asterisk-11.14.0.tar.gz) = ad4710aba7f21c75bf1d16159a349034a04d3d36895243c262059a89f892098a +SIZE (asterisk-11.14.0.tar.gz) = 34975152 Modified: branches/2014Q4/net/asterisk11/files/asterisk.in ============================================================================== --- branches/2014Q4/net/asterisk11/files/asterisk.in Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/files/asterisk.in Fri Nov 21 17:39:28 2014 (r373005) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1" From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 21 17:41:11 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A8F4780; Fri, 21 Nov 2014 17:41:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5C0096F; Fri, 21 Nov 2014 17:41:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALHfBhj065846; Fri, 21 Nov 2014 17:41:11 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALHfAJF065832; Fri, 21 Nov 2014 17:41:10 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411211741.sALHfAJF065832@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 21 Nov 2014 17:41:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373006 - in branches/2014Q4/net: asterisk asterisk11 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.18-1 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, 21 Nov 2014 17:41:11 -0000 Author: madpilot Date: Fri Nov 21 17:41:09 2014 New Revision: 373006 URL: https://svnweb.freebsd.org/changeset/ports/373006 QAT: https://qat.redports.org/buildarchive/r373006/ Log: MFH: r372996 - Update net/asterisk to 1.8.32.1 [1] - Update net/asterisk11 to 11.14.1 [2] Security: a92ed304-716c-11e4-b008-001999f8d30b [1] [2] Security: 7bfd797c-716d-11e4-b008-001999f8d30b [2] Approved by: ports-secteam (rea) Modified: branches/2014Q4/net/asterisk/Makefile branches/2014Q4/net/asterisk/distinfo branches/2014Q4/net/asterisk11/Makefile branches/2014Q4/net/asterisk11/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/asterisk/Makefile ============================================================================== --- branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:39:28 2014 (r373005) +++ branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:41:09 2014 (r373006) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.32.0 +PORTVERSION= 1.8.32.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk/distinfo ============================================================================== --- branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:39:28 2014 (r373005) +++ branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:41:09 2014 (r373006) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.32.0.tar.gz) = 37dee258431baf3ef726fb89f5d590b3e5498654f5080afed649697a0a227a8f -SIZE (asterisk-1.8.32.0.tar.gz) = 29639709 +SHA256 (asterisk-1.8.32.1.tar.gz) = 89be3fa2b9de10685afa1ec1413768d4b6f1107312e403f0f798eaddadea7ba3 +SIZE (asterisk-1.8.32.1.tar.gz) = 29636238 Modified: branches/2014Q4/net/asterisk11/Makefile ============================================================================== --- branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:39:28 2014 (r373005) +++ branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:41:09 2014 (r373006) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.14.0 +PORTVERSION= 11.14.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk11/distinfo ============================================================================== --- branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:39:28 2014 (r373005) +++ branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:41:09 2014 (r373006) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.14.0.tar.gz) = ad4710aba7f21c75bf1d16159a349034a04d3d36895243c262059a89f892098a -SIZE (asterisk-11.14.0.tar.gz) = 34975152 +SHA256 (asterisk-11.14.1.tar.gz) = bc46e3b8dcfec84ac327000ad11fcce96869b256612a71bee5d19b7c5e93b8a8 +SIZE (asterisk-11.14.1.tar.gz) = 34966823 From owner-svn-ports-branches@FreeBSD.ORG Sat Nov 22 18:47:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14A213DC; Sat, 22 Nov 2014 18:47:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 011583DC; Sat, 22 Nov 2014 18:47:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMIlbkV029484; Sat, 22 Nov 2014 18:47:37 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMIlbDP029483; Sat, 22 Nov 2014 18:47:37 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201411221847.sAMIlbDP029483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 22 Nov 2014 18:47:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373089 - branches/2014Q4/misc/getopt 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.18-1 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, 22 Nov 2014 18:47:38 -0000 Author: sunpoet Date: Sat Nov 22 18:47:37 2014 New Revision: 373089 URL: https://svnweb.freebsd.org/changeset/ports/373089 QAT: https://qat.redports.org/buildarchive/r373089/ Log: MFH: r373015 - Fix MASTER_SITES PR: ports/195247 Submitted by: Thomas Schweikle Approved by: ports-secteam (rea) Modified: branches/2014Q4/misc/getopt/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/misc/getopt/Makefile ============================================================================== --- branches/2014Q4/misc/getopt/Makefile Sat Nov 22 18:46:05 2014 (r373088) +++ branches/2014Q4/misc/getopt/Makefile Sat Nov 22 18:47:37 2014 (r373089) @@ -4,7 +4,7 @@ PORTNAME= getopt PORTVERSION= 1.1.5 CATEGORIES= misc -MASTER_SITES= http://software.frodo.looijaard.name/getopt/files/ \ +MASTER_SITES= http://frodo.looijaard.name/system/files/software/getopt/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org