Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Aug 2020 14:24:02 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r543913 - in branches/2020Q3: x11-servers/xorg-server x11/libX11
Message-ID:  <202008011424.071EO2bD036168@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Sat Aug  1 14:24:01 2020
New Revision: 543913
URL: https://svnweb.freebsd.org/changeset/ports/543913

Log:
  MFH: r543911 r543912
  
  x11-servers/xorg-server: Fix CVE-2020-14347
  
  Add upstream patch to fix CVE-2020-14347, Pixel Data Uninitialized Memory
  Information Disclosure.
  Announcement:
  https://lists.x.org/archives/xorg-announce/2020-July/003051.html
  
  PR:		248410 (based on)
  Submitted by:	VVD
  Security:	3c7ba82a-d3fb-11ea-9aba-0c9d925bbbc0
  
  x11/libX11: Fix CVE-2020-14347
  
  Add upstream patches to x11/libX11 to fix Heap corruption in the X input
  method client in libX11.
  Announcement:
  https://lists.x.org/archives/xorg-announce/2020-July/003050.html
  
  PR:		248409 (based on)
  Submitted by:	VVD
  Security:	6faa7feb-d3fa-11ea-9aba-0c9d925bbbc0
  
  Approved by:	ports-secteam (implicit, security update)

Modified:
  branches/2020Q3/x11-servers/xorg-server/Makefile
  branches/2020Q3/x11-servers/xorg-server/distinfo
  branches/2020Q3/x11/libX11/Makefile
  branches/2020Q3/x11/libX11/distinfo
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/x11-servers/xorg-server/Makefile
==============================================================================
--- branches/2020Q3/x11-servers/xorg-server/Makefile	Sat Aug  1 14:21:21 2020	(r543912)
+++ branches/2020Q3/x11-servers/xorg-server/Makefile	Sat Aug  1 14:24:01 2020	(r543913)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.20.8
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -14,6 +14,7 @@ COMMENT?=	X.Org X server and related programs
 
 PATCH_SITES=	https://gitlab.freedesktop.org/xorg/xserver/-/commit/
 PATCHFILES=	271934db9f3b1297754b29855646e0a4ee01db59.diff:-p1
+PATCHFILES+=	aac28e162e5108510065ad4c323affd6deffd816.diff:-p1
 
 LICENSE=	MIT
 

Modified: branches/2020Q3/x11-servers/xorg-server/distinfo
==============================================================================
--- branches/2020Q3/x11-servers/xorg-server/distinfo	Sat Aug  1 14:21:21 2020	(r543912)
+++ branches/2020Q3/x11-servers/xorg-server/distinfo	Sat Aug  1 14:24:01 2020	(r543913)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1588512348
+TIMESTAMP = 1596289918
 SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146
 SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640
 SHA256 (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = b29a3af8f6d93a5b6e1d4652fca0a76e438884dee8caf03f89148fbc47c98f71
 SIZE (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = 1262
+SHA256 (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = c1713942583adc12f77a381ed2ee8907ca0d189e08f6a1730948b51744d2f764
+SIZE (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = 520

Modified: branches/2020Q3/x11/libX11/Makefile
==============================================================================
--- branches/2020Q3/x11/libX11/Makefile	Sat Aug  1 14:21:21 2020	(r543912)
+++ branches/2020Q3/x11/libX11/Makefile	Sat Aug  1 14:24:01 2020	(r543913)
@@ -3,12 +3,19 @@
 
 PORTNAME=	libX11
 PORTVERSION=	1.6.9
-PORTREVISION=	1
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 library
+
+PATCH_SITES=	https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/
+PATCHFILES=	0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff:-p1
+PATCHFILES+=	388b303c62aa35a245f1704211a023440ad2c488.diff:-p1
+PATCHFILES+=	2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff:-p1
+PATCHFILES+=	1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff:-p1
+PATCHFILES+=	1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff:-p1
 
 LICENSE=	MIT
 

Modified: branches/2020Q3/x11/libX11/distinfo
==============================================================================
--- branches/2020Q3/x11/libX11/distinfo	Sat Aug  1 14:21:21 2020	(r543912)
+++ branches/2020Q3/x11/libX11/distinfo	Sat Aug  1 14:24:01 2020	(r543913)
@@ -1,3 +1,13 @@
-TIMESTAMP = 1571332179
+TIMESTAMP = 1596290430
 SHA256 (xorg/lib/libX11-1.6.9.tar.bz2) = 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 SIZE (xorg/lib/libX11-1.6.9.tar.bz2) = 2283814
+SHA256 (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 9ad45b12018b914a03db18773d6a98bada3b0bcdae652b32a6015d85ed2abb1f
+SIZE (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 1638
+SHA256 (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 94132d3b1b3fa43c6e8a6c1ae465b4565eef6e3f0b50e94351b8f40d17bbc1c7
+SIZE (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 1917
+SHA256 (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 71ac3ec3e27a48a2d08ad11a3f3654dd0452e51c2ee3f21a16a7ddeb041f85bb
+SIZE (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 854
+SHA256 (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 1a85e3b4bd56248be5a5a373dda6f3985af60de8b8d784db1406a583d1a24091
+SIZE (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 4297
+SHA256 (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 8b002aa51e1eb0ac7d435e078c9104ce47f1327bffa29e5bece93af8b4cdd27f
+SIZE (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 443



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008011424.071EO2bD036168>