From owner-svn-ports-branches@freebsd.org Thu Dec 3 20:41: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 90D7A4AF38D; Thu, 3 Dec 2020 20:41:53 +0000 (UTC) (envelope-from zeising@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 4Cn76n3bZ0z4jdJ; Thu, 3 Dec 2020 20:41:53 +0000 (UTC) (envelope-from zeising@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 6384E1F733; Thu, 3 Dec 2020 20:41:53 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B3Kfrr0043827; Thu, 3 Dec 2020 20:41:53 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B3KfqNg043824; Thu, 3 Dec 2020 20:41:52 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202012032041.0B3KfqNg043824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 3 Dec 2020 20:41:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r556923 - in branches/2020Q4/x11-servers: xorg-server xwayland X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2020Q4/x11-servers: xorg-server xwayland X-SVN-Commit-Revision: 556923 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.34 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, 03 Dec 2020 20:41:53 -0000 Author: zeising Date: Thu Dec 3 20:41:52 2020 New Revision: 556923 URL: https://svnweb.freebsd.org/changeset/ports/556923 Log: MFH: r556790 xorg-server: Add patches to fix security issues Patch xorg-server (and sub ports) to fix recently discovered security isses: CVE-2020-14360 and CVE-2020-25712. These issues can lead to privileges elevations for authorized clients on systems where the X server is running privileged. Tested by: adridg, tcberner, mikael Security: 76c8b690-340b-11eb-a2b7-54e1ad3d6335 Approved by: ports-secteam (joenum) Modified: branches/2020Q4/x11-servers/xorg-server/Makefile branches/2020Q4/x11-servers/xorg-server/distinfo branches/2020Q4/x11-servers/xwayland/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2020Q4/x11-servers/xorg-server/Makefile Thu Dec 3 20:41:49 2020 (r556922) +++ branches/2020Q4/x11-servers/xorg-server/Makefile Thu Dec 3 20:41:52 2020 (r556923) @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.9 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -11,6 +11,10 @@ DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs + +PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/-/commit/ +PATCHFILES+= 06d1a032ee491547f7037c3ff042065dc2aeaa99.diff:-p1 +PATCHFILES+= 7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff:-p1 LICENSE= MIT Modified: branches/2020Q4/x11-servers/xorg-server/distinfo ============================================================================== --- branches/2020Q4/x11-servers/xorg-server/distinfo Thu Dec 3 20:41:49 2020 (r556922) +++ branches/2020Q4/x11-servers/xorg-server/distinfo Thu Dec 3 20:41:52 2020 (r556923) @@ -1,3 +1,7 @@ -TIMESTAMP = 1598382481 +TIMESTAMP = 1606845198 SHA256 (xorg/xserver/xorg-server-1.20.9.tar.bz2) = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 SIZE (xorg/xserver/xorg-server-1.20.9.tar.bz2) = 6302902 +SHA256 (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 2e0f1027e56e1512f659dc5cc48400de9bea722e516b05498a7c6a4130f09f55 +SIZE (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 3867 +SHA256 (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 5f0996f07af30d6d55713def544aa4b3280909ed91a36cd495ca2ace517b328b +SIZE (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 3606 Modified: branches/2020Q4/x11-servers/xwayland/Makefile ============================================================================== --- branches/2020Q4/x11-servers/xwayland/Makefile Thu Dec 3 20:41:49 2020 (r556922) +++ branches/2020Q4/x11-servers/xwayland/Makefile Thu Dec 3 20:41:52 2020 (r556923) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xwayland -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= X Clients under Wayland