From owner-svn-ports-branches@FreeBSD.ORG Sun Jan 18 22:20:26 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53040DD; Sun, 18 Jan 2015 22:20:26 +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 3DA76762; Sun, 18 Jan 2015 22:20:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IMKQ9n087842; Sun, 18 Jan 2015 22:20:26 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IMKPUH087836; Sun, 18 Jan 2015 22:20:25 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201501182220.t0IMKPUH087836@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 18 Jan 2015 22:20:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377351 - in branches/2015Q1/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: Sun, 18 Jan 2015 22:20:26 -0000 Author: rene Date: Sun Jan 18 22:20:24 2015 New Revision: 377351 URL: https://svnweb.freebsd.org/changeset/ports/377351 QAT: https://qat.redports.org/buildarchive/r377351/ Log: MFH: r376780 www/chromium: - install libpdf.so to enable the built-in PDF viewer [1] - show memory usage of browser, GPU, individual plugins, and individual tabs in chrome://memory-redirect [2] - bump PORTREVISION Submitted by: Imre Vadász via GitHub [1,2] Approved by: portmgr (unanswered, but needed for next MFH to align) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2015Q1/www/chromium/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Sun Jan 18 22:01:52 2015 (r377350) +++ branches/2015Q1/www/chromium/Makefile Sun Jan 18 22:20:24 2015 (r377351) @@ -4,7 +4,7 @@ #TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium PORTVERSION= 39.0.2171.95 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -360,6 +360,8 @@ do-install: ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \ ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libpdf.so \ + ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} Modified: branches/2015Q1/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sun Jan 18 22:01:52 2015 (r377350) +++ branches/2015Q1/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sun Jan 18 22:20:24 2015 (r377351) @@ -11,3 +11,26 @@ #include "base/logging.h" #include "base/strings/string_util.h" +@@ -68,19 +72,13 @@ + for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { + size_t length; + struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; +- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; + + if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) + continue; + +- length = 0; +- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) { +- LOG(ERROR) << "failed to figure out the buffer size for a command line"; +- continue; +- } +- +- data.resize(length); +- ++ data.resize(ARG_MAX); ++ length = ARG_MAX; + if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) { + LOG(ERROR) << "failed to fetch a commandline"; + continue; Modified: branches/2015Q1/www/chromium/pkg-plist ============================================================================== --- branches/2015Q1/www/chromium/pkg-plist Sun Jan 18 22:01:52 2015 (r377350) +++ branches/2015Q1/www/chromium/pkg-plist Sun Jan 18 22:20:24 2015 (r377351) @@ -7,6 +7,7 @@ share/applications/chromium-browser.desk %%DATADIR%%/content_resources.pak %%DATADIR%%/keyboard_resources.pak %%DATADIR%%/libffmpegsumo.so +%%DATADIR%%/libpdf.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/bg.pak From owner-svn-ports-branches@FreeBSD.ORG Sun Jan 18 22:21:44 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A236422C; Sun, 18 Jan 2015 22:21:44 +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 8D422809; Sun, 18 Jan 2015 22:21:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IMLi7b090896; Sun, 18 Jan 2015 22:21:44 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IMLiGp090894; Sun, 18 Jan 2015 22:21:44 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201501182221.t0IMLiGp090894@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 18 Jan 2015 22:21:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377352 - branches/2015Q1/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: Sun, 18 Jan 2015 22:21:44 -0000 Author: rene Date: Sun Jan 18 22:21:43 2015 New Revision: 377352 URL: https://svnweb.freebsd.org/changeset/ports/377352 QAT: https://qat.redports.org/buildarchive/r377352/ Log: MFH: r377349 www/chromium: update to 39.0.2171.99 (bugfix release) - Make build against Kerberos optional [1] - Mark DEBUG builds as BROKEN - Pet portlint Submitted by: Igor R via freebsd-chromium@ [1] Approved by: ports-secteam (zi) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Sun Jan 18 22:20:24 2015 (r377351) +++ branches/2015Q1/www/chromium/Makefile Sun Jan 18 22:21:43 2015 (r377352) @@ -1,10 +1,8 @@ # Created by: Florent Thoumie # $FreeBSD$ -#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium -PORTVERSION= 39.0.2171.95 -PORTREVISION= 3 +PORTVERSION= 39.0.2171.99 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -68,6 +66,7 @@ SHEBANG_FILES= chrome/tools/build/linux/ ALL_TARGET= chrome INSTALLS_ICONS= yes +#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) # See build/common.gypi for all the available variables. GYP_DEFINES+= \ clang_use_chrome_plugins=0 \ @@ -127,10 +126,10 @@ GYP_DEFINES+= google_api_key=AIzaSyBsp9n SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST DEBUG +OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG CODECS_DESC= Compile and enable patented codecs like H.264 -OPTIONS_DEFAULT= CODECS GCONF +OPTIONS_DEFAULT= CODECS GCONF KERBEROS GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio @@ -180,6 +179,7 @@ ALL_TARGET+= ${TEST_TARGETS} DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} +BROKEN= Produces empty binary BUILDTYPE= Debug .else BUILDTYPE= Release @@ -206,6 +206,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- CONFIGURE_ENV+= AR=/usr/bin/ar .endif +.if ! ${PORT_OPTIONS:MKERBEROS} +GYP_DEFINES+= use_kerberos=0 +.endif + # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ Modified: branches/2015Q1/www/chromium/distinfo ============================================================================== --- branches/2015Q1/www/chromium/distinfo Sun Jan 18 22:20:24 2015 (r377351) +++ branches/2015Q1/www/chromium/distinfo Sun Jan 18 22:21:43 2015 (r377352) @@ -1,4 +1,4 @@ -SHA256 (chromium-39.0.2171.95.tar.xz) = 66cb6902afbd8a0f990cb9e70ff1df843a7461f66077ffe7f41d730278a2a868 -SIZE (chromium-39.0.2171.95.tar.xz) = 253091292 -SHA256 (chromium-39.0.2171.95-testdata.tar.xz) = 1b723bfb8afdd1caf40c43caa85ea78c0400992436d54d1a33444acd8535ae96 -SIZE (chromium-39.0.2171.95-testdata.tar.xz) = 115237960 +SHA256 (chromium-39.0.2171.99.tar.xz) = 6d527003a7dc3256a266d33fa42185c75934efd6de14f51cde345701ba2ae449 +SIZE (chromium-39.0.2171.99.tar.xz) = 253080280 +SHA256 (chromium-39.0.2171.99-testdata.tar.xz) = 2daf63226cfb78b7c67a1ddfd7d105e61392020f1b7484495174468e636275ae +SIZE (chromium-39.0.2171.99-testdata.tar.xz) = 115235592 From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 19 22:01:03 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E6934F3; Mon, 19 Jan 2015 22:01:03 +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 11BADEEF; Mon, 19 Jan 2015 22:01:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JM12If076195; Mon, 19 Jan 2015 22:01:02 GMT (envelope-from jase@FreeBSD.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JM12Ml076193; Mon, 19 Jan 2015 22:01:02 GMT (envelope-from jase@FreeBSD.org) Message-Id: <201501192201.t0JM12Ml076193@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jase set sender to jase@FreeBSD.org using -f From: Jase Thew Date: Mon, 19 Jan 2015 22:01:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377487 - in branches/2015Q1/security/polarssl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 22:01:03 -0000 Author: jase Date: Mon Jan 19 22:01:01 2015 New Revision: 377487 URL: https://svnweb.freebsd.org/changeset/ports/377487 QAT: https://qat.redports.org/buildarchive/r377487/ Log: MFH: r377482 security/polarssl: - Add upstream patch to address crafted certificates vulnerability - Add USES cpe Security: CVE-2015-1182 Security: a5856eba-a015-11e4-a680-1c6f65c3c4ff Approved by: ports-secteam (zi) Added: branches/2015Q1/security/polarssl/files/patch-library-asn1parse_c - copied unchanged from r377482, head/security/polarssl/files/patch-library-asn1parse_c Modified: branches/2015Q1/security/polarssl/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/polarssl/Makefile ============================================================================== --- branches/2015Q1/security/polarssl/Makefile Mon Jan 19 21:43:06 2015 (r377486) +++ branches/2015Q1/security/polarssl/Makefile Mon Jan 19 22:01:01 2015 (r377487) @@ -2,6 +2,7 @@ PORTNAME= polarssl PORTVERSION= 1.2.12 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gpl CATEGORIES= security devel MASTER_SITES= http://polarssl.org/download/ @@ -13,7 +14,7 @@ LICENSE= GPLv2 ALL_TARGET= no_test -USES= gmake tar:tgz +USES= cpe gmake tar:tgz USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Copied: branches/2015Q1/security/polarssl/files/patch-library-asn1parse_c (from r377482, head/security/polarssl/files/patch-library-asn1parse_c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/polarssl/files/patch-library-asn1parse_c Mon Jan 19 22:01:01 2015 (r377487, copy of r377482, head/security/polarssl/files/patch-library-asn1parse_c) @@ -0,0 +1,11 @@ +--- library/asn1parse.c.orig 2015-01-19 19:31:49.664592954 +0000 ++++ library/asn1parse.c 2015-01-19 19:34:11.583587052 +0000 +@@ -244,6 +244,8 @@ + if( cur->next == NULL ) + return( POLARSSL_ERR_ASN1_MALLOC_FAILED ); + ++ memset( cur->next, 0, sizeof( asn1_sequence ) ); ++ + cur = cur->next; + } + } From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 20 21:29:53 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC456A99; Tue, 20 Jan 2015 21:29:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A75E7DF3; Tue, 20 Jan 2015 21:29:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KLTrPf041671; Tue, 20 Jan 2015 21:29:53 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KLTqPB041666; Tue, 20 Jan 2015 21:29:52 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201501202129.t0KLTqPB041666@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 20 Jan 2015 21:29:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377541 - in branches/2015Q1/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: Tue, 20 Jan 2015 21:29:53 -0000 Author: rene Date: Tue Jan 20 21:29:52 2015 New Revision: 377541 URL: https://svnweb.freebsd.org/changeset/ports/377541 QAT: https://qat.redports.org/buildarchive/r377541/ Log: MFH: r377533 www/chromium: fix crashing on windows stacking, bump PORTREVISION PR: 194484 Submitted by: lapo@lapo.it Approved by: portmgr (erwin) Added: branches/2015Q1/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc - copied unchanged from r377533, head/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc - copied unchanged from r377533, head/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc Modified: branches/2015Q1/www/chromium/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Tue Jan 20 21:24:09 2015 (r377540) +++ branches/2015Q1/www/chromium/Makefile Tue Jan 20 21:29:52 2015 (r377541) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 39.0.2171.99 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc (from r377533, head/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc Tue Jan 20 21:29:52 2015 (r377541, copy of r377533, head/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/window_open_apitest.cc.orig 2015-01-14 08:44:00.000000000 +0100 ++++ chrome/browser/extensions/window_open_apitest.cc 2015-01-20 19:34:00.351092058 +0100 +@@ -263,7 +263,7 @@ + ASSERT_TRUE(RunExtensionTest("window_open/panel")) << message_; + } + +-#if defined(USE_ASH_PANELS) || defined(OS_LINUX) ++#if defined(USE_ASH_PANELS) || defined(OS_LINUX) || defined(OS_FREEBSD) + // On Ash, this currently fails because we're currently opening new panel + // windows as popup windows instead. + // We're also failing on Linux-aura due to the panel is not opened in the Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc (from r377533, head/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc Tue Jan 20 21:29:52 2015 (r377541, copy of r377533, head/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/panels/panel_manager.cc.orig 2015-01-14 08:44:01.000000000 +0100 ++++ chrome/browser/ui/panels/panel_manager.cc 2015-01-20 19:36:06.959753456 +0100 +@@ -138,7 +138,7 @@ + // static + bool PanelManager::IsPanelStackingEnabled() { + // Stacked panel mode is not supported in linux-aura. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + return false; + #else + return true; From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 21 04:42:25 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD3051A8; Wed, 21 Jan 2015 04:42: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 9A8AD1C7; Wed, 21 Jan 2015 04:42: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 t0L4gPsr055066; Wed, 21 Jan 2015 04:42:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L4gPKN055065; Wed, 21 Jan 2015 04:42:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201501210442.t0L4gPKN055065@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Jan 2015 04:42:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377573 - branches/2015Q1/www/seamonkey-i18n 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, 21 Jan 2015 04:42:25 -0000 Author: jbeich Date: Wed Jan 21 04:42:24 2015 New Revision: 377573 URL: https://svnweb.freebsd.org/changeset/ports/377573 QAT: https://qat.redports.org/buildarchive/r377573/ Log: MFH: r377546 Add missing checksum for ja-JP-mac language pack This unbreaks PACKAGE_BUILDING build as used by poudriere and tinderbox. PR: 196807 Reported by: freebsd-bugzilla@in-addr.com, marino Differential Revision: https://reviews.freebsd.org/D1566 Approved by: bapt, flo (mentors) Approved by: portmgr (erwin) Modified: branches/2015Q1/www/seamonkey-i18n/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/seamonkey-i18n/distinfo ============================================================================== --- branches/2015Q1/www/seamonkey-i18n/distinfo Wed Jan 21 04:31:17 2015 (r377572) +++ branches/2015Q1/www/seamonkey-i18n/distinfo Wed Jan 21 04:42:24 2015 (r377573) @@ -24,6 +24,8 @@ SHA256 (xpi/seamonkey-i18n-2.32/seamonke SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 844069 SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 1925e77234e5a4423d66b0e988a5ef9aeb067d8193e34a31273741570cb77540 SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 742070 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja-JP-mac.langpack.xpi) = d999898fc267310b68c419e56c7fc520791f2a03e596b5b150ea45e28b215ec6 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja-JP-mac.langpack.xpi) = 900391 SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = e44009f8ec92c476f0c04ea6862629db8884f8f143f707ae47418ac9ecbad6dd SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = 884921 SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = f2b7a50cb4a8e02e2cdd4badcf5566ca520f95450a0d84d267297e6ca57b7a22 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 21 04:47:49 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5A603F3; Wed, 21 Jan 2015 04:47:49 +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 C825C1FC; Wed, 21 Jan 2015 04:47:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0L4lnSw056024; Wed, 21 Jan 2015 04:47:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L4lnY6056022; Wed, 21 Jan 2015 04:47:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201501210447.t0L4lnY6056022@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Jan 2015 04:47:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377575 - in branches/2015Q1/www: firefox/files seamonkey/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: Wed, 21 Jan 2015 04:47:50 -0000 Author: jbeich Date: Wed Jan 21 04:47:48 2015 New Revision: 377575 URL: https://svnweb.freebsd.org/changeset/ports/377575 QAT: https://qat.redports.org/buildarchive/r377575/ Log: MFH: r377551 Unbreak build with base libstdc++ on i386 and powerpc std::abs(int64_t) for 32bit archs or std::llabs are not available in base libstdc++ from forked GCC 4.2.1 or before 10.0-RELEASE (r255294) for libstdc++ in lang/gcc47 and earlier (upstream PR libstdc++/54686). To avoid the build error use mozilla::Abs which implements overloads for all signed natural types but has unsigned return value. This change won't be requried for Firefox 36 et al. PR: 196772 Reported by: many Submitted by: bar (initial version) Obtained from: https://github.com/mozilla/gecko-dev/commit/e664fe8 Differential Revision: https://reviews.freebsd.org/D1569 Approved by: bapt, flo (mentors) Approved by: portmgr (bapt) Added: branches/2015Q1/www/firefox/files/patch-bug1122586 - copied unchanged from r377551, head/www/firefox/files/patch-bug1122586 branches/2015Q1/www/seamonkey/files/patch-bug1122586 - copied unchanged from r377551, head/www/seamonkey/files/patch-bug1122586 Modified: Directory Properties: branches/2015Q1/ (props changed) Copied: branches/2015Q1/www/firefox/files/patch-bug1122586 (from r377551, head/www/firefox/files/patch-bug1122586) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/firefox/files/patch-bug1122586 Wed Jan 21 04:47:48 2015 (r377575, copy of r377551, head/www/firefox/files/patch-bug1122586) @@ -0,0 +1,30 @@ +diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp +index 36a6ccf..96d3bd0 100644 +--- content/media/MediaDecoderStateMachine.cpp ++++ content/media/MediaDecoderStateMachine.cpp +@@ -18,6 +18,7 @@ + #include "nsTArray.h" + #include "MediaDecoder.h" + #include "MediaDecoderReader.h" ++#include "mozilla/MathAlgorithms.h" + #include "mozilla/mozalloc.h" + #include "VideoUtils.h" + #include "mozilla/dom/TimeRanges.h" +@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS, + // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration + // less than this are ignored, as they're assumed to be the result of + // instability in the duration estimation. +-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; ++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; + + static TimeDuration UsecsToDuration(int64_t aUsecs) { + return TimeDuration::FromMicroseconds(aUsecs); +@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration) + AssertCurrentThreadInMonitor(); + int64_t duration = GetDuration(); + if (aDuration != duration && +- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { ++ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { + SetDuration(aDuration); + nsCOMPtr event = + NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged); Copied: branches/2015Q1/www/seamonkey/files/patch-bug1122586 (from r377551, head/www/seamonkey/files/patch-bug1122586) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/seamonkey/files/patch-bug1122586 Wed Jan 21 04:47:48 2015 (r377575, copy of r377551, head/www/seamonkey/files/patch-bug1122586) @@ -0,0 +1,30 @@ +diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp +index 36a6ccf..96d3bd0 100644 +--- mozilla/content/media/MediaDecoderStateMachine.cpp ++++ mozilla/content/media/MediaDecoderStateMachine.cpp +@@ -18,6 +18,7 @@ + #include "nsTArray.h" + #include "MediaDecoder.h" + #include "MediaDecoderReader.h" ++#include "mozilla/MathAlgorithms.h" + #include "mozilla/mozalloc.h" + #include "VideoUtils.h" + #include "mozilla/dom/TimeRanges.h" +@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS, + // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration + // less than this are ignored, as they're assumed to be the result of + // instability in the duration estimation. +-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; ++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; + + static TimeDuration UsecsToDuration(int64_t aUsecs) { + return TimeDuration::FromMicroseconds(aUsecs); +@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration) + AssertCurrentThreadInMonitor(); + int64_t duration = GetDuration(); + if (aDuration != duration && +- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { ++ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { + SetDuration(aDuration); + nsCOMPtr event = + NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged); From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 21 05:00:47 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E94E456C; Wed, 21 Jan 2015 05:00:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3A48303; Wed, 21 Jan 2015 05:00:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0L50lCT061832; Wed, 21 Jan 2015 05:00:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L50kC4061824; Wed, 21 Jan 2015 05:00:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201501210500.t0L50kC4061824@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Jan 2015 05:00:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377576 - in branches/2015Q1: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/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: Wed, 21 Jan 2015 05:00:48 -0000 Author: jbeich Date: Wed Jan 21 05:00:45 2015 New Revision: 377576 URL: https://svnweb.freebsd.org/changeset/ports/377576 QAT: https://qat.redports.org/buildarchive/r377576/ Log: MFH: r377564 Backport Wikipedia crashfix for clang 3.5 PR: 196802 Reported by: dumbbell Obtained from: https://github.com/mozilla/gecko-dev/commit/87f367b Obtained from: https://github.com/mozilla/gecko-dev/commit/c97894b (esr31 version) Differential Revision: https://reviews.freebsd.org/D1568 Approved by: flo (mentor) Approved by: portmgr (bapt) Added: branches/2015Q1/mail/thunderbird/files/patch-bug1083461 - copied unchanged from r377564, head/mail/thunderbird/files/patch-bug1083461 branches/2015Q1/www/firefox-esr/files/patch-bug1083461 - copied unchanged from r377564, head/www/firefox-esr/files/patch-bug1083461 branches/2015Q1/www/firefox/files/patch-bug1083461 - copied unchanged from r377564, head/www/firefox/files/patch-bug1083461 branches/2015Q1/www/libxul/files/patch-bug1083461 - copied unchanged from r377564, head/www/libxul/files/patch-bug1083461 branches/2015Q1/www/seamonkey/files/patch-bug1083461 - copied unchanged from r377564, head/www/seamonkey/files/patch-bug1083461 Modified: Directory Properties: branches/2015Q1/ (props changed) Copied: branches/2015Q1/mail/thunderbird/files/patch-bug1083461 (from r377564, head/mail/thunderbird/files/patch-bug1083461) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/mail/thunderbird/files/patch-bug1083461 Wed Jan 21 05:00:45 2015 (r377576, copy of r377564, head/mail/thunderbird/files/patch-bug1083461) @@ -0,0 +1,156 @@ +commit c97894b +Author: L. David Baron +Date: Sun Oct 19 23:31:39 2014 -0400 + + Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa +--- + layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ + layout/style/nsCSSValue.h | 22 ++++++++++++++++------ + layout/style/nsStyleAnimation.cpp | 6 ++++-- + 3 files changed, 36 insertions(+), 20 deletions(-) + +diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp +index 781ef65..4bbc979 100644 +--- mozilla/layout/style/nsCSSValue.cpp ++++ mozilla/layout/style/nsCSSValue.cpp +@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const + return *mValue.mRect == *aOther.mValue.mRect; + } + else if (eCSSUnit_List == mUnit) { +- return *mValue.mList == *aOther.mValue.mList; ++ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); + } + else if (eCSSUnit_SharedList == mUnit) { + return *mValue.mSharedList == *aOther.mValue.mSharedList; + } + else if (eCSSUnit_PairList == mUnit) { +- return *mValue.mPairList == *aOther.mValue.mPairList; ++ return nsCSSValuePairList::Equal(mValue.mPairList, ++ aOther.mValue.mPairList); + } + else if (eCSSUnit_GridTemplateAreas == mUnit) { + return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; +@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, + } + } + +-bool +-nsCSSValueList::operator==(const nsCSSValueList& aOther) const ++/* static */ bool ++nsCSSValueList::Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValueList *p1 = this, *p2 = &aOther; ++ const nsCSSValueList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mValue != p2->mValue) + return false; +@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult + bool + nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const + { +- return !mHead == !aOther.mHead && +- (!mHead || *mHead == *aOther.mHead); ++ return nsCSSValueList::Equal(mHead, aOther.mHead); + } + + size_t +@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, + } + } + +-bool +-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const ++/* static */ bool ++nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValuePairList *p1 = this, *p2 = &aOther; ++ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mXValue != p2->mXValue || + p1->mYValue != p2->mYValue) +diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h +index 753938c..77eeef0 100644 +--- mozilla/layout/style/nsCSSValue.h ++++ mozilla/layout/style/nsCSSValue.h +@@ -806,9 +806,8 @@ struct nsCSSValueList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(nsCSSValueList const& aOther) const; +- bool operator!=(const nsCSSValueList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -821,6 +820,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValueList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; + }; + + // nsCSSValueList_heap differs from nsCSSValueList only in being +@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(const nsCSSValuePairList& aOther) const; +- bool operator!=(const nsCSSValuePairList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -1215,6 +1219,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValuePairList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; + }; + + // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being +diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp +index 6c2ccb0..8dbe404 100644 +--- mozilla/layout/style/nsStyleAnimation.cpp ++++ mozilla/layout/style/nsStyleAnimation.cpp +@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const + case eUnit_Filter: + case eUnit_Shadow: + case eUnit_BackgroundPosition: +- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; ++ return nsCSSValueList::Equal(mValue.mCSSValueList, ++ aOther.mValue.mCSSValueList); + case eUnit_Transform: + return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; + case eUnit_CSSValuePairList: +- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; ++ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, ++ aOther.mValue.mCSSValuePairList); + case eUnit_UnparsedString: + return (NS_strcmp(GetStringBufferValue(), + aOther.GetStringBufferValue()) == 0); Copied: branches/2015Q1/www/firefox-esr/files/patch-bug1083461 (from r377564, head/www/firefox-esr/files/patch-bug1083461) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/firefox-esr/files/patch-bug1083461 Wed Jan 21 05:00:45 2015 (r377576, copy of r377564, head/www/firefox-esr/files/patch-bug1083461) @@ -0,0 +1,156 @@ +commit c97894b +Author: L. David Baron +Date: Sun Oct 19 23:31:39 2014 -0400 + + Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa +--- + layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ + layout/style/nsCSSValue.h | 22 ++++++++++++++++------ + layout/style/nsStyleAnimation.cpp | 6 ++++-- + 3 files changed, 36 insertions(+), 20 deletions(-) + +diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp +index 781ef65..4bbc979 100644 +--- layout/style/nsCSSValue.cpp ++++ layout/style/nsCSSValue.cpp +@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const + return *mValue.mRect == *aOther.mValue.mRect; + } + else if (eCSSUnit_List == mUnit) { +- return *mValue.mList == *aOther.mValue.mList; ++ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); + } + else if (eCSSUnit_SharedList == mUnit) { + return *mValue.mSharedList == *aOther.mValue.mSharedList; + } + else if (eCSSUnit_PairList == mUnit) { +- return *mValue.mPairList == *aOther.mValue.mPairList; ++ return nsCSSValuePairList::Equal(mValue.mPairList, ++ aOther.mValue.mPairList); + } + else if (eCSSUnit_GridTemplateAreas == mUnit) { + return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; +@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, + } + } + +-bool +-nsCSSValueList::operator==(const nsCSSValueList& aOther) const ++/* static */ bool ++nsCSSValueList::Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValueList *p1 = this, *p2 = &aOther; ++ const nsCSSValueList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mValue != p2->mValue) + return false; +@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult + bool + nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const + { +- return !mHead == !aOther.mHead && +- (!mHead || *mHead == *aOther.mHead); ++ return nsCSSValueList::Equal(mHead, aOther.mHead); + } + + size_t +@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, + } + } + +-bool +-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const ++/* static */ bool ++nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValuePairList *p1 = this, *p2 = &aOther; ++ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mXValue != p2->mXValue || + p1->mYValue != p2->mYValue) +diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h +index 753938c..77eeef0 100644 +--- layout/style/nsCSSValue.h ++++ layout/style/nsCSSValue.h +@@ -806,9 +806,8 @@ struct nsCSSValueList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(nsCSSValueList const& aOther) const; +- bool operator!=(const nsCSSValueList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -821,6 +820,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValueList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; + }; + + // nsCSSValueList_heap differs from nsCSSValueList only in being +@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(const nsCSSValuePairList& aOther) const; +- bool operator!=(const nsCSSValuePairList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -1215,6 +1219,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValuePairList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; + }; + + // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being +diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp +index 6c2ccb0..8dbe404 100644 +--- layout/style/nsStyleAnimation.cpp ++++ layout/style/nsStyleAnimation.cpp +@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const + case eUnit_Filter: + case eUnit_Shadow: + case eUnit_BackgroundPosition: +- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; ++ return nsCSSValueList::Equal(mValue.mCSSValueList, ++ aOther.mValue.mCSSValueList); + case eUnit_Transform: + return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; + case eUnit_CSSValuePairList: +- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; ++ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, ++ aOther.mValue.mCSSValuePairList); + case eUnit_UnparsedString: + return (NS_strcmp(GetStringBufferValue(), + aOther.GetStringBufferValue()) == 0); Copied: branches/2015Q1/www/firefox/files/patch-bug1083461 (from r377564, head/www/firefox/files/patch-bug1083461) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/firefox/files/patch-bug1083461 Wed Jan 21 05:00:45 2015 (r377576, copy of r377564, head/www/firefox/files/patch-bug1083461) @@ -0,0 +1,159 @@ +commit 87f367b +Author: L. David Baron +Date: Sun Oct 19 23:31:39 2014 -0400 + + Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky + + --HG-- + extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B +--- + layout/style/StyleAnimationValue.cpp | 6 ++++-- + layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ + layout/style/nsCSSValue.h | 22 ++++++++++++++++------ + 3 files changed, 36 insertions(+), 20 deletions(-) + +diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp +index 40bc8bf..1898fe6 100644 +--- layout/style/StyleAnimationValue.cpp ++++ layout/style/StyleAnimationValue.cpp +@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& aOther) const + case eUnit_Filter: + case eUnit_Shadow: + case eUnit_BackgroundPosition: +- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; ++ return nsCSSValueList::Equal(mValue.mCSSValueList, ++ aOther.mValue.mCSSValueList); + case eUnit_Transform: + return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; + case eUnit_CSSValuePairList: +- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; ++ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, ++ aOther.mValue.mCSSValuePairList); + case eUnit_UnparsedString: + return (NS_strcmp(GetStringBufferValue(), + aOther.GetStringBufferValue()) == 0); +diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp +index dcb8496..fefb4f9 100644 +--- layout/style/nsCSSValue.cpp ++++ layout/style/nsCSSValue.cpp +@@ -264,13 +264,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const + return *mValue.mRect == *aOther.mValue.mRect; + } + else if (eCSSUnit_List == mUnit) { +- return *mValue.mList == *aOther.mValue.mList; ++ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); + } + else if (eCSSUnit_SharedList == mUnit) { + return *mValue.mSharedList == *aOther.mValue.mSharedList; + } + else if (eCSSUnit_PairList == mUnit) { +- return *mValue.mPairList == *aOther.mValue.mPairList; ++ return nsCSSValuePairList::Equal(mValue.mPairList, ++ aOther.mValue.mPairList); + } + else if (eCSSUnit_GridTemplateAreas == mUnit) { + return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; +@@ -1875,13 +1876,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, + } + } + +-bool +-nsCSSValueList::operator==(const nsCSSValueList& aOther) const ++/* static */ bool ++nsCSSValueList::Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValueList *p1 = this, *p2 = &aOther; ++ const nsCSSValueList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mValue != p2->mValue) + return false; +@@ -1934,8 +1937,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult + bool + nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const + { +- return !mHead == !aOther.mHead && +- (!mHead || *mHead == *aOther.mHead); ++ return nsCSSValueList::Equal(mHead, aOther.mHead); + } + + size_t +@@ -2148,13 +2150,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, + } + } + +-bool +-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const ++/* static */ bool ++nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValuePairList *p1 = this, *p2 = &aOther; ++ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mXValue != p2->mXValue || + p1->mYValue != p2->mYValue) +diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h +index 8418a2d..f0c4e63 100644 +--- layout/style/nsCSSValue.h ++++ layout/style/nsCSSValue.h +@@ -871,9 +871,8 @@ struct nsCSSValueList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(nsCSSValueList const& aOther) const; +- bool operator!=(const nsCSSValueList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -886,6 +885,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValueList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; + }; + + // nsCSSValueList_heap differs from nsCSSValueList only in being +@@ -1264,9 +1269,8 @@ struct nsCSSValuePairList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(const nsCSSValuePairList& aOther) const; +- bool operator!=(const nsCSSValuePairList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -1280,6 +1284,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValuePairList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; + }; + + // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being Copied: branches/2015Q1/www/libxul/files/patch-bug1083461 (from r377564, head/www/libxul/files/patch-bug1083461) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/libxul/files/patch-bug1083461 Wed Jan 21 05:00:45 2015 (r377576, copy of r377564, head/www/libxul/files/patch-bug1083461) @@ -0,0 +1,156 @@ +commit c97894b +Author: L. David Baron +Date: Sun Oct 19 23:31:39 2014 -0400 + + Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa +--- + layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ + layout/style/nsCSSValue.h | 22 ++++++++++++++++------ + layout/style/nsStyleAnimation.cpp | 6 ++++-- + 3 files changed, 36 insertions(+), 20 deletions(-) + +diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp +index 781ef65..4bbc979 100644 +--- layout/style/nsCSSValue.cpp ++++ layout/style/nsCSSValue.cpp +@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const + return *mValue.mRect == *aOther.mValue.mRect; + } + else if (eCSSUnit_List == mUnit) { +- return *mValue.mList == *aOther.mValue.mList; ++ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); + } + else if (eCSSUnit_SharedList == mUnit) { + return *mValue.mSharedList == *aOther.mValue.mSharedList; + } + else if (eCSSUnit_PairList == mUnit) { +- return *mValue.mPairList == *aOther.mValue.mPairList; ++ return nsCSSValuePairList::Equal(mValue.mPairList, ++ aOther.mValue.mPairList); + } + else if (eCSSUnit_GridTemplateAreas == mUnit) { + return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; +@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, + } + } + +-bool +-nsCSSValueList::operator==(const nsCSSValueList& aOther) const ++/* static */ bool ++nsCSSValueList::Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValueList *p1 = this, *p2 = &aOther; ++ const nsCSSValueList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mValue != p2->mValue) + return false; +@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult + bool + nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const + { +- return !mHead == !aOther.mHead && +- (!mHead || *mHead == *aOther.mHead); ++ return nsCSSValueList::Equal(mHead, aOther.mHead); + } + + size_t +@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, + } + } + +-bool +-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const ++/* static */ bool ++nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValuePairList *p1 = this, *p2 = &aOther; ++ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mXValue != p2->mXValue || + p1->mYValue != p2->mYValue) +diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h +index 753938c..77eeef0 100644 +--- layout/style/nsCSSValue.h ++++ layout/style/nsCSSValue.h +@@ -806,9 +806,8 @@ struct nsCSSValueList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(nsCSSValueList const& aOther) const; +- bool operator!=(const nsCSSValueList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -821,6 +820,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValueList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; + }; + + // nsCSSValueList_heap differs from nsCSSValueList only in being +@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(const nsCSSValuePairList& aOther) const; +- bool operator!=(const nsCSSValuePairList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -1215,6 +1219,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValuePairList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; + }; + + // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being +diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp +index 6c2ccb0..8dbe404 100644 +--- layout/style/nsStyleAnimation.cpp ++++ layout/style/nsStyleAnimation.cpp +@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const + case eUnit_Filter: + case eUnit_Shadow: + case eUnit_BackgroundPosition: +- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; ++ return nsCSSValueList::Equal(mValue.mCSSValueList, ++ aOther.mValue.mCSSValueList); + case eUnit_Transform: + return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; + case eUnit_CSSValuePairList: +- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; ++ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, ++ aOther.mValue.mCSSValuePairList); + case eUnit_UnparsedString: + return (NS_strcmp(GetStringBufferValue(), + aOther.GetStringBufferValue()) == 0); Copied: branches/2015Q1/www/seamonkey/files/patch-bug1083461 (from r377564, head/www/seamonkey/files/patch-bug1083461) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/seamonkey/files/patch-bug1083461 Wed Jan 21 05:00:45 2015 (r377576, copy of r377564, head/www/seamonkey/files/patch-bug1083461) @@ -0,0 +1,159 @@ +commit 87f367b +Author: L. David Baron +Date: Sun Oct 19 23:31:39 2014 -0400 + + Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky + + --HG-- + extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B +--- + layout/style/StyleAnimationValue.cpp | 6 ++++-- + layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ + layout/style/nsCSSValue.h | 22 ++++++++++++++++------ + 3 files changed, 36 insertions(+), 20 deletions(-) + +diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp +index 40bc8bf..1898fe6 100644 +--- mozilla/layout/style/StyleAnimationValue.cpp ++++ mozilla/layout/style/StyleAnimationValue.cpp +@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& aOther) const + case eUnit_Filter: + case eUnit_Shadow: + case eUnit_BackgroundPosition: +- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; ++ return nsCSSValueList::Equal(mValue.mCSSValueList, ++ aOther.mValue.mCSSValueList); + case eUnit_Transform: + return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; + case eUnit_CSSValuePairList: +- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; ++ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, ++ aOther.mValue.mCSSValuePairList); + case eUnit_UnparsedString: + return (NS_strcmp(GetStringBufferValue(), + aOther.GetStringBufferValue()) == 0); +diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp +index dcb8496..fefb4f9 100644 +--- mozilla/layout/style/nsCSSValue.cpp ++++ mozilla/layout/style/nsCSSValue.cpp +@@ -264,13 +264,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const + return *mValue.mRect == *aOther.mValue.mRect; + } + else if (eCSSUnit_List == mUnit) { +- return *mValue.mList == *aOther.mValue.mList; ++ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); + } + else if (eCSSUnit_SharedList == mUnit) { + return *mValue.mSharedList == *aOther.mValue.mSharedList; + } + else if (eCSSUnit_PairList == mUnit) { +- return *mValue.mPairList == *aOther.mValue.mPairList; ++ return nsCSSValuePairList::Equal(mValue.mPairList, ++ aOther.mValue.mPairList); + } + else if (eCSSUnit_GridTemplateAreas == mUnit) { + return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; +@@ -1875,13 +1876,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, + } + } + +-bool +-nsCSSValueList::operator==(const nsCSSValueList& aOther) const ++/* static */ bool ++nsCSSValueList::Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValueList *p1 = this, *p2 = &aOther; ++ const nsCSSValueList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mValue != p2->mValue) + return false; +@@ -1934,8 +1937,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult + bool + nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const + { +- return !mHead == !aOther.mHead && +- (!mHead || *mHead == *aOther.mHead); ++ return nsCSSValueList::Equal(mHead, aOther.mHead); + } + + size_t +@@ -2148,13 +2150,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, + } + } + +-bool +-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const ++/* static */ bool ++nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2) + { +- if (this == &aOther) ++ if (aList1 == aList2) { + return true; ++ } + +- const nsCSSValuePairList *p1 = this, *p2 = &aOther; ++ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; + for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { + if (p1->mXValue != p2->mXValue || + p1->mYValue != p2->mYValue) +diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h +index 8418a2d..f0c4e63 100644 +--- mozilla/layout/style/nsCSSValue.h ++++ mozilla/layout/style/nsCSSValue.h +@@ -871,9 +871,8 @@ struct nsCSSValueList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(nsCSSValueList const& aOther) const; +- bool operator!=(const nsCSSValueList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValueList* aList1, ++ const nsCSSValueList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -886,6 +885,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValueList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; + }; + + // nsCSSValueList_heap differs from nsCSSValueList only in being +@@ -1264,9 +1269,8 @@ struct nsCSSValuePairList { + void AppendToString(nsCSSProperty aProperty, nsAString& aResult, + nsCSSValue::Serialization aValueSerialization) const; + +- bool operator==(const nsCSSValuePairList& aOther) const; +- bool operator!=(const nsCSSValuePairList& aOther) const +- { return !(*this == aOther); } ++ static bool Equal(const nsCSSValuePairList* aList1, ++ const nsCSSValuePairList* aList2); + + size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; + +@@ -1280,6 +1284,12 @@ private: + { + MOZ_COUNT_CTOR(nsCSSValuePairList); + } ++ ++ // We don't want operator== or operator!= because they wouldn't be ++ // null-safe, which is generally what we need. Use |Equal| method ++ // above instead. ++ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; ++ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; + }; + + // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 21 13:53:24 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5FAFB6D3; Wed, 21 Jan 2015 13:53:24 +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 49F0A371; Wed, 21 Jan 2015 13:53:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0LDrOp5018100; Wed, 21 Jan 2015 13:53:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0LDrN90018095; Wed, 21 Jan 2015 13:53:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201501211353.t0LDrN90018095@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Jan 2015 13:53:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377609 - in branches/2015Q1: mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey 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, 21 Jan 2015 13:53:24 -0000 Author: jbeich Date: Wed Jan 21 13:53:22 2015 New Revision: 377609 URL: https://svnweb.freebsd.org/changeset/ports/377609 QAT: https://qat.redports.org/buildarchive/r377609/ Log: MFH: r377605 Bump PORTREVISION after r377564. PR: 196802 Requested by: dumbbell, tijl Differential Revision: https://reviews.freebsd.org/D1574 Approved by: bapt (mentor) Approved by: portmgr (bapt) Modified: branches/2015Q1/mail/thunderbird/Makefile branches/2015Q1/www/firefox-esr/Makefile branches/2015Q1/www/firefox/Makefile branches/2015Q1/www/libxul/Makefile branches/2015Q1/www/seamonkey/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q1/mail/thunderbird/Makefile Wed Jan 21 13:48:36 2015 (r377608) +++ branches/2015Q1/mail/thunderbird/Makefile Wed Jan 21 13:53:22 2015 (r377609) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 31.4.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ Modified: branches/2015Q1/www/firefox-esr/Makefile ============================================================================== --- branches/2015Q1/www/firefox-esr/Makefile Wed Jan 21 13:48:36 2015 (r377608) +++ branches/2015Q1/www/firefox-esr/Makefile Wed Jan 21 13:53:22 2015 (r377609) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 31.4.0 DISTVERSIONSUFFIX=esr.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source Modified: branches/2015Q1/www/firefox/Makefile ============================================================================== --- branches/2015Q1/www/firefox/Makefile Wed Jan 21 13:48:36 2015 (r377608) +++ branches/2015Q1/www/firefox/Makefile Wed Jan 21 13:53:22 2015 (r377609) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 35.0 DISTVERSIONSUFFIX=.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2015Q1/www/libxul/Makefile ============================================================================== --- branches/2015Q1/www/libxul/Makefile Wed Jan 21 13:48:36 2015 (r377608) +++ branches/2015Q1/www/libxul/Makefile Wed Jan 21 13:53:22 2015 (r377609) @@ -3,6 +3,7 @@ PORTNAME= libxul DISTVERSION= 31.4.0 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source DISTNAME= firefox-${DISTVERSION}esr.source Modified: branches/2015Q1/www/seamonkey/Makefile ============================================================================== --- branches/2015Q1/www/seamonkey/Makefile Wed Jan 21 13:48:36 2015 (r377608) +++ branches/2015Q1/www/seamonkey/Makefile Wed Jan 21 13:53:22 2015 (r377609) @@ -3,6 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.32 +PORTREVISION= 1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 22 17:54:25 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1238245; Thu, 22 Jan 2015 17:54: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 72B35C35; Thu, 22 Jan 2015 17:54: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 t0MHsPBm018400; Thu, 22 Jan 2015 17:54:25 GMT (envelope-from jase@FreeBSD.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MHsPHe018398; Thu, 22 Jan 2015 17:54:25 GMT (envelope-from jase@FreeBSD.org) Message-Id: <201501221754.t0MHsPHe018398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jase set sender to jase@FreeBSD.org using -f From: Jase Thew Date: Thu, 22 Jan 2015 17:54:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377689 - in branches/2015Q1/security/polarssl13: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2015 17:54:25 -0000 Author: jase Date: Thu Jan 22 17:54:24 2015 New Revision: 377689 URL: https://svnweb.freebsd.org/changeset/ports/377689 QAT: https://qat.redports.org/buildarchive/r377689/ Log: MFH: r377673 security/polarssl13: - Add upstream patch to address crafted certificates vulnerability - Add USES cpe Security: CVE-2015-1182 Security: a5856eba-a015-11e4-a680-1c6f65c3c4ff Approved by: maintainer (chris@bsdjunk.com) Approved by: ports-secteam (erwin) Added: branches/2015Q1/security/polarssl13/files/patch-library-asn1parse_c - copied unchanged from r377673, head/security/polarssl13/files/patch-library-asn1parse_c Modified: branches/2015Q1/security/polarssl13/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/polarssl13/Makefile ============================================================================== --- branches/2015Q1/security/polarssl13/Makefile Thu Jan 22 17:49:26 2015 (r377688) +++ branches/2015Q1/security/polarssl13/Makefile Thu Jan 22 17:54:24 2015 (r377689) @@ -2,6 +2,7 @@ PORTNAME= polarssl PORTVERSION= 1.3.9 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gpl CATEGORIES= security devel MASTER_SITES= http://polarssl.org/download/ @@ -14,7 +15,7 @@ LICENSE= GPLv2 ALL_TARGET= no_test -USES= gmake tar:tgz +USES= cpe gmake tar:tgz USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Copied: branches/2015Q1/security/polarssl13/files/patch-library-asn1parse_c (from r377673, head/security/polarssl13/files/patch-library-asn1parse_c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/polarssl13/files/patch-library-asn1parse_c Thu Jan 22 17:54:24 2015 (r377689, copy of r377673, head/security/polarssl13/files/patch-library-asn1parse_c) @@ -0,0 +1,11 @@ +--- library/asn1parse.c.orig 2015-01-20 10:12:00.469677333 +0000 ++++ library/asn1parse.c 2015-01-20 10:14:00.764667419 +0000 +@@ -278,6 +278,8 @@ + if( cur->next == NULL ) + return( POLARSSL_ERR_ASN1_MALLOC_FAILED ); + ++ memset( cur->next, 0, sizeof( asn1_sequence ) ); ++ + cur = cur->next; + } + } From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 22 19:48:49 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC0E5B3C; Thu, 22 Jan 2015 19:48:49 +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 BE4BFAE9; Thu, 22 Jan 2015 19:48:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0MJmnmh073341; Thu, 22 Jan 2015 19:48:49 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MJmnwe073339; Thu, 22 Jan 2015 19:48:49 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201501221948.t0MJmnwe073339@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Thu, 22 Jan 2015 19:48:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377694 - branches/2015Q1/security/linux-c6-openssl 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, 22 Jan 2015 19:48:50 -0000 Author: xmj Date: Thu Jan 22 19:48:48 2015 New Revision: 377694 URL: https://svnweb.freebsd.org/changeset/ports/377694 QAT: https://qat.redports.org/buildarchive/r377694/ Log: MFH: r377671 security/linux-c6-openssl: upgrade to 1.0.1e_3 - Upgrade to 1.0.1e_3 - Fixes CVEs from 2015-01-08. Differential Revision: https://reviews.freebsd.org/D1597 Security: 4e536c14-9791-11e4-977d-d050992ecde8 Approved by: swills (mentor) Approved by: ports-secteam (delphij) Modified: branches/2015Q1/security/linux-c6-openssl/Makefile branches/2015Q1/security/linux-c6-openssl/distinfo.i686 Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/linux-c6-openssl/Makefile ============================================================================== --- branches/2015Q1/security/linux-c6-openssl/Makefile Thu Jan 22 18:59:38 2015 (r377693) +++ branches/2015Q1/security/linux-c6-openssl/Makefile Thu Jan 22 19:48:48 2015 (r377694) @@ -3,8 +3,9 @@ PORTNAME= openssl PORTVERSION= 1.0.1e -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security linux +MASTER_SITES= CENTOS_LINUX_UPDATES MAINTAINER= emulation@FreeBSD.org COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER}) @@ -14,7 +15,7 @@ CONFLICTS= linux-openssl-[0-9]* linux-f8 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= c6 USE_LINUX_RPM= yes -RPMVERSION= 30.el6 +RPMVERSION= 30.el6_6.5 BRANDELF_FILES= usr/bin/openssl USE_LDCONFIG= yes Modified: branches/2015Q1/security/linux-c6-openssl/distinfo.i686 ============================================================================== --- branches/2015Q1/security/linux-c6-openssl/distinfo.i686 Thu Jan 22 18:59:38 2015 (r377693) +++ branches/2015Q1/security/linux-c6-openssl/distinfo.i686 Thu Jan 22 19:48:48 2015 (r377694) @@ -1,4 +1,4 @@ -SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.i686.rpm) = ce24bb4bf68da374a9de97a34d9efb4b122a93dc87f55b15c89e78cf69913bd1 -SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.i686.rpm) = 1582028 -SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.src.rpm) = f388776bc8efa0f61dbcbb20a305c45e98a697aeb1ef6cd44cf60d44f776ef56 -SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.src.rpm) = 3166046 +SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6_6.5.i686.rpm) = 0b92c578790913dffc24ce526b0465d216dd988451a5a9666a357a321969c276 +SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6_6.5.i686.rpm) = 1582840 +SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6_6.5.src.rpm) = 61aaf1b8adff685f227ace33dec9b5ab68b4e614587d40b5dd11ba76117461ca +SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6_6.5.src.rpm) = 3189496