From owner-svn-ports-branches@freebsd.org Sun May 31 00:07:48 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 77B492FC120; Sun, 31 May 2020 00:07:48 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: from mail-ua1-x933.google.com (mail-ua1-x933.google.com [IPv6:2607:f8b0:4864:20::933]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZJXf6YpTz40pC; Sun, 31 May 2020 00:07:46 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: by mail-ua1-x933.google.com with SMTP id 59so328853uam.7; Sat, 30 May 2020 17:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=B/Pc3eQH4v+uoB9N/E+dm7piKUs7lSVLIWd6jmbxyOE=; b=W7a9n5y0d0cyakz1z6tMg2l4hSSOyD5/SIUHu7OjtumT3mA5BJN/YR3jJ+jcKswBWh f4k9o6ntmmgibLtyiUvVHTMIIb8VyKtfJWsuHp1PhMgGvnxtZweUorqth0x+Sqm/+RY4 PXOevxYTW2edo2dOnf4vJCYYf7KCGbjaOJCUAHmUriErh4KnY2mkVvEO/e4JvpauWAaa kkx25Av/uB338L8iDdbZDIHDHO7A0nv7xgyJW7YXL7mYSz7lBGkEFSM0JjYwf6Yc2xHd crNq73U6Rr0GQ0Q4GV6FlQVyJwZhCbE9nf0hzbK8KjYN0ydGhoBNzr88Sz0TMV1o5HjP mgcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=B/Pc3eQH4v+uoB9N/E+dm7piKUs7lSVLIWd6jmbxyOE=; b=U++ABO4YKzs/htPahJ+7suPUQDvq/k9WQFL/WHOpKJJ6invKhJ5yvKlJRDYKlJX8uB QPWmoB98d/9NFxdCKEWRwcbjMOy0kfANhF7nkwtspbWTTrImMFALbKJbydEwW7AxWg4B uSCthnKZb6Ig144J7NEv0xhzcwv21MeNko9HdvaHEgjd2Rt0dhR8BsNoc6l0zCfR4tZM q8dmo+8lnGnr1UPvgesu+hrQ6kHbCjs33vn4hWvQkUDpZNEtZdzHjSYuwdTIlrs7L4os SHaTV2aWKXgWh6jGM4+T6WTLpKATkx6ZySJyo6J5PMM1UzPx9LDFa5/hSFSYyZENZMPy AuBQ== X-Gm-Message-State: AOAM532+zU4z/gzMPW4PsA92O0gq3k3rh9Li5v85vB9tU3zbLcJq5oin dd1OxuSgEgw1yYEHp6fJr/CoOeteZ2lf6qwl5vRpNkxO X-Google-Smtp-Source: ABdhPJyf/w87UjEBxSy5mJWj5Hw2WLgIJtIjxlII1wMhQJuRLdNwu+3LtYCSxmYSbuuhUK/qI5VEszR165dJSLBB/bM= X-Received: by 2002:a9f:2a82:: with SMTP id z2mr9813917uai.71.1590883665357; Sat, 30 May 2020 17:07:45 -0700 (PDT) MIME-Version: 1.0 References: <202005151642.04FGgfA6028982@repo.freebsd.org> In-Reply-To: <202005151642.04FGgfA6028982@repo.freebsd.org> From: Ben Woods Date: Sun, 31 May 2020 08:07:34 +0800 Message-ID: Subject: Re: svn commit: r535306 - in branches/2020Q2: . dns dns/bind914 dns/dnsperf net/samba410 To: Mathieu Arnold Cc: "ports-committers@FreeBSD.org" , svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org X-Rspamd-Queue-Id: 49ZJXf6YpTz40pC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=W7a9n5y0; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of woodsb02@gmail.com designates 2607:f8b0:4864:20::933 as permitted sender) smtp.mailfrom=woodsb02@gmail.com X-Spamd-Result: default: False [-2.95 / 15.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.998]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.05)[0.050]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::933:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 00:07:48 -0000 On Sat, 16 May 2020 at 00:42, Mathieu Arnold wrote: > Author: mat > Date: Fri May 15 16:42:41 2020 > New Revision: 535306 > URL: https://svnweb.freebsd.org/changeset/ports/535306 > > Log: > Remove expired ports: > > dns/dnsperf: depends on expired dns/bind914, not compatible with > dns/bind916 > 2020-04-30 dns/bind914: End of life, please migrate to a newer version > of BIND9 > > Deleted: > branches/2020Q2/dns/bind914/ > branches/2020Q2/dns/dnsperf/ > Modified: > branches/2020Q2/MOVED > branches/2020Q2/dns/Makefile (contents, props changed) > branches/2020Q2/net/samba410/Makefile (contents, props changed) > Hi Mat, Can I please ask what the logic was for doing this in a quarterly branch? Regards, Ben From owner-svn-ports-branches@freebsd.org Sun May 31 02:08:55 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00F8A2FEC8C; Sun, 31 May 2020 02:08:54 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com [IPv6:2607:f8b0:4864:20::e2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZMDP56t4z48FF; Sun, 31 May 2020 02:08:53 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: by mail-vs1-xe2c.google.com with SMTP id 1so3703600vsl.9; Sat, 30 May 2020 19:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ehOJaVoVVWZKZCBLrinKA0wIzGZNv92aKzhs/xjGKJE=; b=VFz4D7xoqsdB0qx0uJq8oYFMdAX6xGouTp8JeCXoTm4ILfSFesKZxoQVQq/2W1JYvE PunEjtKda8kox3/iw7zL+uEdAOqQ5+lUCJ1nkUyqfEPF9WiY9j+wTNpae/HbDh1khBoj K3JmGqMU9noXcdeGby+eLSxG0NT4GYqB/tSo2G/dyZLDoUwfAjf/UqLww7Sq/9JnMaFv 8BRUEgCehqbXXI1XIG/UlM5UNe+ZWZKRrfjQT4uqwKy54IDv9rnWOwYhq5Iz3QT4OGjD kXssVg174No9/7V++4Q0qmoicvS1CaHIgRZyUPFM65F+pH7Tb1apXhpa1ViT+dwL2tdM HljQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ehOJaVoVVWZKZCBLrinKA0wIzGZNv92aKzhs/xjGKJE=; b=o/EsekJjXNYM/YTEut625pXgQX74m1mWeCpeIE9+JwFhOppy7RHIrD4o4NmASPqv9r /bOaI9QcecikUNHL8lkbxBk2G3HQFOZTUlrueA6FxxbB3Hr4MtK91ODCSA81F6RSJyLr 6qrI6RQFBRFuuGUITM3KeIBf8viW8b4TyEDqB8ZPLNmp3Bu0OIh2fC1spqnnsSlGER+2 02xAYA2kXAgbsnKMttHvRo9Ne1aLC+hYGNi2uoIzlCv1bmNpm+fsoCDjDGRnGqe0m5Po Ii9WZY12p7QeDG2yejIydnZcBXAijZ+wJ4PnmwOvqRP/jrfQWe20XIZhFyHJp7JSZY1j BT/A== X-Gm-Message-State: AOAM531uU3a0WOYvhajIM1fhg9C7zECev+hCAI+sS2CAL/fX8PEMA4dH afHUdcBfsgGV9el1o7V2shuQEiTJnyIIH11EWwf96WlPUHk= X-Google-Smtp-Source: ABdhPJyK+GJ+db/JAoJoDVJsmrTPUjPmCjlV6eTxLZ98UBuMKH2lJP4yVMeCeFn52TjA7ys7vZ3I5gd83iJLkNTyLgw= X-Received: by 2002:a67:2702:: with SMTP id n2mr9924549vsn.42.1590890932354; Sat, 30 May 2020 19:08:52 -0700 (PDT) MIME-Version: 1.0 References: <202005151642.04FGgfA6028982@repo.freebsd.org> In-Reply-To: From: Ben Woods Date: Sun, 31 May 2020 10:08:41 +0800 Message-ID: Subject: Re: svn commit: r535306 - in branches/2020Q2: . dns dns/bind914 dns/dnsperf net/samba410 To: Mathieu Arnold Cc: "ports-committers@FreeBSD.org" , svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org X-Rspamd-Queue-Id: 49ZMDP56t4z48FF X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=VFz4D7xo; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of woodsb02@gmail.com designates 2607:f8b0:4864:20::e2c as permitted sender) smtp.mailfrom=woodsb02@gmail.com X-Spamd-Result: default: False [-3.92 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-1.00)[-0.998]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e2c:from]; NEURAL_HAM_SHORT(-0.93)[-0.926]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 02:08:55 -0000 On Sun, 31 May 2020 at 08:07, Ben Woods wrote: > On Sat, 16 May 2020 at 00:42, Mathieu Arnold wrote: > >> Author: mat >> Date: Fri May 15 16:42:41 2020 >> New Revision: 535306 >> URL: https://svnweb.freebsd.org/changeset/ports/535306 >> >> Log: >> Remove expired ports: >> >> dns/dnsperf: depends on expired dns/bind914, not compatible with >> dns/bind916 >> 2020-04-30 dns/bind914: End of life, please migrate to a newer version >> of BIND9 >> >> Deleted: >> branches/2020Q2/dns/bind914/ >> branches/2020Q2/dns/dnsperf/ >> Modified: >> branches/2020Q2/MOVED >> branches/2020Q2/dns/Makefile (contents, props changed) >> branches/2020Q2/net/samba410/Makefile (contents, props changed) >> > > Hi Mat, > > Can I please ask what the logic was for doing this in a quarterly branch? > > Regards, > Ben > Hi again, For the record, I am not against this change. In fact, I think it is going to make it easier to backport the latest security update to net/samba410 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246721 I was just surprised to see expired ports removed from quarterly, rather than just being done in head and aging out when the next quarterly branch occurs on 1 July. I guess what I am asking is - what is the procedure for expired ports in quarterly, and is this documented somewhere? Regards, Ben From owner-svn-ports-branches@freebsd.org Sun May 31 08:41:59 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8665432F2AA; Sun, 31 May 2020 08:41:59 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZWxz35nqz4fv4; Sun, 31 May 2020 08:41:59 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65991173D0; Sun, 31 May 2020 08:41:59 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V8fxrB091247; Sun, 31 May 2020 08:41:59 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V8fwm5091243; Sun, 31 May 2020 08:41:58 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005310841.04V8fwm5091243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 31 May 2020 08:41:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537130 - in branches/2020Q2/security/openvpn: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q2/security/openvpn: . files X-SVN-Commit-Revision: 537130 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 08:41:59 -0000 Author: mandree Date: Sun May 31 08:41:58 2020 New Revision: 537130 URL: https://svnweb.freebsd.org/changeset/ports/537130 Log: MFH: r537129 security/openvpn: cherry-pick fixes from git repo * 098edbb1 2020-05-20 | Switch assertion failure to returning false [Jeremy Evans] * fc029714 2020-05-30 | pool: prevent IPv6 pools to be larger than 2^16 addresses [Antonio Quartulli] * 38b46e6b 2020-02-20 | Persist management-query-remote and proxy prompts [Selva Nair] Approved by: ports-secteam (blanket approval for stability fixes) Added: branches/2020Q2/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992 - copied unchanged from r537129, head/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992 branches/2020Q2/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88 - copied unchanged from r537129, head/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88 branches/2020Q2/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5 - copied unchanged from r537129, head/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5 Modified: branches/2020Q2/security/openvpn/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/openvpn/Makefile ============================================================================== --- branches/2020Q2/security/openvpn/Makefile Sun May 31 08:40:02 2020 (r537129) +++ branches/2020Q2/security/openvpn/Makefile Sun May 31 08:41:58 2020 (r537130) @@ -3,7 +3,7 @@ PORTNAME= openvpn DISTVERSION= 2.4.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ Copied: branches/2020Q2/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992 (from r537129, head/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992 Sun May 31 08:41:58 2020 (r537130, copy of r537129, head/security/openvpn/files/patch-git-098edbb1f5a2e1360fd6a4ae0642b63bec12e992) @@ -0,0 +1,136 @@ +From 098edbb1f5a2e1360fd6a4ae0642b63bec12e992 Mon Sep 17 00:00:00 2001 +From: Jeremy Evans +Date: Wed, 20 May 2020 11:34:04 -0700 +Subject: [PATCH] Switch assertion failure to returning false + +This assertion failure can be hit in production, which causes the +openvpn server process to stop and all clients to be disconnected. +Bug #1270 has been filed for this issue on Trac by another user +who has experienced the issue, and this patch attempts to address it. + +Tracing callers, it appears that some callers check ks->authenticated +before calling, but others do not. It may be possible to add the check +for the callers that do not check, but this seems to be a simpler +solution. + +To give some background, we hit this assertion failure, with the +following log output: + +``` +Tue May 19 15:57:05 2020 username/73.135.141.11:1194 PUSH: Received +control message: 'PUSH_REQUEST' +Tue May 19 15:57:05 2020 username/73.135.141.11:1194 SENT CONTROL +[username]: 'PUSH_REPLY,redirect-gateway +def1,comp-lzo,persist-key,persist-tun,route-gateway 10.28.47.1,topology +subnet,ping 10,ping-restart 120,ifconfig 10.28.47.38 255.255.255.0,peer-id +89' (status=1) +Tue May 19 15:57:05 2020 username/73.135.141.11:1194 Assertion failed at +/path/to/openvpn-2.4.7/src/openvpn/ssl.c:1944 (ks->authenticated) +Tue May 19 15:57:05 2020 username/73.135.141.11:1194 Exiting due to fatal +error +Tue May 19 15:57:05 2020 username/73.135.141.11:1194 Closing TUN/TAP +interface +``` + +using the following OpenVPN server configuration: + +``` +port 1194 +proto udp +dev-type tun +ca ca.crt +cert server.crt +key server.key +dh dh.pem +topology subnet +push "redirect-gateway def1" +push "comp-lzo" +push "persist-key" +push "persist-tun" +keepalive 10 120 +comp-lzo +user nobody +group nobody +persist-key +persist-tun +cd /home/openvpn/server +chroot /var/empty +daemon +verb 3 +crl-verify crl.pem +tls-auth ta.key 0 +cipher AES-256-CBC +tls-version-min 1.2 +tls-cipher ECDHE-RSA-AES256-GCM-SHA384 +ncp-disable +mute-replay-warnings +script-security 3 +auth-user-pass-verify "ldap-auth/ldap-auth" via-env +auth-user-pass-optional +``` + +and the following command line options: + +``` +--config openvpn.conf --dev tun1 --local 206.131.72.52 \ +--log-append openvpn.log --status openvpn-status.log \ +--server 10.28.47.0 255.255.255.0 +``` + +The failed assertion is inside the function +`tls_session_generate_data_channel_keys`, which is called 3 other places +in `ssl.c.`: + +* `key_method_2_write`: checks for `ks->authenticated` before calling + +* `key_method_2_read`: appears to run in client mode but not in server + mode + +* `tls_session_update_crypto_params`: runs in server mode and does not + check before calling + +That leads me to believe the problem caller is +`tls_session_update_crypto_params`. There.s three callers of +`tls_session_update_crypto_params`:. + +* `incoming_push_message` (`push.c`): Probably this caller, since the + server pushes configuration to clients, and the log shows the + assertion failure right after the push reply. + +* `multi_process_file_closed` (`multi.c`): Not this caller. NCP is + disabled in config, and async push was not enabled when compiling. + +* `do_deferred_options` (`init.c`): Not this caller. The server + configuration doesn't pull. + +Changing the assertion to returning false appears to be the simplest +fix. Another approach would be changing callers to check +`ks->authenticated` before calling, either +`tls_session_update_crypto_params` or `incoming_push_message`. + +Signed-off-by: Jeremy Evans +Acked-by: Steffan Karger +Message-Id: <20200520183404.54822-1-code@jeremyevans.net> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19914.html +Signed-off-by: Gert Doering +(cherry picked from commit 984bd1e1601e4b9562dbc88b02a8db60b884286f) +--- + src/openvpn/ssl.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c +index cf6689982..215147f37 100644 +--- ./src/openvpn/ssl.c ++++ ./src/openvpn/ssl.c +@@ -1941,7 +1941,10 @@ tls_session_generate_data_channel_keys(struct tls_session *session) + const struct session_id *server_sid = !session->opt->server ? + &ks->session_id_remote : &session->session_id; + +- ASSERT(ks->authenticated); ++ if (!ks->authenticated) { ++ msg(D_TLS_ERRORS, "TLS Error: key_state not authenticated"); ++ goto cleanup; ++ } + + ks->crypto_options.flags = session->opt->crypto_flags; + if (!generate_key_expansion(&ks->crypto_options.key_ctx_bi, Copied: branches/2020Q2/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88 (from r537129, head/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88 Sun May 31 08:41:58 2020 (r537130, copy of r537129, head/security/openvpn/files/patch-git-38b46e6bf65489c2c5d75da1c02a3a1c33e6da88) @@ -0,0 +1,61 @@ +From 38b46e6bf65489c2c5d75da1c02a3a1c33e6da88 Mon Sep 17 00:00:00 2001 +From: Selva Nair +Date: Thu, 20 Feb 2020 22:00:28 -0500 +Subject: [PATCH] Persist management-query-remote and proxy prompts + +Currently this prompt is only output once, not re-written to the +management interface when the management client connects. It is thus +not seen by a client that connects after the prompt is output or one that +disconnects and reconnects. This leads to a deadlock: the daemon waiting +for the "remote" command from the client, the latter not aware of it. + +Resolve by adding the ">REMOTE" and ">PROXY" prompt to +man.persist.special_state_msg as done for other persisted prompts such +as ">PASSWORD" + +Signed-off-by: Selva Nair +Acked-by: Gert Doering +Message-Id: <1582254028-7763-1-git-send-email-selva.nair@gmail.com> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19497.html +Signed-off-by: Gert Doering +(cherry picked from commit 93ba6ccddafcc87f336f50dadde144ea4f6178ad) +--- + src/openvpn/init.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/openvpn/init.c b/src/openvpn/init.c +index 8bac74f97..e153682ed 100644 +--- ./src/openvpn/init.c ++++ ./src/openvpn/init.c +@@ -269,6 +269,7 @@ ce_management_query_proxy(struct context *c) + buf_printf(&out, ">PROXY:%u,%s,%s", (l ? l->current : 0) + 1, + (proto_is_udp(ce->proto) ? "UDP" : "TCP"), np(ce->remote)); + management_notify_generic(management, BSTR(&out)); ++ management->persist.special_state_msg = BSTR(&out); + } + ce->flags |= CE_MAN_QUERY_PROXY; + while (ce->flags & CE_MAN_QUERY_PROXY) +@@ -280,6 +281,7 @@ ce_management_query_proxy(struct context *c) + break; + } + } ++ management->persist.special_state_msg = NULL; + gc_free(&gc); + } + +@@ -349,6 +351,7 @@ ce_management_query_remote(struct context *c) + buf_printf(&out, ">REMOTE:%s,%s,%s", np(ce->remote), ce->remote_port, + proto2ascii(ce->proto, ce->af, false)); + management_notify_generic(management, BSTR(&out)); ++ management->persist.special_state_msg = BSTR(&out); + + ce->flags &= ~(CE_MAN_QUERY_REMOTE_MASK << CE_MAN_QUERY_REMOTE_SHIFT); + ce->flags |= (CE_MAN_QUERY_REMOTE_QUERY << CE_MAN_QUERY_REMOTE_SHIFT); +@@ -362,6 +365,7 @@ ce_management_query_remote(struct context *c) + break; + } + } ++ management->persist.special_state_msg = NULL; + } + gc_free(&gc); + Copied: branches/2020Q2/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5 (from r537129, head/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5 Sun May 31 08:41:58 2020 (r537130, copy of r537129, head/security/openvpn/files/patch-git-fc0297143494e0a0f08564d90dbb210669d0abf5) @@ -0,0 +1,28 @@ +From fc0297143494e0a0f08564d90dbb210669d0abf5 Mon Sep 17 00:00:00 2001 +From: Antonio Quartulli +Date: Sat, 30 May 2020 02:05:54 +0200 +Subject: [PATCH] pool: prevent IPv6 pools to be larger than 2^16 addresses + +Signed-off-by: Antonio Quartulli +Acked-by: Gert Doering +Message-Id: <20200530000600.1680-2-a@unstable.cc> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19945.html +Signed-off-by: Gert Doering +(cherry picked from commit 81d66a1f14d4be3282dd648ecc2049658e3a65ed) +--- + src/openvpn/pool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/openvpn/pool.c b/src/openvpn/pool.c +index da28bc06b..e45bf88a2 100644 +--- ./src/openvpn/pool.c ++++ ./src/openvpn/pool.c +@@ -183,7 +183,7 @@ ifconfig_pool_init(int type, in_addr_t start, in_addr_t end, + if (pool->ipv6) + { + pool->base_ipv6 = ipv6_base; +- pool->size_ipv6 = ipv6_netbits>96 ? ( 1<<(128-ipv6_netbits) ) ++ pool->size_ipv6 = ipv6_netbits > 112 ? (1 << (128 - ipv6_netbits)) + : IFCONFIG_POOL_MAX; + + msg( D_IFCONFIG_POOL, "IFCONFIG POOL IPv6: (IPv4) size=%d, size_ipv6=%d, netbits=%d, base_ipv6=%s", From owner-svn-ports-branches@freebsd.org Sun May 31 08:43:46 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4AA0B32EE68; Sun, 31 May 2020 08:43:46 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZX021KgGz3Rbn; Sun, 31 May 2020 08:43:46 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28CE917627; Sun, 31 May 2020 08:43:46 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V8hkZd092417; Sun, 31 May 2020 08:43:46 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V8hkwY092416; Sun, 31 May 2020 08:43:46 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202005310843.04V8hkwY092416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 31 May 2020 08:43:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537131 - branches/2020Q2/audio/rhvoice X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q2/audio/rhvoice X-SVN-Commit-Revision: 537131 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 08:43:46 -0000 Author: linimon Date: Sun May 31 08:43:45 2020 New Revision: 537131 URL: https://svnweb.freebsd.org/changeset/ports/537131 Log: MFH: r537128 Mark as BROKEN on powerpc64-12. This is true even though the usual workaround of USES is in place. It seems to build everywhere else. Approved by: portmgr (tier-2 blanket) Modified: branches/2020Q2/audio/rhvoice/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/audio/rhvoice/Makefile ============================================================================== --- branches/2020Q2/audio/rhvoice/Makefile Sun May 31 08:41:58 2020 (r537130) +++ branches/2020Q2/audio/rhvoice/Makefile Sun May 31 08:43:45 2020 (r537131) @@ -12,6 +12,8 @@ LICENSE_COMB= multi LICENSE_FILE_LGPL21+ = ${WRKSRC}/licenses/lgpl-2.1.txt LICENSE_FILE_GPLv3+ = ${WRKSRC}/licenses/gpl-3.0.txt +BROKEN_FreeBSD_12_powerpc64= fails to configure: The C++ compiler is not working + USES= compiler:c++0x pkgconfig scons USE_GITHUB= yes GH_ACCOUNT= Olga-Yakovleva From owner-svn-ports-branches@freebsd.org Sun May 31 08:58:32 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 60C7B32F6E1; Sun, 31 May 2020 08:58:32 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZXK41hhHz3S9c; Sun, 31 May 2020 08:58:32 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 355CB17641; Sun, 31 May 2020 08:58:32 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V8wWvk098974; Sun, 31 May 2020 08:58:32 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V8wWIp098973; Sun, 31 May 2020 08:58:32 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202005310858.04V8wWIp098973@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 31 May 2020 08:58:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537133 - branches/2020Q2/astro/oskar X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q2/astro/oskar X-SVN-Commit-Revision: 537133 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 08:58:32 -0000 Author: linimon Date: Sun May 31 08:58:31 2020 New Revision: 537133 URL: https://svnweb.freebsd.org/changeset/ports/537133 Log: MFH: r537132 Mark as BROKEN on powerpc64-12. Seems to build everywhere else. Approved by: portmgr (tier-2 blanket) Modified: branches/2020Q2/astro/oskar/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/astro/oskar/Makefile ============================================================================== --- branches/2020Q2/astro/oskar/Makefile Sun May 31 08:56:19 2020 (r537132) +++ branches/2020Q2/astro/oskar/Makefile Sun May 31 08:58:31 2020 (r537133) @@ -12,6 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 ONLY_FOR_ARCHS_REASON= gccfeatures.h:54:4: This code has only been tested on x86 and powerpc platforms +BROKEN_FreeBSD_12_powerpc64= fails to compile: oskar_convert_cirs_relative_directions_to_enu_directions.c:67:29: 'csinl' undeclared (first use in this function) LIB_DEPENDS= libcfitsio.so:astro/cfitsio From owner-svn-ports-branches@freebsd.org Sun May 31 09:13:19 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A05632FF87; Sun, 31 May 2020 09:13:19 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZXf7358Vz3TJT; Sun, 31 May 2020 09:13:19 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6557317A4F; Sun, 31 May 2020 09:13:19 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V9DJT0011360; Sun, 31 May 2020 09:13:19 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V9DJ7j011359; Sun, 31 May 2020 09:13:19 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202005310913.04V9DJ7j011359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 31 May 2020 09:13:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537136 - branches/2020Q2/benchmarks/sipp X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q2/benchmarks/sipp X-SVN-Commit-Revision: 537136 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 09:13:19 -0000 Author: linimon Date: Sun May 31 09:13:18 2020 New Revision: 537136 URL: https://svnweb.freebsd.org/changeset/ports/537136 Log: MFH: r537135 Mark as BROKEN on powercp64-12. Seems to build elsewhere. Approved by: portmgr (tier-2 blanket) Modified: branches/2020Q2/benchmarks/sipp/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/benchmarks/sipp/Makefile ============================================================================== --- branches/2020Q2/benchmarks/sipp/Makefile Sun May 31 09:09:55 2020 (r537135) +++ branches/2020Q2/benchmarks/sipp/Makefile Sun May 31 09:13:18 2020 (r537136) @@ -12,6 +12,8 @@ COMMENT= SIP benchmarking and testing tool LICENSE= GPLv2 +BROKEN_FreeBSD_12_powerpc64= fails to compile: /usr/local/lib/gcc9/include/c++/cstddef:52:8: expected unqualified-id before string constant + BUILD_DEPENDS= help2man:misc/help2man USES= autoreconf compiler:c++11-lang gmake ncurses pkgconfig From owner-svn-ports-branches@freebsd.org Sun May 31 09:26:44 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7FD2330378; Sun, 31 May 2020 09:26:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZXxc5yQlz3VZs; Sun, 31 May 2020 09:26:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7C6A17D78; Sun, 31 May 2020 09:26:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04V9QiBj018303; Sun, 31 May 2020 09:26:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V9Qhn7018297; Sun, 31 May 2020 09:26:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005310926.04V9Qhn7018297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 31 May 2020 09:26:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537141 - in branches/2020Q2: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files X-SVN-Commit-Revision: 537141 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 09:26:45 -0000 Author: jbeich Date: Sun May 31 09:26:43 2020 New Revision: 537141 URL: https://svnweb.freebsd.org/changeset/ports/537141 Log: MFH: r537140 www/firefox: don't abort WaylandShmPool::Resize if posix_fallocate succeeds PR: 240884 Submitted by: tijl Pointy hat to: jbeich Approved by: ports-secteam blanket Modified: branches/2020Q2/mail/thunderbird/Makefile branches/2020Q2/mail/thunderbird/files/patch-bug1618914 branches/2020Q2/www/firefox-esr/Makefile branches/2020Q2/www/firefox-esr/files/patch-bug1618914 branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/files/patch-bug1618914 Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q2/mail/thunderbird/Makefile Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/mail/thunderbird/Makefile Sun May 31 09:26:43 2020 (r537141) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2020Q2/mail/thunderbird/files/patch-bug1618914 ============================================================================== --- branches/2020Q2/mail/thunderbird/files/patch-bug1618914 Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/mail/thunderbird/files/patch-bug1618914 Sun May 31 09:26:43 2020 (r537141) @@ -37,7 +37,7 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 errno = posix_fallocate(mShmPoolFd, 0, aSize); } while (errno == EINTR); - if (errno != 0) return false; -+ if (errno != EINVAL && errno != EOPNOTSUPP) return false; ++ if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP) return false; #endif wl_shm_pool_resize(mShmPool, aSize); Modified: branches/2020Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2020Q2/www/firefox-esr/Makefile Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/www/firefox-esr/Makefile Sun May 31 09:26:43 2020 (r537141) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.8.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Modified: branches/2020Q2/www/firefox-esr/files/patch-bug1618914 ============================================================================== --- branches/2020Q2/www/firefox-esr/files/patch-bug1618914 Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/www/firefox-esr/files/patch-bug1618914 Sun May 31 09:26:43 2020 (r537141) @@ -37,7 +37,7 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 errno = posix_fallocate(mShmPoolFd, 0, aSize); } while (errno == EINTR); - if (errno != 0) return false; -+ if (errno != EINVAL && errno != EOPNOTSUPP) return false; ++ if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP) return false; #endif wl_shm_pool_resize(mShmPool, aSize); Modified: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/www/firefox/Makefile Sun May 31 09:26:43 2020 (r537141) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 76.0.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2020Q2/www/firefox/files/patch-bug1618914 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1618914 Sun May 31 09:24:20 2020 (r537140) +++ branches/2020Q2/www/firefox/files/patch-bug1618914 Sun May 31 09:26:43 2020 (r537141) @@ -37,7 +37,7 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 errno = posix_fallocate(mShmPoolFd, 0, aSize); } while (errno == EINTR); - if (errno != 0) return false; -+ if (errno != EINVAL && errno != EOPNOTSUPP) return false; ++ if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP) return false; #endif wl_shm_pool_resize(mShmPool, aSize); From owner-svn-ports-branches@freebsd.org Sun May 31 10:58:30 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 618BF331C69; Sun, 31 May 2020 10:58:30 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZZzV1y0jz3dBp; Sun, 31 May 2020 10:58:30 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D71F18DA8; Sun, 31 May 2020 10:58:30 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VAwUrB075190; Sun, 31 May 2020 10:58:30 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VAwTSW075188; Sun, 31 May 2020 10:58:29 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202005311058.04VAwTSW075188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 31 May 2020 10:58:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537152 - branches/2020Q2/www/gitea X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: branches/2020Q2/www/gitea X-SVN-Commit-Revision: 537152 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 10:58:30 -0000 Author: adamw Date: Sun May 31 10:58:29 2020 New Revision: 537152 URL: https://svnweb.freebsd.org/changeset/ports/537152 Log: MFH: r534858 r537149 gitea: Update to 1.11.5 This release fixes 22 bugs, and includes two enhancements. Release notes: https://github.com/go-gitea/gitea/releases/tag/v1.11.5 PR: 246353 Submitted by: maintainer gitea: Update to 1.11.6 Update Gitea to 1.11.6 This release fixes two security issues and 14 bugs. Release notes: https://github.com/go-gitea/gitea/releases/tag/v1.11.6 And despite /some/ work being done on the invalid Go template syntax for the Wiki pages, the main bug has not been fixed and merged, so the patch still is required. PR: 246892 Submitted by: maintainer Relnotes: https://github.com/go-gitea/gitea/releases/tag/v1.11.6 Security: yes, see Relnotes Approved by: portmgr (with hat) Modified: branches/2020Q2/www/gitea/Makefile branches/2020Q2/www/gitea/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/gitea/Makefile ============================================================================== --- branches/2020Q2/www/gitea/Makefile Sun May 31 10:54:18 2020 (r537151) +++ branches/2020Q2/www/gitea/Makefile Sun May 31 10:58:29 2020 (r537152) @@ -2,8 +2,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.11.4 -PORTREVISION= 2 +DISTVERSION= 1.11.6 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} Modified: branches/2020Q2/www/gitea/distinfo ============================================================================== --- branches/2020Q2/www/gitea/distinfo Sun May 31 10:54:18 2020 (r537151) +++ branches/2020Q2/www/gitea/distinfo Sun May 31 10:58:29 2020 (r537152) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586790205 -SHA256 (gitea-src-1.11.4.tar.gz) = ee643516bf201296a4ef8cc0d782cddbbd894be2012be1d5fb5746801b9b66a2 -SIZE (gitea-src-1.11.4.tar.gz) = 68915569 +TIMESTAMP = 1590915922 +SHA256 (gitea-src-1.11.6.tar.gz) = 1ac3880df7f38e411376c284959d8f5e1e1d9137ac423fe20d1e02ac5cc1de86 +SIZE (gitea-src-1.11.6.tar.gz) = 68915319 From owner-svn-ports-branches@freebsd.org Mon Jun 1 08:35:20 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B323B32E587; Mon, 1 Jun 2020 08:35:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49b7lr4gLsz4QCZ; Mon, 1 Jun 2020 08:35:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97493891E; Mon, 1 Jun 2020 08:35:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0518ZKWr010429; Mon, 1 Jun 2020 08:35:20 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0518ZJog010425; Mon, 1 Jun 2020 08:35:19 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <202006010835.0518ZJog010425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 1 Jun 2020 08:35:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537468 - in branches/2020Q2/net/samba410: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2020Q2/net/samba410: . files X-SVN-Commit-Revision: 537468 X-SVN-Commit-Repository: ports 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.33 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, 01 Jun 2020 08:35:20 -0000 Author: woodsb02 Date: Mon Jun 1 08:35:19 2020 New Revision: 537468 URL: https://svnweb.freebsd.org/changeset/ports/537468 Log: MFH: r531462 r533307 Update Samba 4.10 to the 4.10.14 release. Security update samba410 to the 4.10.15 Security: CVE-2020-10700 CVE-2020-10704 PR: 246721 Approved by: timur (maintainer) Approved by: ports-secteam (joneum) Added: branches/2020Q2/net/samba410/files/patch-bind - copied, changed from r537111, branches/2020Q2/net/samba410/files/patch-bind14 Deleted: branches/2020Q2/net/samba410/files/patch-bind14 Modified: branches/2020Q2/net/samba410/Makefile branches/2020Q2/net/samba410/distinfo branches/2020Q2/net/samba410/pkg-plist Modified: branches/2020Q2/net/samba410/Makefile ============================================================================== --- branches/2020Q2/net/samba410/Makefile Mon Jun 1 08:33:43 2020 (r537467) +++ branches/2020Q2/net/samba410/Makefile Mon Jun 1 08:35:19 2020 (r537468) @@ -24,12 +24,11 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-provision-use-ASCII SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.10.13 +SAMBA4_VERSION= 4.10.15 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} -.if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories @@ -81,7 +80,7 @@ SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} ############################################################################## OPTIONS_SUB= yes -OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DEBUG DOCS FAM GPGME \ +OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DOCS FAM GPGME \ LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP # This shouldn't be default in the release OPTIONS_DEFINE+= DEVELOPER MANDOC @@ -89,7 +88,6 @@ OPTIONS_DEFINE+= DEVELOPER MANDOC OPTIONS_DEFINE_amd64= AESNI OPTIONS_DEFAULT_amd64= AESNI -OPTIONS_EXCLUDE_powerpc64= DEBUG OPTIONS_GROUP= VFS OPTIONS_GROUP_VFS= FRUIT GLUSTERFS @@ -100,9 +98,9 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER OPTIONS_RADIO= DNS -OPTIONS_RADIO_DNS= NSUPDATE BIND911 +OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND916 # Make those default options -OPTIONS_DEFAULT= AD_DC ADS DEBUG DOCS FAM LDAP \ +OPTIONS_DEFAULT= AD_DC ADS DOCS FAM LDAP \ QUOTAS SYSLOG UTMP PROFILE \ FRUIT GSSAPI_BUILTIN AVAHI ############################################################################## @@ -135,11 +133,14 @@ ZEROCONF_NONE_DESC= Zeroconf support is absent DNS_DESC= DNS frontend BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend +BIND916_DESC= Use Bind 9.16 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC ############################################################################## # XXX: Unconditional dependencies which can't be switched off(if present in # the system) +# Iconv(picked up unconditionaly) +LIB_DEPENDS+= libiconv.so:converters/libiconv # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency LIB_DEPENDS+= libreadline.so:devel/readline @@ -174,20 +175,19 @@ SAMBA4_BUNDLED_LDB?= yes # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka -CONFLICTS+= cmocka-1.* +CONFLICTS_INSTALL+= cmocka-1.* PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="" SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="" .else SAMBA4_BUNDLED_LIBS+= !cmocka BUILD_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka -RUN_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment " SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " .endif # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc -CONFLICTS+= talloc-* talloc1-* +CONFLICTS_INSTALL+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else @@ -200,7 +200,7 @@ SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " # tevent .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= tevent -CONFLICTS+= tevent-* tevent1-* +CONFLICTS_INSTALL+= tevent-* tevent1-* PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" .else @@ -213,7 +213,7 @@ SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " # tdb .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= tdb -CONFLICTS+= tdb-* tdb1-* +CONFLICTS_INSTALL+= tdb-* tdb1-* PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else @@ -239,7 +239,7 @@ SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules .endif -.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \ +.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes) \ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \ || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes) @@ -252,7 +252,8 @@ TEST_USES= python TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA1SUM=/sbin/sha1 \ SHA256SUM=/sbin/sha256 \ - MD5SUM=/sbin/md5 + MD5SUM=/sbin/md5 \ + PYTHONDONTWRITEBYTECODE=1 TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark ############################################################################## @@ -296,12 +297,9 @@ MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSRespon MDNSRESPONDER_VARS= SAMBA4_SERVICES+=mdnsd ############################################################################## BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 +BIND916_RUN_DEPENDS= bind916>=9.16.0.0:dns/bind916 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate ############################################################################## -DEBUG_CONFIGURE_ON= --verbose --enable-debug -DEBUG_MAKE_ARGS= --verbose -DEBUG_FLAGS= -g -ggdb3 -O0 - MEMORY_DEBUG_IMPLIES= DEBUG MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`" MEMORY_DEBUG_LIB_DEPENDS= libjemalloc.so.2:devel/jemalloc @@ -373,15 +371,11 @@ LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" -# !SAMBA4_SUBPORT -.endif ############################################################################## .include ############################################################################## -.if !defined(SAMBA4_SUBPORT) - .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime .endif @@ -416,7 +410,9 @@ SUB_LIST+= SAMBA4_PYTHON="@comment " USES+= python:3.4+ PLIST_SUB+= SAMBA4_PYTHON="" SUB_LIST+= SAMBA4_PYTHON="" +# Don't cache Python modules CONFIGURE_ARGS+= --nopycache +MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= pytalloc-util @@ -442,9 +438,6 @@ SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util .endif # External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} - BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} .endif @@ -465,14 +458,17 @@ CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODU .for module in ${SAMBA4_MODULES} PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so .endfor -# !SAMBA4_SUBPORT + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --verbose --enable-debug +MAKE_ARGS+= --verbose +DEBUG_FLAGS?= -g -ggdb3 -O0 .endif ############################################################################## .include ############################################################################## -.if !defined(SAMBA4_SUBPORT) # Require llvm 4.0 and AMD64 .if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni @@ -481,6 +477,7 @@ PLIST_FILES+= lib/samba4/private/libaesni-intel-samb CONFIGURE_ARGS+= --accel-aes=none .endif + # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) @@ -511,6 +508,7 @@ MAKE_ENV+= RPCGEN_CPP="${CPP}" #.if ${readline_ARGS} == port #CFLAGS+= -D_FUNCTION_DEF #.endif + # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* @@ -545,8 +543,6 @@ post-patch: ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript - @${REINPLACE_CMD} -e '1s|/bin/bash|/bin/sh|' \ - ${PATCH_WRKSRC}/ctdb/tools/onnode # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @@ -635,6 +631,12 @@ post-install: post-install-rm-junk post-install-fix-ma .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor +.if !defined(WITH_DEBUG) + -${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \ + -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} + -${FIND} ${STAGEDIR}${PREFIX}/lib -name '*.so*' \ + -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} +.endif post-install-FRUIT-off: ${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so @@ -651,8 +653,5 @@ post-install-CLUSTER-on: ${LN} -nfs ../../../../share/ctdb/events/legacy/10.interface.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/10.interface.script ${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script ${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script - -# !SAMBA4_SUBPORT -.endif .include Modified: branches/2020Q2/net/samba410/distinfo ============================================================================== --- branches/2020Q2/net/samba410/distinfo Mon Jun 1 08:33:43 2020 (r537467) +++ branches/2020Q2/net/samba410/distinfo Mon Jun 1 08:35:19 2020 (r537468) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580085990 -SHA256 (samba-4.10.13.tar.gz) = 49eb6426e97cbf538e416e51ed8535930382512ad2d13d5ffd7f4336aa7faf63 -SIZE (samba-4.10.13.tar.gz) = 18350580 +TIMESTAMP = 1588122967 +SHA256 (samba-4.10.15.tar.gz) = 0b8b62558b62fbb121015f28f40fae0f07522710b6bef77c508b51bb6914ced9 +SIZE (samba-4.10.15.tar.gz) = 18383201 Copied and modified: branches/2020Q2/net/samba410/files/patch-bind (from r537111, branches/2020Q2/net/samba410/files/patch-bind14) ============================================================================== --- branches/2020Q2/net/samba410/files/patch-bind14 Sat May 30 23:20:00 2020 (r537111, copy source) +++ branches/2020Q2/net/samba410/files/patch-bind Mon Jun 1 08:35:19 2020 (r537468) @@ -1,91 +1,215 @@ ---- source4/dns_server/wscript_build.orig 2019-01-15 10:07:00 UTC -+++ source4/dns_server/wscript_build -@@ -68,6 +68,26 @@ bld.SAMBA_LIBRARY('dlz_bind9_12', - deps='samba-hostconfig samdb-common gensec popt dnsserver_common', - enabled=bld.AD_DC_BUILD_IS_ENABLED()) - -+bld.SAMBA_LIBRARY('dlz_bind9_13', -+ source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_13', -+ private_library=True, -+ link_name='modules/bind9/dlz_bind9_13.so', -+ realname='dlz_bind9_13.so', -+ install_path='${MODULESDIR}/bind9', -+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) +--- python/samba/provision/sambadns.py.orig 2020-03-26 08:58:46 UTC ++++ python/samba/provision/sambadns.py +@@ -27,6 +27,7 @@ import time + import ldb + from base64 import b64encode + import subprocess ++import re + import samba + from samba.tdb_util import tdb_copy + from samba.mdb_util import mdb_copy +@@ -965,34 +966,35 @@ def create_named_conf(paths, realm, dnsdomain, dns_bac + stderr=subprocess.STDOUT, + cwd='.').communicate()[0] + bind_info = get_string(bind_info) +- bind9_8 = '#' +- bind9_9 = '#' +- bind9_10 = '#' +- bind9_11 = '#' +- bind9_12 = '#' +- if bind_info.upper().find('BIND 9.8') != -1: +- bind9_8 = '' +- elif bind_info.upper().find('BIND 9.9') != -1: +- bind9_9 = '' +- elif bind_info.upper().find('BIND 9.10') != -1: +- bind9_10 = '' +- elif bind_info.upper().find('BIND 9.11') != -1: +- bind9_11 = '' +- elif bind_info.upper().find('BIND 9.12') != -1: +- bind9_12 = '' +- elif bind_info.upper().find('BIND 9.7') != -1: +- raise ProvisioningError("DLZ option incompatible with BIND 9.7.") ++ bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I) ++ if bind9_release: ++ bind9_disabled = '' ++ bind9_version = bind9_release.group(0) + "x" ++ bind9_version_major = int(bind9_release.group(1)) ++ bind9_version_minor = int(bind9_release.group(2)) ++ if bind9_version_minor == 7: ++ raise ProvisioningError("DLZ option incompatible with BIND 9.7.") ++ elif bind9_version_minor == 8: ++ bind9_dlz_version = "9" ++ else: ++ bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor) + else: ++ bind9_disabled = '# ' ++ bind9_version = "BIND z.y.x" ++ bind9_dlz_version = "z_y" + logger.warning("BIND version unknown, please modify %s manually." % paths.namedconf) + -+bld.SAMBA_LIBRARY('dlz_bind9_14', -+ source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_14', -+ private_library=True, -+ link_name='modules/bind9/dlz_bind9_14.so', -+ realname='dlz_bind9_14.so', -+ install_path='${MODULESDIR}/bind9', -+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) ++ bind9_dlz = ( ++ ' # For %s\n' ++ ' %sdatabase "dlopen %s/bind9/dlz_bind%s.so";' ++ ) % ( ++ bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version ++ ) + - bld.SAMBA_LIBRARY('dlz_bind9_for_torture', - source='dlz_bind9.c', - cflags='-DBIND_VERSION_9_8', ---- source4/dns_server/dlz_minimal.h.orig 2019-01-15 10:07:00 UTC + setup_file(setup_path("named.conf.dlz"), paths.namedconf, { + "NAMED_CONF": paths.namedconf, + "MODULESDIR": samba.param.modules_dir(), +- "BIND9_8": bind9_8, +- "BIND9_9": bind9_9, +- "BIND9_10": bind9_10, +- "BIND9_11": bind9_11, +- "BIND9_12": bind9_12 +- ++ "BIND9_DLZ": bind9_dlz + }) + + +--- source4/dns_server/dlz_minimal.h.orig 2019-12-06 10:10:30 UTC +++ source4/dns_server/dlz_minimal.h -@@ -31,10 +31,7 @@ - #elif defined (BIND_VERSION_9_10) - # define DLZ_DLOPEN_VERSION 3 - # define DNS_CLIENTINFO_VERSION 1 +@@ -23,22 +23,23 @@ + #ifndef DLZ_MINIMAL_H + #define DLZ_MINIMAL_H 1 + +-#if defined (BIND_VERSION_9_8) +-# define DLZ_DLOPEN_VERSION 1 +-#elif defined (BIND_VERSION_9_9) +-# define DLZ_DLOPEN_VERSION 2 +-# define DNS_CLIENTINFO_VERSION 1 +-#elif defined (BIND_VERSION_9_10) +-# define DLZ_DLOPEN_VERSION 3 +-# define DNS_CLIENTINFO_VERSION 1 -#elif defined (BIND_VERSION_9_11) -# define DLZ_DLOPEN_VERSION 3 -# define DNS_CLIENTINFO_VERSION 2 -#elif defined (BIND_VERSION_9_12) -+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14) - # define DLZ_DLOPEN_VERSION 3 - # define DNS_CLIENTINFO_VERSION 2 +-# define DLZ_DLOPEN_VERSION 3 +-# define DNS_CLIENTINFO_VERSION 2 ++#if defined (BIND_VERSION) ++# if BIND_VERSION == 908 ++# define DLZ_DLOPEN_VERSION 1 ++# elif BIND_VERSION == 909 ++# define DLZ_DLOPEN_VERSION 2 ++# define DNS_CLIENTINFO_VERSION 1 ++# elif BIND_VERSION == 910 ++# define DLZ_DLOPEN_VERSION 3 ++# define DNS_CLIENTINFO_VERSION 1 ++# elif BIND_VERSION >= 911 ++# define DLZ_DLOPEN_VERSION 3 ++# define DNS_CLIENTINFO_VERSION 2 ++# else ++# error Unsupported BIND version ++# endif #else ---- source4/setup/named.conf.dlz.orig 2019-06-22 09:56:57 UTC -+++ source4/setup/named.conf.dlz -@@ -24,5 +24,11 @@ dlz "AD DNS Zone" { - - # For BIND 9.12.x - ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; -+ -+ # For BIND 9.13.x -+ ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so"; -+ -+ # For BIND 9.14.x -+ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; - }; +-# error Unsupported BIND version ++# error BIND_VERSION undefined + #endif ---- python/samba/provision/sambadns.py.orig 2019-01-15 10:07:00 UTC -+++ python/samba/provision/sambadns.py -@@ -960,6 +960,8 @@ def create_named_conf(paths, realm, dnsd - bind9_10 = '#' - bind9_11 = '#' - bind9_12 = '#' -+ bind9_13 = '#' -+ bind9_14 = '#' - if bind_info.upper().find('BIND 9.8') != -1: - bind9_8 = '' - elif bind_info.upper().find('BIND 9.9') != -1: -@@ -970,6 +972,10 @@ def create_named_conf(paths, realm, dnsd - bind9_11 = '' - elif bind_info.upper().find('BIND 9.12') != -1: - bind9_12 = '' -+ elif bind_info.upper().find('BIND 9.13') != -1: -+ bind9_13 = '' -+ elif bind_info.upper().find('BIND 9.14') != -1: -+ bind9_14 = '' - elif bind_info.upper().find('BIND 9.7') != -1: - raise ProvisioningError("DLZ option incompatible with BIND 9.7.") - else: -@@ -981,8 +987,9 @@ def create_named_conf(paths, realm, dnsd - "BIND9_9": bind9_9, - "BIND9_10": bind9_10, - "BIND9_11": bind9_11, -- "BIND9_12": bind9_12 + #if DLZ_DLOPEN_VERSION > 1 +--- source4/dns_server/wscript_build.orig 2019-12-06 10:11:08 UTC ++++ source4/dns_server/wscript_build +@@ -20,7 +20,7 @@ bld.SAMBA_MODULE('service_dns', + # a bind9 dlz module giving access to the Samba DNS SAM + bld.SAMBA_LIBRARY('dlz_bind9', + source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_8', ++ cflags='-DBIND_VERSION=908', + private_library=True, + link_name='modules/bind9/dlz_bind9.so', + realname='dlz_bind9.so', +@@ -28,49 +28,21 @@ bld.SAMBA_LIBRARY('dlz_bind9', + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) + +-bld.SAMBA_LIBRARY('dlz_bind9_9', ++for bind_version in (909, 910, 911, 912, 914, 916): ++ string_version='%d_%d' % (bind_version//100, bind_version % 100) ++ bld.SAMBA_LIBRARY('dlz_bind%s' % (string_version), + source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_9', ++ cflags='-DBIND_VERSION=%d' % bind_version, + private_library=True, +- link_name='modules/bind9/dlz_bind9_9.so', +- realname='dlz_bind9_9.so', ++ link_name='modules/bind9/dlz_bind%s.so' % (string_version), ++ realname='dlz_bind%s.so' % (string_version), + install_path='${MODULESDIR}/bind9', + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) + +-bld.SAMBA_LIBRARY('dlz_bind9_10', +- source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_10', +- private_library=True, +- link_name='modules/bind9/dlz_bind9_10.so', +- realname='dlz_bind9_10.so', +- install_path='${MODULESDIR}/bind9', +- deps='samba-hostconfig samdb-common gensec popt dnsserver_common', +- enabled=bld.AD_DC_BUILD_IS_ENABLED()) - -+ "BIND9_12" : bind9_12, -+ "BIND9_13" : bind9_13, -+ "BIND9_14" : bind9_14 - }) +-bld.SAMBA_LIBRARY('dlz_bind9_11', +- source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_11', +- private_library=True, +- link_name='modules/bind9/dlz_bind9_11.so', +- realname='dlz_bind9_11.so', +- install_path='${MODULESDIR}/bind9', +- deps='samba-hostconfig samdb-common gensec popt dnsserver_common', +- enabled=bld.AD_DC_BUILD_IS_ENABLED()) +- +-bld.SAMBA_LIBRARY('dlz_bind9_12', +- source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_12', +- private_library=True, +- link_name='modules/bind9/dlz_bind9_12.so', +- realname='dlz_bind9_12.so', +- install_path='${MODULESDIR}/bind9', +- deps='samba-hostconfig samdb-common gensec popt dnsserver_common', +- enabled=bld.AD_DC_BUILD_IS_ENABLED()) +- + bld.SAMBA_LIBRARY('dlz_bind9_for_torture', + source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_8', ++ cflags='-DBIND_VERSION=908', + private_library=True, + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) +--- source4/setup/named.conf.dlz.orig 2019-12-06 10:10:31 UTC ++++ source4/setup/named.conf.dlz +@@ -7,22 +7,10 @@ + # + # This configures dynamically loadable zones (DLZ) from AD schema +-# Uncomment only single database line, depending on your BIND version + # + dlz "AD DNS Zone" { +- # For BIND 9.8.x +- ${BIND9_8} database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so"; +- # For BIND 9.9.x +- ${BIND9_9} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so"; ++${BIND9_DLZ} + +- # For BIND 9.10.x +- ${BIND9_10} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so"; +- +- # For BIND 9.11.x +- ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; +- +- # For BIND 9.12.x +- ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; + }; + +--- source4/torture/dns/wscript_build.orig 2020-04-11 03:26:46 UTC ++++ source4/torture/dns/wscript_build +@@ -5,7 +5,7 @@ if bld.AD_DC_BUILD_IS_ENABLED(): + source='dlz_bind9.c', + subsystem='smbtorture', + init_function='torture_bind_dns_init', +- cflags='-DBIND_VERSION_9_8', ++ cflags='-DBIND_VERSION=908', + deps='torture talloc torturemain dlz_bind9_for_torture', + internal_module=True + ) Modified: branches/2020Q2/net/samba410/pkg-plist ============================================================================== --- branches/2020Q2/net/samba410/pkg-plist Mon Jun 1 08:33:43 2020 (r537467) +++ branches/2020Q2/net/samba410/pkg-plist Mon Jun 1 08:35:19 2020 (r537468) @@ -296,13 +296,13 @@ lib/samba4/private/libutil-tdb-samba4.so lib/samba4/private/libwinbind-client-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0 lib/samba4/private/libxattr-tdb-samba4.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/krb5/winbind_krb5_locator.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/acl.so @@ -1002,6 +1002,7 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py %%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py +%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py %%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py %%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py %%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py From owner-svn-ports-branches@freebsd.org Mon Jun 1 23:22:45 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1A4A2F587C; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bWRn3mqmz44kY; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 633DB1367B; Mon, 1 Jun 2020 23:22:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051NMjgp059067; Mon, 1 Jun 2020 23:22:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051NMh3m059059; Mon, 1 Jun 2020 23:22:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006012322.051NMh3m059059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 1 Jun 2020 23:22:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537512 - in branches/2020Q2: Mk www/firefox www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2: Mk www/firefox www/firefox/files X-SVN-Commit-Revision: 537512 X-SVN-Commit-Repository: ports 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.33 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, 01 Jun 2020 23:22:45 -0000 Author: jbeich Date: Mon Jun 1 23:22:43 2020 New Revision: 537512 URL: https://svnweb.freebsd.org/changeset/ports/537512 Log: MFH: r536538 r536713 r537007 www/firefox: update to 77.0 Changes: https://www.mozilla.org/firefox/77.0/releasenotes/ Approved by: ports-secteam blanket Added: branches/2020Q2/www/firefox/files/patch-bug1632456 - copied unchanged from r536713, head/www/firefox/files/patch-bug1632456 branches/2020Q2/www/firefox/files/patch-bug1636072 - copied unchanged from r536713, head/www/firefox/files/patch-bug1636072 branches/2020Q2/www/firefox/files/patch-bug1638010 - copied unchanged from r536713, head/www/firefox/files/patch-bug1638010 Deleted: branches/2020Q2/www/firefox/files/patch-bug1624128 branches/2020Q2/www/firefox/files/patch-bug1625431 branches/2020Q2/www/firefox/files/patch-bug1628690 Modified: branches/2020Q2/Mk/bsd.gecko.mk branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/distinfo branches/2020Q2/www/firefox/files/patch-addon-search branches/2020Q2/www/firefox/files/patch-bug1288587 Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/Mk/bsd.gecko.mk ============================================================================== --- branches/2020Q2/Mk/bsd.gecko.mk Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/Mk/bsd.gecko.mk Mon Jun 1 23:22:43 2020 (r537512) @@ -72,6 +72,7 @@ USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrend HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes LDFLAGS+= -Wl,--as-needed +BINARY_ALIAS+= python3=python${PYTHON3_DEFAULT} BUNDLE_LIBS= yes Modified: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/Makefile Mon Jun 1 23:22:43 2020 (r537512) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 76.0.1 -PORTREVISION= 4 +DISTVERSION= 77.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q2/www/firefox/distinfo ============================================================================== --- branches/2020Q2/www/firefox/distinfo Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/distinfo Mon Jun 1 23:22:43 2020 (r537512) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588879058 -SHA256 (firefox-76.0.1.source.tar.xz) = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3 -SIZE (firefox-76.0.1.source.tar.xz) = 323251680 +TIMESTAMP = 1590732186 +SHA256 (firefox-77.0.source.tar.xz) = b534794c493d8698dfb6c852af52b49540afdf88dc50451f42d6591de93291e8 +SIZE (firefox-77.0.source.tar.xz) = 329713656 Modified: branches/2020Q2/www/firefox/files/patch-addon-search ============================================================================== --- branches/2020Q2/www/firefox/files/patch-addon-search Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/files/patch-addon-search Mon Jun 1 23:22:43 2020 (r537512) @@ -5,18 +5,16 @@ diff --git browser/app/profile/firefox.js browser/app/ index 75c2c5e435e35..4d8c09c02759b 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js -@@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru +@@ -37,7 +37,7 @@ pref("extensions.webextOptionalPermissionPrompts", true); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); -+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%"); pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); -@@ -169,8 +169,8 @@ pref("app.update.url", "https://aus5.mozilla.org/updat +@@ -168,8 +168,8 @@ pref("app.update.staging.enabled", true); // .. etc .. // pref("extensions.update.enabled", true); Modified: branches/2020Q2/www/firefox/files/patch-bug1288587 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1288587 Mon Jun 1 23:20:08 2020 (r537511) +++ branches/2020Q2/www/firefox/files/patch-bug1288587 Mon Jun 1 23:22:43 2020 (r537512) @@ -2,48 +2,15 @@ diff --git a/build/moz.configure/init.configure b/buil index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -252,6 +252,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr - @imports(_from='mozbuild.pythonutil', _import='find_python2_executable') - @imports(_from='mozbuild.pythonutil', _import='python_executable_version') - @imports(_from='six', _import='ensure_text') -+@imports(_from='__builtin__', _import='KeyError') - def virtualenv_python2(env_python, build_env, mozillabuild, mozconfig, help): - if help: - return -@@ -283,6 +284,12 @@ def virtualenv_python2(env_python, build_env, mozillab - python = mozconfig['vars']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['vars']['modified']: - python = mozconfig['vars']['modified']['PYTHON'][1] -+ for i in ('env', 'vars'): -+ for j in ('added', 'modified'): -+ try: -+ del mozconfig[i][j]['PYTHON'] -+ except KeyError: -+ pass - - log.debug("python2: executable from configuration: %r" % python) - -@@ -365,7 +372,10 @@ def virtualenv_python2(env_python, build_env, mozillab - sys.executable, manager.python_path)) - log.info('Reexecuting in the virtualenv') - if env_python: -- del os.environ['PYTHON'] -+ try: -+ del os.environ['PYTHON'] -+ except KeyError: -+ pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) -@@ -468,6 +478,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre +@@ -252,6 +252,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') - def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): + def virtualenv_python3(env_python, build_env, mozconfig, help): + # Avoid re-executing python when running configure --help. if help: - return -@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -284,6 +285,12 @@ def virtualenv_python3(env_python, build_env, mozconfi python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] @@ -56,7 +23,7 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -373,7 +380,10 @@ def virtualenv_python3(env_python, build_env, mozconfi sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: Copied: branches/2020Q2/www/firefox/files/patch-bug1632456 (from r536713, head/www/firefox/files/patch-bug1632456) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1632456 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1632456) @@ -0,0 +1,40 @@ +commit 0aaf67da2681 +Author: Martin Stransky +Date: Wed May 27 08:37:58 2020 +0000 + + Bug 1632456 [Wayland] Release mVAAPIDeviceContext when FFmpegVideoDecoder::CreateVAAPIDeviceContext() fails, r=jya + + Differential Revision: https://phabricator.services.mozilla.com/D76745 +--- + dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +index 889d1d1ed5b97..1bd144d7375f4 100644 +--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ++++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +@@ -175,6 +175,10 @@ bool FFmpegVideoDecoder::CreateVAAPIDeviceContext() { + if (!mVAAPIDeviceContext) { + return false; + } ++ ++ auto releaseVAAPIcontext = ++ MakeScopeExit([&] { mLib->av_buffer_unref(&mVAAPIDeviceContext); }); ++ + AVHWDeviceContext* hwctx = (AVHWDeviceContext*)mVAAPIDeviceContext->data; + AVVAAPIDeviceContext* vactx = (AVVAAPIDeviceContext*)hwctx->hwctx; + +@@ -195,12 +199,12 @@ bool FFmpegVideoDecoder::CreateVAAPIDeviceContext() { + } + + vactx->display = mDisplay; +- + if (mLib->av_hwdevice_ctx_init(mVAAPIDeviceContext) < 0) { + return false; + } + + mCodecContext->hw_device_ctx = mLib->av_buffer_ref(mVAAPIDeviceContext); ++ releaseVAAPIcontext.release(); + return true; + } + Copied: branches/2020Q2/www/firefox/files/patch-bug1636072 (from r536713, head/www/firefox/files/patch-bug1636072) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1636072 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1636072) @@ -0,0 +1,33 @@ +commit edbe69232a5b +Author: Martin Stransky +Date: Tue May 12 09:20:25 2020 +0000 + + Bug 1636072 [Wayland] Don't crash when GetWlBuffer() fails, r=jhorak + + Differential Revision: https://phabricator.services.mozilla.com/D74663 +--- + widget/gtk/WindowSurfaceWayland.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp +index 372158c9f0f33..56f5d3d530853 100644 +--- widget/gtk/WindowSurfaceWayland.cpp ++++ widget/gtk/WindowSurfaceWayland.cpp +@@ -390,10 +390,13 @@ void WindowBackBuffer::Attach(wl_surface* aSurface) { + (void*)GetWlBuffer(), + GetWlBuffer() ? wl_proxy_get_id((struct wl_proxy*)GetWlBuffer()) : -1)); + +- wl_surface_attach(aSurface, GetWlBuffer(), 0, 0); +- wl_surface_commit(aSurface); +- wl_display_flush(WaylandDisplayGetWLDisplay()); +- SetAttached(); ++ wl_buffer* buffer = GetWlBuffer(); ++ if (buffer) { ++ wl_surface_attach(aSurface, buffer, 0, 0); ++ wl_surface_commit(aSurface); ++ wl_display_flush(WaylandDisplayGetWLDisplay()); ++ SetAttached(); ++ } + } + + void WindowBackBufferShm::Detach(wl_buffer* aBuffer) { Copied: branches/2020Q2/www/firefox/files/patch-bug1638010 (from r536713, head/www/firefox/files/patch-bug1638010) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1638010 Mon Jun 1 23:22:43 2020 (r537512, copy of r536713, head/www/firefox/files/patch-bug1638010) @@ -0,0 +1,25 @@ +commit 9a89dccd2a85 +Author: Martin Stransky +Date: Fri May 15 07:52:39 2020 +0000 + + Bug 1638010 [Wayland] Make WaylandDMABUFTextureData::BorrowDrawTarget() fail when underlying dmabuf surface is not locked, r=sotaro + + Differential Revision: https://phabricator.services.mozilla.com/D75329 +--- + gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +index bb556d9fcfaf5..da9c9cb6f4d19 100644 +--- gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp ++++ gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +@@ -86,6 +86,9 @@ already_AddRefed WaylandDMABUFTextureData::BorrowDrawTarget() { + return nullptr; + } + auto surf = mSurface->GetAsWaylandDMABufSurfaceRGBA(); ++ if (!surf->GetMappedRegion()) { ++ return nullptr; ++ } + return Factory::CreateDrawTargetForData( + mBackend, (unsigned char*)surf->GetMappedRegion(), + IntSize(surf->GetWidth(), surf->GetHeight()), From owner-svn-ports-branches@freebsd.org Mon Jun 1 23:24:31 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4AE732F5B3F; Mon, 1 Jun 2020 23:24:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bWTq1K5jz458W; Mon, 1 Jun 2020 23:24:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 288851367C; Mon, 1 Jun 2020 23:24:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051NOVNP059263; Mon, 1 Jun 2020 23:24:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051NOUpX059262; Mon, 1 Jun 2020 23:24:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006012324.051NOUpX059262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 1 Jun 2020 23:24:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537513 - branches/2020Q2/www/firefox-esr X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/www/firefox-esr X-SVN-Commit-Revision: 537513 X-SVN-Commit-Repository: ports 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.33 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, 01 Jun 2020 23:24:31 -0000 Author: jbeich Date: Mon Jun 1 23:24:30 2020 New Revision: 537513 URL: https://svnweb.freebsd.org/changeset/ports/537513 Log: MFH: r536731 www/firefox-esr: update to 68.9.0 Changes: https://www.mozilla.org/firefox/68.9.0/releasenotes/ Approved by: ports-secteam blanket Modified: branches/2020Q2/www/firefox-esr/Makefile branches/2020Q2/www/firefox-esr/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2020Q2/www/firefox-esr/Makefile Mon Jun 1 23:22:43 2020 (r537512) +++ branches/2020Q2/www/firefox-esr/Makefile Mon Jun 1 23:24:30 2020 (r537513) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 68.8.0 -PORTREVISION= 4 +DISTVERSION= 68.9.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} Modified: branches/2020Q2/www/firefox-esr/distinfo ============================================================================== --- branches/2020Q2/www/firefox-esr/distinfo Mon Jun 1 23:22:43 2020 (r537512) +++ branches/2020Q2/www/firefox-esr/distinfo Mon Jun 1 23:24:30 2020 (r537513) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588197054 -SHA256 (firefox-68.8.0esr.source.tar.xz) = fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 -SIZE (firefox-68.8.0esr.source.tar.xz) = 312602308 +TIMESTAMP = 1590624328 +SHA256 (firefox-68.9.0esr.source.tar.xz) = 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 +SIZE (firefox-68.9.0esr.source.tar.xz) = 317469120 From owner-svn-ports-branches@freebsd.org Tue Jun 2 05:58:48 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA4B532B50A; Tue, 2 Jun 2020 05:58:48 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bhDm4XD8z3fs4; Tue, 2 Jun 2020 05:58:48 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9667D17C7D; Tue, 2 Jun 2020 05:58:48 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0525wmkw000187; Tue, 2 Jun 2020 05:58:48 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0525wmB3000186; Tue, 2 Jun 2020 05:58:48 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202006020558.0525wmB3000186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 2 Jun 2020 05:58:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537523 - branches/2020Q2/multimedia/mkvtoolnix X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2020Q2/multimedia/mkvtoolnix X-SVN-Commit-Revision: 537523 X-SVN-Commit-Repository: ports 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.33 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, 02 Jun 2020 05:58:48 -0000 Author: riggs Date: Tue Jun 2 05:58:48 2020 New Revision: 537523 URL: https://svnweb.freebsd.org/changeset/ports/537523 Log: MFH: r537522 Update to upstream version 47.0.0 Details: - Upstream news see https://mkvtoolnix.download/doc/NEWS.md - Many enhancements in the UI - Fix for a logging crash - New non-default OPTION DVDREAD to support reading chapters from DVD Approved by: ports-secteam (riggs) Modified: branches/2020Q2/multimedia/mkvtoolnix/Makefile branches/2020Q2/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2020Q2/multimedia/mkvtoolnix/Makefile Tue Jun 2 05:57:35 2020 (r537522) +++ branches/2020Q2/multimedia/mkvtoolnix/Makefile Tue Jun 2 05:58:48 2020 (r537523) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 46.0.0 +PORTVERSION= 47.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ @@ -39,9 +39,13 @@ MAKE_CMD= rake -v MAKEFILE= Rakefile ALL_TARGET= #Empty -OPTIONS_DEFINE= FLAC NLS QT5 MANTRANS +OPTIONS_DEFINE= DVDREAD FLAC NLS QT5 MANTRANS OPTIONS_DEFAULT= FLAC QT5 OPTIONS_SUB= yes + +DVDREAD_DESC= Support reading DVD chapters via libdvdread +DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread +DVDREAD_CONFIGURE_WITH= dvdread FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac Modified: branches/2020Q2/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2020Q2/multimedia/mkvtoolnix/distinfo Tue Jun 2 05:57:35 2020 (r537522) +++ branches/2020Q2/multimedia/mkvtoolnix/distinfo Tue Jun 2 05:58:48 2020 (r537523) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588338194 -SHA256 (mkvtoolnix-46.0.0.tar.xz) = f780eaf4913cc501a90a9abd177c3373daa99c499648a8bed3d7c12d83d35199 -SIZE (mkvtoolnix-46.0.0.tar.xz) = 7505996 +TIMESTAMP = 1590987339 +SHA256 (mkvtoolnix-47.0.0.tar.xz) = 8b7744203758025585b28200906c4b85716a6b1b95fed77cc520f9ae59c2ae44 +SIZE (mkvtoolnix-47.0.0.tar.xz) = 7532248 From owner-svn-ports-branches@freebsd.org Tue Jun 2 06:33:22 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27AD232BC9E; Tue, 2 Jun 2020 06:33:22 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bj0f0K7pz413B; Tue, 2 Jun 2020 06:33:22 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id D89FF17532; Tue, 2 Jun 2020 06:33:21 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (aching.in.mat.cc [IPv6:2a01:678:42:0:5e80:b6ff:fe2c:99e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 330B1942D81; Tue, 2 Jun 2020 06:33:19 +0000 (UTC) Date: Tue, 2 Jun 2020 08:33:17 +0200 From: Mathieu Arnold To: Ben Woods Cc: Mathieu Arnold , "ports-committers@FreeBSD.org" , svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r535306 - in branches/2020Q2: . dns dns/bind914 dns/dnsperf net/samba410 Message-ID: <20200602063317.accatonbq4ovinkm@aching.in.mat.cc> X-TUID: GDcVTfgOPw6X References: <202005151642.04FGgfA6028982@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gr7yjook7efjyphn" Content-Disposition: inline In-Reply-To: X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 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, 02 Jun 2020 06:33:22 -0000 --gr7yjook7efjyphn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 31, 2020 at 10:08:41AM +0800, Ben Woods wrote: > On Sun, 31 May 2020 at 08:07, Ben Woods wrote: >=20 > > On Sat, 16 May 2020 at 00:42, Mathieu Arnold wrote: > > > >> Author: mat > >> Date: Fri May 15 16:42:41 2020 > >> New Revision: 535306 > >> URL: https://svnweb.freebsd.org/changeset/ports/535306 > >> > >> Log: > >> Remove expired ports: > >> > >> dns/dnsperf: depends on expired dns/bind914, not compatible with > >> dns/bind916 > >> 2020-04-30 dns/bind914: End of life, please migrate to a newer versi= on > >> of BIND9 > >> > >> Deleted: > >> branches/2020Q2/dns/bind914/ > >> branches/2020Q2/dns/dnsperf/ > >> Modified: > >> branches/2020Q2/MOVED > >> branches/2020Q2/dns/Makefile (contents, props changed) > >> branches/2020Q2/net/samba410/Makefile (contents, props changed) > >> > > > > Hi Mat, > > > > Can I please ask what the logic was for doing this in a quarterly branc= h? > > > > Regards, > > Ben > > >=20 > Hi again, >=20 > For the record, I am not against this change. In fact, I think it is going > to make it easier to backport the latest security update to net/samba410 > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D246721 >=20 > I was just surprised to see expired ports removed from quarterly, rather > than just being done in head and aging out when the next quarterly branch > occurs on 1 July. >=20 > I guess what I am asking is - what is the procedure for expired ports in > quarterly, and is this documented somewhere? It is not documented. It happens very very rarely, the only reason I removed it was because of circumstances, and all these reasons: - It had expired (and was no longer in head) - It was no longer supported upstream - There was a large security issue with it. The impending security issue was embargoed when I removed the port, which is why it was not mentionned in the commit message. And I removed the port early because it was a security issue and it felt better to get rid of it early rather than wait. --=20 Mathieu Arnold --gr7yjook7efjyphn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl7V8qlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgL12Q/+MMlWCLd0tb9EDq12V2qrNKR4QaVX4Is2y6l2jmKRYldyJ4yTl+HhYM2D WxMJanPg2Sa2YKqVVgLXOjuJCKU60iWt0PZjwgufFqpleZAwpv5sAX9U9tCvWS32 My+Sh3S1N1lswQMSYFYKUXBL+oDcorKeDe5Y/UMH1X+RIeli5Ofjak4UD4gwy7/k tETgnPMmw4ajv/bQ0nMbzSdlh5005UwVU1O2ArZfvauFRbrL11Dh3KNhV6Vej4ty mLW8KWb2VeOiEX5hHVg560aH2s3Z/40CfsTbAwCXptib77Uhjyln33DFCLI/jES0 xIsyUYpeFJOTdfcaDivWu8i5bVLfxKiIQCay7Cce8tHWgKa/Kuch59WmJa4bQiND MkuZfXkdNTN/BsQLYBGNg4I/9Uf6k8XHpstNk0Zq/xWTV1HzePBx3pN6g3fDTPCu NfpAQETISZ9wH4GuOxJttEbgrFymi/vx8pwpMwTsUZH+EUihxLHr8Dvs9dcxDKlN 46yD97DKX3uBMOYX0PGAZnG0O8r9R7Oys+cqlZ8z7bKK3ra1kZZQz6KMVmtkp++D DbDZHL5KDd368aPjPZs9xfYAFIRpg8eEmXX+0wLvheLyvzxadmo5b7LdGr2Odgb6 KPNPv97t4ygl+u6EXv3yb5we/HiBzBcJVAI2BKLLQGy7bk2YeHk= =jEUA -----END PGP SIGNATURE----- --gr7yjook7efjyphn-- From owner-svn-ports-branches@freebsd.org Tue Jun 2 06:38:53 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 493CA32BDB3; Tue, 2 Jun 2020 06:38:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bj711JHgz4218; Tue, 2 Jun 2020 06:38:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27F18187CF; Tue, 2 Jun 2020 06:38:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0526crqn025274; Tue, 2 Jun 2020 06:38:53 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0526cpI7025268; Tue, 2 Jun 2020 06:38:51 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202006020638.0526cpI7025268@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 2 Jun 2020 06:38:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537526 - in branches/2020Q2/lang: perl5.28 perl5.30 X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2020Q2/lang: perl5.28 perl5.30 X-SVN-Commit-Revision: 537526 X-SVN-Commit-Repository: ports 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.33 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, 02 Jun 2020 06:38:53 -0000 Author: mat Date: Tue Jun 2 06:38:51 2020 New Revision: 537526 URL: https://svnweb.freebsd.org/changeset/ports/537526 Log: MFH: r537524 r537525 Update to 5.30.3, 5.28.3. Security: CVE-2020-10543 CVE-2020-10878 CVE-2020-12723 Modified: branches/2020Q2/lang/perl5.28/distinfo branches/2020Q2/lang/perl5.28/pkg-plist branches/2020Q2/lang/perl5.28/version.mk branches/2020Q2/lang/perl5.30/distinfo branches/2020Q2/lang/perl5.30/pkg-plist branches/2020Q2/lang/perl5.30/version.mk Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/lang/perl5.28/distinfo ============================================================================== --- branches/2020Q2/lang/perl5.28/distinfo Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.28/distinfo Tue Jun 2 06:38:51 2020 (r537526) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556016829 -SHA256 (perl/perl-5.28.2.tar.xz) = 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 -SIZE (perl/perl-5.28.2.tar.xz) = 12374448 +TIMESTAMP = 1591078640 +SHA256 (perl/perl-5.28.3.tar.xz) = 77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 +SIZE (perl/perl-5.28.3.tar.xz) = 12382032 Modified: branches/2020Q2/lang/perl5.28/pkg-plist ============================================================================== --- branches/2020Q2/lang/perl5.28/pkg-plist Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.28/pkg-plist Tue Jun 2 06:38:51 2020 (r537526) @@ -1005,6 +1005,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5280delta.1.gz %%MAN1%%/perl5281delta.1.gz %%MAN1%%/perl5282delta.1.gz +%%MAN1%%/perl5283delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1809,6 +1810,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5280delta.pod %%PRIV_LIB%%/pod/perl5281delta.pod %%PRIV_LIB%%/pod/perl5282delta.pod +%%PRIV_LIB%%/pod/perl5283delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod Modified: branches/2020Q2/lang/perl5.28/version.mk ============================================================================== --- branches/2020Q2/lang/perl5.28/version.mk Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.28/version.mk Tue Jun 2 06:38:51 2020 (r537526) @@ -1,2 +1,2 @@ -PERL_VERSION= 5.28.2 +PERL_VERSION= 5.28.3 PERL5_DEPEND= perl5>=5.28.r1<5.29 Modified: branches/2020Q2/lang/perl5.30/distinfo ============================================================================== --- branches/2020Q2/lang/perl5.30/distinfo Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.30/distinfo Tue Jun 2 06:38:51 2020 (r537526) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584442679 -SHA256 (perl/perl-5.30.2.tar.xz) = a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 -SIZE (perl/perl-5.30.2.tar.xz) = 12373480 +TIMESTAMP = 1591078525 +SHA256 (perl/perl-5.30.3.tar.xz) = 6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 +SIZE (perl/perl-5.30.3.tar.xz) = 12375128 Modified: branches/2020Q2/lang/perl5.30/pkg-plist ============================================================================== --- branches/2020Q2/lang/perl5.30/pkg-plist Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.30/pkg-plist Tue Jun 2 06:38:51 2020 (r537526) @@ -963,6 +963,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5300delta.1.gz %%MAN1%%/perl5301delta.1.gz %%MAN1%%/perl5302delta.1.gz +%%MAN1%%/perl5303delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1754,6 +1755,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5300delta.pod %%PRIV_LIB%%/pod/perl5301delta.pod %%PRIV_LIB%%/pod/perl5302delta.pod +%%PRIV_LIB%%/pod/perl5303delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod Modified: branches/2020Q2/lang/perl5.30/version.mk ============================================================================== --- branches/2020Q2/lang/perl5.30/version.mk Tue Jun 2 06:37:59 2020 (r537525) +++ branches/2020Q2/lang/perl5.30/version.mk Tue Jun 2 06:38:51 2020 (r537526) @@ -1,2 +1,2 @@ -PERL_VERSION= 5.30.2 +PERL_VERSION= 5.30.3 PERL5_DEPEND= perl5>=5.30.r1<5.31 From owner-svn-ports-branches@freebsd.org Tue Jun 2 09:38:39 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5573E32F858; Tue, 2 Jun 2020 09:38:39 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bn6R1fgPz4LSX; Tue, 2 Jun 2020 09:38:39 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32E501A761; Tue, 2 Jun 2020 09:38:39 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0529cdIp035433; Tue, 2 Jun 2020 09:38:39 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0529cc0T035429; Tue, 2 Jun 2020 09:38:38 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202006020938.0529cc0T035429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Tue, 2 Jun 2020 09:38:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537532 - in branches/2020Q2/mail/exim: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in branches/2020Q2/mail/exim: . files X-SVN-Commit-Revision: 537532 X-SVN-Commit-Repository: ports 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.33 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, 02 Jun 2020 09:38:39 -0000 Author: fluffy Date: Tue Jun 2 09:38:37 2020 New Revision: 537532 URL: https://svnweb.freebsd.org/changeset/ports/537532 Log: MFH: r537520 mail/exim: update to 4.94 release while here, convert POST-INSTALL-NOTES* to ucl PR: 246922 Submitted by: pi Approved by: ports-secteam (joneum) Deleted: branches/2020Q2/mail/exim/files/74_19-SPF-fix-result-for-case-of-only-non-spf-TXT-RRs.patch branches/2020Q2/mail/exim/files/74_20-Fix-error-logging-for-dynamically-loaded-modules.patch branches/2020Q2/mail/exim/files/74_21-heimdal-auth-fix-the-increase-of-big_buffer-size.patch branches/2020Q2/mail/exim/files/74_22-Taint-hybrid-checking-mode.patch branches/2020Q2/mail/exim/files/74_23-Fix-taint-hybrid-checking-on-BSD.patch branches/2020Q2/mail/exim/files/74_24-TFO-even-in-binary-built-for-modern-Linux-handle-err.patch branches/2020Q2/mail/exim/files/74_25-Taint-slow-mode-checking-only.patch branches/2020Q2/mail/exim/files/74_26-Auths-fix-cyrus-sasl-driver-for-gssapi-use.patch branches/2020Q2/mail/exim/files/74_27-GnuTLS-fix-hanging-callout-connections.patch Modified: branches/2020Q2/mail/exim/Makefile branches/2020Q2/mail/exim/distinfo branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/exim/Makefile ============================================================================== --- branches/2020Q2/mail/exim/Makefile Tue Jun 2 09:33:07 2020 (r537531) +++ branches/2020Q2/mail/exim/Makefile Tue Jun 2 09:38:37 2020 (r537532) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 3 +PORTREVISION?= 0 CATEGORIES= mail MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ @@ -57,11 +57,13 @@ INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql OPENLDAP_USE= openldap=yes -PGSQL_USES= pgsql +PGSQL_LIB_DEPENDS= libicudata.so:devel/icu +PGSQL_USES= pgsql pkgconfig REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:mail/spamassassin SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 +SQLITE_LIB_DEPENDS= libicudata.so:devel/icu SQLITE_USES= pkgconfig sqlite .include @@ -103,7 +105,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim. EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf .endif -EXIM_VERSION= 4.93.0.4 +EXIM_VERSION= 4.94 SA_EXIM_VERSION=4.2.1 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h` Modified: branches/2020Q2/mail/exim/distinfo ============================================================================== --- branches/2020Q2/mail/exim/distinfo Tue Jun 2 09:33:07 2020 (r537531) +++ branches/2020Q2/mail/exim/distinfo Tue Jun 2 09:38:37 2020 (r537532) @@ -1,5 +1,5 @@ -TIMESTAMP = 1582564322 -SHA256 (exim/exim-4.93.0.4.tar.bz2) = b67336ba06f8d8233060de073d6082d75a378faaafad660c5f124bb13d75e4d9 -SIZE (exim/exim-4.93.0.4.tar.bz2) = 1974190 +TIMESTAMP = 1591032067 +SHA256 (exim/exim-4.94.tar.bz2) = 73feeaa5ddb43363782db0c307b593aacb49542dd7e4b795a2880779595affe5 +SIZE (exim/exim-4.94.tar.bz2) = 1997217 SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1 SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933 Modified: branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES ============================================================================== --- branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES Tue Jun 2 09:33:07 2020 (r537531) +++ branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES Tue Jun 2 09:38:37 2020 (r537532) @@ -1,3 +1,6 @@ +[ +{ type: install + message: < Exim options (command line) @@ -40,3 +43,6 @@ You may also want to configure newsyslog(8) to rotate Additional scripts to help upgrading are installed in: %%EXAMPLESDIR%% +EOM +} +] Modified: branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd ============================================================================== --- branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd Tue Jun 2 09:33:07 2020 (r537531) +++ branches/2020Q2/mail/exim/files/POST-INSTALL-NOTES.clamd Tue Jun 2 09:38:37 2020 (r537532) @@ -1,3 +1,6 @@ +[ +{ type: install + message: < +EOM +} +] Modified: branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c ============================================================================== --- branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c Tue Jun 2 09:33:07 2020 (r537531) +++ branches/2020Q2/mail/exim/files/patch-src-auths-call_radius.c Tue Jun 2 09:38:37 2020 (r537532) @@ -1,6 +1,6 @@ ---- src/auths/call_radius.c.orig 2019-12-08 12:53:48 UTC -+++ src/auths/call_radius.c -@@ -112,37 +112,37 @@ rc_openlog("exim"); +--- src/auths/call_radius.c.orig 2020-05-30 22:35:38.000000000 +0200 ++++ src/auths/call_radius.c 2020-06-01 19:54:14.402105000 +0200 +@@ -113,37 +113,37 @@ #ifdef RADIUS_LIB_RADIUSCLIENT if (rc_read_config(RADIUS_CONFIG_FILE) != 0) @@ -8,65 +8,65 @@ + *errptr = string_sprintf("%s", "RADIUS: can't open %s", RADIUS_CONFIG_FILE); else if (rc_read_dictionary(rc_conf_str("dictionary")) != 0) -- *errptr = string_sprintf("RADIUS: can't read dictionary"); +- *errptr = US"RADIUS: can't read dictionary"; + *errptr = string_sprintf("%s", "RADIUS: can't read dictionary"); - else if (rc_avpair_add(&send, PW_USER_NAME, user, 0) == NULL) -- *errptr = string_sprintf("RADIUS: add user name failed\n"); + else if (!rc_avpair_add(&send, PW_USER_NAME, user, 0)) +- *errptr = US"RADIUS: add user name failed"; + *errptr = string_sprintf("%s", "RADIUS: add user name failed\n"); - else if (rc_avpair_add(&send, PW_USER_PASSWORD, CS radius_args, 0) == NULL) -- *errptr = string_sprintf("RADIUS: add password failed\n"); + else if (!rc_avpair_add(&send, PW_USER_PASSWORD, CS radius_args, 0)) +- *errptr = US"RADIUS: add password failed"); + *errptr = string_sprintf("%s", "RADIUS: add password failed\n"); - else if (rc_avpair_add(&send, PW_SERVICE_TYPE, &service, 0) == NULL) -- *errptr = string_sprintf("RADIUS: add service type failed\n"); + else if (!rc_avpair_add(&send, PW_SERVICE_TYPE, &service, 0)) +- *errptr = US"RADIUS: add service type failed"; + *errptr = string_sprintf("%s", "RADIUS: add service type failed\n"); #else /* RADIUS_LIB_RADIUSCLIENT unset => RADIUS_LIB_RADIUSCLIENT2 */ - if ((h = rc_read_config(RADIUS_CONFIG_FILE)) == NULL) + if (!(h = rc_read_config(RADIUS_CONFIG_FILE))) - *errptr = string_sprintf("RADIUS: can't open %s", RADIUS_CONFIG_FILE); + *errptr = string_sprintf("%s", "RADIUS: can't open %s", RADIUS_CONFIG_FILE); else if (rc_read_dictionary(h, rc_conf_str(h, "dictionary")) != 0) -- *errptr = string_sprintf("RADIUS: can't read dictionary"); +- *errptr = US"RADIUS: can't read dictionary"; + *errptr = string_sprintf("%s", "RADIUS: can't read dictionary"); - else if (rc_avpair_add(h, &send, PW_USER_NAME, user, Ustrlen(user), 0) == NULL) -- *errptr = string_sprintf("RADIUS: add user name failed\n"); + else if (!rc_avpair_add(h, &send, PW_USER_NAME, user, Ustrlen(user), 0)) +- *errptr = US"RADIUS: add user name failed"; + *errptr = string_sprintf("%s", "RADIUS: add user name failed\n"); - else if (rc_avpair_add(h, &send, PW_USER_PASSWORD, CS radius_args, - Ustrlen(radius_args), 0) == NULL) -- *errptr = string_sprintf("RADIUS: add password failed\n"); + else if (!rc_avpair_add(h, &send, PW_USER_PASSWORD, CS radius_args, + Ustrlen(radius_args), 0)) +- *errptr = US"RADIUS: add password failed"; + *errptr = string_sprintf("%s", "RADIUS: add password failed\n"); - else if (rc_avpair_add(h, &send, PW_SERVICE_TYPE, &service, 0, 0) == NULL) -- *errptr = string_sprintf("RADIUS: add service type failed\n"); + else if (!rc_avpair_add(h, &send, PW_SERVICE_TYPE, &service, 0, 0)) +- *errptr = US"RADIUS: add service type failed"; + *errptr = string_sprintf("%s", "RADIUS: add service type failed\n"); #endif /* RADIUS_LIB_RADIUSCLIENT */ -@@ -175,7 +175,7 @@ switch (result) +@@ -176,7 +176,7 @@ - default: case BADRESP_RC: -- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); -+ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result); - return ERROR; + default: +- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); ++ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result); + return ERROR; } -@@ -186,7 +186,7 @@ switch (result) - h = rad_auth_open(); - if (h == NULL) +@@ -186,7 +186,7 @@ + + if (!(h = rad_auth_open())) { - *errptr = string_sprintf("RADIUS: can't initialise libradius"); + *errptr = string_sprintf("%s", "RADIUS: can't initialise libradius"); return ERROR; } if (rad_config(h, RADIUS_CONFIG_FILE) != 0 || -@@ -196,7 +196,7 @@ if (rad_config(h, RADIUS_CONFIG_FILE) != 0 || +@@ -196,7 +196,7 @@ rad_put_int(h, RAD_SERVICE_TYPE, RAD_AUTHENTICATE_ONLY) != 0 || rad_put_string(h, RAD_NAS_IDENTIFIER, CS primary_hostname) != 0) { @@ -75,18 +75,18 @@ result = ERROR; } else -@@ -214,12 +214,12 @@ else - break; +@@ -211,12 +211,12 @@ + break; case -1: -- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h)); -+ *errptr = string_sprintf("%s", "RADIUS: %s", rad_strerror(h)); - result = ERROR; - break; +- *errptr = string_sprintf("RADIUS: %s", rad_strerror(h)); ++ *errptr = string_sprintf("%s", "RADIUS: %s", rad_strerror(h)); + result = ERROR; + break; default: -- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); -+ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result); - result= ERROR; - break; +- *errptr = string_sprintf("RADIUS: unexpected response (%d)", result); ++ *errptr = string_sprintf("%s", "RADIUS: unexpected response (%d)", result); + result= ERROR; + break; } From owner-svn-ports-branches@freebsd.org Tue Jun 2 19:56:18 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A87042F8CB9; Tue, 2 Jun 2020 19:56:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49c2q63m6fz4dGL; Tue, 2 Jun 2020 19:56:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C3D3221AB; Tue, 2 Jun 2020 19:56:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052JuIj5020878; Tue, 2 Jun 2020 19:56:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052JuID9020877; Tue, 2 Jun 2020 19:56:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006021956.052JuID9020877@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 2 Jun 2020 19:56:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537577 - branches/2020Q2/x11-wm/wayfire X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/x11-wm/wayfire X-SVN-Commit-Revision: 537577 X-SVN-Commit-Repository: ports 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.33 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, 02 Jun 2020 19:56:18 -0000 Author: jbeich Date: Tue Jun 2 19:56:17 2020 New Revision: 537577 URL: https://svnweb.freebsd.org/changeset/ports/537577 Log: MFH: r537575 x11-wm/wayfire: unbreak with wlroots + X11=off ../plugins/matcher/matcher.cpp:16:10: fatal error: 'wlr/xwayland.h' file not found #include ^~~~~~~~~~~~~~~~ Submitted by: Greg V Approved by: ports-secteam blanket Modified: branches/2020Q2/x11-wm/wayfire/Makefile branches/2020Q2/x11-wm/wayfire/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/x11-wm/wayfire/Makefile ============================================================================== --- branches/2020Q2/x11-wm/wayfire/Makefile Tue Jun 2 19:55:51 2020 (r537576) +++ branches/2020Q2/x11-wm/wayfire/Makefile Tue Jun 2 19:56:17 2020 (r537577) @@ -4,6 +4,9 @@ PORTNAME= wayfire DISTVERSION= 0.4.0 CATEGORIES= x11-wm +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= e5b6f1245709.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/472 + MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor Modified: branches/2020Q2/x11-wm/wayfire/distinfo ============================================================================== --- branches/2020Q2/x11-wm/wayfire/distinfo Tue Jun 2 19:55:51 2020 (r537576) +++ branches/2020Q2/x11-wm/wayfire/distinfo Tue Jun 2 19:56:17 2020 (r537577) @@ -1,3 +1,5 @@ TIMESTAMP = 1584817827 SHA256 (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97 SIZE (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 265360 +SHA256 (e5b6f1245709.patch) = 2c0f2c892ba299f84b47c64c96b2bb9704448808f6a8e536050cceb606653203 +SIZE (e5b6f1245709.patch) = 1249 From owner-svn-ports-branches@freebsd.org Tue Jun 2 21:40:09 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55F262FB6BA; Tue, 2 Jun 2020 21:40:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49c56x1dRCz3c69; Tue, 2 Jun 2020 21:40:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 331762325E; Tue, 2 Jun 2020 21:40:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052Le8le087471; Tue, 2 Jun 2020 21:40:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052Le8J0087470; Tue, 2 Jun 2020 21:40:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006022140.052Le8J0087470@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 2 Jun 2020 21:40:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537584 - branches/2020Q2/x11-servers/xwayland-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/x11-servers/xwayland-devel X-SVN-Commit-Revision: 537584 X-SVN-Commit-Repository: ports 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.33 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, 02 Jun 2020 21:40:09 -0000 Author: jbeich Date: Tue Jun 2 21:40:08 2020 New Revision: 537584 URL: https://svnweb.freebsd.org/changeset/ports/537584 Log: MFH: r537582 x11-servers/xwayland-devel: document DRI3 quirk Wayland clients (unlike server/compositor) are not supposed to require special privileges. Something in drm-kmod fails to authorize access to /dev/dri/* even if user is under "video" group. Not a port option because Xwayland doesn't know how to drop priveleges. Approved by: ports-secteam blanket (runtime fix, no content changes) Added: branches/2020Q2/x11-servers/xwayland-devel/pkg-message - copied unchanged from r537582, head/x11-servers/xwayland-devel/pkg-message Modified: Directory Properties: branches/2020Q2/ (props changed) Copied: branches/2020Q2/x11-servers/xwayland-devel/pkg-message (from r537582, head/x11-servers/xwayland-devel/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/x11-servers/xwayland-devel/pkg-message Tue Jun 2 21:40:08 2020 (r537584, copy of r537582, head/x11-servers/xwayland-devel/pkg-message) @@ -0,0 +1,10 @@ +Known issues: +- When /dev/dri/card0 and /dev/dri/renderD128 have different major(3) + DRI3 may fail e.g., on i915kms in I915_GETPARAM with EACCESS. + Without DRI3 for glamor Xwayland falls back to swrast (llvmpipe). + If OpenGL applications appear slow check with glxinfo then try + enabling setuid bit e.g., + + $ glxinfo | fgrep Device: + Device: llvmpipe (LLVM 8.0, 256 bits) (0xffffffff) + $ chmod u+s `which Xwayland` From owner-svn-ports-branches@freebsd.org Wed Jun 3 05:48:28 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D79232DE9F; Wed, 3 Jun 2020 05:48:28 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cHyM6fVYz4n37; Wed, 3 Jun 2020 05:48:27 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DFACD9352; Wed, 3 Jun 2020 05:48:27 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0535mRxD089240; Wed, 3 Jun 2020 05:48:27 GMT (envelope-from tagattie@FreeBSD.org) Received: (from tagattie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0535mRde089238; Wed, 3 Jun 2020 05:48:27 GMT (envelope-from tagattie@FreeBSD.org) Message-Id: <202006030548.0535mRde089238@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tagattie set sender to tagattie@FreeBSD.org using -f From: Hiroki Tagato Date: Wed, 3 Jun 2020 05:48:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537596 - branches/2020Q2/devel/mill X-SVN-Group: ports-branches X-SVN-Commit-Author: tagattie X-SVN-Commit-Paths: branches/2020Q2/devel/mill X-SVN-Commit-Revision: 537596 X-SVN-Commit-Repository: ports 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.33 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, 03 Jun 2020 05:48:28 -0000 Author: tagattie Date: Wed Jun 3 05:48:27 2020 New Revision: 537596 URL: https://svnweb.freebsd.org/changeset/ports/537596 Log: MFH: r536763 Update to 0.7.3 PR: 246565 246799 Submitted by: Jens Grassel (maintainer) Approved by: ehaupt (mentor) Approved by: ports-secteam (joneum) Modified: branches/2020Q2/devel/mill/Makefile branches/2020Q2/devel/mill/distinfo Modified: branches/2020Q2/devel/mill/Makefile ============================================================================== --- branches/2020Q2/devel/mill/Makefile Wed Jun 3 05:32:50 2020 (r537595) +++ branches/2020Q2/devel/mill/Makefile Wed Jun 3 05:48:27 2020 (r537596) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mill -DISTVERSION= 0.5.7 +DISTVERSION= 0.7.3 CATEGORIES= devel java MASTER_SITES= https://github.com/lihaoyi/mill/releases/download/${PORTVERSION}/ DISTNAME= ${PORTVERSION}-assembly @@ -10,15 +10,15 @@ DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= MAINTAINER= freebsd-ports@jan0sch.de -COMMENT= Mill is a Java/Scala build tool +COMMENT= Java/Scala build tool LICENSE= MIT USE_JAVA= yes - JAVA_VERSION= 1.8+ -NO_BUILD= yes + NO_ARCH= yes +NO_BUILD= yes PLIST_FILES= bin/mill Modified: branches/2020Q2/devel/mill/distinfo ============================================================================== --- branches/2020Q2/devel/mill/distinfo Wed Jun 3 05:32:50 2020 (r537595) +++ branches/2020Q2/devel/mill/distinfo Wed Jun 3 05:48:27 2020 (r537596) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578437854 -SHA256 (mill/0.5.7-assembly) = e4c3ffd2b7b42237d33b21336a16b257b0a7809c3ae9861767a75b73c450b94f -SIZE (mill/0.5.7-assembly) = 42969137 +TIMESTAMP = 1590646190 +SHA256 (mill/0.7.3-assembly) = ef11e9cadec79cd81bd3262808711f22d9728a8c4278d737d4a9de773a929463 +SIZE (mill/0.7.3-assembly) = 56298184 From owner-svn-ports-branches@freebsd.org Wed Jun 3 11:20:49 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17EFF33413F; Wed, 3 Jun 2020 11:20:49 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cRKs049Wz4816; Wed, 3 Jun 2020 11:20:49 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1054D217; Wed, 3 Jun 2020 11:20:48 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053BKmVF097995; Wed, 3 Jun 2020 11:20:48 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053BKgU7097961; Wed, 3 Jun 2020 11:20:42 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <202006031120.053BKgU7097961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Wed, 3 Jun 2020 11:20:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537611 - in branches/2020Q2/www/chromium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in branches/2020Q2/www/chromium: . files X-SVN-Commit-Revision: 537611 X-SVN-Commit-Repository: ports 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.33 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, 03 Jun 2020 11:20:49 -0000 Author: jrm Date: Wed Jun 3 11:20:42 2020 New Revision: 537611 URL: https://svnweb.freebsd.org/changeset/ports/537611 Log: MFH: r537579 www/chromium: Update to version 83.0.4103.61 Submitted by: Matthias Wolf Reviewed by: rene Approved by: portmgr (blanket) chromium@ (rene) Obtained from: https://github.com/gliaskos/freebsd-chromium Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html Differential Revision: https://reviews.freebsd.org/D25102 Added: branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc - copied unchanged from r537579, head/www/chromium/files/patch-base_location__unittest.cc branches/2020Q2/www/chromium/files/patch-base_stl__util.h - copied unchanged from r537579, head/www/chromium/files/patch-base_stl__util.h branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_browser_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h - copied unchanged from r537579, head/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h branches/2020Q2/www/chromium/files/patch-components_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-components_BUILD.gn branches/2020Q2/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py - copied unchanged from r537579, head/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py branches/2020Q2/www/chromium/files/patch-components_security__interstitials_content_utils.cc - copied unchanged from r537579, head/www/chromium/files/patch-components_security__interstitials_content_utils.cc branches/2020Q2/www/chromium/files/patch-content_browser_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-content_browser_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc - copied unchanged from r537579, head/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc branches/2020Q2/www/chromium/files/patch-content_child_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-content_child_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_public_common_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_public_common_content__constants.cc - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_content__constants.cc branches/2020Q2/www/chromium/files/patch-content_public_common_content__constants.h - copied unchanged from r537579, head/www/chromium/files/patch-content_public_common_content__constants.h branches/2020Q2/www/chromium/files/patch-content_renderer_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-content_renderer_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_test_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-content_test_BUILD.gn branches/2020Q2/www/chromium/files/patch-extensions_shell_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-extensions_shell_BUILD.gn branches/2020Q2/www/chromium/files/patch-headless_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-headless_BUILD.gn branches/2020Q2/www/chromium/files/patch-media_audio_audio__features.cc - copied unchanged from r537579, head/www/chromium/files/patch-media_audio_audio__features.cc branches/2020Q2/www/chromium/files/patch-media_base_status.cc - copied unchanged from r537579, head/www/chromium/files/patch-media_base_status.cc branches/2020Q2/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc - copied unchanged from r537579, head/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc - copied unchanged from r537579, head/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc branches/2020Q2/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc - copied unchanged from r537579, head/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp - copied unchanged from r537579, head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc - copied unchanged from r537579, head/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc branches/2020Q2/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc - copied unchanged from r537579, head/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp - copied unchanged from r537579, head/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp - copied unchanged from r537579, head/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp branches/2020Q2/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc - copied unchanged from r537579, head/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h branches/2020Q2/www/chromium/files/patch-ui_gfx_native__widget__types.h - copied unchanged from r537579, head/www/chromium/files/patch-ui_gfx_native__widget__types.h branches/2020Q2/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc - copied unchanged from r537579, head/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc branches/2020Q2/www/chromium/files/patch-weblayer_BUILD.gn - copied unchanged from r537579, head/www/chromium/files/patch-weblayer_BUILD.gn Deleted: branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py branches/2020Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc branches/2020Q2/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc branches/2020Q2/www/chromium/files/patch-components_crash_content_app_BUILD.gn branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad.cc branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad.h branches/2020Q2/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc branches/2020Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp branches/2020Q2/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc branches/2020Q2/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h Modified: branches/2020Q2/www/chromium/Makefile branches/2020Q2/www/chromium/distinfo branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h branches/2020Q2/www/chromium/files/patch-BUILD.gn branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc branches/2020Q2/www/chromium/files/patch-base_BUILD.gn branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc branches/2020Q2/www/chromium/files/patch-base_linux__util.cc branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc branches/2020Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd branches/2020Q2/www/chromium/files/patch-chrome_app_generated__resources.grd branches/2020Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd branches/2020Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp branches/2020Q2/www/chromium/files/patch-chrome_browser_about__flags.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h branches/2020Q2/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd branches/2020Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_download_download__item__model.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h branches/2020Q2/www/chromium/files/patch-chrome_browser_memory__details.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html branches/2020Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js branches/2020Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc branches/2020Q2/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc branches/2020Q2/www/chromium/files/patch-chrome_common_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_common_channel__info.h branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__features.cc branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__features.h branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc branches/2020Q2/www/chromium/files/patch-chrome_common_chrome__switches.h branches/2020Q2/www/chromium/files/patch-chrome_common_features.gni branches/2020Q2/www/chromium/files/patch-chrome_common_pref__names.cc branches/2020Q2/www/chromium/files/patch-chrome_common_pref__names.h branches/2020Q2/www/chromium/files/patch-chrome_common_webui__url__constants.cc branches/2020Q2/www/chromium/files/patch-chrome_common_webui__url__constants.h branches/2020Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc branches/2020Q2/www/chromium/files/patch-chrome_test_BUILD.gn branches/2020Q2/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc branches/2020Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc branches/2020Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h branches/2020Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc branches/2020Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc branches/2020Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc branches/2020Q2/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc branches/2020Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc branches/2020Q2/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc branches/2020Q2/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc branches/2020Q2/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc branches/2020Q2/www/chromium/files/patch-components_download_internal_common_base__file.cc branches/2020Q2/www/chromium/files/patch-components_metrics_metrics__log.cc branches/2020Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc branches/2020Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json branches/2020Q2/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h branches/2020Q2/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc branches/2020Q2/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc branches/2020Q2/www/chromium/files/patch-components_viz_common_features.cc branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc branches/2020Q2/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h branches/2020Q2/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc branches/2020Q2/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h branches/2020Q2/www/chromium/files/patch-components_viz_test_fake__output__surface.cc branches/2020Q2/www/chromium/files/patch-components_viz_test_fake__output__surface.h branches/2020Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc branches/2020Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2020Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc branches/2020Q2/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc branches/2020Q2/www/chromium/files/patch-content_browser_media_media__internals.cc branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc branches/2020Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc branches/2020Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc branches/2020Q2/www/chromium/files/patch-content_browser_utility__process__host.cc branches/2020Q2/www/chromium/files/patch-content_common_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_common_user__agent.cc branches/2020Q2/www/chromium/files/patch-content_gpu_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2020Q2/www/chromium/files/patch-content_public_app_content__main__delegate.cc branches/2020Q2/www/chromium/files/patch-content_public_app_content__main__delegate.h branches/2020Q2/www/chromium/files/patch-content_public_common_common__param__traits__macros.h branches/2020Q2/www/chromium/files/patch-content_public_common_content__features.cc branches/2020Q2/www/chromium/files/patch-content_public_common_content__switches.cc branches/2020Q2/www/chromium/files/patch-content_public_common_content__switches.h branches/2020Q2/www/chromium/files/patch-content_public_test_browser__test__base.cc branches/2020Q2/www/chromium/files/patch-content_public_test_content__browser__test.cc branches/2020Q2/www/chromium/files/patch-content_public_test_mock__render__thread.cc branches/2020Q2/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc branches/2020Q2/www/chromium/files/patch-content_renderer_render__process__impl.cc branches/2020Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2020Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h branches/2020Q2/www/chromium/files/patch-content_shell_BUILD.gn branches/2020Q2/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc branches/2020Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc branches/2020Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.cc branches/2020Q2/www/chromium/files/patch-content_utility_BUILD.gn branches/2020Q2/www/chromium/files/patch-extensions_common_api___permission__features.json branches/2020Q2/www/chromium/files/patch-extensions_common_feature__switch.cc branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h branches/2020Q2/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc branches/2020Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc branches/2020Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h branches/2020Q2/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc branches/2020Q2/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h branches/2020Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc branches/2020Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc branches/2020Q2/www/chromium/files/patch-media_BUILD.gn branches/2020Q2/www/chromium/files/patch-media_base_audio__latency.cc branches/2020Q2/www/chromium/files/patch-media_base_media__switches.cc branches/2020Q2/www/chromium/files/patch-media_base_video__frame.cc branches/2020Q2/www/chromium/files/patch-media_base_video__frame.h branches/2020Q2/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc branches/2020Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc branches/2020Q2/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc branches/2020Q2/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc branches/2020Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc branches/2020Q2/www/chromium/files/patch-net_BUILD.gn branches/2020Q2/www/chromium/files/patch-net_base_features.cc branches/2020Q2/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc branches/2020Q2/www/chromium/files/patch-net_dns_dns__util.cc branches/2020Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc branches/2020Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc branches/2020Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc branches/2020Q2/www/chromium/files/patch-net_url__request_url__fetcher.h branches/2020Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc branches/2020Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc branches/2020Q2/www/chromium/files/patch-remoting_host_host__attributes.cc branches/2020Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc branches/2020Q2/www/chromium/files/patch-remoting_resources_remoting__strings.grd branches/2020Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc branches/2020Q2/www/chromium/files/patch-services_network_BUILD.gn branches/2020Q2/www/chromium/files/patch-services_network_network__context.cc branches/2020Q2/www/chromium/files/patch-services_network_network__service.cc branches/2020Q2/www/chromium/files/patch-services_network_network__service.h branches/2020Q2/www/chromium/files/patch-services_service__manager_embedder_main.cc branches/2020Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc branches/2020Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc branches/2020Q2/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc branches/2020Q2/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc branches/2020Q2/www/chromium/files/patch-third__party_angle_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp branches/2020Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h branches/2020Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c branches/2020Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h branches/2020Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc branches/2020Q2/www/chromium/files/patch-third__party_boringssl_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h branches/2020Q2/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc branches/2020Q2/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc branches/2020Q2/www/chromium/files/patch-third__party_sqlite_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp branches/2020Q2/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp branches/2020Q2/www/chromium/files/patch-third__party_usrsctp_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn branches/2020Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc branches/2020Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc branches/2020Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn branches/2020Q2/www/chromium/files/patch-tools_gn_build_gen.py branches/2020Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py branches/2020Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn branches/2020Q2/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc branches/2020Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc branches/2020Q2/www/chromium/files/patch-ui_base_ui__base__features.cc branches/2020Q2/www/chromium/files/patch-ui_base_ui__base__features.h branches/2020Q2/www/chromium/files/patch-ui_compositor_compositor.cc branches/2020Q2/www/chromium/files/patch-ui_compositor_compositor.h branches/2020Q2/www/chromium/files/patch-ui_gfx_BUILD.gn branches/2020Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc branches/2020Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h branches/2020Q2/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc branches/2020Q2/www/chromium/files/patch-ui_gfx_render__text.cc branches/2020Q2/www/chromium/files/patch-ui_gl_BUILD.gn branches/2020Q2/www/chromium/files/patch-ui_gl_generate__bindings.py branches/2020Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h branches/2020Q2/www/chromium/files/patch-ui_native__theme_native__theme.h branches/2020Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.cc branches/2020Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc branches/2020Q2/www/chromium/files/patch-ui_views_controls_label.cc branches/2020Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc branches/2020Q2/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc branches/2020Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc branches/2020Q2/www/chromium/files/patch-ui_views_selection__controller.cc branches/2020Q2/www/chromium/files/patch-ui_views_views__delegate.h branches/2020Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc branches/2020Q2/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc branches/2020Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc branches/2020Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc branches/2020Q2/www/chromium/files/patch-ui_views_window_frame__background.cc branches/2020Q2/www/chromium/files/patch-ui_webui_resources_js_cr.js branches/2020Q2/www/chromium/files/patch-v8_BUILD.gn branches/2020Q2/www/chromium/files/patch-v8_src_api_api.cc branches/2020Q2/www/chromium/files/patch-v8_src_base_cpu.cc branches/2020Q2/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc branches/2020Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc branches/2020Q2/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc branches/2020Q2/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc branches/2020Q2/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc branches/2020Q2/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h branches/2020Q2/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc branches/2020Q2/www/chromium/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/chromium/Makefile ============================================================================== --- branches/2020Q2/www/chromium/Makefile Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/Makefile Wed Jun 3 11:20:42 2020 (r537611) @@ -89,7 +89,7 @@ USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt -SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper +SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -275,6 +275,11 @@ do-configure: @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java .endif + + # Setup buildtools/freebsd + @${MKDIR} ${WRKSRC}/buildtools/freebsd + ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd + ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd .endif do-test-TEST-on: Modified: branches/2020Q2/www/chromium/distinfo ============================================================================== --- branches/2020Q2/www/chromium/distinfo Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/distinfo Wed Jun 3 11:20:42 2020 (r537611) @@ -1,7 +1,7 @@ -TIMESTAMP = 1588777393 -SHA256 (chromium-81.0.4044.138.tar.xz) = f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6 -SIZE (chromium-81.0.4044.138.tar.xz) = 785960928 -SHA256 (chromium-81.0.4044.138-testdata.tar.xz) = e2083a3c9ae5bd183ebaf3dc0b701c3fc6e990a6864852a2fa961e811c99ec32 -SIZE (chromium-81.0.4044.138-testdata.tar.xz) = 257018904 +TIMESTAMP = 1590142056 +SHA256 (chromium-83.0.4103.61.tar.xz) = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc +SIZE (chromium-83.0.4103.61.tar.xz) = 802558244 +SHA256 (chromium-83.0.4103.61-testdata.tar.xz) = 06096007d6fd1a4adce3b9940a653086e380d0f2be3cf9e36d39956ba2f7363e +SIZE (chromium-83.0.4103.61-testdata.tar.xz) = 257159920 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Modified: branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h ============================================================================== --- branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-04-03 04:13:08 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-18 18:42:41 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) Modified: branches/2020Q2/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- BUILD.gn.orig 2020-05-13 18:40:15 UTC +++ BUILD.gn @@ -418,7 +418,7 @@ group("gn_all") { ] @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -575,10 +569,6 @@ group("gn_all") { +@@ -579,10 +573,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -652,7 +642,7 @@ group("gn_all") { +@@ -656,7 +646,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -794,7 +784,6 @@ group("gn_all") { +@@ -789,7 +779,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,15 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -934,7 +923,6 @@ if (is_chromeos) { - "//ppapi/examples/video_decode", - "//sandbox/linux:chrome_sandbox", - "//sandbox/linux:sandbox_linux_unittests", -- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", - - # Blocked on https://github.com/catapult-project/catapult/issues/2297 - #"//third_party/catapult/telemetry:bitmaptools", -@@ -1092,7 +1080,7 @@ if (!is_ios) { +@@ -1071,7 +1060,7 @@ if (!is_ios) { ] } @@ -74,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1101,7 +1089,7 @@ if (!is_ios) { +@@ -1080,7 +1069,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") { +@@ -1273,9 +1262,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] Modified: branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2020-03-16 18:40:27 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-05-13 18:39:35 UTC +++ ash/display/mirror_window_controller.cc -@@ -276,7 +276,11 @@ void MirrorWindowController::UpdateWindow( +@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); Modified: branches/2020Q2/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,15 @@ ---- base/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- base/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ base/BUILD.gn -@@ -912,7 +912,7 @@ jumbo_component("base") { +@@ -59,7 +59,7 @@ declare_args() { + # replacement base::Location::Current(). On by default in non-official builds + # for testing purposes. + # TODO(https://crbug.com/974061): remove this eventually. +- from_here_uses_location_builtins = !is_official_build ++ from_here_uses_location_builtins = !is_official_build && !is_bsd + + # Unsafe developer build. Has developer-friendly features that may weaken or + # disable security measures like sandboxing or ASLR. +@@ -929,7 +929,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +18,7 @@ sources += [ "profiler/stack_copier_signal.cc", "profiler/stack_copier_signal.h", -@@ -921,6 +921,12 @@ jumbo_component("base") { +@@ -938,6 +938,12 @@ jumbo_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +31,7 @@ } if (is_win) { -@@ -1305,7 +1311,7 @@ jumbo_component("base") { +@@ -1321,7 +1327,7 @@ jumbo_component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -31,7 +40,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1331,7 +1337,7 @@ jumbo_component("base") { +@@ -1347,7 +1353,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -40,7 +49,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1930,6 +1936,33 @@ jumbo_component("base") { +@@ -1942,6 +1948,33 @@ jumbo_component("base") { } } @@ -74,7 +83,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2880,7 +2913,7 @@ test("base_unittests") { +@@ -2898,7 +2931,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -83,7 +92,7 @@ sources += [ "profiler/stack_copier_signal_unittest.cc" ] } } -@@ -3068,6 +3101,12 @@ test("base_unittests") { +@@ -3087,6 +3120,12 @@ test("base_unittests") { manifest = "//build/config/fuchsia/tests.cmx" } Modified: branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-10-21 19:06:18 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-13 18:39:35 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -19,7 +19,7 @@ +@@ -22,7 +22,7 @@ #if defined(OS_ANDROID) #include #endif Modified: branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_debug_debugger__posix.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2019-09-09 21:55:05 UTC +--- base/debug/debugger_posix.cc.orig 2020-05-13 18:40:16 UTC +++ base/debug/debugger_posix.cc -@@ -90,7 +90,7 @@ bool BeingDebugged() { +@@ -95,7 +95,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -98,33 +98,35 @@ bool BeingDebugged() { +@@ -103,33 +103,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. Modified: branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-05-13 18:40:16 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -430,7 +430,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -808,7 +808,7 @@ enum Permission { +@@ -803,7 +803,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -832,9 +832,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -30,7 +30,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -869,7 +869,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } Modified: branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_i18n_icu__util.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2020-03-16 18:40:27 UTC +--- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC +++ base/i18n/icu_util.cc -@@ -46,7 +46,7 @@ +@@ -49,7 +49,7 @@ #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ @@ -14,7 +14,7 @@ icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); -#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) - // To respond to the timezone change properly, the default timezone ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) + // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). Modified: branches/2020Q2/www/chromium/files/patch-base_linux__util.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_linux__util.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_linux__util.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,20 +1,12 @@ ---- base/linux_util.cc.orig 2019-12-16 21:50:40 UTC +--- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +++ base/linux_util.cc -@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] = - "CrOS"; - #elif defined(OS_ANDROID) - "Android"; -+#elif defined(OS_BSD) -+ "BSD"; - #else // if defined(OS_LINUX) - "Unknown"; - #endif -@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo - } - - std::string GetLinuxDistro() { --#if defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - return g_linux_distro; - #elif defined(OS_LINUX) - LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); +@@ -78,6 +78,9 @@ class DistroNameGetter { + public: + DistroNameGetter() { + static const char* const kFilesToCheck[] = {"/etc/os-release", ++#if defined(OS_BSD) ++ "/usr/local/etc/os-release", ++#endif + "/usr/lib/os-release"}; + for (const char* file : kFilesToCheck) { + if (ReadDistroFromOSReleaseFile(file)) Copied: branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc (from r537579, head/www/chromium/files/patch-base_location__unittest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/chromium/files/patch-base_location__unittest.cc Wed Jun 3 11:20:42 2020 (r537611, copy of r537579, head/www/chromium/files/patch-base_location__unittest.cc) @@ -0,0 +1,11 @@ +--- base/location_unittest.cc.orig 2020-05-26 09:56:30 UTC ++++ base/location_unittest.cc +@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { + EXPECT_EQ(here.line_number(), previous_line + 1); + EXPECT_STREQ("TestBody", here.function_name()); + #endif +-#elif defined(OFFICIAL_BUILD) ++#elif defined(OFFICIAL_BUILD) && !defined(OS_BSD) + #error Location builtins must be supported in official builds. + #elif BUILDFLAG(FROM_HERE_USES_LOCATION_BUILTINS) + #error FROM_HERE requires location builtins to be supported. Modified: branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-05-13 18:40:16 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { +@@ -69,7 +69,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: +@@ -78,7 +78,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: return region.PassPlatformHandle().fd; return ScopedFD(); } @@ -18,7 +18,7 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -203,7 +203,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -27,7 +27,7 @@ , bool executable #endif -@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -232,7 +232,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_profiler_stack__copier__signal.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2020-04-10 00:33:01 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-05-13 18:40:16 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include #include #include -@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { +@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { +@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-05-13 18:40:16 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ #include #include #include Modified: branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-04-03 04:10:36 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2020-05-13 18:39:35 UTC +++ base/profiler/thread_delegate_posix.cc @@ -9,6 +9,9 @@ #include "base/stl_util.h" @@ -10,7 +10,7 @@ namespace base { -@@ -17,7 +20,12 @@ +@@ -17,7 +20,12 @@ namespace { uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,7 +23,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -93,16 +103,33 @@ +@@ -93,16 +101,33 @@ std::vector ThreadDelegatePosix::GetRegist return { // Return the set of callee-save registers per the i386 System V ABI // section 2.2.3, plus the stack pointer. @@ -57,7 +57,7 @@ reinterpret_cast(&thread_context->gregs[REG_RBP]), reinterpret_cast(&thread_context->gregs[REG_RBX]), reinterpret_cast(&thread_context->gregs[REG_R12]), -@@ -110,6 +137,7 @@ +@@ -110,6 +135,7 @@ std::vector ThreadDelegatePosix::GetRegist reinterpret_cast(&thread_context->gregs[REG_R14]), reinterpret_cast(&thread_context->gregs[REG_R15]), reinterpret_cast(&thread_context->gregs[REG_RSP]), Copied: branches/2020Q2/www/chromium/files/patch-base_stl__util.h (from r537579, head/www/chromium/files/patch-base_stl__util.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/chromium/files/patch-base_stl__util.h Wed Jun 3 11:20:42 2020 (r537611, copy of r537579, head/www/chromium/files/patch-base_stl__util.h) @@ -0,0 +1,47 @@ +--- base/stl_util.h.orig 2020-05-18 14:07:28 UTC ++++ base/stl_util.h +@@ -561,14 +561,6 @@ size_t EraseIf(std::vector& container, P + return removed; + } + +-template +-size_t Erase(std::forward_list& container, const Value& value) { +- // Unlike std::forward_list::remove, this function template accepts +- // heterogeneous types and does not force a conversion to the container's +- // value type before invoking the == operator. +- return EraseIf(container, [&](const T& cur) { return cur == value; }); +-} +- + template + size_t EraseIf(std::forward_list& container, Predicate pred) { + // Note: std::forward_list does not have a size() API, thus we need to use the +@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list& contai + } + + template +-size_t Erase(std::list& container, const Value& value) { +- // Unlike std::list::remove, this function template accepts heterogeneous +- // types and does not force a conversion to the container's value type before +- // invoking the == operator. ++size_t Erase(std::forward_list& container, const Value& value) { ++ // Unlike std::forward_list::remove, this function template accepts ++ // heterogeneous types and does not force a conversion to the container's ++ // value type before invoking the == operator. + return EraseIf(container, [&](const T& cur) { return cur == value; }); + } + +@@ -592,6 +584,14 @@ size_t EraseIf(std::list& container, Pre + size_t old_size = container.size(); + container.remove_if(pred); + return old_size - container.size(); ++} ++ ++template ++size_t Erase(std::list& container, const Value& value) { ++ // Unlike std::list::remove, this function template accepts heterogeneous ++ // types and does not force a conversion to the container's value type before ++ // invoking the == operator. ++ return EraseIf(container, [&](const T& cur) { return cur == value; }); + } + + template Modified: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_system_sys__info.h Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2020-03-16 18:39:41 UTC +--- base/system/sys_info.h.orig 2020-05-13 18:39:35 UTC +++ base/system/sys_info.h -@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo { +@@ -197,6 +197,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo { +@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); Modified: branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-base_test_test__suite.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- base/test/test_suite.cc.orig 2020-03-23 15:30:45 UTC +--- base/test/test_suite.cc.orig 2020-05-13 18:39:35 UTC +++ base/test/test_suite.cc -@@ -68,7 +68,7 @@ +@@ -69,7 +69,7 @@ #include "base/test/test_support_ios.h" #endif @@ -9,7 +9,7 @@ #include "base/test/fontconfig_util_linux.h" #endif -@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { +@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -26,7 +26,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -620,7 +620,7 @@ void TestSuite::Initialize() { +@@ -623,7 +623,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); Modified: branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_config_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- build/config/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- build/config/BUILD.gn.orig 2020-05-13 18:39:35 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. @@ -19,7 +19,7 @@ ] } } -@@ -315,7 +313,7 @@ config("executable_config") { +@@ -316,7 +314,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] Modified: branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,24 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- build/config/compiler/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ build/config/compiler/BUILD.gn -@@ -137,7 +137,7 @@ declare_args() { - # TODO(vitalybuka): +@@ -138,7 +138,7 @@ declare_args() { # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. # 'use_xcode_clang' may call old clang. -- init_stack_vars = !is_android && !use_xcode_clang && !is_official_build -+ init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd + init_stack_vars = +- !is_android && !use_xcode_clang && (!is_official_build || is_linux) ++ !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd } declare_args() { @@ -298,7 +298,7 @@ config("compiler") { + } # Linker warnings. - if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && -- !is_mac && !is_ios && current_os != "aix") { -+ !is_mac && !is_ios && current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 +- if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") { ++ if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -393,7 +393,7 @@ config("compiler") { + if (fatal_linker_warnings && (is_mac || is_ios)) { +@@ -392,7 +392,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -486,7 +486,7 @@ config("compiler") { +@@ -485,7 +485,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -767,7 +767,7 @@ config("compiler_cpu_abi") { +@@ -755,7 +755,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1118,7 +1118,7 @@ config("compiler_deterministic") { +@@ -1105,7 +1105,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1507,7 +1507,7 @@ config("default_warnings") { +@@ -1488,7 +1488,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1741,7 +1741,7 @@ config("thin_archive") { +@@ -1738,7 +1738,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2334,7 +2334,7 @@ config("symbols") { +@@ -2262,7 +2262,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -80,8 +80,8 @@ + cflags += [ "-g0" ] } - if (use_debug_fission && !is_nacl && !is_android) { -@@ -2355,7 +2355,7 @@ config("symbols") { + if (is_clang && !is_nacl && !use_xcode_clang) { +@@ -2290,7 +2290,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && Modified: branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_config_compiler_compiler.gni Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- build/config/compiler/compiler.gni.orig 2020-03-16 18:40:27 UTC +--- build/config/compiler/compiler.gni.orig 2020-05-13 18:40:16 UTC +++ build/config/compiler/compiler.gni @@ -47,7 +47,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -200,7 +200,7 @@ declare_args() { +@@ -190,7 +190,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = Modified: branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_config_linux_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,9 +1,9 @@ ---- build/config/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/BUILD.gn.orig 2020-05-13 18:39:36 UTC +++ build/config/linux/BUILD.gn -@@ -28,7 +28,7 @@ config("runtime_library") { - } +@@ -30,7 +30,7 @@ config("runtime_library") { - if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && + if ((!(is_chromeos || chromeos_is_browser_only) || + default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { libs = [ "atomic" ] Modified: branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_config_sysroot.gni Wed Jun 3 11:20:42 2020 (r537611) @@ -1,15 +1,14 @@ ---- build/config/sysroot.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/sysroot.gni.orig 2020-05-13 18:39:36 UTC +++ build/config/sysroot.gni -@@ -15,9 +15,10 @@ declare_args() { - # The absolute path to directory containing linux sysroot images - target_sysroot_dir = "//build/linux" +@@ -21,9 +21,9 @@ declare_args() { + # Controls default is_linux sysroot. If set to true, and sysroot + # is empty, default sysroot is calculated. - use_sysroot = current_cpu == "x86" || current_cpu == "x64" || -+ use_sysroot = !is_bsd && ( -+ current_cpu == "x86" || current_cpu == "x64" || ++ use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64" || - current_cpu == "mipsel" || current_cpu == "mips64el" + current_cpu == "mipsel" || current_cpu == "mips64el") } - if (current_os == target_os && current_cpu == target_cpu && + if (sysroot == "") { Modified: branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni ============================================================================== --- branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Wed Jun 3 11:20:42 2020 (r537611) @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-03-16 18:40:27 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-05-13 18:40:16 UTC +++ build/toolchain/gcc_toolchain.gni @@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { enable_resource_whitelist_generation = false @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -577,13 +582,23 @@ template("clang_toolchain") { +@@ -589,13 +594,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { Modified: branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn ============================================================================== --- branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-cc_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- cc/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ cc/BUILD.gn -@@ -582,7 +582,7 @@ cc_test_static_library("test_support") { +@@ -589,7 +589,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,11 +9,11 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -788,7 +788,6 @@ cc_test("cc_unittests") { +@@ -790,7 +790,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - if (enable_vulkan) { + defines = [] Modified: branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-cc_trees_property__tree.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-03-16 18:40:27 UTC +--- cc/trees/property_tree.cc.orig 2020-05-13 18:40:17 UTC +++ cc/trees/property_tree.cc -@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1241,13 +1241,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); Copied: branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn (from r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/chromium/files/patch-chrome_app_BUILD.gn Wed Jun 3 11:20:42 2020 (r537611, copy of r537579, head/www/chromium/files/patch-chrome_app_BUILD.gn) @@ -0,0 +1,11 @@ +--- chrome/app/BUILD.gn.orig 2020-05-18 10:34:00 UTC ++++ chrome/app/BUILD.gn +@@ -138,7 +138,7 @@ static_library("test_support") { + "//v8:v8_headers", + ] + +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + deps += [ + "//components/crash/core/app", Modified: branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h ============================================================================== --- branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h Wed Jun 3 11:20:42 2020 (r537611) @@ -1,8 +1,8 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-02-03 21:53:28 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-05-13 18:39:36 UTC +++ chrome/app/chrome_command_ids.h -@@ -62,7 +62,7 @@ - #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 - #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 +@@ -60,7 +60,7 @@ + #define IDC_MAXIMIZE_WINDOW 34047 + #define IDC_ALL_WINDOWS_FRONT 34048 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) Modified: branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Wed Jun 3 11:16:45 2020 (r537610) +++ branches/2020Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Wed Jun 3 11:20:42 2020 (r537611) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-03-16 18:40:27 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-05-13 18:40:17 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -142,12 +142,12 @@ +@@ -145,12 +145,12 @@ #include "v8/include/v8.h" #endif @@ -22,18 +22,18 @@ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" - #include "components/crash/content/app/crashpad.h" + #include "components/crash/core/app/crashpad.h" #endif -@@ -246,7 +246,7 @@ bool UseHooks() { +@@ -276,7 +276,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) void AdjustLinuxOOMScore(const std::string& process_type) { - // Browsers and zygotes should still be killable, but killed last. - const int kZygoteScore = 0; -@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty + int score = -1; + +@@ -316,13 +316,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -49,7 +49,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -361,7 +361,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +58,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -371,7 +371,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -425,7 +425,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +76,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -437,7 +437,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,16 +85,25 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -483,7 +483,7 @@ void InitLogging(const std::string& process_type) { - void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { - if (!exe_entry_point_ticks.is_null()) - startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); +@@ -509,7 +509,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat + startup_metric_utils::RecordApplicationStartTime(now); + #endif + -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -701,7 +701,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi + v8_crashpad_support::SetUp(); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + if (!crash_reporter::IsCrashpadEnabled()) { + breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); + } +@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -103,7 +112,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -112,7 +121,16 @@ nacl::RegisterPathProvider(); #endif -@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -916,7 +916,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + + crash_reporter::InitializeCrashKeys(); + +-#if defined(OS_POSIX) ++#if defined(OS_POSIX) && !defined(OS_BSD) + ChromeCrashReporterClient::Create(); + #endif + +@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -121,16 +139,16 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - InitializePDF(); - #endif +@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + locale; + } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1068,7 +1068,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -139,7 +157,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1059,7 +1059,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1082,7 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. @@ -148,7 +166,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1128,7 +1128,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ @@ -157,3 +175,21 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"", NULL}, // To avoid constant array of size 0 +@@ -1156,7 +1156,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str + #endif // !defined(OS_ANDROID) + } + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Wed Jun 3 12:38:54 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B005033663A; Wed, 3 Jun 2020 12:38:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cT3y4Flnz4HFm; Wed, 3 Jun 2020 12:38:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D2FBDAE4; Wed, 3 Jun 2020 12:38:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053CcsZ5044420; Wed, 3 Jun 2020 12:38:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053CcsKl044418; Wed, 3 Jun 2020 12:38:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006031238.053CcsKl044418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 3 Jun 2020 12:38:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537614 - branches/2020Q2/www/firefox X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/www/firefox X-SVN-Commit-Revision: 537614 X-SVN-Commit-Repository: ports 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.33 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, 03 Jun 2020 12:38:54 -0000 Author: jbeich Date: Wed Jun 3 12:38:53 2020 New Revision: 537614 URL: https://svnweb.freebsd.org/changeset/ports/537614 Log: MFH: r537612 www/firefox: update to 77.0.1 Changes: https://www.mozilla.org/firefox/77.0.1/releasenotes/ Approved by: ports-secteam blanket Modified: branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Wed Jun 3 12:37:48 2020 (r537613) +++ branches/2020Q2/www/firefox/Makefile Wed Jun 3 12:38:53 2020 (r537614) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 77.0 +DISTVERSION= 77.0.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q2/www/firefox/distinfo ============================================================================== --- branches/2020Q2/www/firefox/distinfo Wed Jun 3 12:37:48 2020 (r537613) +++ branches/2020Q2/www/firefox/distinfo Wed Jun 3 12:38:53 2020 (r537614) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590732186 -SHA256 (firefox-77.0.source.tar.xz) = b534794c493d8698dfb6c852af52b49540afdf88dc50451f42d6591de93291e8 -SIZE (firefox-77.0.source.tar.xz) = 329713656 +TIMESTAMP = 1591146315 +SHA256 (firefox-77.0.1.source.tar.xz) = 54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640 +SIZE (firefox-77.0.1.source.tar.xz) = 334037816 From owner-svn-ports-branches@freebsd.org Wed Jun 3 12:43:28 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 492353365BD; Wed, 3 Jun 2020 12:43:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cT9D1Fx3z4HfR; Wed, 3 Jun 2020 12:43:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 267A1E318; Wed, 3 Jun 2020 12:43:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053ChSDe050283; Wed, 3 Jun 2020 12:43:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053ChRho050281; Wed, 3 Jun 2020 12:43:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006031243.053ChRho050281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 3 Jun 2020 12:43:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537615 - branches/2020Q2/print/harfbuzz X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/print/harfbuzz X-SVN-Commit-Revision: 537615 X-SVN-Commit-Repository: ports 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.33 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, 03 Jun 2020 12:43:28 -0000 Author: jbeich Date: Wed Jun 3 12:43:27 2020 New Revision: 537615 URL: https://svnweb.freebsd.org/changeset/ports/537615 Log: MFH: r537613 print/harfbuzz: update to 2.6.7 Changes: https://github.com/harfbuzz/harfbuzz/releases/tag/2.6.7 ABI: https://abi-laboratory.pro/tracker/timeline/harfbuzz/ Reported by: GitHub (watch releases) Approved by: ports-secteam blanket (required by Firefox 79) Modified: branches/2020Q2/print/harfbuzz/Makefile branches/2020Q2/print/harfbuzz/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/print/harfbuzz/Makefile ============================================================================== --- branches/2020Q2/print/harfbuzz/Makefile Wed Jun 3 12:38:53 2020 (r537614) +++ branches/2020Q2/print/harfbuzz/Makefile Wed Jun 3 12:43:27 2020 (r537615) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= harfbuzz -DISTVERSION= 2.6.6 +DISTVERSION= 2.6.7 PORTREVISION?= 0 CATEGORIES= print MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ @@ -27,7 +27,7 @@ USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check -PLIST_SUB+= LIBVER=0.20600.6 +PLIST_SUB+= LIBVER=0.20600.7 HARFBUZZ_SLAVE?= no Modified: branches/2020Q2/print/harfbuzz/distinfo ============================================================================== --- branches/2020Q2/print/harfbuzz/distinfo Wed Jun 3 12:38:53 2020 (r537614) +++ branches/2020Q2/print/harfbuzz/distinfo Wed Jun 3 12:43:27 2020 (r537615) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584073551 -SHA256 (harfbuzz-2.6.6.tar.xz) = 84d0f1fb4cf4b3ee398ac20eaa608ca9f7cd90d992a44540fdcb16469bb460e5 -SIZE (harfbuzz-2.6.6.tar.xz) = 8530984 +TIMESTAMP = 1591108113 +SHA256 (harfbuzz-2.6.7.tar.xz) = 49e481d06cdff97bf68d99fa26bdf785331f411614485d892ea4c78eb479b218 +SIZE (harfbuzz-2.6.7.tar.xz) = 9001936 From owner-svn-ports-branches@freebsd.org Thu Jun 4 00:59:11 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D10A22F920C; Thu, 4 Jun 2020 00:59:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cnV75FDMz4CK1; Thu, 4 Jun 2020 00:59:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9521016EC5; Thu, 4 Jun 2020 00:59:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0540xB1Y034471; Thu, 4 Jun 2020 00:59:11 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0540xBeE034469; Thu, 4 Jun 2020 00:59:11 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006040059.0540xBeE034469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 4 Jun 2020 00:59:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537863 - branches/2020Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/citra X-SVN-Commit-Revision: 537863 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 00:59:11 -0000 Author: jbeich Date: Thu Jun 4 00:59:10 2020 New Revision: 537863 URL: https://svnweb.freebsd.org/changeset/ports/537863 Log: MFH: r537862 emulators/citra: update to s20200531 Changes: https://github.com/citra-emu/citra/compare/7dc472a3a...76253063a Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2020Q2/emulators/citra/Makefile branches/2020Q2/emulators/citra/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/citra/Makefile ============================================================================== --- branches/2020Q2/emulators/citra/Makefile Thu Jun 4 00:58:22 2020 (r537862) +++ branches/2020Q2/emulators/citra/Makefile Thu Jun 4 00:59:10 2020 (r537863) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200529 +PORTVERSION= s20200531 PORTREVISION?= 0 CATEGORIES= emulators @@ -21,7 +21,7 @@ LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COP USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 7dc472a3a +GH_TAGNAME= 76253063a GH_TUPLE= citra-emu:ext-boost:36603a1:boost/externals/boost \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ Modified: branches/2020Q2/emulators/citra/distinfo ============================================================================== --- branches/2020Q2/emulators/citra/distinfo Thu Jun 4 00:58:22 2020 (r537862) +++ branches/2020Q2/emulators/citra/distinfo Thu Jun 4 00:59:10 2020 (r537863) @@ -1,6 +1,6 @@ -TIMESTAMP = 1590709994 -SHA256 (citra-emu-citra-s20200529-7dc472a3a_GH0.tar.gz) = 97aada2b6a85c3c3c67c81ac3b7e6eded5337141813e60f165b52f6a920e294f -SIZE (citra-emu-citra-s20200529-7dc472a3a_GH0.tar.gz) = 5245754 +TIMESTAMP = 1590956875 +SHA256 (citra-emu-citra-s20200531-76253063a_GH0.tar.gz) = 42795c02a12636d682c846047a76608b93e118e7de86e5049cdc257808b7c1a7 +SIZE (citra-emu-citra-s20200531-76253063a_GH0.tar.gz) = 5253157 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 From owner-svn-ports-branches@freebsd.org Thu Jun 4 09:04:38 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01C8B331942; Thu, 4 Jun 2020 09:04:38 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d0GF6KsYz4Byg; Thu, 4 Jun 2020 09:04:37 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D49711D28A; Thu, 4 Jun 2020 09:04:37 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05494bF8036783; Thu, 4 Jun 2020 09:04:37 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05494bQX036781; Thu, 4 Jun 2020 09:04:37 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202006040904.05494bQX036781@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Thu, 4 Jun 2020 09:04:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537875 - branches/2020Q2/mail/thunderbird X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: branches/2020Q2/mail/thunderbird X-SVN-Commit-Revision: 537875 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 09:04:38 -0000 Author: cmt Date: Thu Jun 4 09:04:37 2020 New Revision: 537875 URL: https://svnweb.freebsd.org/changeset/ports/537875 Log: MFH: r537874 update thunderbird to 68.9.0 Release Notes: https://www.thunderbird.net/en-US/thunderbird/68.9.0/releasenotes/ Approved by: portmgr (blanket: web browser alike) Modified: branches/2020Q2/mail/thunderbird/Makefile branches/2020Q2/mail/thunderbird/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q2/mail/thunderbird/Makefile Thu Jun 4 09:02:48 2020 (r537874) +++ branches/2020Q2/mail/thunderbird/Makefile Thu Jun 4 09:04:37 2020 (r537875) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.8.1 -PORTREVISION= 2 +DISTVERSION= 68.9.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2020Q2/mail/thunderbird/distinfo ============================================================================== --- branches/2020Q2/mail/thunderbird/distinfo Thu Jun 4 09:02:48 2020 (r537874) +++ branches/2020Q2/mail/thunderbird/distinfo Thu Jun 4 09:04:37 2020 (r537875) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590140127 -SHA256 (thunderbird-68.8.1.source.tar.xz) = 99b42a8451dfdd7b343f70aff66c3f28e1be22ba7fcd5dca51e39606d9ba7b6d -SIZE (thunderbird-68.8.1.source.tar.xz) = 337093664 +TIMESTAMP = 1591180151 +SHA256 (thunderbird-68.9.0.source.tar.xz) = 8286599f14a852dfc503893d141d3e0582892faae8aef81bc36cfab3906408cc +SIZE (thunderbird-68.9.0.source.tar.xz) = 332239044 From owner-svn-ports-branches@freebsd.org Thu Jun 4 12:59:38 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D54C82F2439; Thu, 4 Jun 2020 12:59:38 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d5TQ5LVjz3T8W; Thu, 4 Jun 2020 12:59:38 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2B661FD96; Thu, 4 Jun 2020 12:59:38 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054CxcJ4080222; Thu, 4 Jun 2020 12:59:38 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054Cxcqa080216; Thu, 4 Jun 2020 12:59:38 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202006041259.054Cxcqa080216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 4 Jun 2020 12:59:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537894 - branches/2020Q2/security/gnutls X-SVN-Group: ports-branches X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: branches/2020Q2/security/gnutls X-SVN-Commit-Revision: 537894 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 12:59:38 -0000 Author: tijl Date: Thu Jun 4 12:59:37 2020 New Revision: 537894 URL: https://svnweb.freebsd.org/changeset/ports/537894 Log: MFH: r537887 Update to 3.6.14. Security: https://gnutls.org/security-new.html#GNUTLS-SA-2020-06-03 Approved by: ports-secteam (joneum) Modified: branches/2020Q2/security/gnutls/Makefile branches/2020Q2/security/gnutls/distinfo branches/2020Q2/security/gnutls/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/gnutls/Makefile ============================================================================== --- branches/2020Q2/security/gnutls/Makefile Thu Jun 4 12:41:05 2020 (r537893) +++ branches/2020Q2/security/gnutls/Makefile Thu Jun 4 12:59:37 2020 (r537894) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.6.13 +PORTVERSION= 3.6.14 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} Modified: branches/2020Q2/security/gnutls/distinfo ============================================================================== --- branches/2020Q2/security/gnutls/distinfo Thu Jun 4 12:41:05 2020 (r537893) +++ branches/2020Q2/security/gnutls/distinfo Thu Jun 4 12:59:37 2020 (r537894) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585668395 -SHA256 (gnutls-3.6.13.tar.xz) = 32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 -SIZE (gnutls-3.6.13.tar.xz) = 5958956 +TIMESTAMP = 1591271084 +SHA256 (gnutls-3.6.14.tar.xz) = 5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63 +SIZE (gnutls-3.6.14.tar.xz) = 6069088 Modified: branches/2020Q2/security/gnutls/pkg-plist ============================================================================== --- branches/2020Q2/security/gnutls/pkg-plist Thu Jun 4 12:41:05 2020 (r537893) +++ branches/2020Q2/security/gnutls/pkg-plist Thu Jun 4 12:59:37 2020 (r537894) @@ -32,7 +32,7 @@ include/gnutls/x509.h %%DANE%%lib/libgnutls-dane.so.0.4.1 lib/libgnutls.so lib/libgnutls.so.30 -lib/libgnutls.so.30.27.0 +lib/libgnutls.so.30.28.0 lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 @@ -261,6 +261,7 @@ man/man3/gnutls_est_record_overhead_size.3.gz man/man3/gnutls_ext_get_current_msg.3.gz man/man3/gnutls_ext_get_data.3.gz man/man3/gnutls_ext_get_name.3.gz +man/man3/gnutls_ext_get_name2.3.gz man/man3/gnutls_ext_raw_parse.3.gz man/man3/gnutls_ext_register.3.gz man/man3/gnutls_ext_set_data.3.gz @@ -523,6 +524,7 @@ man/man3/gnutls_pkcs7_get_signature_info.3.gz man/man3/gnutls_pkcs7_import.3.gz man/man3/gnutls_pkcs7_init.3.gz man/man3/gnutls_pkcs7_print.3.gz +man/man3/gnutls_pkcs7_print_signature_info.3.gz man/man3/gnutls_pkcs7_set_crl.3.gz man/man3/gnutls_pkcs7_set_crl_raw.3.gz man/man3/gnutls_pkcs7_set_crt.3.gz From owner-svn-ports-branches@freebsd.org Thu Jun 4 15:26:25 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDB312F616C; Thu, 4 Jun 2020 15:26:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d8kn58Qlz45R8; Thu, 4 Jun 2020 15:26:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC23F21AAA; Thu, 4 Jun 2020 15:26:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054FQPfs072973; Thu, 4 Jun 2020 15:26:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054FQPMt072971; Thu, 4 Jun 2020 15:26:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006041526.054FQPMt072971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 4 Jun 2020 15:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537904 - branches/2020Q2/multimedia/libva-intel-driver X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/multimedia/libva-intel-driver X-SVN-Commit-Revision: 537904 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 15:26:25 -0000 Author: jbeich Date: Thu Jun 4 15:26:25 2020 New Revision: 537904 URL: https://svnweb.freebsd.org/changeset/ports/537904 Log: MFH: r537576 multimedia/libva-intel-driver: update to 2.4.1 Changes: https://github.com/intel/intel-vaapi-driver/compare/2.4.0...2.4.1 Reported by: Repology Approved by: ports-secteam (joneum) Modified: branches/2020Q2/multimedia/libva-intel-driver/Makefile branches/2020Q2/multimedia/libva-intel-driver/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/libva-intel-driver/Makefile ============================================================================== --- branches/2020Q2/multimedia/libva-intel-driver/Makefile Thu Jun 4 15:25:50 2020 (r537903) +++ branches/2020Q2/multimedia/libva-intel-driver/Makefile Thu Jun 4 15:26:25 2020 (r537904) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libva-intel-driver -DISTVERSION= 2.4.0 +DISTVERSION= 2.4.1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Modified: branches/2020Q2/multimedia/libva-intel-driver/distinfo ============================================================================== --- branches/2020Q2/multimedia/libva-intel-driver/distinfo Thu Jun 4 15:25:50 2020 (r537903) +++ branches/2020Q2/multimedia/libva-intel-driver/distinfo Thu Jun 4 15:26:25 2020 (r537904) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575616698 -SHA256 (intel-intel-vaapi-driver-2.4.0_GH0.tar.gz) = 58567dac882167021f031489062cbbab76bc646214be0ee44d5f724d960b3d76 -SIZE (intel-intel-vaapi-driver-2.4.0_GH0.tar.gz) = 3962269 +TIMESTAMP = 1590974265 +SHA256 (intel-intel-vaapi-driver-2.4.1_GH0.tar.gz) = 03cd7e16acc94f828b6e7f3087863d8ca06e99ffa3385588005b1984bdd56157 +SIZE (intel-intel-vaapi-driver-2.4.1_GH0.tar.gz) = 3962460 From owner-svn-ports-branches@freebsd.org Thu Jun 4 15:29:21 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1978F2F750E; Thu, 4 Jun 2020 15:29:21 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d8p872Lyz45fZ; Thu, 4 Jun 2020 15:29:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECC8F21B13; Thu, 4 Jun 2020 15:29:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054FTKJk073264; Thu, 4 Jun 2020 15:29:20 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054FTKND073263; Thu, 4 Jun 2020 15:29:20 GMT (envelope-from ler@FreeBSD.org) Message-Id: <202006041529.054FTKND073263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Thu, 4 Jun 2020 15:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537905 - branches/2020Q2/mail/dovecot X-SVN-Group: ports-branches X-SVN-Commit-Author: ler X-SVN-Commit-Paths: branches/2020Q2/mail/dovecot X-SVN-Commit-Revision: 537905 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 15:29:21 -0000 Author: ler Date: Thu Jun 4 15:29:20 2020 New Revision: 537905 URL: https://svnweb.freebsd.org/changeset/ports/537905 Log: MFH: r537587 r537837 mail/dovecot: restore the REINPLACE_CMD for the example config. Overzealous removal. PR: 246947 Submitted by: gwbr0601@yahoo.de Pointy Hat To: ler mail/dovecot: fix example config *.conf.ext REINPLACE missed in r537587. PR: 246963 Submitted by: kfv@irbug.org Approved by: ports-secteam (joneum) Modified: branches/2020Q2/mail/dovecot/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/dovecot/Makefile ============================================================================== --- branches/2020Q2/mail/dovecot/Makefile Thu Jun 4 15:26:25 2020 (r537904) +++ branches/2020Q2/mail/dovecot/Makefile Thu Jun 4 15:29:20 2020 (r537905) @@ -9,6 +9,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.10.1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -133,6 +134,10 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: + @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ + s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ + ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \ + ${WRKSRC}/doc/example-config/*.conf.ext @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/ From owner-svn-ports-branches@freebsd.org Thu Jun 4 18:05:21 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 56D5632B2D6; Thu, 4 Jun 2020 18:05:21 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dDG91fjcz4Qy8; Thu, 4 Jun 2020 18:05:21 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3406623832; Thu, 4 Jun 2020 18:05:21 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054I5LWi075771; Thu, 4 Jun 2020 18:05:21 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054I5KgZ075766; Thu, 4 Jun 2020 18:05:20 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202006041805.054I5KgZ075766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 4 Jun 2020 18:05:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537915 - in branches/2020Q2/www: libnghttp2 nghttp2 X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in branches/2020Q2/www: libnghttp2 nghttp2 X-SVN-Commit-Revision: 537915 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 18:05:21 -0000 Author: sunpoet Date: Thu Jun 4 18:05:19 2020 New Revision: 537915 URL: https://svnweb.freebsd.org/changeset/ports/537915 Log: MFH: r537638 r537639 Update to 1.41.0 Changes: https://github.com/nghttp2/nghttp2/releases Security: 4bb56d2f-a5b0-11ea-a860-08002728f74c Update to 1.41.0 Changes: https://github.com/nghttp2/nghttp2/releases Security: 4bb56d2f-a5b0-11ea-a860-08002728f74c Approved by: ports-secteam (joneum) Modified: branches/2020Q2/www/libnghttp2/Makefile branches/2020Q2/www/libnghttp2/distinfo branches/2020Q2/www/libnghttp2/pkg-plist branches/2020Q2/www/nghttp2/Makefile branches/2020Q2/www/nghttp2/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/libnghttp2/Makefile ============================================================================== --- branches/2020Q2/www/libnghttp2/Makefile Thu Jun 4 17:56:03 2020 (r537914) +++ branches/2020Q2/www/libnghttp2/Makefile Thu Jun 4 18:05:19 2020 (r537915) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.40.0 +PORTVERSION= 1.41.0 DISTVERSIONPREFIX= v CATEGORIES= www net PKGNAMEPREFIX= lib Modified: branches/2020Q2/www/libnghttp2/distinfo ============================================================================== --- branches/2020Q2/www/libnghttp2/distinfo Thu Jun 4 17:56:03 2020 (r537914) +++ branches/2020Q2/www/libnghttp2/distinfo Thu Jun 4 18:05:19 2020 (r537915) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573888147 -SHA256 (nghttp2-nghttp2-v1.40.0_GH0.tar.gz) = 63de2828bf6a43a501a982140b7ee969b8118f80351a9e43a1432b0979221957 -SIZE (nghttp2-nghttp2-v1.40.0_GH0.tar.gz) = 1749262 +TIMESTAMP = 1591186754 +SHA256 (nghttp2-nghttp2-v1.41.0_GH0.tar.gz) = 3d53e8bd1513a271a45b6ecda2e22fa05e9eb90fa92f7c5daf57b08c6e40cc55 +SIZE (nghttp2-nghttp2-v1.41.0_GH0.tar.gz) = 1754150 Modified: branches/2020Q2/www/libnghttp2/pkg-plist ============================================================================== --- branches/2020Q2/www/libnghttp2/pkg-plist Thu Jun 4 17:56:03 2020 (r537914) +++ branches/2020Q2/www/libnghttp2/pkg-plist Thu Jun 4 18:05:19 2020 (r537915) @@ -3,5 +3,5 @@ include/nghttp2/nghttp2ver.h lib/libnghttp2.a lib/libnghttp2.so lib/libnghttp2.so.14 -lib/libnghttp2.so.14.19.0 +lib/libnghttp2.so.14.20.0 libdata/pkgconfig/libnghttp2.pc Modified: branches/2020Q2/www/nghttp2/Makefile ============================================================================== --- branches/2020Q2/www/nghttp2/Makefile Thu Jun 4 17:56:03 2020 (r537914) +++ branches/2020Q2/www/nghttp2/Makefile Thu Jun 4 18:05:19 2020 (r537915) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.40.0 +PORTVERSION= 1.41.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www net MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2020Q2/www/nghttp2/distinfo ============================================================================== --- branches/2020Q2/www/nghttp2/distinfo Thu Jun 4 17:56:03 2020 (r537914) +++ branches/2020Q2/www/nghttp2/distinfo Thu Jun 4 18:05:19 2020 (r537915) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573888149 -SHA256 (nghttp2-nghttp2-v1.40.0_GH0.tar.gz) = 63de2828bf6a43a501a982140b7ee969b8118f80351a9e43a1432b0979221957 -SIZE (nghttp2-nghttp2-v1.40.0_GH0.tar.gz) = 1749262 +TIMESTAMP = 1591186756 +SHA256 (nghttp2-nghttp2-v1.41.0_GH0.tar.gz) = 3d53e8bd1513a271a45b6ecda2e22fa05e9eb90fa92f7c5daf57b08c6e40cc55 +SIZE (nghttp2-nghttp2-v1.41.0_GH0.tar.gz) = 1754150 From owner-svn-ports-branches@freebsd.org Thu Jun 4 18:07:12 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A9F432B7A6; Thu, 4 Jun 2020 18:07:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dDJH72Tvz4RLJ; Thu, 4 Jun 2020 18:07:11 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC00D23835; Thu, 4 Jun 2020 18:07:11 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054I7Brq076058; Thu, 4 Jun 2020 18:07:11 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054I7BFW076057; Thu, 4 Jun 2020 18:07:11 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202006041807.054I7BFW076057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 4 Jun 2020 18:07:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537916 - branches/2020Q2/www/rubygem-websocket-extensions X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2020Q2/www/rubygem-websocket-extensions X-SVN-Commit-Revision: 537916 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 18:07:12 -0000 Author: sunpoet Date: Thu Jun 4 18:07:11 2020 New Revision: 537916 URL: https://svnweb.freebsd.org/changeset/ports/537916 Log: MFH: r537824 Update to 0.1.5 Changes: https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md Security: ca8327f7-a5a5-11ea-a860-08002728f74c Approved by: ports-secteam (joneum) Modified: branches/2020Q2/www/rubygem-websocket-extensions/Makefile branches/2020Q2/www/rubygem-websocket-extensions/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/rubygem-websocket-extensions/Makefile ============================================================================== --- branches/2020Q2/www/rubygem-websocket-extensions/Makefile Thu Jun 4 18:05:19 2020 (r537915) +++ branches/2020Q2/www/rubygem-websocket-extensions/Makefile Thu Jun 4 18:07:11 2020 (r537916) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= websocket-extensions -PORTVERSION= 0.1.4 +PORTVERSION= 0.1.5 CATEGORIES= www rubygems MASTER_SITES= RG Modified: branches/2020Q2/www/rubygem-websocket-extensions/distinfo ============================================================================== --- branches/2020Q2/www/rubygem-websocket-extensions/distinfo Thu Jun 4 18:05:19 2020 (r537915) +++ branches/2020Q2/www/rubygem-websocket-extensions/distinfo Thu Jun 4 18:07:11 2020 (r537916) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565627634 -SHA256 (rubygem/websocket-extensions-0.1.4.gem) = d53c14130d5648387082181087553f119adbbb476ec8c97cf873dbf02c112602 -SIZE (rubygem/websocket-extensions-0.1.4.gem) = 10752 +TIMESTAMP = 1591187120 +SHA256 (rubygem/websocket-extensions-0.1.5.gem) = 1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241 +SIZE (rubygem/websocket-extensions-0.1.5.gem) = 10752 From owner-svn-ports-branches@freebsd.org Thu Jun 4 23:32:27 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7335233627E; Thu, 4 Jun 2020 23:32:27 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dMWb2WQVz4HGC; Thu, 4 Jun 2020 23:32:27 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51AD627A1D; Thu, 4 Jun 2020 23:32:27 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054NWRPJ088490; Thu, 4 Jun 2020 23:32:27 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054NWQQZ088488; Thu, 4 Jun 2020 23:32:26 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <202006042332.054NWQQZ088488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Thu, 4 Jun 2020 23:32:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537979 - in branches/2020Q2/emulators/qemu40: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: in branches/2020Q2/emulators/qemu40: . files X-SVN-Commit-Revision: 537979 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 23:32:27 -0000 Author: bdragon (src committer) Date: Thu Jun 4 23:32:26 2020 New Revision: 537979 URL: https://svnweb.freebsd.org/changeset/ports/537979 Log: MFH: r537912 emulators/qemu40: Apply upstream fix for cacheline detection on big endian Backport qemu 5ca156cfde0f3821f15988619e51cf3cda99aaa6, which fixes cacheline detection on big-endian to use the correct sized variable to store the sysctl result. Fixes "Assertion failed: ((isize & (isize - 1)) == 0)" on BE platforms. Reviewed by: bofh, pkubaj Approved by: pkubaj Obtained from: qemu Differential Revision: https://reviews.freebsd.org/D23246 Approved by: ports-secteam (joneum) Added: branches/2020Q2/emulators/qemu40/files/patch-util-cacheinfo.c - copied unchanged from r537912, head/emulators/qemu40/files/patch-util-cacheinfo.c Modified: branches/2020Q2/emulators/qemu40/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/qemu40/Makefile ============================================================================== --- branches/2020Q2/emulators/qemu40/Makefile Thu Jun 4 23:31:29 2020 (r537978) +++ branches/2020Q2/emulators/qemu40/Makefile Thu Jun 4 23:32:26 2020 (r537979) @@ -3,6 +3,7 @@ PORTNAME= qemu PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ PKGNAMESUFFIX= 40 Copied: branches/2020Q2/emulators/qemu40/files/patch-util-cacheinfo.c (from r537912, head/emulators/qemu40/files/patch-util-cacheinfo.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/emulators/qemu40/files/patch-util-cacheinfo.c Thu Jun 4 23:32:26 2020 (r537979, copy of r537912, head/emulators/qemu40/files/patch-util-cacheinfo.c) @@ -0,0 +1,41 @@ +--- util/cacheinfo.c.orig 2019-10-17 15:17:44.000000000 -0500 ++++ util/cacheinfo.c 2020-01-17 21:13:29.459470000 -0600 +@@ -65,25 +65,28 @@ static void sys_cache_info(int *isize, int *dsize) + g_free(buf); + } + +-#elif defined(__APPLE__) \ +- || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__APPLE__) + # include +-# if defined(__APPLE__) +-# define SYSCTL_CACHELINE_NAME "hw.cachelinesize" +-# else +-# define SYSCTL_CACHELINE_NAME "machdep.cacheline_size" +-# endif +- + static void sys_cache_info(int *isize, int *dsize) + { + /* There's only a single sysctl for both I/D cache line sizes. */ + long size; + size_t len = sizeof(size); +- if (!sysctlbyname(SYSCTL_CACHELINE_NAME, &size, &len, NULL, 0)) { ++ if (!sysctlbyname("hw.cachelinesize", &size, &len, NULL, 0)) { + *isize = *dsize = size; + } + } +- ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++# include ++static void sys_cache_info(int *isize, int *dsize) ++{ ++ /* There's only a single sysctl for both I/D cache line sizes. */ ++ int size; ++ size_t len = sizeof(size); ++ if (!sysctlbyname("machdep.cacheline_size", &size, &len, NULL, 0)) { ++ *isize = *dsize = size; ++ } ++} + #else + /* POSIX */ + From owner-svn-ports-branches@freebsd.org Thu Jun 4 23:51:53 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A48D336CCD; Thu, 4 Jun 2020 23:51:53 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dMy11GnSz4KtG; Thu, 4 Jun 2020 23:51:53 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26E47278D2; Thu, 4 Jun 2020 23:51:53 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054Npq0J097993; Thu, 4 Jun 2020 23:51:52 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054Npqsj097990; Thu, 4 Jun 2020 23:51:52 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202006042351.054Npqsj097990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Thu, 4 Jun 2020 23:51:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537981 - in branches/2020Q2/www: py-django22 py-django30 X-SVN-Group: ports-branches X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in branches/2020Q2/www: py-django22 py-django30 X-SVN-Commit-Revision: 537981 X-SVN-Commit-Repository: ports 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.33 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, 04 Jun 2020 23:51:53 -0000 Author: wen Date: Thu Jun 4 23:51:51 2020 New Revision: 537981 URL: https://svnweb.freebsd.org/changeset/ports/537981 Log: MFH: r537896 - Update django to 3.0.7 and 2.2.13 - Remove django21 from CONFLICTS_INSTALL Security: CVE-2020-13254, CVE-2020-13596 Approved by: ports-secteam@(joneum@) Modified: branches/2020Q2/www/py-django22/Makefile branches/2020Q2/www/py-django22/distinfo branches/2020Q2/www/py-django30/Makefile branches/2020Q2/www/py-django30/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/py-django22/Makefile ============================================================================== --- branches/2020Q2/www/py-django22/Makefile Thu Jun 4 23:43:25 2020 (r537980) +++ branches/2020Q2/www/py-django22/Makefile Thu Jun 4 23:51:51 2020 (r537981) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 2.2.12 +PORTVERSION= 2.2.13 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ @@ -27,8 +27,7 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django21 \ - ${PYTHON_PKGNAMEPREFIX}django30 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django30 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: branches/2020Q2/www/py-django22/distinfo ============================================================================== --- branches/2020Q2/www/py-django22/distinfo Thu Jun 4 23:43:25 2020 (r537980) +++ branches/2020Q2/www/py-django22/distinfo Thu Jun 4 23:51:51 2020 (r537981) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585742383 -SHA256 (python/Django-2.2.12.tar.gz) = 69897097095f336d5aeef45b4103dceae51c00afa6d3ae198a2a18e519791b7a -SIZE (python/Django-2.2.12.tar.gz) = 8877061 +TIMESTAMP = 1591277467 +SHA256 (python/Django-2.2.13.tar.gz) = 84f370f6acedbe1f3c41e1a02de44ac206efda3355e427139ecb785b5f596d80 +SIZE (python/Django-2.2.13.tar.gz) = 8879757 Modified: branches/2020Q2/www/py-django30/Makefile ============================================================================== --- branches/2020Q2/www/py-django30/Makefile Thu Jun 4 23:43:25 2020 (r537980) +++ branches/2020Q2/www/py-django30/Makefile Thu Jun 4 23:51:51 2020 (r537981) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 3.0.5 +PORTVERSION= 3.0.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ @@ -28,8 +28,7 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django21 \ - ${PYTHON_PKGNAMEPREFIX}django22 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django22 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: branches/2020Q2/www/py-django30/distinfo ============================================================================== --- branches/2020Q2/www/py-django30/distinfo Thu Jun 4 23:43:25 2020 (r537980) +++ branches/2020Q2/www/py-django30/distinfo Thu Jun 4 23:51:51 2020 (r537981) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585742194 -SHA256 (python/Django-3.0.5.tar.gz) = d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1 -SIZE (python/Django-3.0.5.tar.gz) = 8943850 +TIMESTAMP = 1591275689 +SHA256 (python/Django-3.0.7.tar.gz) = 5052b34b34b3425233c682e0e11d658fd6efd587d11335a0203d827224ada8f2 +SIZE (python/Django-3.0.7.tar.gz) = 8947502 From owner-svn-ports-branches@freebsd.org Fri Jun 5 13:12:55 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37C5032AA78; Fri, 5 Jun 2020 13:12:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49djkH0p4fz3WlW; Fri, 5 Jun 2020 13:12:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16A8911538; Fri, 5 Jun 2020 13:12:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055DCsEQ096470; Fri, 5 Jun 2020 13:12:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055DCsRc096469; Fri, 5 Jun 2020 13:12:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006051312.055DCsRc096469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 5 Jun 2020 13:12:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538017 - branches/2020Q2/sysutils/zfsnap2 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/sysutils/zfsnap2 X-SVN-Commit-Revision: 538017 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 13:12:55 -0000 Author: jbeich Date: Fri Jun 5 13:12:54 2020 New Revision: 538017 URL: https://svnweb.freebsd.org/changeset/ports/538017 Log: MFH: r538016 sysutils/zfsnap2: fix ZSH symlink compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_zfsnap PR: 240628 Submitted by: Christopher Hall Approved by: maintainer timeout (9 months) Approved by: ports-secteam blanket (runtime fix) Modified: branches/2020Q2/sysutils/zfsnap2/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/zfsnap2/Makefile ============================================================================== --- branches/2020Q2/sysutils/zfsnap2/Makefile Fri Jun 5 13:11:24 2020 (r538016) +++ branches/2020Q2/sysutils/zfsnap2/Makefile Fri Jun 5 13:12:54 2020 (r538017) @@ -4,7 +4,7 @@ PORTNAME= zfsnap DISTVERSIONPREFIX= v DISTVERSION= 2.0.0-beta3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= 2 @@ -44,7 +44,7 @@ post-install-BASH-on: post-install-ZSH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${LN} -s ../../share/zfsnap/completion/zfsnap-completion.zsh \ + ${LN} -s ../../zfsnap/completion/zfsnap-completion.zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_zfsnap .include From owner-svn-ports-branches@freebsd.org Sat Jun 6 16:47:58 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E848D3390A5; Sat, 6 Jun 2020 16:47:58 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49fQRy5wzXz4L6J; Sat, 6 Jun 2020 16:47:58 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6E2A25329; Sat, 6 Jun 2020 16:47:58 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056Glw93024335; Sat, 6 Jun 2020 16:47:58 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056GlwrW024334; Sat, 6 Jun 2020 16:47:58 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202006061647.056GlwrW024334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sat, 6 Jun 2020 16:47:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538111 - branches/2020Q2/net-mgmt/zabbix4-server X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2020Q2/net-mgmt/zabbix4-server X-SVN-Commit-Revision: 538111 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 16:47:59 -0000 Author: dbaio Date: Sat Jun 6 16:47:58 2020 New Revision: 538111 URL: https://svnweb.freebsd.org/changeset/ports/538111 Log: MFH: r538108 net-mgmt/zabbix4-*: Update to 4.0.21 Changelog: https://www.zabbix.com/rn/rn4.0.21 PR: 246749 Submitted by: Pakhom Golynga (maintainer) Approved by: ports-secteam (blanket, bugfix release) Modified: branches/2020Q2/net-mgmt/zabbix4-server/Makefile branches/2020Q2/net-mgmt/zabbix4-server/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/net-mgmt/zabbix4-server/Makefile ============================================================================== --- branches/2020Q2/net-mgmt/zabbix4-server/Makefile Sat Jun 6 16:45:44 2020 (r538110) +++ branches/2020Q2/net-mgmt/zabbix4-server/Makefile Sat Jun 6 16:47:58 2020 (r538111) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix4 -PORTVERSION= 4.0.20 +PORTVERSION= 4.0.21 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ Modified: branches/2020Q2/net-mgmt/zabbix4-server/distinfo ============================================================================== --- branches/2020Q2/net-mgmt/zabbix4-server/distinfo Sat Jun 6 16:45:44 2020 (r538110) +++ branches/2020Q2/net-mgmt/zabbix4-server/distinfo Sat Jun 6 16:47:58 2020 (r538111) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589899035 -SHA256 (zabbix-4.0.20.tar.gz) = 7c401f2cbe0b76882b1a65f7de82422ac39e544039f6cf6ab5b1b85c23e9d840 -SIZE (zabbix-4.0.20.tar.gz) = 17215217 +TIMESTAMP = 1591446454 +SHA256 (zabbix-4.0.21.tar.gz) = 5809fd716b8dce4c5f53df256d768d2f4a1aa6f1b49b7e81ed8aa14402061e6a +SIZE (zabbix-4.0.21.tar.gz) = 17300931 From owner-svn-ports-branches@freebsd.org Sat Jun 6 23:10:05 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D635340C92; Sat, 6 Jun 2020 23:10:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49fZws0q5lz47Ml; Sat, 6 Jun 2020 23:10:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17218987C; Sat, 6 Jun 2020 23:10:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 056NA484060302; Sat, 6 Jun 2020 23:10:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 056NA4sD060301; Sat, 6 Jun 2020 23:10:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006062310.056NA4sD060301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 6 Jun 2020 23:10:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538137 - branches/2020Q2/emulators/ppsspp X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/ppsspp X-SVN-Commit-Revision: 538137 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 23:10:05 -0000 Author: jbeich Date: Sat Jun 6 23:10:04 2020 New Revision: 538137 URL: https://svnweb.freebsd.org/changeset/ports/538137 Log: MFH: r538136 emulators/ppsspp: unbreak Vulkan on Wayland after r512863 Regressed by https://github.com/hrydgard/ppsspp/commit/3e4faea6adcb $ SDL_VIDEODRIVER=wayland LD_PRELOAD=libGLEW-wayland.so ppsspp [...] I: VulkanLoader.cpp:451: VulkanLoad: Found library 'libvulkan.so' W: VulkanLoader.cpp:472: VulkanLoad: Base functions loaded. W: VulkanLoader.cpp:548: Vulkan instance functions loaded. I: VulkanContext.cpp:502: Chose physical device 0: 0x8056427c0 I: VulkanContext.cpp:538: Memory Types (1): I: VulkanContext.cpp:547: 0: Heap 0; Flags: DEVICE_LOCAL HOST_VISIBLE HOST_CACHED HOST_COHERENT W: VulkanLoader.cpp:555: Vulkan device functions loaded. I: VulkanLoader.cpp:571: Missing (device): vkGetPhysicalDeviceSparseImageFormatProperties I: VulkanContext.cpp:659: Device created. Vulkan subsystem 6 not supported Approved by: ports-secteam blanket Modified: branches/2020Q2/emulators/ppsspp/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/ppsspp/Makefile ============================================================================== --- branches/2020Q2/emulators/ppsspp/Makefile Sat Jun 6 23:07:59 2020 (r538136) +++ branches/2020Q2/emulators/ppsspp/Makefile Sat Jun 6 23:10:04 2020 (r538137) @@ -3,7 +3,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.9.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage @@ -39,7 +39,7 @@ EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu USE_SDL= sdl2 # joystick -CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP +CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_WAYLAND_WSI CMAKE_OFF= USE_DISCORD SUB_FILES= pkg-message PORTDATA= assets ${PORTNAME}