diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-12-01 19:48:10 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-12-01 19:48:10 +0000 |
| commit | 21256cd6f475070e399b1555d62a2888d02eb3c8 (patch) | |
| tree | 9e558a90b8b0de2a457050e5efb47ad8199a5942 /x11-servers | |
| parent | d54ac71b2f6d11a2e189e1bca7742d38320b444d (diff) | |
| download | ports-21256cd6f475070e399b1555d62a2888d02eb3c8.tar.gz ports-21256cd6f475070e399b1555d62a2888d02eb3c8.zip | |
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
Notes
Notes:
svn path=/head/; revision=556790
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/xorg-server/distinfo | 6 | ||||
| -rw-r--r-- | x11-servers/xwayland/Makefile | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 7cb8eb70e2a4..54dac30b4d89 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -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 @@ -12,6 +12,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 RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 6ced2d949d51..9e9fae901e26 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -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 diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index b31c431f581e..33266f967e7f 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xwayland -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= X Clients under Wayland |