<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c05fac4d484457badb5cb0615f590374bb0dbcb1">https://github.com/macports/macports-ports/commit/c05fac4d484457badb5cb0615f590374bb0dbcb1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c05fac4d484 xorg-server: update to 1.20.9
</span>c05fac4d484 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c05fac4d484457badb5cb0615f590374bb0dbcb1
</span>Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
AuthorDate: Tue Aug 25 18:53:41 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> xorg-server: update to 1.20.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes multiple CVEs: https://lists.x.org/archives/xorg-announce/2020-August/003058.html
</span>---
x11/xorg-server/Portfile | 11 ++--
...k-around-an-issue-that-can-occur-on-macOS.patch | 59 ----------------------
x11/xorg-server/files/CVE-2020-14347.diff | 12 -----
3 files changed, 5 insertions(+), 77 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a531b471e6..452059ad781 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-server
conflicts xorg-server-devel xorg-server-1.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.20.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11 devel
license X11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ master_sites https://xorg.freedesktop.org/archive/individual/xserver/
</span>
distname xorg-server-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 74f2a5ab7b482d2aded54fd412e9c0d673f270ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6309640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6302902
</span>
use_bzip2 yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,6 @@ configure.env-append \
</span> RAWCPP=${configure.cpp}
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CVE-2020-14347.diff \
</span> 0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
0001-xquartz-Add-stub-ddxInputThread.patch \
0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch b/x11/xorg-server/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 16d0ea63efb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7c2f104ace0bfdc033145db478f17111fedaa432 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 18 Jul 2017 21:35:49 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] XQuartz: Hack around an issue that can occur on macOS due to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- background apps incorrectly stealing focus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Works around <rdar://problem/7150340>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hw/xquartz/X11Application.m | 29 ++++++++++++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 24 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 768eecf68..821e1c5a1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -275,13 +275,32 @@ message_kit_thread(SEL selector, NSObject *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_x_active) [self activateX:NO];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ([self modalWindow] == nil) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Must be an X window. Tell appkit it doesn't have focus. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Must be an X window. Tell appkit windows to resign main/key */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for_appkit = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([self isActive]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self deactivate];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!_x_active && quartzProcs->IsX11Window([e windowNumber])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([self respondsToSelector:@selector(_setKeyWindow:)] && [self respondsToSelector:@selector(_setMainWindow:)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSWindow *keyWindow = [self keyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (keyWindow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self _setKeyWindow:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [keyWindow resignKeyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSWindow *mainWindow = [self mainWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mainWindow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self _setMainWindow:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [mainWindow resignMainWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* This has a side effect of causing background apps to steal focus from XQuartz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Unfortunately, there is no public and stable API to do what we want, but this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * is a decent fallback in the off chance that the above selectors get dropped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * in the future.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self deactivate];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/CVE-2020-14347.diff b/x11/xorg-server/files/CVE-2020-14347.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7adec3a16e7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/CVE-2020-14347.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/dix/pixmap.c b/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1186d7dbb..5a0146bbb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/dix/pixmap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NullPixmap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pPixmap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NullPixmap;
</span></pre><pre style='margin:0'>
</pre>