From owner-dev-commits-ports-branches@freebsd.org Mon May 31 21:54:44 2021 Return-Path: Delivered-To: dev-commits-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 C326C63130E; Mon, 31 May 2021 21:54:44 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fv8GD53qJz3JLR; Mon, 31 May 2021 21:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95B221801C; Mon, 31 May 2021 21:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14VLsinC046475; Mon, 31 May 2021 21:54:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14VLsiLh046474; Mon, 31 May 2021 21:54:44 GMT (envelope-from git) Date: Mon, 31 May 2021 21:54:44 GMT Message-Id: <202105312154.14VLsiLh046474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adriaan de Groot Subject: git: 07b0f0396052 - 2021Q2 - graphics/wayland: merge upstream fix for CVE-2013-2003 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 07b0f03960528e9f5be1a9fd985650a32c579e0a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 21:54:44 -0000 The branch 2021Q2 has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=07b0f03960528e9f5be1a9fd985650a32c579e0a commit 07b0f03960528e9f5be1a9fd985650a32c579e0a Author: Adriaan de Groot AuthorDate: 2021-05-31 19:59:06 +0000 Commit: Adriaan de Groot CommitDate: 2021-05-31 21:54:42 +0000 graphics/wayland: merge upstream fix for CVE-2013-2003 This is upstream MR 133, https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/133 which in turn is a Wayland-ified version of the fix to libXcursor. PR: 256273 Reported by: Evgeniy Khramtsov Approved by: zeising (x11) (cherry picked from commit 6431a5d2419ada906a7927c7b85e5f98bcd6eba2) --- graphics/wayland/Makefile | 4 ++++ graphics/wayland/distinfo | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile index adaf4cc8f1fa..521b769eb7c1 100644 --- a/graphics/wayland/Makefile +++ b/graphics/wayland/Makefile @@ -2,9 +2,13 @@ PORTNAME= wayland PORTVERSION= 1.19.0 +PORTREVISION= 1 CATEGORIES= graphics wayland MASTER_SITES= https://wayland.freedesktop.org/releases/ +PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES+= ed55438366e93d70867e3ba6b80978673e536fc0.patch:-p1 # MR 133 + MAINTAINER= x11@FreeBSD.org COMMENT= Wayland composite "server" diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo index 881ce9b87cb6..7e14bd29b092 100644 --- a/graphics/wayland/distinfo +++ b/graphics/wayland/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1611766143 +TIMESTAMP = 1622412504 SHA256 (wayland-1.19.0.tar.xz) = baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 SIZE (wayland-1.19.0.tar.xz) = 456380 +SHA256 (ed55438366e93d70867e3ba6b80978673e536fc0.patch) = cdf90fc3ec9455aad348a5251842f9035484fb49a7d10fd4930192002308c6ea +SIZE (ed55438366e93d70867e3ba6b80978673e536fc0.patch) = 927