From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 11 20:07:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AC29899 for ; Mon, 11 Aug 2014 20:07:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67D6D2C98 for ; Mon, 11 Aug 2014 20:07:25 +0000 (UTC) Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2ca1 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 20:07:25 +0000 From: Olli Hauer Date: Mon, 11 Aug 2014 20:07:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364651 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e9227d.2ca1.41dd1ebe@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 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, 11 Aug 2014 20:07:25 -0000 Author: ohauer Date: Mon Aug 11 20:07:24 2014 New Revision: 364651 URL: http://svnweb.freebsd.org/changeset/ports/364651 QAT: https://qat.redports.org/buildarchive/r364651/ Log: MFH: r364230 Document OpenSSL multiple vulnerabilities. MFH: r364456 Document nginx vulnerability. MFH: r364494 Fix typo. Found by: rene MFH: r364637 - document subversion CVE-2014-3522, CVE-2014-3528 MFH: r364638 - document serf CVE-2014-3504 MFH: r364641 - INSERT URL HERE Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Mon Aug 11 20:05:02 2014 (r364650) +++ branches/2014Q3/security/vuxml/vuln.xml Mon Aug 11 20:07:24 2014 (r364651) @@ -57,6 +57,193 @@ Notes: --> + + serf -- SSL Certificate Null Byte Poisoning + + + serf + 1.3.7 + + + + +

serf Development list reports:

+
Serf provides APIs to retrieve information about a certificate. These + APIs return the information as NUL terminated strings (commonly called C + strings). X.509 uses counted length strings which may include a NUL byte. + This means that a library user will interpret any information as ending + upon seeing this NUL byte and will only see a partial value for that field. +
+
Attackers could exploit this vulnerability to create a certificate that a + client will accept for a different hostname than the full certificate is + actually for by embedding a NUL byte in the certificate.
+
This can lead to a man-in-the-middle attack. There are no known instances + of this problem being exploited in the wild and in practice it should be + difficult to actually exploit this vulnerability.
+

+ + + + CVE-2014-3504 + + + 2014-08-06 + 2014-08-11 + + + + + subversion -- several vulnerabilities + + + subversion17 + 1.7.01.7.18 + + + subversion18 + 1.8.01.8.10 + + + + +

Subversion Project reports:

+
Using the Serf RA layer of Subversion for HTTPS uses the apr_fnmatch API + to handle matching wildcards in certificate Common Names and Subject + Alternate Names. However, apr_fnmatch is not designed for this purpose. + Instead it is designed to behave like common shell globbing. In particular + this means that '*' is not limited to a single label within a hostname + (i.e. it will match '.'). But even further apr_fnmatch supports '?' and + character classes (neither of which are part of the RFCs defining how + certificate validation works).
+
Subversion stores cached credentials by an MD5 hash based on the URL and + the authentication realm of the server the credentials are cached for. + MD5 has been shown to be subject to chosen plaintext hash collisions. + This means it may be possible to generate an authentication realm which + results in the same MD5 hash for a different URL.
+

+ + + + CVE-2014-3522 + CVE-2014-3528 + http://subversion.apache.org/security/CVE-2014-3522-advisory.txt + http://subversion.apache.org/security/CVE-2014-3528-advisory.txt + + + 2014-08-06 + 2014-08-11 + + + + + nginx -- inject commands into SSL session vulnerability + + + nginx + 1.6.0,21.6.1,2 + + + nginx-devel + 1.5.61.7.4 + + + + +

The nginx project reports:

+
Security: pipelined commands were not discarded after STARTTLS + command in SMTP proxy (CVE-2014-3556); the bug had appeared in 1.5.6.
+

+ + + + CVE-2014-3556 + http://mailman.nginx.org/pipermail/nginx-announce/2014/000144.html + + + 2014-08-05 + 2014-08-09 + + + + + OpenSSL -- multiple vulnerabilities + + + openssl + 1.0.11.0.1_14 + + + mingw32-openssl + 1.0.11.0.1i + + + + +

The OpenSSL Project reports:

+
A flaw in OBJ_obj2txt may cause pretty printing functions + such as X509_name_oneline, X509_name_print_ex et al. to leak + some information from the stack. [CVE-2014-3508]
+
The issue affects OpenSSL clients and allows a malicious + server to crash the client with a null pointer dereference + (read) by specifying an SRP ciphersuite even though it was + not properly negotiated with the client. [CVE-2014-5139]
+
If a multithreaded client connects to a malicious server + using a resumed session and the server sends an ec point + format extension it could write up to 255 bytes to freed + memory. [CVE-2014-3509]
+
An attacker can force an error condition which causes + openssl to crash whilst processing DTLS packets due to + memory being freed twice. This can be exploited through + a Denial of Service attack. [CVE-2014-3505]
+
An attacker can force openssl to consume large amounts + of memory whilst processing DTLS handshake messages. + This can be exploited through a Denial of Service + attack. [CVE-2014-3506]
+
By sending carefully crafted DTLS packets an attacker + could cause openssl to leak memory. This can be exploited + through a Denial of Service attack. [CVE-2014-3507]
+
OpenSSL DTLS clients enabling anonymous (EC)DH + ciphersuites are subject to a denial of service attack. + A malicious server can crash the client with a null pointer + dereference (read) by specifying an anonymous (EC)DH + ciphersuite and sending carefully crafted handshake + messages. [CVE-2014-3510]
+
A flaw in the OpenSSL SSL/TLS server code causes the + server to negotiate TLS 1.0 instead of higher protocol + versions when the ClientHello message is badly + fragmented. This allows a man-in-the-middle attacker + to force a downgrade to TLS 1.0 even if both the server + and the client support a higher protocol version, by + modifying the client's TLS records. [CVE-2014-3511]
+
A malicious client or server can send invalid SRP + parameters and overrun an internal buffer. Only + applications which are explicitly set up for SRP + use are affected. [CVE-2014-3512]
+

+ + + + https://www.openssl.org/news/secadv_20140806.txt + CVE-2014-3505 + CVE-2014-3506 + CVE-2014-3507 + CVE-2014-3508 + CVE-2014-3509 + CVE-2014-3510 + CVE-2014-3511 + CVE-2014-3512 + CVE-2014-5139 + + + 2014-08-06 + 2014-08-06 + + + krfb -- Possible Denial of Service or code execution via integer overflow From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 11 20:22:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32E81CC for ; Mon, 11 Aug 2014 20:22:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 082E42EBF for ; Mon, 11 Aug 2014 20:22:05 +0000 (UTC) Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2488 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 20:22:04 +0000 From: Olli Hauer Date: Mon, 11 Aug 2014 20:22:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364657 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e925ec.2488.3b5c7021@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 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, 11 Aug 2014 20:22:05 -0000 Author: ohauer Date: Mon Aug 11 20:22:04 2014 New Revision: 364657 URL: http://svnweb.freebsd.org/changeset/ports/364657 QAT: https://qat.redports.org/buildarchive/r364657/ Log: - fix package name s/subversion18/subversion/ Thanks to jkim@ for the notice! Approved by: portmgr (implicit) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Mon Aug 11 20:20:51 2014 (r364656) +++ branches/2014Q3/security/vuxml/vuln.xml Mon Aug 11 20:22:04 2014 (r364657) @@ -101,7 +101,7 @@ Notes: 1.7.01.7.18 - subversion18 + subversion 1.8.01.8.10 From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 11 20:32:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76E417DE for ; Mon, 11 Aug 2014 20:32:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56A1620B2 for ; Mon, 11 Aug 2014 20:32:57 +0000 (UTC) Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2a7f by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 20:32:56 +0000 From: Olli Hauer Date: Mon, 11 Aug 2014 20:32:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364660 - branches/2014Q3/www/apache24 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e92879.2a7f.56dcf6c6@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 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, 11 Aug 2014 20:32:57 -0000 Author: ohauer Date: Mon Aug 11 20:32:56 2014 New Revision: 364660 URL: http://svnweb.freebsd.org/changeset/ports/364660 QAT: https://qat.redports.org/buildarchive/r364660/ Log: MFH: r364481 - adjust default modules, changed during the last revisions + SESSION_DBD + SLOTMEM_SHM (e.g neeed for mod_ajp) - CERN_META - Use OPTION desc. from modules/config.m4 to match upstream - bump PORTREVISION with hat apache@ Approved by: portmgr (mat@) Modified: branches/2014Q3/www/apache24/Makefile branches/2014Q3/www/apache24/Makefile.options branches/2014Q3/www/apache24/Makefile.options.desc Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/apache24/Makefile ============================================================================== --- branches/2014Q3/www/apache24/Makefile Mon Aug 11 20:32:07 2014 (r364659) +++ branches/2014Q3/www/apache24/Makefile Mon Aug 11 20:32:56 2014 (r364660) @@ -2,6 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.10 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -150,10 +151,10 @@ post-configure: post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ - ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${ETCDIR}/modules.d/ + ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/ # place for module configuration samples @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d - ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${EXAMPLESDIR}/modules.d + ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/modules.d # suppress warning for non binary files -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* \ Modified: branches/2014Q3/www/apache24/Makefile.options ============================================================================== --- branches/2014Q3/www/apache24/Makefile.options Mon Aug 11 20:32:07 2014 (r364659) +++ branches/2014Q3/www/apache24/Makefile.options Mon Aug 11 20:32:56 2014 (r364660) @@ -18,10 +18,9 @@ PROXY_DISABLED_MODULES= \ # SESSION_CRYPTO need APR build with crypto (EVP support in APR) SESSION_ENABLED_MODULES= \ - SESSION_COOKIE SESSION_CRYPTO + SESSION_COOKIE SESSION_CRYPTO SESSION_DBD -SESSION_DISABLED_MODULES= \ - SESSION_DBD +SESSION_DISABLED_MODULES= HEARTBEAT_MODULES= \ HEARTBEAT HEARTMONITOR LBMETHOD_HEARTBEAT @@ -40,7 +39,7 @@ MOST_ENABLED_MODULES= \ AUTHZ_OWNER AUTHZ_USER \ AUTH_BASIC AUTH_DIGEST AUTH_FORM AUTOINDEX \ BUFFER \ - CACHE CACHE_DISK CACHE_SOCACHE CERN_META CGI CGID \ + CACHE CACHE_DISK CACHE_SOCACHE CGI CGID \ DAV DAV_FS DBD DEFLATE DIR DUMPIO \ ENV EXPIRES EXT_FILTER \ FILE_CACHE FILTER \ @@ -51,14 +50,14 @@ MOST_ENABLED_MODULES= \ MACRO MIME MIME_MAGIC \ NEGOTIATION \ RATELIMIT REMOTEIP REQTIMEOUT REQUEST REWRITE \ - SED SETENVIF SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \ + SED SETENVIF SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \ SSL STATUS SUBSTITUTE \ UNIQUE_ID USERDIR \ VERSION VHOST_ALIAS MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP AUTHNZ_FCGI LDAP CHARSET_LITE DATA DAV_LOCK DIALUP IDENT LOG_FORENSIC \ - LUA REFLECTOR SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DC SUEXEC USERTRACK \ + AUTHNZ_LDAP AUTHNZ_FCGI LDAP CERN_META CHARSET_LITE DATA DAV_LOCK DIALUP IDENT \ + LOG_FORENSIC LUA REFLECTOR SLOTMEM_PLAIN SOCACHE_DC SUEXEC USERTRACK \ XML2ENC WATCHDOG ${HEARTBEAT_MODULES} ${EXAMPLE_MODULES} ${DEV_MODULES} #MULTI_MODULES:= ${OPTIONS_MULTI} Modified: branches/2014Q3/www/apache24/Makefile.options.desc ============================================================================== --- branches/2014Q3/www/apache24/Makefile.options.desc Mon Aug 11 20:32:07 2014 (r364659) +++ branches/2014Q3/www/apache24/Makefile.options.desc Mon Aug 11 20:32:56 2014 (r364660) @@ -36,13 +36,13 @@ STATIC_SUPPORT_DESC= static linked supp # ===================================== # modules -# deprecated: ACCESS_COMPAT -ACCESS_COMPAT_DESC= Old group authorizations based on host (name or IP), deprecated by mod_authz_host +# DESC from modules/*/config.m4 files +ACCESS_COMPAT_DESC= mod_access compatibility ACTIONS_DESC= Action triggering on requests ALIAS_DESC= Mapping of requests to different filesystem parts -ALLOWMETHODS_DESC= Easily restrict what HTTP methods can be used on the server +ALLOWMETHODS_DESC= Restrict allowed HTTP methods ASIS_DESC= Sends files that contain their own HTTP headers -AUTHNZ_FCGI_DESC= Allows a FastCGI authorizer to handle the check_authn hook +AUTHNZ_FCGI_DESC= FastCGI authorizer-based authentication and authorization AUTHNZ_LDAP_DESC= LDAP based authentication AUTHN_ANON_DESC= Anonymous user authentication control AUTHN_CORE_DESC= Core authentication module @@ -53,21 +53,21 @@ AUTHN_SOCACHE_DESC= Cached authenticati AUTHZ_CORE_DESC= Core authorization provider vector module AUTHZ_DBD_DESC= SQL based authorization and Login/Session support AUTHZ_DBM_DESC= DBM-based authorization control -AUTHZ_GROUPFILE_DESC= Group authorization using plaintext files +AUTHZ_GROUPFILE_DESC= "require group" authorization control AUTHZ_HOST_DESC= Host-based authorization control -AUTHZ_OWNER_DESC= Authorization based on file ownership -AUTHZ_USER_DESC= User Authorization +AUTHZ_OWNER_DESC= "require file-owner" authorization control +AUTHZ_USER_DESC= "require user" authorization control AUTH_BASIC_DESC= Basic authentication AUTH_DIGEST_DESC= RFC2617 Digest authentication AUTH_FORM_DESC= Form authentication AUTOINDEX_DESC= Directory listing -BUCKETEER_DESC= (dev) buckets manipulation filter, useful only for developers and testing purposes +BUCKETEER_DESC= (dev) buckets manipulation filter BUFFER_DESC= Filter Buffering CACHE_DESC= Dynamic file caching CACHE_DISK_DESC= Disk caching module -CACHE_SOCACHE_DESC= Shared object cache (socache) based storage module for the HTTP caching filter +CACHE_SOCACHE_DESC= Shared object cacheing module CASE_FILTER_DESC= (dev) example uppercase conversion filter CASE_FILTER_IN_DESC= (dev) example uppercase conversion input filter CERN_META_DESC= CERN-type meta files @@ -86,9 +86,9 @@ DIR_DESC= Directory request handling DUMPIO_DESC= I/O dump filter ECHO_DESC= (dev) example echo server -ENV_DESC= Modifies environment passed to CGI/SSI pages -EXAMPLE_HOOKS_DESC= (dev) example hook module -EXAMPLE_IPC_DESC= (dev) example IPC module +ENV_DESC= Clearing/setting of ENV vars +EXAMPLE_HOOKS_DESC= (dev) example hook callback handler module +EXAMPLE_IPC_DESC= (dev) Example of shared memory and mutex usage EXPIRES_DESC= Expires header control EXT_FILTER_DESC= External filter module @@ -115,7 +115,7 @@ LOG_DEBUG_DESC= Configurable debug log LOG_FORENSIC_DESC= Forensic logging LUA_DESC= Apache Lua Framework -MACRO_DESC= Provides usage of macros within apache runtime configuration files +MACRO_DESC= Define and use macros in configuration files MIME_DESC= Mapp file-ext. to MIME (recommended) MIME_MAGIC_DESC= Automagically determining MIME type @@ -137,7 +137,7 @@ PROXY_FTP_DESC= FTP support module for PROXY_HTML_DESC= Fix HTML Links in a Reverse Proxy PROXY_HTTP_DESC= HTTP support module for mod_proxy PROXY_SCGI_DESC= SCGI gateway module for mod_proxy -PROXY_WSTUNNEL_DESC= Websockets support module for mod_proxy +PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy RATELIMIT_DESC= Output Bandwidth Limiting REFLECTOR_DESC= Reflect request through the output filter stack From owner-svn-ports-branches@FreeBSD.ORG Tue Aug 12 16:15:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 140ABFA for ; Tue, 12 Aug 2014 16:15:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDF772606 for ; Tue, 12 Aug 2014 16:15:07 +0000 (UTC) Received: from bdrewery (uid 1298) (envelope-from bdrewery@FreeBSD.org) id 6167 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 12 Aug 2014 16:15:07 +0000 From: Bryan Drewery Date: Tue, 12 Aug 2014 16:15:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364717 - in branches/2014Q3/ports-mgmt/pkg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53ea3d8b.6167.1e0a495e@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 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, 12 Aug 2014 16:15:08 -0000 Author: bdrewery Date: Tue Aug 12 16:15:07 2014 New Revision: 364717 URL: http://svnweb.freebsd.org/changeset/ports/364717 QAT: https://qat.redports.org/buildarchive/r364717/ Log: MFH: r360653 - Fix pkg-rquery -I to have all expected output. Obtained from: upstream 29c9c84e0e11c2c182a8d79634344e57bf2575f1 With hat: portmgr Reported by: dteske Added: branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I - copied unchanged from r360653, head/ports-mgmt/pkg/files/patch-rquery-I Modified: branches/2014Q3/ports-mgmt/pkg/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2014Q3/ports-mgmt/pkg/Makefile Tue Aug 12 16:07:26 2014 (r364716) +++ branches/2014Q3/ports-mgmt/pkg/Makefile Tue Aug 12 16:15:07 2014 (r364717) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ Copied: branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I (from r360653, head/ports-mgmt/pkg/files/patch-rquery-I) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I Tue Aug 12 16:15:07 2014 (r364717, copy of r360653, head/ports-mgmt/pkg/files/patch-rquery-I) @@ -0,0 +1,43 @@ +diff --git pkg/rquery.c pkg/rquery.c +index 7ce40f7..f967a34 100644 +--- pkg/rquery.c ++++ pkg/rquery.c +@@ -84,13 +84,23 @@ print_index(struct pkg *pkg) + #ifndef PORTSDIR + #define PORTSDIR "/usr/ports" + #endif +- struct pkg_category *cat = NULL; + +- pkg_printf("%n-%v|" PORTSDIR "/%o|%p|%c|" PORTSDIR "/%o/pkg-descr|%m|", +- pkg, pkg, pkg, pkg, pkg, pkg, pkg); +- while (pkg_categories(pkg, &cat) == EPKG_OK) +- pkg_printf("%Cn ", cat); +- printf("\n"); ++ pkg_printf( ++ "%n-%v|" /* PKGNAME */ ++ "%S/%o|" /* PORTDIR */ ++ "%p|" /* PREFIX */ ++ "%c|" /* COMMENT */ ++ "%S/%o/pkg-descr|" /* _DESCR */ ++ "%m|" /* MAINTAINER */ ++ "%C%{%Cn%| %}|" /* CATEGORIES */ ++ "|" /* BUILD_DEPENDS */ ++ "%d%{%dn-%dv%| %}|" /* RUN_DEPENDS */ ++ "%w|" /* WWW */ ++ "|" /* EXTRACT_DEPENDS */ ++ "|" /* PATCH_DEPENDS */ ++ "\n", /* FETCH_DEPENDS */ ++ pkg, pkg, PORTSDIR, pkg, pkg, pkg, PORTSDIR, pkg, pkg, pkg, pkg, ++ pkg); + } + + int +@@ -201,7 +211,7 @@ exec_rquery(int argc, char **argv) + return (EX_IOERR); + + if (index_output) +- query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES; ++ query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES|PKG_LOAD_DEPS; + + if (match == MATCH_ALL || match == MATCH_CONDITION) { + const char *condition_sql = NULL; From owner-svn-ports-branches@FreeBSD.ORG Tue Aug 12 20:56:24 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5ADB271D for ; Tue, 12 Aug 2014 20:56:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FF3F2172 for ; Tue, 12 Aug 2014 20:56:24 +0000 (UTC) Received: from riggs (uid 1334) (envelope-from riggs@FreeBSD.org) id 6d9f by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 12 Aug 2014 20:56:23 +0000 From: Thomas Zander Date: Tue, 12 Aug 2014 20:56:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364745 - in branches/2014Q3/net-mgmt/isic: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53ea7f78.6d9f.1a45c776@svn.freebsd.org> 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, 12 Aug 2014 20:56:24 -0000 Author: riggs Date: Tue Aug 12 20:56:23 2014 New Revision: 364745 URL: http://svnweb.freebsd.org/changeset/ports/364745 QAT: https://qat.redports.org/buildarchive/r364745/ Log: MFH: r364738 - Fix build failure on 9.1 - Simplify Makefile in the process PR: 190649 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer) Reviewed by: Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer) Approved by: portmgr (erwin), mentors (implicit), maintainer Modified: branches/2014Q3/net-mgmt/isic/Makefile branches/2014Q3/net-mgmt/isic/files/patch-isic.h Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/net-mgmt/isic/Makefile ============================================================================== --- branches/2014Q3/net-mgmt/isic/Makefile Tue Aug 12 20:55:08 2014 (r364744) +++ branches/2014Q3/net-mgmt/isic/Makefile Tue Aug 12 20:56:23 2014 (r364745) @@ -19,16 +19,10 @@ USES= tar:tgz LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config -.include - post-patch: -.if ${OSVERSION} > 900000 - @${REINPLACE_CMD} -e 's|2147483647|2147483645|' \ - ${WRKSRC}/isic.h -.endif @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \ ${WRKSRC}/Makefile.in -.include +.include Modified: branches/2014Q3/net-mgmt/isic/files/patch-isic.h ============================================================================== --- branches/2014Q3/net-mgmt/isic/files/patch-isic.h Tue Aug 12 20:55:08 2014 (r364744) +++ branches/2014Q3/net-mgmt/isic/files/patch-isic.h Tue Aug 12 20:56:23 2014 (r364745) @@ -1,5 +1,5 @@ --- isic.h.orig 2006-12-16 01:08:44.000000000 +0100 -+++ isic.h 2013-02-18 07:36:38.000000000 +0100 ++++ isic.h 2014-08-11 16:25:34.551003726 +0200 @@ -5,11 +5,15 @@ #endif @@ -16,3 +16,15 @@ #ifndef ETHER_FRAME_SIZE #define ETHER_FRAME_SIZE 1500 +@@ -21,11 +25,6 @@ + #define IP6_FRAGH 8 + #define ICMP6_H 8 + +-/* We want a random function that returns 0 to 0x7fff */ +-#if ( RAND_MAX != 2147483647 ) /* expect signed long */ +-#error Random IP generation broken: unexpected RAND_MAX. +-#endif +- + #define RAND8 ((u_int8_t)(rand() & 0xff)) + #define RAND16 ((u_int16_t)(rand() & 0xffff)) + #define RAND32 ((u_int32_t)((RAND16 << 16) + RAND16)) From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 13 06:48:18 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1E3CD1A; Wed, 13 Aug 2014 06:48: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 B5B6B2728; Wed, 13 Aug 2014 06:48: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 s7D6mIYs037471; Wed, 13 Aug 2014 06:48:18 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7D6mIDt037470; Wed, 13 Aug 2014 06:48:18 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408130648.s7D6mIDt037470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 13 Aug 2014 06:48:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364756 - branches/2014Q3/security/vuxml 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: Wed, 13 Aug 2014 06:48:19 -0000 Author: rene Date: Wed Aug 13 06:48:18 2014 New Revision: 364756 URL: http://svnweb.freebsd.org/changeset/ports/364756 QAT: https://qat.redports.org/buildarchive/r364756/ Log: MFH: r364755 Document new vulnerabilities in www/chromium < 36.0.1985.143 Submitted by: Carlos Jacobo Puga Media Obtained from: http://googlechromereleases.blogspot.nl/ Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Wed Aug 13 06:43:35 2014 (r364755) +++ branches/2014Q3/security/vuxml/vuln.xml Wed Aug 13 06:48:18 2014 (r364756) @@ -57,6 +57,42 @@ Notes: --> + + chromium -- multiple vulnerabilities + + + chromium + 36.0.1985.143 + + + + +

Google Chrome Releases reports:

+
12 security fixes in this release, including
+
+
[390174] High CVE-2014-3165: Use-after-free in web sockets. + Credit to Collin Payne.
+
[398925] High CVE-2014-3166: Information disclosure in SPDY. + Credit to Antoine Delignat-Lavaud.
+
[400950] CVE-2014-3167: Various fixes from internal audits, + fuzzing and other initiatives.
+
+

+ + + + CVE-2014-3165 + CVE-2014-3166 + CVE-2014-3167 + http://googlechromereleases.blogspot.nl + + + 2014-08-12 + 2014-08-13 + + + serf -- SSL Certificate Null Byte Poisoning From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 13 09:36:26 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3C96957; Wed, 13 Aug 2014 09:36:25 +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 C5A9A2ADB; Wed, 13 Aug 2014 09:36:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7D9aPmR017018; Wed, 13 Aug 2014 09:36:25 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7D9aP19017015; Wed, 13 Aug 2014 09:36:25 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408130936.s7D9aP19017015@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 13 Aug 2014 09:36:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364769 - branches/2014Q3/textproc/sassc 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: Wed, 13 Aug 2014 09:36:26 -0000 Author: antoine Date: Wed Aug 13 09:36:25 2014 New Revision: 364769 URL: http://svnweb.freebsd.org/changeset/ports/364769 QAT: https://qat.redports.org/buildarchive/r364769/ Log: MFH: r360717 - Fix fetch. The project was transferred to github.com/sass account - Fix distinfo. No difference in the source code: http://people.freebsd.org/~nivit/public_distfiles/sassc/1.0.1-hcatlin/sassc-1.0.1.tar.gz (old distfile) http://people.freebsd.org/~nivit/public_distfiles/sassc/1.0.1-sass/sassc-1.0.1.tar.gz (new distfile) - Bump PORTREVISION Pointed out by: amdmi3 (see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191437 ) Modified: branches/2014Q3/textproc/sassc/Makefile branches/2014Q3/textproc/sassc/distinfo (contents, props changed) Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/textproc/sassc/Makefile ============================================================================== --- branches/2014Q3/textproc/sassc/Makefile Wed Aug 13 09:32:16 2014 (r364768) +++ branches/2014Q3/textproc/sassc/Makefile Wed Aug 13 09:36:25 2014 (r364769) @@ -3,7 +3,7 @@ PORTNAME= sassc PORTVERSION= 1.0.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= nivit@FreeBSD.org @@ -17,7 +17,7 @@ AUTOMAKE_ARGS= --add-missing CPPFLAGS+= -I${LOCALBASE}/include -GH_ACCOUNT= hcatlin +GH_ACCOUNT= sass GH_COMMIT= 9451dd7 GH_TAGNAME= v${PORTVERSION} Modified: branches/2014Q3/textproc/sassc/distinfo ============================================================================== --- branches/2014Q3/textproc/sassc/distinfo Wed Aug 13 09:32:16 2014 (r364768) +++ branches/2014Q3/textproc/sassc/distinfo Wed Aug 13 09:36:25 2014 (r364769) @@ -1,2 +1,2 @@ -SHA256 (sassc-1.0.1.tar.gz) = 895d78974907fc00dd01acf20836f924965c4bb4fe6cbdf4e11e18b7e1848107 -SIZE (sassc-1.0.1.tar.gz) = 5561 +SHA256 (sassc-1.0.1.tar.gz) = bd8e8fa11d31fec295867e8682d1afb63361d3cfb48071d59e80ace6127479b8 +SIZE (sassc-1.0.1.tar.gz) = 5553 From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 13 09:38:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E74BEA3E; Wed, 13 Aug 2014 09:38:07 +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 D30C62AE6; Wed, 13 Aug 2014 09:38:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7D9c7oI017351; Wed, 13 Aug 2014 09:38:07 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7D9c7xH017350; Wed, 13 Aug 2014 09:38:07 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408130938.s7D9c7xH017350@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 13 Aug 2014 09:38:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364770 - branches/2014Q3/graphics/iccxml 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: Wed, 13 Aug 2014 09:38:08 -0000 Author: antoine Date: Wed Aug 13 09:38:07 2014 New Revision: 364770 URL: http://svnweb.freebsd.org/changeset/ports/364770 QAT: https://qat.redports.org/buildarchive/r364770/ Log: MFH: r364410 Mark BROKEN: fails to build /bin/sh ../libtool --tag=CXX --mode=compile c++ -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"IccXML\" -DVERSION=\"0.9.6\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRERROR=1 -I. -I.. -I../IccXML -I/usr/local/include/SampleICC -I/usr/local/include/libxml2 -I/usr/local/include -O2 -pipe -fno-strict-aliasing -MT IccMpeXml.lo -MD -MP -MF .deps/IccMpeXml.Tpo -c -o IccMpeXml.lo IccMpeXml.cpp libtool: compile: c++ -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"IccXML\" -DVERSION=\"0.9.6\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRERROR=1 -I. -I.. -I../IccXML -I/usr/local/include/SampleICC -I/usr/local/include/libxml2 -I/usr/local/include -O2 -pipe -fno-strict-aliasing -MT IccMpeXml.lo -MD -MP -MF .deps/IccMpeXml.Tpo -c IccMpeXml.cpp -fPIC -DPIC -o .libs/IccMpeXml.o In file included from IccMpeXml.cpp:65: IccUtilXml.h:197:23: warning: no newline at end of file In file included from IccMpeXml.cpp:65: IccUtilXml.h:73: error: redefinition of 'class CIccUTF16String' /usr/local/include/SampleICC/IccUtil.h:317: error: previous definition of 'class CIccUTF16String' IccUtilXml.h:112: error: default argument given for parameter 3 of 'const char* icUtf16ToUtf8(std::string&, const icUInt16Number*, int)' /usr/local/include/SampleICC/IccUtil.h:354: error: after previous specification in 'const char* icUtf16ToUtf8(std::string&, const icUInt16Number*, int)' IccUtilXml.h:113: error: default argument given for parameter 3 of 'const short unsigned int* icUtf8ToUtf16(CIccUTF16String&, const char*, int)' /usr/local/include/SampleICC/IccUtil.h:355: error: after previous specification in 'const short unsigned int* icUtf8ToUtf16(CIccUTF16String&, const char*, int)' gmake[1]: *** [IccMpeXml.lo] Error 1 Reported by: pkg-fallout Modified: branches/2014Q3/graphics/iccxml/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/graphics/iccxml/Makefile ============================================================================== --- branches/2014Q3/graphics/iccxml/Makefile Wed Aug 13 09:36:25 2014 (r364769) +++ branches/2014Q3/graphics/iccxml/Makefile Wed Aug 13 09:38:07 2014 (r364770) @@ -10,6 +10,8 @@ DISTNAME= IccXML-${PORTVERSION} MAINTAINER= bsam@FreeBSD.org COMMENT= Tools for reading and writing the ICC profile contents as XML files +BROKEN= Fails to build with sampleicc 1.6.8 + LIB_DEPENDS= libSampleICC.so:${PORTSDIR}/graphics/sampleicc USES= gmake pathfix pkgconfig libtool From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 14 23:06:14 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 193C291D; Thu, 14 Aug 2014 23:06:14 +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 052C54E4D; Thu, 14 Aug 2014 23:06:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7EN6D5p064787; Thu, 14 Aug 2014 23:06:13 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7EN6DlR064786; Thu, 14 Aug 2014 23:06:13 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408142306.s7EN6DlR064786@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 14 Aug 2014 23:06:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364875 - branches/2014Q3/misc 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, 14 Aug 2014 23:06:14 -0000 Author: rene Date: Thu Aug 14 23:06:13 2014 New Revision: 364875 URL: http://svnweb.freebsd.org/changeset/ports/364875 QAT: https://qat.redports.org/buildarchive/r364875/ Log: MFH: r364874 Fix INDEX by adding misc/usbids to misc/Makefile Pointyhat: bapt (3 months overdue ...) Approved by: portmgr (bdrewery) Modified: branches/2014Q3/misc/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/misc/Makefile ============================================================================== --- branches/2014Q3/misc/Makefile Thu Aug 14 22:42:36 2014 (r364874) +++ branches/2014Q3/misc/Makefile Thu Aug 14 23:06:13 2014 (r364875) @@ -448,6 +448,7 @@ SUBDIR += unclutter SUBDIR += upclient SUBDIR += us-zipcodes + SUBDIR += usbids SUBDIR += usbrh-libusb SUBDIR += utftools SUBDIR += valspeak From owner-svn-ports-branches@FreeBSD.ORG Fri Aug 15 19:01:18 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B1B35C0; Fri, 15 Aug 2014 19:01: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 232D82B21; Fri, 15 Aug 2014 19:01: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 s7FJ1Ijk030050; Fri, 15 Aug 2014 19:01:18 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FJ1BhE030000; Fri, 15 Aug 2014 19:01:11 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408151901.s7FJ1BhE030000@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 15 Aug 2014 19:01:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365022 - in branches/2014Q3/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: Fri, 15 Aug 2014 19:01:18 -0000 Author: rene Date: Fri Aug 15 19:01:10 2014 New Revision: 365022 URL: http://svnweb.freebsd.org/changeset/ports/365022 QAT: https://qat.redports.org/buildarchive/r365022/ Log: MFH: r364870 - Update to 36.0.1985.143 and unforbid - Use a lot of ports dependencies instead of bundled versions (idea from Gentoo Linux) - Make patches more compatible with OpenBSD - Add note about Python (only relevant for DIY builds) - Install more icons into PREFIX/share/icons/hicolor/XxY/apps/ - Mute mkdir in installation - Install mksnapshot binary - Do not install bundled protoc binary Obtained from: Gentoo, OpenBSD, various contributors in freebsd-chromium@ Security: http://www.vuxml.org/freebsd/df7754c0-2294-11e4-b505-000c6e25e3e9.html Approved by: portmgr (erwin) Added: branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc - copied unchanged from r364870, head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc branches/2014Q3/www/chromium/files/patch-base__process__launch.cc - copied unchanged from r364870, head/www/chromium/files/patch-base__process__launch.cc branches/2014Q3/www/chromium/files/patch-base__process__launch.h - copied unchanged from r364870, head/www/chromium/files/patch-base__process__launch.h branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp - copied unchanged from r364870, head/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi - copied unchanged from r364870, head/www/chromium/files/patch-build__filename_rules.gypi branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp - copied unchanged from r364870, head/www/chromium/files/patch-build__linux__system.gyp branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp - copied unchanged from r364870, head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc - copied unchanged from r364870, head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc - copied unchanged from r364870, head/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi - copied unchanged from r364870, head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2014Q3/www/chromium/files/patch-components__usb_service.gypi - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service.gypi branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_context.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_context.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_handle.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_device_handle.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_impl.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_device_impl.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_interface.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_interface.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_service_impl.cc - copied unchanged from r364870, head/www/chromium/files/patch-components__usb_service__usb_service_impl.cc branches/2014Q3/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc - copied unchanged from r364870, head/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc branches/2014Q3/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc - copied unchanged from r364870, head/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc branches/2014Q3/www/chromium/files/patch-net__base__address_tracker_linux.h - copied unchanged from r364870, head/www/chromium/files/patch-net__base__address_tracker_linux.h branches/2014Q3/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc - copied unchanged from r364870, head/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc branches/2014Q3/www/chromium/files/patch-net__net.gypi - copied unchanged from r364870, head/www/chromium/files/patch-net__net.gypi branches/2014Q3/www/chromium/files/patch-remoting__remoting_host.gypi - copied unchanged from r364870, head/www/chromium/files/patch-remoting__remoting_host.gypi branches/2014Q3/www/chromium/files/patch-skia__skia_chrome.gypi - copied unchanged from r364870, head/www/chromium/files/patch-skia__skia_chrome.gypi branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp branches/2014Q3/www/chromium/files/patch-third_party__khronos__khronos.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__khronos__khronos.gyp branches/2014Q3/www/chromium/files/patch-third_party__libexif__libexif.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__libexif__libexif.gyp branches/2014Q3/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q3/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp branches/2014Q3/www/chromium/files/patch-third_party__sfntly__sfntly.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2014Q3/www/chromium/files/patch-third_party__sqlite__sqlite.gyp - copied unchanged from r364870, head/www/chromium/files/patch-third_party__sqlite__sqlite.gyp branches/2014Q3/www/chromium/files/patch-ui__app_list__app_list_constants.cc - copied unchanged from r364870, head/www/chromium/files/patch-ui__app_list__app_list_constants.cc branches/2014Q3/www/chromium/files/patch-ui__app_list__app_list_constants.h - copied unchanged from r364870, head/www/chromium/files/patch-ui__app_list__app_list_constants.h branches/2014Q3/www/chromium/files/patch-ui__base__ui_base.gyp - copied unchanged from r364870, head/www/chromium/files/patch-ui__base__ui_base.gyp branches/2014Q3/www/chromium/files/patch-ui__views__views.gyp - copied unchanged from r364870, head/www/chromium/files/patch-ui__views__views.gyp branches/2014Q3/www/chromium/files/patch-ui__views__views_delegate.cc - copied unchanged from r364870, head/www/chromium/files/patch-ui__views__views_delegate.cc branches/2014Q3/www/chromium/files/patch-ui__views__views_delegate.h - copied unchanged from r364870, head/www/chromium/files/patch-ui__views__views_delegate.h Deleted: branches/2014Q3/www/chromium/files/patch-cc__layers__layer.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__usb__usb_context.cc branches/2014Q3/www/chromium/files/patch-chrome__chrome_tests_unit.gypi branches/2014Q3/www/chromium/files/patch-chrome__test__ui__ui_test.cc branches/2014Q3/www/chromium/files/patch-content__plugin__plugin_main_linux.cc branches/2014Q3/www/chromium/files/patch-content__renderer__render_process_impl.cc branches/2014Q3/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp branches/2014Q3/www/chromium/files/patch-third_party__libusb__libusb.gyp Modified: branches/2014Q3/www/chromium/Makefile branches/2014Q3/www/chromium/distinfo branches/2014Q3/www/chromium/files/patch-base__base.gyp branches/2014Q3/www/chromium/files/patch-base__base.gypi branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q3/www/chromium/files/patch-build__common.gypi branches/2014Q3/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q3/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q3/www/chromium/files/patch-chrome__chrome_tests.gypi branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q3/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q3/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q3/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q3/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q3/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q3/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q3/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc branches/2014Q3/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q3/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q3/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q3/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q3/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q3/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q3/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q3/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q3/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q3/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q3/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q3/www/chromium/files/patch-content__content_browser.gypi branches/2014Q3/www/chromium/files/patch-content__content_common.gypi branches/2014Q3/www/chromium/files/patch-content__content_tests.gypi branches/2014Q3/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q3/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q3/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc branches/2014Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q3/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q3/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q3/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q3/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q3/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q3/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q3/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q3/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q3/www/chromium/files/patch-media__cast__rtcp__rtcp.cc branches/2014Q3/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q3/www/chromium/files/patch-media__media.gyp branches/2014Q3/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q3/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q3/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp branches/2014Q3/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp branches/2014Q3/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q3/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q3/www/chromium/files/patch-net__base__net_util.h branches/2014Q3/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q3/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q3/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q3/www/chromium/files/patch-net__net.gyp branches/2014Q3/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q3/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q3/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2014Q3/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q3/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q3/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q3/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q3/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q3/www/chromium/files/patch-printing__printing.gyp branches/2014Q3/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q3/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q3/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q3/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__config.h branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q3/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h branches/2014Q3/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q3/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q3/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc branches/2014Q3/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q3/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q3/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q3/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q3/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q3/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q3/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q3/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q3/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q3/www/chromium/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/Makefile Fri Aug 15 19:01:10 2014 (r365022) @@ -1,11 +1,8 @@ # Created by: Florent Thoumie # $FreeBSD$ -#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 - PORTNAME= chromium -PORTVERSION= 35.0.1916.153 -PORTREVISION= 1 +PORTVERSION= 36.0.1985.143 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -22,7 +19,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat + ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ + protoc:${PORTSDIR}/devel/protobuf \ + ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -30,51 +29,94 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libasound.so:${PORTSDIR}/audio/alsa-lib \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ + libFLAC.so:${PORTSDIR}/audio/flac \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libcups.so:${PORTSDIR}/print/cups-client \ libevent-1.4.so:${PORTSDIR}/devel/libevent \ + libexif.so:${PORTSDIR}/graphics/libexif \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libpci.so:${PORTSDIR}/devel/libpci \ - libdrm.so:${PORTSDIR}/graphics/libdrm + libdrm.so:${PORTSDIR}/graphics/libdrm \ + libicuuc.so:${PORTSDIR}/devel/icu \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ + libminizip.so:${PORTSDIR}/archivers/minizip \ + libnspr4.so:${PORTSDIR}/devel/nspr \ + libpng.so:${PORTSDIR}/graphics/png \ + libre2.so:${PORTSDIR}/devel/re2 \ + libsnappy.so:${PORTSDIR}/archivers/snappy \ + libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher \ + libspeex.so:${PORTSDIR}/audio/speex \ + libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libwebp.so:${PORTSDIR}/graphics/webp RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ - ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf + ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ + xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ - perl5 shebangfix ninja tar:xz + perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= The Chromium Project USE_PERL5= build -USE_PYTHON_BUILD= 2 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt - +USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes # simplify for pkg-config in configure phase SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome +INSTALLS_ICONS= yes # See build/common.gypi for all the available variables. -GYP_DEFINES+= use_cups=1 \ - use_system_yasm=1 \ - use_system_libxml=1 \ - use_system_ffmpeg=0 \ - use_system_libusb=1 \ - use_system_libevent=1 \ - use_system_libvpx=0 \ +GYP_DEFINES+= \ + clang_use_chrome_plugins=0 \ linux_breakpad=0 \ - linux_strip_binary=1 \ - linux_use_tcmalloc=0 \ linux_use_heapchecker=0 \ + linux_strip_binary=1 \ test_isolation_mode=noop \ - clang_use_chrome_plugins=0 \ disable_nacl=1 \ - enable_webrtc=1 \ - enable_openmax=1 \ enable_one_click_signin=1 \ + enable_openmax=1 \ + enable_webrtc=1 \ werror= \ no_gc_sections=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ - python_ver=${PYTHON_VER} + python_ver=${PYTHON_VER} \ + use_allocator=none \ + use_cups=1 \ + linux_link_gsettings=1 \ + linux_link_libpci=1 \ + linux_link_libspeechd=1 \ + libspeechd_h_prefix=speech-dispatcher/ \ + usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ + want_separate_host_toolset=0 \ + use_system_bzip2=1 \ + use_system_flac=1 \ + use_system_harfbuzz=1 \ + use_system_icu=1 \ + use_system_jsoncpp=1 \ + use_system_libevent=1 \ + use_system_libexif=1 \ + use_system_libjpeg=1 \ + use_system_libpng=1 \ + use_system_libusb=1 \ + use_system_libwebp=1 \ + use_system_libxml=1 \ + use_system_libxslt=1 \ + use_system_minizip=1 \ + use_system_nspr=1 \ + use_system_openssl=1 \ + use_system_protobuf=1 \ + use_system_re2=1 \ + use_system_snappy=1 \ + use_system_speex=1 \ + use_system_xdg_utils=1 \ + use_system_yasm=1 \ + use_system_zlib=1 +# allow removal of third_party/adobe +GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . @@ -107,7 +149,9 @@ GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif -.if ! ${PORT_OPTIONS:MGCONF} +.if ${PORT_OPTIONS:MGCONF} +GYP_DEFINES+= use_gconf=1 +.else GYP_DEFINES+= use_gconf=0 .endif @@ -124,9 +168,6 @@ GYP_DEFINES+= disable_sse2=1 .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif -.if ${OSVERSION} < 1000052 -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" @@ -138,11 +179,11 @@ DEBUG_MAKE_ENV= V=1 BUILDTYPE= Debug .else BUILDTYPE= Release -GYP_DEFINES+= buildtype=Official .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ + GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" @@ -177,6 +218,8 @@ pre-everything:: @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} + @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" + @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ @@ -184,10 +227,95 @@ post-patch: ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ - ${WRKSRC}/chrome/common/chrome_paths.cc + ${WRKSRC}/chrome/common/chrome_paths.cc \ + ${WRKSRC}/base/base.gyp @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi + @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ + ${WRKSRC}/tools/compile_test/compile_test.py + +pre-configure: + # phajdan-jr: list of things *not* to remove, so maybe the script + # should be called "keep_bundled_libraries.py" + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/angle' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld' \ + 'third_party/cros_system_api' \ + 'third_party/dom_distiller_js' \ + 'third_party/ffmpeg' \ + 'third_party/flot' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/icu/icu.isolate' \ + 'third_party/jinja2' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libvpx' \ + 'third_party/libwebm' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/markupsafe' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/polymer' \ + 'third_party/ply' \ + 'third_party/pywebsocket' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/tlslite' \ + 'third_party/trace-viewer' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/valgrind' \ + --do-remove || ${FALSE} + cd ${WRKSRC} && ${PYTHON_CMD} \ + ./build/linux/unbundle/replace_gyp_files.py \ + ${GYP_DEFINES:C/^/-D/} || ${FALSE} + # allow removal of third_party/adobe + ${ECHO_CMD} > ${WRKSRC}/flapper_version.h do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -200,21 +328,26 @@ test regression-test: build .endfor do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ - ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent content_resources resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} +.for s in 22 24 48 64 128 256 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps + ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor -.for f in chrome libffmpegsumo.so protoc - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ + ${STAGEDIR}${DATADIR} +.for p in chrome_100_percent content_resources keyboard_resources resources + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} .endfor + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/x86/:S/amd64/x64/} \ + ${STAGEDIR}${DATADIR}/mksnapshot .include Modified: branches/2014Q3/www/chromium/distinfo ============================================================================== --- branches/2014Q3/www/chromium/distinfo Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/distinfo Fri Aug 15 19:01:10 2014 (r365022) @@ -1,4 +1,4 @@ -SHA256 (chromium-35.0.1916.153.tar.xz) = 280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e -SIZE (chromium-35.0.1916.153.tar.xz) = 206225052 -SHA256 (chromium-35.0.1916.153-testdata.tar.xz) = b3b977312a7a57f53cd8a02ab59480509ab39ea66130855da16438de888d92f4 -SIZE (chromium-35.0.1916.153-testdata.tar.xz) = 109105000 +SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 +SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 +SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 +SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 Modified: branches/2014Q3/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__base.gyp Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__base.gyp Fri Aug 15 19:01:10 2014 (r365022) @@ -1,14 +1,11 @@ ---- ./base/base.gyp.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gyp 2014-05-04 14:38:46.000000000 +0200 -@@ -803,6 +803,11 @@ - ['include', '^debug/proc_maps_linux_unittest\\.cc$'], +--- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +@@ -129,7 +129,7 @@ ], + 'link_settings': { + 'libraries': [ +- '-L/usr/local/lib -lexecinfo', ++ '-L/usr/local/lib -lexecinfo -lkvm', + ], + }, }], -+ ['<(os_bsd) == 1', { -+ 'sources/': [ -+ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'], -+ ], -+ }], - ], # target_conditions - }, - { Modified: branches/2014Q3/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__base.gypi Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__base.gypi Fri Aug 15 19:01:10 2014 (r365022) @@ -1,12 +1,12 @@ ---- ./base/base.gypi.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/base.gypi 2014-05-04 14:38:46.000000000 +0200 -@@ -915,11 +915,15 @@ +--- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -912,11 +912,14 @@ 'process/memory_stubs.cc', ], 'sources/': [ + ['exclude', '^debug/proc_maps_linux\\.cc$'], ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], +- ['exclude', '^files/file_path_watcher_stub\\.cc$'], ['exclude', '^file_util_linux\\.cc$'], + ['exclude', '^process/memory_linux\\.cc$'], ['exclude', '^process/process_linux\\.cc$'], Modified: branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-05-04 15:46:56.000000000 +0200 -@@ -586,6 +586,10 @@ +--- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -590,6 +590,10 @@ // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -11,7 +11,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -601,6 +605,7 @@ +@@ -605,6 +609,7 @@ is_initialized_ = true; return true; Copied: branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc (from r364870, head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc) @@ -0,0 +1,44 @@ +--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -18,6 +18,15 @@ + #include "base/posix/eintr_wrapper.h" + #include "base/stl_util.h" + ++#if defined(__FreeBSD__) ++// Port over Linux ucred structure ++struct ucred { ++ pid_t pid; // process ID of the sending process ++ uid_t uid; // user ID of the sending process ++ gid_t gid; // group ID of the sending process ++}; ++#endif ++ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; + + // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes +@@ -35,7 +44,13 @@ + // static + bool UnixDomainSocket::EnableReceiveProcessId(int fd) { + const int enable = 1; ++#if defined(__FreeBSD__) ++ // XXX(rene) do this? : ++ // taken from dbus, Academic Free License 2.1 / GPL 2+ ++ return 0; // fake OK ++#else + return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; ++#endif + } + + // static +@@ -131,7 +146,11 @@ + wire_fds_len = payload_len / sizeof(int); + } + if (cmsg->cmsg_level == SOL_SOCKET && ++#if defined(__FreeBSD__) ++ 1) { // XXX(rene) carpet getting full ... ++#else + cmsg->cmsg_type == SCM_CREDENTIALS) { ++#endif + DCHECK(payload_len == sizeof(struct ucred)); + DCHECK(pid == -1); + pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; Modified: branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-30 22:41:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. Modified: branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" Copied: branches/2014Q3/www/chromium/files/patch-base__process__launch.cc (from r364870, head/www/chromium/files/patch-base__process__launch.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-base__process__launch.cc Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-base__process__launch.cc) @@ -0,0 +1,15 @@ +--- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -23,10 +23,10 @@ + fds_to_remap(NULL), + maximize_rlimits(NULL), + new_process_group(false) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + , clone_flags(0) + , allow_new_privs(false) +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_FREEBSD + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) + #endif // OS_CHROMEOS Copied: branches/2014Q3/www/chromium/files/patch-base__process__launch.h (from r364870, head/www/chromium/files/patch-base__process__launch.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-base__process__launch.h Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-base__process__launch.h) @@ -0,0 +1,19 @@ +--- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 +@@ -108,14 +108,14 @@ + // will be the same as its pid. + bool new_process_group; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; + + // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If + // true, then this bit will not be set in the new child process. + bool allow_new_privs; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_FREEBSD) + + #if defined(OS_CHROMEOS) + // If non-negative, the specified file descriptor will be set as the launched Modified: branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,24 +1,20 @@ ---- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200 -@@ -151,12 +151,12 @@ +--- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -151,9 +151,9 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. -// OpenBSD does not support these tests either. -+// OpenBSD and FreeBSD does not support these tests either. - // AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc. - // functions so that they don't crash if the program is out of memory, so the - // OOM tests aren't supposed to work. ++// OpenBSD and FreeBSD do not support these tests either. // TODO(vandebo) make this work on Windows too. -#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ +#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ - !defined(OS_WIN) && \ - !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + !defined(OS_WIN) -@@ -427,5 +427,5 @@ + #if defined(USE_TCMALLOC) +@@ -425,4 +425,4 @@ EXPECT_TRUE(value_ == NULL); } - --#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && -+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && - // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) + #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) ++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -8,6 +8,10 @@ #include #include Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-05-04 14:38:46.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,3 +14,21 @@ #if defined(OS_MACOSX) #include #endif +@@ -242,13 +249,17 @@ + // CPU-related ticks. Returns -1 on parse error. + // Exposed for testing. + BASE_EXPORT int ParseProcStatCPU(const std::string& input); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + // Get the number of threads of |process| as available in /proc//stat. + // This should be used with care as no synchronization with running threads is + // done. This is mostly useful to guarantee being single-threaded. + // Returns 0 on failure. + BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) + // /proc/self/exe refers to the current executable. + BASE_EXPORT extern const char kProcSelfExe[]; + Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,11 +1,36 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -10,6 +10,8 @@ +--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -10,6 +10,9 @@ #include "base/sys_info.h" +#include /* getpagesize() */ ++#include /* O_RDONLY */ + namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) +@@ -119,4 +122,23 @@ + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); + } + ++int GetNumberOfThreads(ProcessHandle process) { ++ // Taken from FreeBSD top (usr.bin/top/machine.c) ++ ++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); ++ if (kd == NULL) ++ return 0; ++ ++ struct kinfo_proc* pbase; ++ int nproc; ++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); ++ if (pbase == NULL) ++ return 0; ++ ++ if (kvm_close(kd) == -1) ++ return 0; ++ ++ return nproc; ++} ++ + } // namespace base Modified: branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./base/security_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/security_unittest.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -159,7 +159,7 @@ +--- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { Modified: branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./base/sys_info_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -49,7 +49,7 @@ +--- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -64,7 +64,7 @@ namespace base { Modified: branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -59,6 +59,7 @@ +--- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -60,6 +60,7 @@ variant != "64") { return false; } @@ -8,7 +8,7 @@ } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { -@@ -122,6 +123,8 @@ +@@ -125,6 +126,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; Modified: branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/test/launcher/test_launcher.cc.orig 2014-08-12 21:01:28.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 @@ -40,6 +40,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif Modified: branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-04-30 22:41:42.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-05-04 14:38:46.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-08-12 21:01:27.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" @@ -10,7 +10,7 @@ #include #include #include -@@ -48,7 +50,7 @@ +@@ -50,7 +52,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); Copied: branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp (from r364870, head/www/chromium/files/patch-breakpad__breakpad.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-breakpad__breakpad.gyp) @@ -0,0 +1,11 @@ +--- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 ++++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -340,7 +340,7 @@ + }, + ], + }], +- [ 'OS=="linux" or OS=="android" or OS=="freebsd"', { ++ [ 'OS=="linux" or OS=="android" or os_bsd==1', { + 'conditions': [ + ['OS=="android"', { + 'defines': [ Modified: branches/2014Q3/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__common.gypi Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-build__common.gypi Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,15 @@ ---- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200 -+++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200 -@@ -615,7 +615,7 @@ +--- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -101,7 +101,7 @@ + # + # TODO(erg): Merge this into the previous block once compiling with + # aura safely implies including ash capabilities. +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'use_aura%': 1, + }], + +@@ -622,7 +622,7 @@ }], # DBus usage. @@ -9,16 +18,16 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -878,7 +878,7 @@ - # By default, use ICU data file (icudtl.dat) on all platforms +@@ -896,7 +896,7 @@ # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). + # Set the data reduction proxy origin for Android Webview. - ['android_webview_build==0', { + ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { 'icu_use_data_file_flag%' : 1, - }, { - 'icu_use_data_file_flag%' : 0, -@@ -1076,6 +1076,9 @@ + 'spdy_proxy_auth_origin%': '', + 'data_reduction_proxy_probe_url%': '', +@@ -1106,6 +1106,9 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -28,7 +37,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. -@@ -3894,6 +3897,13 @@ +@@ -3960,6 +3963,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Copied: branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi (from r364870, head/www/chromium/files/patch-build__filename_rules.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-build__filename_rules.gypi) @@ -0,0 +1,11 @@ +--- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +@@ -85,7 +85,7 @@ + ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] + }], +- ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { ++ ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { + 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] + }], + ['<(use_ash)==0 or >(nacl_untrusted_build)==1', { Copied: branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp (from r364870, head/www/chromium/files/patch-build__linux__system.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-build__linux__system.gyp) @@ -0,0 +1,16 @@ +--- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -885,6 +885,13 @@ + 'include_dirs': [ + '../..', + ], ++ 'conditions' : [ ++ ['OS=="freebsd"', { ++ 'include_dirs': [ ++ '<(prefix_dir)/include', ++ ], ++ }], ++ ], + 'hard_dependency': 1, + 'actions': [ + { Copied: branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp (from r364870, head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Fri Aug 15 19:01:10 2014 (r365022, copy of r364870, head/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp) @@ -0,0 +1,17 @@ +--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +@@ -14,13 +14,7 @@ + }, + 'link_settings': { + 'libraries': [ +- # Check for presence of webpdemux library, use it if present. +- '::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -243,7 +243,7 @@ +@@ -245,7 +245,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -457,7 +457,7 @@ +@@ -459,7 +459,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -498,7 +498,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -630,7 +630,7 @@ +@@ -632,7 +632,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -748,7 +748,7 @@ +@@ -757,7 +757,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -760,7 +760,7 @@ +@@ -769,7 +769,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -845,7 +845,7 @@ +@@ -854,7 +854,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } Modified: branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Fri Aug 15 19:01:10 2014 (r365022) @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-05-04 14:38:46.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 @@ -35,7 +35,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( Modified: branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd Fri Aug 15 19:01:10 2014 (r365022) @@ -1,11 +1,11 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-04-30 22:42:53.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-05-05 13:13:16.000000000 +0200 -@@ -1115,7 +1115,7 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 +@@ -1099,7 +1099,7 @@ -- -+ - +- ++ + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -2153,7 +2153,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -2183,7 +2183,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-04-30 22:42:17.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -256,7 +256,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-12 21:01:48.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -239,7 +239,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Fri Aug 15 19:01:10 2014 (r365022) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-30 22:42:18.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-05-04 14:38:46.000000000 +0200 -@@ -972,7 +972,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-12 21:01:47.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200 +@@ -926,7 +926,7 @@ } #endif Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Fri Aug 15 18:56:58 2014 (r365021) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Fri Aug 15 19:01:10 2014 (r365022) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Fri Aug 15 19:03: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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D5C67CA; Fri, 15 Aug 2014 19:03: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 08AED2BBC; Fri, 15 Aug 2014 19:03: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 s7FJ3R1H031252; Fri, 15 Aug 2014 19:03:27 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FJ3Rmp031251; Fri, 15 Aug 2014 19:03:27 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408151903.s7FJ3Rmp031251@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 15 Aug 2014 19:03:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365023 - branches/2014Q3/www/chromium 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, 15 Aug 2014 19:03:28 -0000 Author: rene Date: Fri Aug 15 19:03:27 2014 New Revision: 365023 URL: http://svnweb.freebsd.org/changeset/ports/365023 QAT: https://qat.redports.org/buildarchive/r365023/ Log: MFH: r365002 Fix installation on i386 where mksnapshot is called mksnapshot.ia32 initially. Approved by: portmgr (erwin) Modified: branches/2014Q3/www/chromium/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Fri Aug 15 19:01:10 2014 (r365022) +++ branches/2014Q3/www/chromium/Makefile Fri Aug 15 19:03:27 2014 (r365023) @@ -347,7 +347,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/x86/:S/amd64/x64/} \ + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/ia32/:S/amd64/x64/} \ ${STAGEDIR}${DATADIR}/mksnapshot .include