svn commit: r556790 - in head/x11-servers: xorg-server xwayland

[Niclas Zeising]

Author: zeising
Date: Tue Dec  1 19:48:10 2020
New Revision: 556790
URL: https://svnweb.freebsd.org/changeset/ports/556790

Log:
  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
  MFH:		2020Q4
  Security:	76c8b690-340b-11eb-a2b7-54e1ad3d6335

Modified:
  head/x11-servers/xorg-server/Makefile
  head/x11-servers/xorg-server/distinfo
  head/x11-servers/xwayland/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Tue Dec  1 19:43:59 2020	(r556789)
+++ head/x11-servers/xorg-server/Makefile	Tue Dec  1 19:48:10 2020	(r556790)
@@ -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 at 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: head/x11-servers/xorg-server/distinfo
==============================================================================
--- head/x11-servers/xorg-server/distinfo	Tue Dec  1 19:43:59 2020	(r556789)
+++ head/x11-servers/xorg-server/distinfo	Tue Dec  1 19:48:10 2020	(r556790)
@@ -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: head/x11-servers/xwayland/Makefile
==============================================================================
--- head/x11-servers/xwayland/Makefile	Tue Dec  1 19:43:59 2020	(r556789)
+++ head/x11-servers/xwayland/Makefile	Tue Dec  1 19:48:10 2020	(r556790)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	X Clients under Wayland