From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 26 21:19:31 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 A534677; Mon, 26 Jan 2015 21:19:31 +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 86C37F21; Mon, 26 Jan 2015 21:19:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0QLJVTn072777; Mon, 26 Jan 2015 21:19:31 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0QLJUpG072774; Mon, 26 Jan 2015 21:19:30 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201501262119.t0QLJUpG072774@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 26 Jan 2015 21:19:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377957 - in branches/2015Q1: devel/bugzilla44 german/bugzilla44 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, 26 Jan 2015 21:19:31 -0000 Author: ohauer Date: Mon Jan 26 21:19:30 2015 New Revision: 377957 URL: https://svnweb.freebsd.org/changeset/ports/377957 QAT: https://qat.redports.org/buildarchive/r377957/ Log: MFH: r377952 - update to 4.4.7 - adjust dependency Security: dc2d76df-a595-11e4-9363-20cf30e32f6d CVE-2014-8630 MFH: r377954 - adjust bugzilla revision to 4.4.7, - bump PORTREVISION Approved by: portmgr (mat) Modified: branches/2015Q1/devel/bugzilla44/Makefile branches/2015Q1/devel/bugzilla44/distinfo branches/2015Q1/german/bugzilla44/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/bugzilla44/Makefile ============================================================================== --- branches/2015Q1/devel/bugzilla44/Makefile Mon Jan 26 20:53:59 2015 (r377956) +++ branches/2015Q1/devel/bugzilla44/Makefile Mon Jan 26 21:19:30 2015 (r377957) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.6 -PORTREVISION= 3 +PORTVERSION= 4.4.7 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -15,7 +14,7 @@ LICENSE= MPL # see Bugzilla/Install/Requirements.pm RUN_DEPENDS= \ p5-CGI.pm>=3.51:${PORTSDIR}/www/p5-CGI.pm \ - p5-DBI>=1.54:${PORTSDIR}/databases/p5-DBI \ + p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \ p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \ p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \ p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \ @@ -89,7 +88,7 @@ RUN_DEPENDS+= p5-PatchReader>=0.9.6:${PO .endif .if ${PORT_OPTIONS:MMORE_HTML} -RUN_DEPENDS+= p5-HTML-Parser>=3.40:${PORTSDIR}/www/p5-HTML-Parser \ +RUN_DEPENDS+= p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \ p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber .endif Modified: branches/2015Q1/devel/bugzilla44/distinfo ============================================================================== --- branches/2015Q1/devel/bugzilla44/distinfo Mon Jan 26 20:53:59 2015 (r377956) +++ branches/2015Q1/devel/bugzilla44/distinfo Mon Jan 26 21:19:30 2015 (r377957) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.4.6.tar.gz) = ac3547195f2ce156488aac2cc537620775e08a9d888441daab2b40ab66ab01f4 -SIZE (bugzilla/bugzilla-4.4.6.tar.gz) = 2956046 +SHA256 (bugzilla/bugzilla-4.4.7.tar.gz) = 5fe8141f017b964b3b80b94665bb73d15a31291393fc34429523ecbab26b2695 +SIZE (bugzilla/bugzilla-4.4.7.tar.gz) = 4924634 Modified: branches/2015Q1/german/bugzilla44/Makefile ============================================================================== --- branches/2015Q1/german/bugzilla44/Makefile Mon Jan 26 20:53:59 2015 (r377956) +++ branches/2015Q1/german/bugzilla44/Makefile Mon Jan 26 21:19:30 2015 (r377957) @@ -2,6 +2,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.6 +PORTREVISION= 1 CATEGORIES= german MASTER_SITES= SF MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION} @@ -16,7 +17,7 @@ NO_WRKSUBDIR= yes # adjust BZ_REVNUM if bugzilla revision was incremented and there are no # changes in bugzilla/templates/en. If not used simply comment the line. -#BZ_REVNUM= 5 +BZ_REVNUM= 7 .include "${.CURDIR}/../../devel/bugzilla44/Makefile.common" From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 27 13:55:30 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 5F24631D; Tue, 27 Jan 2015 13:55:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F5BFE3B; Tue, 27 Jan 2015 13:55:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0RDtU6s056613; Tue, 27 Jan 2015 13:55:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0RDtSLX056602; Tue, 27 Jan 2015 13:55:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201501271355.t0RDtSLX056602@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 27 Jan 2015 13:55:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378009 - in branches/2015Q1/net/libutp: . 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, 27 Jan 2015 13:55:30 -0000 Author: jbeich Date: Tue Jan 27 13:55:27 2015 New Revision: 378009 URL: https://svnweb.freebsd.org/changeset/ports/378009 QAT: https://qat.redports.org/buildarchive/r378009/ Log: MFH: r377320 by riggs Convert to USE_GITHUB PR: 196616 Submitted by: jbeich@vfemail.net Approved by: mi@FreeBSD.org (maintainer) MFH: r377674 by mi Add a patch fixing a long-standing security problem. Bump PORTREVISION. PR: 196351 Differential Revision: D1593 Submitted by: Jan Beich Security: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-6129 While here, arrange for building a few of the small utilities bundled with library, and install them along with another potentially useful header-file. Sponsored by: http://libpipe.com/ MFH: r377699 by mi Add a patch to fix 64-bit specific warnings in the just-added utilities. PR: 197009 Submitted by: Jan Beich Approved by: portmgr (mat, bapt) Approved by: bapt (mentor) Added: branches/2015Q1/net/libutp/files/BSDmakefile.utils - copied unchanged from r377674, head/net/libutp/files/BSDmakefile.utils branches/2015Q1/net/libutp/files/patch-CVE-2012-6129 - copied unchanged from r377674, head/net/libutp/files/patch-CVE-2012-6129 branches/2015Q1/net/libutp/files/patch-size_t - copied unchanged from r377699, head/net/libutp/files/patch-size_t Modified: branches/2015Q1/net/libutp/Makefile branches/2015Q1/net/libutp/distinfo branches/2015Q1/net/libutp/files/BSDmakefile branches/2015Q1/net/libutp/pkg-descr branches/2015Q1/net/libutp/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/libutp/Makefile ============================================================================== --- branches/2015Q1/net/libutp/Makefile Tue Jan 27 13:38:01 2015 (r378008) +++ branches/2015Q1/net/libutp/Makefile Tue Jan 27 13:55:27 2015 (r378009) @@ -3,15 +3,20 @@ PORTNAME= bittorrent-libutp PORTVERSION= 0.20130514 -DISTVERSION= 7c4f19a +PORTREVISION= 1 CATEGORIES= net devel -MASTER_SITES= https://github.com/bittorrent/libutp/tarball/${DISTVERSION}/ MAINTAINER= mi@aldan.algebra.com -COMMENT= The uTorrent Transport Protocol library +COMMENT= The uTorrent Transport Protocol library and sample utilities LICENSE= MIT +USE_GITHUB= yes +GH_ACCOUNT= ${PORTNAME:C/-.*//} +GH_PROJECT= ${PORTNAME:C/.*-//} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 7c4f19a + USES= dos2unix uidfix MAKEFILE= ${FILESDIR}/BSDmakefile USE_LDCONFIG= yes @@ -19,4 +24,16 @@ USE_LDCONFIG= yes pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/libutp +post-build: + ${MAKE} -f ${FILESDIR}/BSDmakefile.utils -C ${WRKSRC}/utp_file PROG_CXX=utp_send + ${MAKE} -f ${FILESDIR}/BSDmakefile.utils -C ${WRKSRC}/utp_file PROG_CXX=utp_recv + ${MAKE} -f ${FILESDIR}/BSDmakefile.utils -C ${WRKSRC}/utp_test PROG_CXX=utp_test + +post-install: + ${INSTALL_PROGRAM} \ + ${WRKSRC}/utp_file/utp_send \ + ${WRKSRC}/utp_file/utp_recv \ + ${WRKSRC}/utp_test/utp_test \ + ${STAGEDIR}${PREFIX}/bin/ + .include Modified: branches/2015Q1/net/libutp/distinfo ============================================================================== --- branches/2015Q1/net/libutp/distinfo Tue Jan 27 13:38:01 2015 (r378008) +++ branches/2015Q1/net/libutp/distinfo Tue Jan 27 13:55:27 2015 (r378009) @@ -1,2 +1,2 @@ -SHA256 (bittorrent-libutp-7c4f19a.tar.gz) = 305ae8aa43bee7d7d7d1411b07bcde246fab449fbdaf087673cf7b07659cb934 -SIZE (bittorrent-libutp-7c4f19a.tar.gz) = 71029 +SHA256 (bittorrent-libutp-0.20130514.tar.gz) = 305ae8aa43bee7d7d7d1411b07bcde246fab449fbdaf087673cf7b07659cb934 +SIZE (bittorrent-libutp-0.20130514.tar.gz) = 71029 Modified: branches/2015Q1/net/libutp/files/BSDmakefile ============================================================================== --- branches/2015Q1/net/libutp/files/BSDmakefile Tue Jan 27 13:38:01 2015 (r378008) +++ branches/2015Q1/net/libutp/files/BSDmakefile Tue Jan 27 13:55:27 2015 (r378009) @@ -9,6 +9,8 @@ CXXFLAGS+= -Wall INCLUDEDIR= ${PREFIX}/include/libutp LIBDIR= ${PREFIX}/lib -INCS= utp.h utp_utils.h utypes.h +INCS= utp.h utp_utils.h utypes.h utp_file/udp.h + +WARNS= 5 .include Copied: branches/2015Q1/net/libutp/files/BSDmakefile.utils (from r377674, head/net/libutp/files/BSDmakefile.utils) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/libutp/files/BSDmakefile.utils Tue Jan 27 13:55:27 2015 (r378009, copy of r377674, head/net/libutp/files/BSDmakefile.utils) @@ -0,0 +1,10 @@ +# PROG_CXX defined on command-line + +SRCS= ${PROG_CXX}.cpp +NO_MAN= ha-ha +LDADD= -L.. -lutp +CXXFLAGS+= -I.. -DPOSIX + +WARNS= 3 + +.include Copied: branches/2015Q1/net/libutp/files/patch-CVE-2012-6129 (from r377674, head/net/libutp/files/patch-CVE-2012-6129) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/libutp/files/patch-CVE-2012-6129 Tue Jan 27 13:55:27 2015 (r378009, copy of r377674, head/net/libutp/files/patch-CVE-2012-6129) @@ -0,0 +1,52 @@ +Index: utp.cpp +=================================================================== +--- utp.cpp (revision 13645) ++++ utp.cpp (revision 13646) +@@ -1487,6 +1487,8 @@ size_t UTPSocket::selective_ack_bytes(uint base, c + return acked_bytes; + } + ++enum { MAX_EACK = 128 }; ++ + void UTPSocket::selective_ack(uint base, const byte *mask, byte len) + { + if (cur_window_packets == 0) return; +@@ -1499,7 +1501,7 @@ void UTPSocket::selective_ack(uint base, const byt + // resends is a stack of sequence numbers we need to resend. Since we + // iterate in reverse over the acked packets, at the end, the top packets + // are the ones we want to resend +- int resends[32]; ++ int resends[MAX_EACK]; + int nr = 0; + + LOG_UTPV("0x%08x: Got EACK [%032b] base:%u", this, *(uint32*)mask, base); +@@ -1572,6 +1574,12 @@ void UTPSocket::selective_ack(uint base, const byt + if (((v - fast_resend_seq_nr) & ACK_NR_MASK) <= OUTGOING_BUFFER_MAX_SIZE && + count >= DUPLICATE_ACKS_BEFORE_RESEND && + duplicate_ack < DUPLICATE_ACKS_BEFORE_RESEND) { ++ // resends is a stack, and we're mostly interested in the top of it ++ // if we're full, just throw away the lower half ++ if (nr >= MAX_EACK - 2) { ++ memmove(resends, &resends[MAX_EACK/2], MAX_EACK/2 * sizeof(resends[0])); ++ nr -= MAX_EACK / 2; ++ } + resends[nr++] = v; + LOG_UTPV("0x%08x: no ack for %u", this, v); + } else { +@@ -1580,13 +1588,12 @@ void UTPSocket::selective_ack(uint base, const byt + } + } while (--bits >= -1); + +- if (((base - 1 - fast_resend_seq_nr) & ACK_NR_MASK) < 256 && +- count >= DUPLICATE_ACKS_BEFORE_RESEND && +- duplicate_ack < DUPLICATE_ACKS_BEFORE_RESEND) { ++ if (((base - 1 - fast_resend_seq_nr) & ACK_NR_MASK) <= OUTGOING_BUFFER_MAX_SIZE && ++ count >= DUPLICATE_ACKS_BEFORE_RESEND) { + // if we get enough duplicate acks to start + // resending, the first packet we should resend + // is base-1 +- resends[nr++] = base - 1; ++ resends[nr++] = (base - 1) & ACK_NR_MASK; + } else { + LOG_UTPV("0x%08x: not resending %u count:%d dup_ack:%u fast_resend_seq_nr:%u", + this, base - 1, count, duplicate_ack, fast_resend_seq_nr); Copied: branches/2015Q1/net/libutp/files/patch-size_t (from r377699, head/net/libutp/files/patch-size_t) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/libutp/files/patch-size_t Tue Jan 27 13:55:27 2015 (r378009, copy of r377699, head/net/libutp/files/patch-size_t) @@ -0,0 +1,54 @@ +--- utp_file/utp_recv.cpp 2013-05-14 19:05:36.000000000 -0400 ++++ utp_file/utp_recv.cpp 2015-01-22 16:45:03.000000000 -0500 +@@ -82,5 +82,5 @@ + UTPSocket *utp_socket = NULL; + FILE *file = NULL; +-size_t total_recv = 0; ++intmax_t total_recv = 0; + bool no_connection = true; + +@@ -205,5 +205,5 @@ + { + assert(utp_socket == socket); +- printf("utp on_write %u\n", count); ++ printf("utp on_write %zu\n", count); + assert(false); + } +@@ -365,10 +365,10 @@ + last_recv = total_recv; + last_time = cur_time; +- printf("\r[%u] recv: %d %.1f bytes/s ", cur_time, total_recv, rate); ++ printf("\r[%u] recv: %jd %.1f bytes/s ", cur_time, total_recv, rate); + fflush(stdout); + } + } + +- printf("\nreceived: %d bytes\n", total_recv); ++ printf("\nreceived: %jd bytes\n", (intmax_t)total_recv); + fclose(file); + fclose(log_file); +--- utp_file/utp_send.cpp 2013-05-14 19:05:36.000000000 -0400 ++++ utp_file/utp_send.cpp 2015-01-22 16:45:03.000000000 -0500 +@@ -82,6 +82,6 @@ + UTPSocket *utp_socket = NULL; + FILE *file = NULL; +-size_t total_sent = 0; +-size_t file_size = 0; ++intmax_t total_sent = 0; ++intmax_t file_size = 0; + + void utp_log(char const* fmt, ...) +@@ -252,5 +252,5 @@ + { + assert(utp_socket == socket); +- printf("utp on_read %u\n", count); ++ printf("utp on_read %zu\n", count); + assert(false); + } +@@ -392,5 +392,5 @@ + last_sent = total_sent; + last_time = cur_time; +- printf("\r[%u] sent: %d/%d %.1f bytes/s ", cur_time, total_sent, file_size, rate); ++ printf("\r[%u] sent: %jd/%jd %.1f bytes/s ", cur_time, total_sent, file_size, rate); + fflush(stdout); + } Modified: branches/2015Q1/net/libutp/pkg-descr ============================================================================== --- branches/2015Q1/net/libutp/pkg-descr Tue Jan 27 13:38:01 2015 (r378008) +++ branches/2015Q1/net/libutp/pkg-descr Tue Jan 27 13:55:27 2015 (r378009) @@ -9,4 +9,4 @@ transport for uTorrent peer-to-peer conn uTP is written in C++, but the external interface is strictly C (ANSI C89). -WWW: https://github.com/bittorrent/libutp +WWW: https://github.com/bittorrent/libutp Modified: branches/2015Q1/net/libutp/pkg-plist ============================================================================== --- branches/2015Q1/net/libutp/pkg-plist Tue Jan 27 13:38:01 2015 (r378008) +++ branches/2015Q1/net/libutp/pkg-plist Tue Jan 27 13:55:27 2015 (r378009) @@ -1,6 +1,10 @@ +bin/utp_send +bin/utp_recv +bin/utp_test lib/libutp.so.0 lib/libutp.so lib/libutp.a +include/libutp/udp.h include/libutp/utp.h include/libutp/utp_utils.h include/libutp/utypes.h From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 27 20:29:21 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 D8861614; Tue, 27 Jan 2015 20:29:20 +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 C2DE65FB; Tue, 27 Jan 2015 20:29:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0RKTKcx040293; Tue, 27 Jan 2015 20:29:20 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0RKTJLx040284; Tue, 27 Jan 2015 20:29:19 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201501272029.t0RKTJLx040284@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 27 Jan 2015 20:29:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378014 - in branches/2015Q1/sysutils/fusefs-kmod: . 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, 27 Jan 2015 20:29:21 -0000 Author: riggs Date: Tue Jan 27 20:29:19 2015 New Revision: 378014 URL: https://svnweb.freebsd.org/changeset/ports/378014 QAT: https://qat.redports.org/buildarchive/r378014/ Log: MFH: r377941 Fix build failure on 9.x While on it: - Pet portlint PR: 195095 Submitted by: woot-woot@yandex.ru (PR) evgeni.dimitrov@gmail.com (patch) Reviewed by: dpejesh@yahoo.com (maintainer) Approved by: portmgr (mat), dpejesh@yahoo.com (maintainer) Added: branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c - copied unchanged from r377941, head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c Modified: branches/2015Q1/sysutils/fusefs-kmod/Makefile branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c branches/2015Q1/sysutils/fusefs-kmod/pkg-descr Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/sysutils/fusefs-kmod/Makefile ============================================================================== --- branches/2015Q1/sysutils/fusefs-kmod/Makefile Tue Jan 27 20:13:45 2015 (r378013) +++ branches/2015Q1/sysutils/fusefs-kmod/Makefile Tue Jan 27 20:29:19 2015 (r378014) @@ -2,13 +2,15 @@ PORTNAME= fusefs-kmod PORTVERSION= 0.263233 +PORTREVISION= 1 PORTEPOCH= 1 -CATEGORIES= sysutils kld +CATEGORIES= sysutils +MASTER_SITES= https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/ MAINTAINER= dpejesh@yahoo.com COMMENT= FUSE kernel module -MASTER_SITES= https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/ +BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs ONLY_FOR_ARCHS= amd64 i386 @@ -17,8 +19,6 @@ WRKSRC= ${WRKDIR} USE_RC_SUBR= fusefs USES= kmod uidfix -BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs - MAKE_ENV= BINDIR="${PREFIX}/sbin" \ MANDIR="${MANPREFIX}/man/man" @@ -32,6 +32,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vnops.c .endif .if ${OSVERSION} >= 900000 && ${OSVERSION} < 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_main.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vfsops.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vnops.c .endif Copied: branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c (from r377941, head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c Tue Jan 27 20:29:19 2015 (r378014, copy of r377941, head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c) @@ -0,0 +1,22 @@ +--- fs/fuse/fuse_main.c.orig 2014-12-02 15:57:14.465629906 +0200 ++++ fs/fuse/fuse_main.c 2014-12-02 16:03:10.070605830 +0200 +@@ -92,10 +92,19 @@ + .vfc_flags = VFCF_SYNTHETIC + }; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION, ++ "FUSE kernel abi major version"); ++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION, ++ "FUSE kernel abi minor version"); ++#else + SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, + 0, FUSE_KERNEL_VERSION, "FUSE kernel abi major version"); + SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, + 0, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version"); ++#endif // SYSCTL_NULL_INT_PTR + + /****************************** + * Modified: branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c ============================================================================== --- branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c Tue Jan 27 20:13:45 2015 (r378013) +++ branches/2015Q1/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c Tue Jan 27 20:29:19 2015 (r378014) @@ -1,6 +1,6 @@ ---- fs/fuse/fuse_vfsops.c.orig -+++ fs/fuse/fuse_vfsops.c -@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); +--- fs/fuse/fuse_vfsops.c.orig 2014-03-16 12:55:57.000000000 +0200 ++++ fs/fuse/fuse_vfsops.c 2014-12-02 16:02:35.879606170 +0200 +@@ -62,7 +62,7 @@ #include #include #include @@ -9,7 +9,32 @@ #include #include #include -@@ -220,7 +220,6 @@ fuse_vfsop_mount(struct mount *mp) +@@ -113,13 +113,24 @@ + .vfs_statfs = fuse_vfsop_statfs, + }; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, 1, "indicate async handshake"); ++#else + SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, + 0, 1, "indicate async handshake"); ++#endif // SYSCTL_NULL_INT_PTR + static int fuse_enforce_dev_perms = 0; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, ++ &fuse_enforce_dev_perms, 0, ++ "enforce fuse device permissions for secondary mounts"); ++#else + SYSCTL_LONG(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, + &fuse_enforce_dev_perms, 0, + "enforce fuse device permissions for secondary mounts"); ++#endif // SYSCTL_NULL_INT_PTR + static unsigned sync_unmount = 1; + + SYSCTL_UINT(_vfs_fuse, OID_AUTO, sync_unmount, CTLFLAG_RW, +@@ -220,7 +231,6 @@ struct file *fp, *fptmp; char *fspec, *subtype; struct vfsoptlist *opts; @@ -17,7 +42,7 @@ subtype = NULL; max_read_set = 0; -@@ -290,7 +289,7 @@ fuse_vfsop_mount(struct mount *mp) +@@ -290,7 +300,7 @@ FS_DEBUG2G("mntopts 0x%jx\n", (uintmax_t)mntopts); @@ -26,7 +51,7 @@ if (err != 0) { FS_DEBUG("invalid or not opened device: data=%p\n", data); goto out; -@@ -459,7 +458,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp) +@@ -459,7 +469,7 @@ FUSE_UNLOCK(); VOP_UNLOCK(*vpp, 0); vrele(*vpp); Modified: branches/2015Q1/sysutils/fusefs-kmod/pkg-descr ============================================================================== --- branches/2015Q1/sysutils/fusefs-kmod/pkg-descr Tue Jan 27 20:13:45 2015 (r378013) +++ branches/2015Q1/sysutils/fusefs-kmod/pkg-descr Tue Jan 27 20:29:19 2015 (r378014) @@ -1,3 +1,2 @@ Kernel module for fusefs based filesystems, backported from 10.x to 8.x and 9.x. - From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 27 22:21: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 50C72E18; Tue, 27 Jan 2015 22:21: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 328C93A5; Tue, 27 Jan 2015 22:21: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 t0RMLnKn001249; Tue, 27 Jan 2015 22:21:49 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0RMLmq0001246; Tue, 27 Jan 2015 22:21:48 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201501272221.t0RMLmq0001246@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 27 Jan 2015 22:21:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378025 - in branches/2015Q1: devel/bugzilla44 german/bugzilla44 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, 27 Jan 2015 22:21:49 -0000 Author: ohauer Date: Tue Jan 27 22:21:47 2015 New Revision: 378025 URL: https://svnweb.freebsd.org/changeset/ports/378025 QAT: https://qat.redports.org/buildarchive/r378025/ Log: MFH: r378023 - update to 4.4.8 Release Notes: https://www.bugzilla.org/releases/4.4.8/release-notes.html This releases contains the following bug fix: - Fixing a regression caused by bug 10902750 [1], JSON-RPC API calls could crash in certain cases instead of displaying the proper error message. (Bug 1124716) [2] [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1090275 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1124716 MFH: r378024 - adjust bugzilla revision to 4.4.7, - bump PORTREVISION Approved by: portmgr (implicit) Modified: branches/2015Q1/devel/bugzilla44/Makefile branches/2015Q1/devel/bugzilla44/distinfo branches/2015Q1/german/bugzilla44/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/bugzilla44/Makefile ============================================================================== --- branches/2015Q1/devel/bugzilla44/Makefile Tue Jan 27 21:34:51 2015 (r378024) +++ branches/2015Q1/devel/bugzilla44/Makefile Tue Jan 27 22:21:47 2015 (r378025) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.7 +PORTVERSION= 4.4.8 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -173,7 +173,7 @@ RUN_DEPENDS+= p5-File-MimeInfo>=0.16:${P .endif post-extract: - @${RM} -rf ${WRKSRC}/.bzr + @${RM} -rf ${WRKSRC}/.git @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ ${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc \ ${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP Modified: branches/2015Q1/devel/bugzilla44/distinfo ============================================================================== --- branches/2015Q1/devel/bugzilla44/distinfo Tue Jan 27 21:34:51 2015 (r378024) +++ branches/2015Q1/devel/bugzilla44/distinfo Tue Jan 27 22:21:47 2015 (r378025) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.4.7.tar.gz) = 5fe8141f017b964b3b80b94665bb73d15a31291393fc34429523ecbab26b2695 -SIZE (bugzilla/bugzilla-4.4.7.tar.gz) = 4924634 +SHA256 (bugzilla/bugzilla-4.4.8.tar.gz) = 90edf7a3193a3bd8c7ac49e3325e63c539b506db28bd48eb173d30ff59385046 +SIZE (bugzilla/bugzilla-4.4.8.tar.gz) = 4924519 Modified: branches/2015Q1/german/bugzilla44/Makefile ============================================================================== --- branches/2015Q1/german/bugzilla44/Makefile Tue Jan 27 21:34:51 2015 (r378024) +++ branches/2015Q1/german/bugzilla44/Makefile Tue Jan 27 22:21:47 2015 (r378025) @@ -2,7 +2,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= german MASTER_SITES= SF MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION} @@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes # adjust BZ_REVNUM if bugzilla revision was incremented and there are no # changes in bugzilla/templates/en. If not used simply comment the line. -BZ_REVNUM= 7 +BZ_REVNUM= 8 .include "${.CURDIR}/../../devel/bugzilla44/Makefile.common" From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 28 08:30:13 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 6B2F4F47; Wed, 28 Jan 2015 08:30:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56408E3C; Wed, 28 Jan 2015 08:30:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0S8UDMa091872; Wed, 28 Jan 2015 08:30:13 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0S8UChY091863; Wed, 28 Jan 2015 08:30:12 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201501280830.t0S8UChY091863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 28 Jan 2015 08:30:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378046 - in branches/2015Q1/www: linux-c6-flashplugin11 linux-f10-flashplugin11 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, 28 Jan 2015 08:30:13 -0000 Author: tijl Date: Wed Jan 28 08:30:11 2015 New Revision: 378046 URL: https://svnweb.freebsd.org/changeset/ports/378046 QAT: https://qat.redports.org/buildarchive/r378046/ Log: MFH: r377649,378021 - Update flash plugin to 11.2r202.438 - Update flash plugin to 11.2r202.440 Approved by: portmgr (erwin) Modified: branches/2015Q1/www/linux-c6-flashplugin11/Makefile branches/2015Q1/www/linux-c6-flashplugin11/distinfo branches/2015Q1/www/linux-f10-flashplugin11/Makefile branches/2015Q1/www/linux-f10-flashplugin11/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2015Q1/www/linux-c6-flashplugin11/Makefile Wed Jan 28 06:35:17 2015 (r378045) +++ branches/2015Q1/www/linux-c6-flashplugin11/Makefile Wed Jan 28 08:30:11 2015 (r378046) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.425 +PORTVERSION= 11.2r202.440 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q1/www/linux-c6-flashplugin11/distinfo ============================================================================== --- branches/2015Q1/www/linux-c6-flashplugin11/distinfo Wed Jan 28 06:35:17 2015 (r378045) +++ branches/2015Q1/www/linux-c6-flashplugin11/distinfo Wed Jan 28 08:30:11 2015 (r378046) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 -SIZE (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 6926590 -SHA256 (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 +SIZE (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = 6927249 +SHA256 (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2015Q1/www/linux-f10-flashplugin11/Makefile ============================================================================== --- branches/2015Q1/www/linux-f10-flashplugin11/Makefile Wed Jan 28 06:35:17 2015 (r378045) +++ branches/2015Q1/www/linux-f10-flashplugin11/Makefile Wed Jan 28 08:30:11 2015 (r378046) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.425 +PORTVERSION= 11.2r202.440 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q1/www/linux-f10-flashplugin11/distinfo ============================================================================== --- branches/2015Q1/www/linux-f10-flashplugin11/distinfo Wed Jan 28 06:35:17 2015 (r378045) +++ branches/2015Q1/www/linux-f10-flashplugin11/distinfo Wed Jan 28 08:30:11 2015 (r378046) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 -SIZE (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 6926590 -SHA256 (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 +SIZE (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = 6927249 +SHA256 (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 28 10:52:11 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 0E9E1E6B; Wed, 28 Jan 2015 10:52:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED23BFDB; Wed, 28 Jan 2015 10:52:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0SAqAXT061813; Wed, 28 Jan 2015 10:52:10 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SAqAj2061809; Wed, 28 Jan 2015 10:52:10 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201501281052.t0SAqAj2061809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Wed, 28 Jan 2015 10:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378053 - branches/2015Q1/emulators/linux_base-c6 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, 28 Jan 2015 10:52:11 -0000 Author: xmj Date: Wed Jan 28 10:52:09 2015 New Revision: 378053 URL: https://svnweb.freebsd.org/changeset/ports/378053 QAT: https://qat.redports.org/buildarchive/r378053/ Log: MFH: r378049 emulators/linux_base-c6: update glibc - Update to a GHOST-free glibc version. Differential Revision: https://reviews.freebsd.org/D1695 Security: 0765de84-a6c1-11e4-a0c1-c485083ca99c Approved by: so@ (des) Approved by: portmgr (erwin) Modified: branches/2015Q1/emulators/linux_base-c6/Makefile branches/2015Q1/emulators/linux_base-c6/distinfo.i686 Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/emulators/linux_base-c6/Makefile ============================================================================== --- branches/2015Q1/emulators/linux_base-c6/Makefile Wed Jan 28 09:33:23 2015 (r378052) +++ branches/2015Q1/emulators/linux_base-c6/Makefile Wed Jan 28 10:52:09 2015 (r378053) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= 6.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= http://mirror.centos.org/centos/6/os/i386/Packages/ \ http://mirror.centos.org/centos/6/updates/i386/Packages/ @@ -41,8 +41,8 @@ BIN_DISTFILES= basesystem-10.0-4.el6.noa gamin-0.1.10-9.el6.${LINUX_RPM_ARCH}.rpm \ gdbm-1.8.0-36.el6.${LINUX_RPM_ARCH}.rpm \ glib2-2.28.8-4.el6.${LINUX_RPM_ARCH}.rpm \ - glibc-2.12-1.149.el6.${LINUX_RPM_ARCH}.rpm \ - glibc-common-2.12-1.149.el6.${LINUX_RPM_ARCH}.rpm \ + glibc-2.12-1.149.el6_6.5.${LINUX_RPM_ARCH}.rpm \ + glibc-common-2.12-1.149.el6_6.5.${LINUX_RPM_ARCH}.rpm \ gmp-4.3.1-7.el6_2.2.${LINUX_RPM_ARCH}.rpm \ grep-2.6.3-6.el6.${LINUX_RPM_ARCH}.rpm \ info-4.13a-8.el6.${LINUX_RPM_ARCH}.rpm \ Modified: branches/2015Q1/emulators/linux_base-c6/distinfo.i686 ============================================================================== --- branches/2015Q1/emulators/linux_base-c6/distinfo.i686 Wed Jan 28 09:33:23 2015 (r378052) +++ branches/2015Q1/emulators/linux_base-c6/distinfo.i686 Wed Jan 28 10:52:09 2015 (r378053) @@ -38,10 +38,10 @@ SHA256 (rpm/i686/centos/6.6/gdbm-1.8.0-3 SIZE (rpm/i686/centos/6.6/gdbm-1.8.0-36.el6.i686.rpm) = 29536 SHA256 (rpm/i686/centos/6.6/glib2-2.28.8-4.el6.i686.rpm) = 778bcfc904fa6c697b0a11399e5310e1684f58c81ae46f6962efcd8d663bc154 SIZE (rpm/i686/centos/6.6/glib2-2.28.8-4.el6.i686.rpm) = 1735384 -SHA256 (rpm/i686/centos/6.6/glibc-2.12-1.149.el6.i686.rpm) = e26820cd135fe4a26820575b44268eb08171aa32cded83e5ba4f724ecb6935c9 -SIZE (rpm/i686/centos/6.6/glibc-2.12-1.149.el6.i686.rpm) = 4552748 -SHA256 (rpm/i686/centos/6.6/glibc-common-2.12-1.149.el6.i686.rpm) = 315d8bf0be25496258a1233421d215a8a2232604711bf1c91d062427f4d0d714 -SIZE (rpm/i686/centos/6.6/glibc-common-2.12-1.149.el6.i686.rpm) = 14870900 +SHA256 (rpm/i686/centos/6.6/glibc-2.12-1.149.el6_6.5.i686.rpm) = 0f0554770d7a565500adf20a0d403376de57f111118c04fed003266e2405598a +SIZE (rpm/i686/centos/6.6/glibc-2.12-1.149.el6_6.5.i686.rpm) = 4553636 +SHA256 (rpm/i686/centos/6.6/glibc-common-2.12-1.149.el6_6.5.i686.rpm) = 167bd7bd46bd8cc6005397b1ea5048ee7868a8717935ee6f95e13b00d8f7499c +SIZE (rpm/i686/centos/6.6/glibc-common-2.12-1.149.el6_6.5.i686.rpm) = 14871568 SHA256 (rpm/i686/centos/6.6/gmp-4.3.1-7.el6_2.2.i686.rpm) = f1855126a943ed4aac412006af98490248b739b4f9f78487f17c3275557948e2 SIZE (rpm/i686/centos/6.6/gmp-4.3.1-7.el6_2.2.i686.rpm) = 331548 SHA256 (rpm/i686/centos/6.6/grep-2.6.3-6.el6.i686.rpm) = 8c4405144885bec59c9abb46a43ee43ce9cdd1969058e3ebf822ee566882fcea From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 28 17:22:07 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 05EDD49E; Wed, 28 Jan 2015 17:22: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 E3FF8FDA; Wed, 28 Jan 2015 17:22:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0SHM6If048222; Wed, 28 Jan 2015 17:22:06 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SHLxck048121; Wed, 28 Jan 2015 17:21:59 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201501281721.t0SHLxck048121@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 28 Jan 2015 17:21:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378073 - 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: Wed, 28 Jan 2015 17:22:07 -0000 Author: rene Date: Wed Jan 28 17:21:58 2015 New Revision: 378073 URL: https://svnweb.freebsd.org/changeset/ports/378073 QAT: https://qat.redports.org/buildarchive/r378073/ Log: MFH: r378071 www/chromium: update to 40.0.2214.93 Many thanks to Imre Vadasz for porting it to 40.0.2214.91. [1] Obtained from: https://github.com/gliaskos/freebsd-chromium/ pull request 8,9 Security: http://www.vuxml.org/freebsd/e30e0c99-a1b7-11e4-b85c-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.h - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.h branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h branches/2015Q1/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc - copied unchanged from r378071, head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc branches/2015Q1/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc - copied unchanged from r378071, head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc branches/2015Q1/www/chromium/files/patch-device__serial__serial_service_impl.cc - copied unchanged from r378071, head/www/chromium/files/patch-device__serial__serial_service_impl.cc branches/2015Q1/www/chromium/files/patch-net__base__net_util_posix.cc - copied unchanged from r378071, head/www/chromium/files/patch-net__base__net_util_posix.cc branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc - copied unchanged from r378071, head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Deleted: branches/2015Q1/www/chromium/files/patch-chrome__chrome_tests_unit.gypi branches/2015Q1/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2015Q1/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h branches/2015Q1/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h branches/2015Q1/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h branches/2015Q1/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/distinfo branches/2015Q1/www/chromium/files/extra-patch-clang branches/2015Q1/www/chromium/files/extra-patch-gcc branches/2015Q1/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2015Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2015Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2015Q1/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.cc branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.h branches/2015Q1/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2015Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2015Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2015Q1/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2015Q1/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc branches/2015Q1/www/chromium/files/patch-content__gpu__gpu_main.cc branches/2015Q1/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2015Q1/www/chromium/files/patch-remoting__remoting_host.gypi branches/2015Q1/www/chromium/files/patch-skia__skia_chrome.gypi branches/2015Q1/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2015Q1/www/chromium/files/patch-third_party__sqlite__sqlite.gyp branches/2015Q1/www/chromium/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/Makefile Wed Jan 28 17:21:58 2015 (r378073) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 39.0.2171.99 -PORTREVISION= 1 +PORTVERSION= 40.0.2214.93 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -42,7 +41,6 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ libnspr4.so:${PORTSDIR}/devel/nspr \ - libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ libre2.so:${PORTSDIR}/devel/re2 \ libsnappy.so:${PORTSDIR}/archivers/snappy \ @@ -107,7 +105,7 @@ GYP_DEFINES+= \ use_system_libxml=1 \ use_system_libxslt=1 \ use_system_nspr=1 \ - use_system_protobuf=1 \ + use_system_protobuf=0 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ @@ -220,7 +218,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ pre-everything:: @${ECHO_MSG} - @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory" + @${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory" .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else @@ -275,6 +273,9 @@ pre-configure: 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ 'third_party/icu/icu.isolate' \ @@ -299,12 +300,14 @@ pre-configure: 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/npapi' \ + 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ + 'third_party/protobuf' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ @@ -329,7 +332,7 @@ pre-configure: 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ - 'v8/third_party/fdlibm' \ + 'v8/src/third_party/fdlibm' \ --do-remove || ${FALSE} cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gyp_files.py \ Modified: branches/2015Q1/www/chromium/distinfo ============================================================================== --- branches/2015Q1/www/chromium/distinfo Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/distinfo Wed Jan 28 17:21:58 2015 (r378073) @@ -1,4 +1,4 @@ -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 +SHA256 (chromium-40.0.2214.93.tar.xz) = c4937596bc02d346a89543a6b5bd0fab9f45e34f3ce20dee94dc132a95c990de +SIZE (chromium-40.0.2214.93.tar.xz) = 284982688 +SHA256 (chromium-40.0.2214.93-testdata.tar.xz) = 883761dd8f559c849f0998fbf4144f2d35a171a8fff67dbc464e3bb8a5da552b +SIZE (chromium-40.0.2214.93-testdata.tar.xz) = 115343772 Modified: branches/2015Q1/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q1/www/chromium/files/extra-patch-clang Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/extra-patch-clang Wed Jan 28 17:21:58 2015 (r378073) @@ -189,17 +189,17 @@ CMapFormat::kFormat4, cmap_id) { } ---- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 -+++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 -@@ -14043,7 +14043,7 @@ +--- v8/src/runtime/runtime-i18n.cc.orig 2015-01-25 15:08:31.732972197 +0100 ++++ v8/src/runtime/runtime-i18n.cc 2015-01-25 15:09:04.260951597 +0100 +@@ -626,7 +626,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. - local_object->SetInternalField(1, reinterpret_cast(NULL)); + local_object->SetInternalField(1, static_cast(NULL)); - RETURN_IF_EMPTY_HANDLE(isolate, - JSObject::SetLocalPropertyIgnoreAttributes( + Factory* factory = isolate->factory(); + Handle key = factory->NewStringFromStaticChars("breakIterator"); --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 @@ -721,12 +721,14 @@ @@ -256,3 +256,34 @@ } static Unique CreateImmovable(Handle handle) { +--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-01-25 14:52:44 UTC ++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +@@ -2072,7 +2072,7 @@ + + const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { + FATAL() << "Not implemented yet."; +- return reinterpret_cast(NULL); ++ return static_cast(NULL); + } + + const CodecInst* AudioCodingImpl::GetSenderCodecInst() { +@@ -2091,7 +2091,7 @@ + + const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { + FATAL() << "Not implemented yet."; +- return reinterpret_cast(NULL); ++ return static_cast(NULL); + } + + bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { +--- v8/src/debug.cc.orig 2015-01-25 14:39:37 UTC ++++ v8/src/debug.cc +@@ -565,7 +565,7 @@ + thread_local_.step_out_fp_ = 0; + // TODO(isolates): frames_are_dropped_? + base::NoBarrier_Store(&thread_local_.current_debug_scope_, +- static_cast(NULL)); ++ reinterpret_cast(NULL)); + thread_local_.restarter_frame_function_pointer_ = NULL; + } + Modified: branches/2015Q1/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2015Q1/www/chromium/files/extra-patch-gcc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/extra-patch-gcc Wed Jan 28 17:21:58 2015 (r378073) @@ -66,8 +66,8 @@ #include #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" ---- third_party/webrtc/common_audio/wav_writer.h.orig 2014-10-17 02:57:34.000000000 +0200 -+++ third_party/webrtc/common_audio/wav_writer.h 2014-10-18 12:04:03.000000000 +0200 +--- third_party/webrtc/common_audio/wav_file.h.orig 2014-10-17 02:57:34.000000000 +0200 ++++ third_party/webrtc/common_audio/wav_file.h 2014-10-18 12:04:03.000000000 +0200 @@ -14,6 +14,7 @@ #ifdef __cplusplus Modified: branches/2015Q1/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,32 +1,32 @@ ---- cc/layers/layer_impl.cc.orig 2014-10-10 09:15:29 UTC +--- cc/layers/layer_impl.cc.orig 2015-01-20 21:28:14 UTC +++ cc/layers/layer_impl.cc -@@ -1202,21 +1202,23 @@ +@@ -1239,21 +1239,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); -- gfx::Vector2dF max_offset( +- gfx::ScrollOffset max_offset( + // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD + // which also defines max_offset -+ gfx::Vector2dF _max_offset( ++ gfx::ScrollOffset _max_offset( scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(), scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height()); // We need the final scroll offset to be in CSS coords. - max_offset.Scale(1 / scale_factor); -- max_offset.SetToMax(gfx::Vector2dF()); -- return gfx::ToFlooredVector2d(max_offset); +- max_offset.SetToMax(gfx::ScrollOffset()); +- return max_offset; + _max_offset.Scale(1 / scale_factor); -+ _max_offset.SetToMax(gfx::Vector2dF()); -+ return gfx::ToFlooredVector2d(_max_offset); ++ _max_offset.SetToMax(gfx::ScrollOffset()); ++ return _max_offset; } gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { -- gfx::Vector2dF max_offset = MaxScrollOffset(); -+ gfx::Vector2dF _max_offset = MaxScrollOffset(); - gfx::Vector2dF old_offset = TotalScrollOffset(); - gfx::Vector2dF clamped_offset = old_offset; +- gfx::ScrollOffset max_offset = MaxScrollOffset(); ++ gfx::ScrollOffset _max_offset = MaxScrollOffset(); + gfx::ScrollOffset old_offset = TotalScrollOffset(); + gfx::ScrollOffset clamped_offset = old_offset; - clamped_offset.SetToMin(max_offset); + clamped_offset.SetToMin(_max_offset); - clamped_offset.SetToMax(gfx::Vector2d()); - gfx::Vector2dF delta = clamped_offset - old_offset; + clamped_offset.SetToMax(gfx::ScrollOffset()); + gfx::Vector2dF delta = clamped_offset.DeltaFrom(old_offset); if (!delta.IsZero()) Modified: branches/2015Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,11 +1,11 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-10-10 09:15:29 UTC +--- chrome/app/chrome_main_delegate.h.orig 2015-01-21 20:05:38 UTC +++ chrome/app/chrome_main_delegate.h -@@ -38,7 +38,7 @@ - virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; - virtual bool DelaySandboxInitialization( - const std::string& process_type) OVERRIDE; +@@ -37,7 +37,7 @@ + const std::string& process_type) override; + bool ShouldSendMachPort(const std::string& process_type) override; + bool DelaySandboxInitialization(const std::string& process_type) override; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - virtual void ZygoteStarting( - ScopedVector* delegates) OVERRIDE; - virtual void ZygoteForked() OVERRIDE; + void ZygoteStarting( + ScopedVector* delegates) override; + void ZygoteForked() override; Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2015-01-21 20:28:15 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -278,7 +278,7 @@ - virtual net::CookieStore* OverrideCookieStoreForRenderProcess( - int render_process_id) OVERRIDE; +@@ -262,7 +262,7 @@ + net::CookieStore* OverrideCookieStoreForRenderProcess( + int render_process_id) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - virtual void GetAdditionalMappedFilesForChildProcess( + void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.cc (from r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc) @@ -0,0 +1,65 @@ +--- chrome/browser/download/download_prefs.cc.orig 2015-01-24 21:51:37 UTC ++++ chrome/browser/download/download_prefs.cc +@@ -51,7 +51,7 @@ + // Consider downloads 'dangerous' if they go to the home directory on Linux and + // to the desktop on any platform. + bool DownloadPathIsDangerous(const base::FilePath& download_path) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::FilePath home_dir = base::GetHomeDir(); + if (download_path == home_dir) { + return true; +@@ -131,7 +131,7 @@ + GetDefaultDownloadDirectoryForProfile())); + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + should_open_pdf_in_system_reader_ = + prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); +@@ -205,7 +205,7 @@ + prefs::kSaveFileDefaultDirectory, + default_download_path, + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + registry->RegisterBooleanPref( + prefs::kOpenPdfDownloadInSystemReader, +@@ -286,7 +286,7 @@ + } + + bool DownloadPrefs::IsAutoOpenUsed() const { +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (ShouldOpenPdfInSystemReader()) + return true; +@@ -301,7 +301,7 @@ + return false; + DCHECK(extension[0] == base::FilePath::kExtensionSeparator); + extension.erase(0, 1); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) + return true; +@@ -333,7 +333,7 @@ + SaveAutoOpenState(); + } + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { + if (should_open_pdf_in_system_reader_ == should_open) +@@ -355,7 +355,7 @@ + #endif + + void DownloadPrefs::ResetAutoOpen() { +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + SetShouldOpenPdfInSystemReader(false); + #endif Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.h (from r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_prefs.h Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__download__download_prefs.h) @@ -0,0 +1,20 @@ +--- chrome/browser/download/download_prefs.h.orig 2015-01-24 21:53:47 UTC ++++ chrome/browser/download/download_prefs.h +@@ -73,7 +73,7 @@ + // Disables auto-open based on file extension. + void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + // Store the user preference to disk. If |should_open| is true, also disable + // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. +@@ -105,7 +105,7 @@ + AutoOpenCompareFunctor> AutoOpenSet; + AutoOpenSet auto_open_; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + bool should_open_pdf_in_system_reader_; + #endif Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc (from r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc) @@ -0,0 +1,46 @@ +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-01-24 21:45:08 UTC ++++ chrome/browser/download/download_shelf_context_menu.cc +@@ -122,7 +122,7 @@ + return download_item_->GetOpenWhenComplete() || + download_crx_util::IsExtensionDownload(*download_item_); + case ALWAYS_OPEN_TYPE: +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (CanOpenPdfInSystemViewer()) { + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( +@@ -162,7 +162,7 @@ + bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE); + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( + download_item_->GetBrowserContext()); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (CanOpenPdfInSystemViewer()) { + prefs->SetShouldOpenPdfInSystemReader(!is_checked); +@@ -390,14 +390,14 @@ + #if defined(OS_WIN) + if (CanOpenPdfInSystemViewer()) + return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER; +-#elif defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + if (CanOpenPdfInSystemViewer()) + return IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; + #endif + return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE; + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + bool DownloadShelfContextMenu::IsDownloadPdf() const { + base::FilePath path = download_item_->GetTargetFilePath(); + return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); +@@ -409,7 +409,7 @@ + return IsDownloadPdf() && + (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ : + true); +-#elif defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return IsDownloadPdf(); + #endif + } Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h (from r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h) @@ -0,0 +1,11 @@ +--- chrome/browser/download/download_shelf_context_menu.h.orig 2015-01-24 22:48:53 UTC ++++ chrome/browser/download/download_shelf_context_menu.h +@@ -75,7 +75,7 @@ + + int GetAlwaysOpenStringId() const; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + bool IsDownloadPdf() const; + bool CanOpenPdfInSystemViewer() const; Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc (from r378071, head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc) @@ -0,0 +1,34 @@ +--- chrome/browser/process_singleton_posix.cc.orig 2015-01-26 10:20:41 UTC ++++ chrome/browser/process_singleton_posix.cc +@@ -82,11 +82,11 @@ + #include "net/base/net_util.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/ui/process_singleton_dialog_linux.h" + #endif + +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -322,7 +322,7 @@ + if (g_disable_prompt) + return false; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::string16 relaunch_button_text = l10n_util::GetStringUTF16( + IDS_PROFILE_IN_USE_LINUX_RELAUNCH); + return ShowProcessSingletonDialog(error, relaunch_button_text); +@@ -880,7 +880,7 @@ + // The other process is shutting down, it's safe to start a new process. + return PROCESS_NONE; + } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) { +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Likely NULL in unit tests. + views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc (from r378071, head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc) @@ -0,0 +1,38 @@ +--- chrome/browser/renderer_preferences_util.cc.orig 2015-01-26 10:24:50 UTC ++++ chrome/browser/renderer_preferences_util.cc +@@ -13,7 +13,7 @@ + #include "content/public/common/renderer_preferences.h" + #include "third_party/skia/include/core/SkColor.h" + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "ui/gfx/font_render_params.h" + #endif + +@@ -25,7 +25,7 @@ + #include "ui/views/controls/textfield/textfield.h" + #endif + +-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/browser/themes/theme_service.h" + #include "chrome/browser/themes/theme_service_factory.h" + #include "ui/views/linux_ui/linux_ui.h" +@@ -71,7 +71,7 @@ + prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; + #endif + +-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) { + if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { +@@ -93,7 +93,7 @@ + } + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, + (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL))); + prefs->should_antialias_text = params.antialiasing; Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,16 +1,16 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-01-21 20:28:15 UTC +++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -234,7 +234,7 @@ - // settings. Weird. TODO(palmer): Do something more graceful than ignoring - // the user's click! crbug.com/394993 - return; +@@ -237,7 +237,7 @@ + #elif defined(OS_IOS) + // iOS does not have a way to launch the date and time settings. + NOTREACHED(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { const char* pathname; const char* argument; -@@ -284,7 +284,7 @@ - #if !defined(OS_CHROMEOS) +@@ -289,7 +289,7 @@ + #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) base::LaunchOptions options; options.wait = false; -#if defined(OS_LINUX) Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc (from r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-01-26 10:30:44 ++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc +@@ -128,7 +128,7 @@ + } + + void ChromeBrowserMainExtraPartsAura::PreProfileInit() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Now that we have some minimal ui initialized, check to see if we're + // running as root and bail if we are. + DetectRunningAsRoot(); +@@ -142,7 +142,7 @@ + // after the metrics service is deleted. + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() { + if (getuid() == 0) { + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h (from r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig 2015-01-26 10:33:29 ++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h +@@ -25,7 +25,7 @@ + void PostMainMessageLoopRun() override; + + private: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // On the Linux desktop, we want to prevent the user from logging in as root, + // so that we don't destroy the profile. + void DetectRunningAsRoot(); Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,20 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2014-10-14 21:32:48.000000000 +0200 -+++ chrome/browser/ui/browser_command_controller.cc 2014-10-14 21:22:15.000000000 +0200 -@@ -67,7 +67,7 @@ +--- chrome/browser/ui/browser_command_controller.cc.orig 2015-01-21 20:28:15 UTC ++++ chrome/browser/ui/browser_command_controller.cc +@@ -69,7 +69,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -279,7 +279,7 @@ +@@ -281,7 +281,7 @@ if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = +@@ -469,7 +469,7 @@ + break; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + case IDC_USE_SYSTEM_TITLE_BAR: { + PrefService* prefs = browser_->profile()->GetPrefs(); + prefs->SetBoolean(prefs::kUseCustomChromeFrame, +@@ -898,7 +898,7 @@ + command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); + command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true); + #endif + Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -80,7 +80,7 @@ +@@ -79,7 +79,7 @@ #include "components/user_manager/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD)) - #include "ui/events/x/touch_factory_x11.h" + #include "ui/events/devices/x11/touch_factory_x11.h" #endif Copied: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc (from r378071, head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc Wed Jan 28 17:21:58 2015 (r378073, copy of r378071, head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc) @@ -0,0 +1,29 @@ +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2015-01-26 10:43:43 UTC ++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc +@@ -266,7 +266,7 @@ + // synchronous on desktop Linux, so use that. + // - Ash + // Releasing capture on Ash cancels gestures so avoid it. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + can_release_capture_ = false; + #else + can_release_capture_ = +@@ -621,7 +621,7 @@ + // that to effect the position of any windows. + SetWindowPositionManaged(browser_widget->GetNativeWindow(), false); + +-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // EndMoveLoop is going to snap the window back to its original location. + // Hide it so users don't see this. Hiding a window in Linux aura causes + // it to lose capture so skip it. +@@ -1791,7 +1791,7 @@ + if (dragged_window) + exclude.insert(dragged_window); + } +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Exclude windows which are pending deletion via Browser::TabStripEmpty(). + // These windows can be returned in the Linux Aura port because the browser + // window which was used for dragging is not hidden once all of its tabs are Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -36,7 +36,7 @@ +@@ -35,7 +35,7 @@ #if defined(OS_WIN) - virtual HICON GetDefaultWindowIcon() const OVERRIDE; - virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; + virtual HICON GetDefaultWindowIcon() const override; + virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; + gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif -@@ -49,7 +49,7 @@ - virtual void OnBeforeWidgetInit( +@@ -48,7 +48,7 @@ + void OnBeforeWidgetInit( views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE; + views::internal::NativeWidgetDelegate* delegate) override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; + bool WindowManagerProvidesTitleBar(bool maximized) override; #endif #if defined(USE_AURA) Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,9 +1,9 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -508,7 +508,7 @@ - url.host() == chrome::kChromeUIMemoryRedirectHost || - url.host() == chrome::kChromeUIStatsHost || - url.host() == chrome::kChromeUITermsHost +@@ -511,7 +511,7 @@ + #if !defined(OS_ANDROID) + || url.host() == chrome::kChromeUITermsHost + #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) || url.host() == chrome::kChromeUILinuxProxyConfigHost Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,42 +1,38 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-10-10 08:54:11 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -344,7 +344,8 @@ +@@ -359,7 +359,7 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -671,7 +672,8 @@ +@@ -692,7 +692,7 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1310,7 +1312,8 @@ +@@ -1342,7 +1342,7 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1332,7 +1335,8 @@ +@@ -1364,7 +1364,7 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); Profile* profile = Profile::FromWebUI(web_ui()); Modified: branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,12 +1,11 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -204,7 +204,8 @@ +@@ -210,7 +210,7 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void ThemesSetNative(const base::ListValue* args); #endif Modified: branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,11 +1,20 @@ ---- chrome/common/pref_names.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/common/pref_names.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/common/pref_names.cc -@@ -891,7 +891,7 @@ - // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. - const char kForceSafeSearch[] = "settings.force_safesearch"; +@@ -895,7 +895,7 @@ + // supervised users. + const char kRecordHistory[] = "settings.history_recorded"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif +@@ -1425,7 +1425,7 @@ + // upgrade a unsafe location to a safe location. + const char kDownloadDirUpgraded[] = "download.directory_upgrade"; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + const char kOpenPdfDownloadInSystemReader[] = + "download.open_pdf_in_system_reader"; Modified: branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__common__pref_names.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,7 +1,7 @@ ---- chrome/common/pref_names.h.orig 2014-10-10 09:15:30 UTC +--- chrome/common/pref_names.h.orig 2015-01-21 20:28:16 UTC +++ chrome/common/pref_names.h -@@ -289,7 +289,7 @@ - extern const char kForceSafeSearch[]; +@@ -291,7 +291,7 @@ + extern const char kRecordHistory[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,3 +9,12 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; +@@ -486,7 +486,7 @@ + extern const char kDownloadDefaultDirectory[]; + extern const char kDownloadExtensionsToOpen[]; + extern const char kDownloadDirUpgraded[]; +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + extern const char kOpenPdfDownloadInSystemReader[]; + #endif Modified: branches/2015Q1/www/chromium/files/patch-chrome__test__base__testing_browser_process.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-chrome__test__base__testing_browser_process.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-chrome__test__base__testing_browser_process.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,13 +1,13 @@ ---- chrome/test/base/testing_browser_process.h.orig 2014-10-10 09:15:30 UTC +--- chrome/test/base/testing_browser_process.h.orig 2015-01-21 20:28:16 UTC +++ chrome/test/base/testing_browser_process.h -@@ -105,8 +105,8 @@ - virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; - virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; +@@ -103,8 +103,8 @@ + DownloadStatusUpdater* download_status_updater() override; + DownloadRequestLimiter* download_request_limiter() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -- virtual void StartAutoupdateTimer() OVERRIDE {} +- void StartAutoupdateTimer() override {} +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) -+ virtual void StartAutoupdateTimer() /*OVERRIDE*/ {} ++ void StartAutoupdateTimer() /*override*/ {} #endif - virtual ChromeNetLog* net_log() OVERRIDE; + ChromeNetLog* net_log() override; Modified: branches/2015Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h ============================================================================== --- branches/2015Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Wed Jan 28 17:21:58 2015 (r378073) @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2014-10-13 17:11:08 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2015-01-24 17:14:44 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. @@ -36,11 +36,11 @@ + virtual ~StorageMonitorFreeBSD(); + + // Must be called for StorageMonitorFreeBSD to work. -+ virtual void Init() OVERRIDE; ++ virtual void Init() override; + private: + // StorageMonitor implementation. + virtual bool GetStorageInfoForPath(const base::FilePath& path, -+ StorageInfo* device_info) const OVERRIDE; ++ StorageInfo* device_info) const override; + + DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD); +}; Modified: branches/2015Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc Wed Jan 28 17:07:21 2015 (r378072) +++ branches/2015Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc Wed Jan 28 17:21:58 2015 (r378073) @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher.cc.orig 2014-10-10 09:15:31 UTC +--- content/browser/child_process_launcher.cc.orig 2015-01-21 20:28:16 UTC +++ content/browser/child_process_launcher.cc -@@ -68,7 +68,7 @@ +@@ -69,7 +69,7 @@ #else terminate_child_on_shutdown_(true) #endif @@ -9,34 +9,42 @@ , zygote_(false) #endif { -@@ -234,7 +234,7 @@ +@@ -190,7 +190,7 @@ + bool launch_elevated = delegate->ShouldLaunchElevated(); + #elif defined(OS_ANDROID) + // Uses |ipcfd_| instead of |ipcfd| on Android. +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + base::EnvironmentMap env = delegate->GetEnvironment(); + base::ScopedFD ipcfd = delegate->TakeIpcFd(); + #elif defined(OS_POSIX) +@@ -253,7 +253,7 @@ + // We need to close the client end of the IPC channel to reliably detect // child termination. - base::ScopedFD ipcfd_closer(ipcfd); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) - GetContentClient()->browser()-> - GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, - &files_to_register); -@@ -244,7 +244,7 @@ - process_type); + GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( + *cmd_line, child_process_id, files_to_register.get()); + if (use_zygote) { +@@ -261,14 +261,14 @@ + cmd_line->argv(), files_to_register.Pass(), process_type); } else // Fall through to the normal posix case below when we're not zygoting. -#endif // !defined(OS_MACOSX) +#endif // !defined(OS_MACOSX) && !defined(OS_BSD) { // Convert FD mapping to FileHandleMappingVector - base::FileHandleMappingVector fds_to_map; -@@ -255,7 +255,7 @@ - base::GlobalDescriptors::kBaseDescriptor)); - } + base::FileHandleMappingVector fds_to_map = + files_to_register->GetMappingWithIDAdjustment( + base::GlobalDescriptors::kBaseDescriptor); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -263,7 +263,7 @@ +@@ -276,7 +276,7 @@ sandbox_fd, GetSandboxFD())); } @@ -45,7 +53,7 @@ // Actually launch the app. base::LaunchOptions options; -@@ -322,7 +322,7 @@ +@@ -335,7 +335,7 @@ base::Bind( &Context::Notify, this_object.get(), @@ -53,8 +61,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) use_zygote, #endif - handle)); -@@ -330,7 +330,7 @@ + base::Passed(base::Process(handle)))); +@@ -343,7 +343,7 @@ } void Notify( @@ -62,9 +70,9 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif - base::ProcessHandle handle) { -@@ -343,7 +343,7 @@ - if (!handle) + base::Process process) { +@@ -356,7 +356,7 @@ + if (!process_.IsValid()) LOG(ERROR) << "Failed to launch child process"; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -72,7 +80,7 @@ zygote_ = zygote; #endif if (client_) { -@@ -370,7 +370,7 @@ +@@ -383,7 +383,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -80,8 +88,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) zygote_, #endif - process_.handle())); -@@ -387,7 +387,7 @@ + base::Passed(&process_))); +@@ -398,7 +398,7 @@ } static void TerminateInternal( @@ -89,8 +97,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif - base::ProcessHandle handle) { -@@ -401,13 +401,13 @@ + base::Process process) { +@@ -412,13 +412,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -99,23 +107,23 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. - ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle); + ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle()); } else -#endif // !OS_MACOSX +#endif // !OS_MACOSX && !OS_BSD { - base::EnsureProcessTerminated(handle); + base::EnsureProcessTerminated(process.Handle()); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 28 19:06: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 70FDFD71; Wed, 28 Jan 2015 19:06: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 5D7E4D4D; Wed, 28 Jan 2015 19:06: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 t0SJ635G096914; Wed, 28 Jan 2015 19:06:03 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SJ63as096913; Wed, 28 Jan 2015 19:06:03 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201501281906.t0SJ63as096913@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Wed, 28 Jan 2015 19:06:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378078 - branches/2015Q1/audio/atunes 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, 28 Jan 2015 19:06:03 -0000 Author: lme Date: Wed Jan 28 19:06:02 2015 New Revision: 378078 URL: https://svnweb.freebsd.org/changeset/ports/378078 QAT: https://qat.redports.org/buildarchive/r378078/ Log: MFH: r377944 - Fix location to atunes binary in atunes.desktop - Bump PORTREVISION PR: 152133 Submitted by: rodrigo Approved by: portmgr (bapt) Modified: branches/2015Q1/audio/atunes/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/audio/atunes/Makefile ============================================================================== --- branches/2015Q1/audio/atunes/Makefile Wed Jan 28 18:08:41 2015 (r378077) +++ branches/2015Q1/audio/atunes/Makefile Wed Jan 28 19:06:02 2015 (r378078) @@ -3,7 +3,7 @@ PORTNAME= atunes PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-bin @@ -63,7 +63,7 @@ RUN_DEPENDS+= flac:${PORTSDIR}/audio/fla DESKTOP_ENTRIES="aTunes" \ "Audio player and manager" \ "${PREFIX}/share/pixmaps/atunes.png" \ - "aTunes" \ + "atunes" \ "Audio;AudioVideo;Java;" \ true From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 29 02:32:45 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 B931FCE7; Thu, 29 Jan 2015 02:32:45 +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 9A0A9B60; Thu, 29 Jan 2015 02:32:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0T2WjxC018155; Thu, 29 Jan 2015 02:32:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0T2Wiba018152; Thu, 29 Jan 2015 02:32:44 GMT (envelope-from pgj@FreeBSD.org) Message-Id: <201501290232.t0T2Wiba018152@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org using -f From: Gabor Pali Date: Thu, 29 Jan 2015 02:32:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378102 - in branches/2015Q1/x11-toolkits/hs-wxc: . 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, 29 Jan 2015 02:32:45 -0000 Author: pgj Date: Thu Jan 29 02:32:44 2015 New Revision: 378102 URL: https://svnweb.freebsd.org/changeset/ports/378102 QAT: https://qat.redports.org/buildarchive/r378102/ Log: MFH: r377911 - Fix build on FreeBSD 8.x and 9.x Obtained from: FreeBSD Haskell Approved by: portmgr (erwin) Added: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal - copied unchanged from r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal - copied unchanged from r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal Deleted: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal Modified: branches/2015Q1/x11-toolkits/hs-wxc/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-toolkits/hs-wxc/Makefile ============================================================================== --- branches/2015Q1/x11-toolkits/hs-wxc/Makefile Thu Jan 29 02:20:28 2015 (r378101) +++ branches/2015Q1/x11-toolkits/hs-wxc/Makefile Thu Jan 29 02:32:44 2015 (r378102) @@ -25,8 +25,10 @@ post-patch:: .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.if ${OSVERSION} >= 900000 -EXTRA_PATCHES+= ${PATCHDIR}/nopatch-wxc.cabal +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${PATCHDIR}/nopatch0-wxc.cabal +.else +EXTRA_PATCHES+= ${PATCHDIR}/nopatch1-wxc.cabal .endif .include Copied: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal (from r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal Thu Jan 29 02:32:44 2015 (r378102, copy of r377911, head/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal) @@ -0,0 +1,11 @@ +--- ./wxc.cabal.orig 2014-03-22 21:53:20.000000000 +0100 ++++ ./wxc.cabal 2014-07-20 08:09:51.000000000 +0200 +@@ -161,6 +161,8 @@ + base >= 4 && < 5, + wxdirect >= 0.90.1.0 + ++ cc-options: -std=c++11 ++ + x-dll-sources: + src/cpp/apppath.cpp + src/cpp/dragimage.cpp Copied: branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal (from r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal Thu Jan 29 02:32:44 2015 (r378102, copy of r377911, head/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal) @@ -0,0 +1,11 @@ +--- wxc.cabal.orig 2015-01-16 21:06:43 UTC ++++ wxc.cabal +@@ -161,6 +161,8 @@ library + base >= 4 && < 5, + wxdirect >= 0.90.1.0 + ++ extra-libraries: stdc++ ++ + x-dll-sources: + src/cpp/apppath.cpp + src/cpp/dragimage.cpp From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 29 17:49:07 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 E5992C0C; Thu, 29 Jan 2015 17:49: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 D0F17D73; Thu, 29 Jan 2015 17:49: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 t0THn7lY044149; Thu, 29 Jan 2015 17:49:07 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0THn6Pc044141; Thu, 29 Jan 2015 17:49:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201501291749.t0THn6Pc044141@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 29 Jan 2015 17:49:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378126 - in branches/2015Q1/net: asterisk asterisk11 asterisk13 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, 29 Jan 2015 17:49:08 -0000 Author: madpilot Date: Thu Jan 29 17:49:05 2015 New Revision: 378126 URL: https://svnweb.freebsd.org/changeset/ports/378126 QAT: https://qat.redports.org/buildarchive/r378126/ Log: MFH: r378125 - Update net/asterisk to 1.8.32.1 - Update net/asterisk11 to 11.15.1 - Update net/asterisk13 to 13.1.1 Security: 7656fc62-a7a7-11e4-96ba-001999f8d30b Security: 2eeb6652-a7a6-11e4-96ba-001999f8d30b Approved by: portmgr (mat) Modified: branches/2015Q1/net/asterisk/Makefile branches/2015Q1/net/asterisk/distinfo branches/2015Q1/net/asterisk11/Makefile branches/2015Q1/net/asterisk11/distinfo branches/2015Q1/net/asterisk13/Makefile branches/2015Q1/net/asterisk13/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/asterisk/Makefile ============================================================================== --- branches/2015Q1/net/asterisk/Makefile Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk/Makefile Thu Jan 29 17:49:05 2015 (r378126) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.32.1 -PORTREVISION= 3 +PORTVERSION= 1.8.32.2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2015Q1/net/asterisk/distinfo ============================================================================== --- branches/2015Q1/net/asterisk/distinfo Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk/distinfo Thu Jan 29 17:49:05 2015 (r378126) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.32.1.tar.gz) = 89be3fa2b9de10685afa1ec1413768d4b6f1107312e403f0f798eaddadea7ba3 -SIZE (asterisk-1.8.32.1.tar.gz) = 29636238 +SHA256 (asterisk-1.8.32.2.tar.gz) = 24b4a48c5b8d79e6c7e48c6076d0370339074c1c0581dc6af0f672c6e93d296e +SIZE (asterisk-1.8.32.2.tar.gz) = 29635914 Modified: branches/2015Q1/net/asterisk11/Makefile ============================================================================== --- branches/2015Q1/net/asterisk11/Makefile Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk11/Makefile Thu Jan 29 17:49:05 2015 (r378126) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.15.0 -PORTREVISION= 2 +PORTVERSION= 11.15.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2015Q1/net/asterisk11/distinfo ============================================================================== --- branches/2015Q1/net/asterisk11/distinfo Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk11/distinfo Thu Jan 29 17:49:05 2015 (r378126) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.15.0.tar.gz) = 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 -SIZE (asterisk-11.15.0.tar.gz) = 34981005 +SHA256 (asterisk-11.15.1.tar.gz) = 54f02df8a8e40b05a338f686705a28349175f31e5c6b2ec9f44bef1042b78fca +SIZE (asterisk-11.15.1.tar.gz) = 34974674 Modified: branches/2015Q1/net/asterisk13/Makefile ============================================================================== --- branches/2015Q1/net/asterisk13/Makefile Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk13/Makefile Thu Jan 29 17:49:05 2015 (r378126) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.1.0 -PORTREVISION= 1 +PORTVERSION= 13.1.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2015Q1/net/asterisk13/distinfo ============================================================================== --- branches/2015Q1/net/asterisk13/distinfo Thu Jan 29 17:24:54 2015 (r378125) +++ branches/2015Q1/net/asterisk13/distinfo Thu Jan 29 17:49:05 2015 (r378126) @@ -1,2 +1,2 @@ -SHA256 (asterisk-13.1.0.tar.gz) = d4a0943b11f31aa4cb6373ff0edd749919582e67944b526468c20486ec3833c4 -SIZE (asterisk-13.1.0.tar.gz) = 31883979 +SHA256 (asterisk-13.1.1.tar.gz) = 070b68238734117c0b9c1018ba192ff29964a115a71620e648d4286c92f2f02b +SIZE (asterisk-13.1.1.tar.gz) = 31869064 From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 29 20:35:28 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 E90D4BE2; Thu, 29 Jan 2015 20:35: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 D528865F; Thu, 29 Jan 2015 20:35: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 t0TKZSLR025138; Thu, 29 Jan 2015 20:35:28 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0TKZSRo025137; Thu, 29 Jan 2015 20:35:28 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201501292035.t0TKZSRo025137@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 29 Jan 2015 20:35:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378129 - 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: Thu, 29 Jan 2015 20:35:29 -0000 Author: rene Date: Thu Jan 29 20:35:27 2015 New Revision: 378129 URL: https://svnweb.freebsd.org/changeset/ports/378129 QAT: https://qat.redports.org/buildarchive/r378129/ Log: MFH: r378106 www/chromium: fix build with GCC This does not fix the build on 8.X yet, which misses pthread_getthreadid_np() Approved by: portmgr (erwin) Modified: branches/2015Q1/www/chromium/files/extra-patch-gcc Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2015Q1/www/chromium/files/extra-patch-gcc Thu Jan 29 19:38:14 2015 (r378128) +++ branches/2015Q1/www/chromium/files/extra-patch-gcc Thu Jan 29 20:35:27 2015 (r378129) @@ -76,3 +76,13 @@ #include #include +--- v8/src/base/platform/platform.h.orig 2015-01-27 03:22:59.000000000 +0100 ++++ v8/src/base/platform/platform.h 2015-01-28 18:37:43.268781292 +0100 +@@ -22,6 +22,7 @@ + #define V8_BASE_PLATFORM_PLATFORM_H_ + + #include ++#include + #include + #include +