aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-08-01 14:24:01 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-08-01 14:24:01 +0000
commit13e315b5101754db4ae6df1f4991efff973e6952 (patch)
treecfbc0da355cc00653f16b8fa77eddfb25c20e900 /x11-servers
parent9bb0ae454b3058cc27f29418d6ef5f576da9d71c (diff)
downloadports-13e315b5101754db4ae6df1f4991efff973e6952.tar.gz
ports-13e315b5101754db4ae6df1f4991efff973e6952.zip
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)
Notes
Notes: svn path=/branches/2020Q3/; revision=543913
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile3
-rw-r--r--x11-servers/xorg-server/distinfo4
2 files changed, 5 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 86f0a80dcaf1..28800ef19008 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -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
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index f0d858b04ac2..5182468c8711 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -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