xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 .gitlab-ci.yml  |    2 +-
 Xext/security.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit aec722db36a3e0b588aa6a27d8f77d10b6c92b27
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Jul 23 09:00:15 2024 +0200

    ci: enable building security extension
    
    Since we already had incident where a break in security extension went to
    master unnoticed, it's better to enable it in CI build.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1617>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc5f6c553..a2926d6d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,7 @@ debian-bullseye:
             - $MESON_BUILDDIR/meson-logs/
             - $MESON_BUILDDIR/test/piglit-results/
     variables:
-        MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true
+        MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true -Dxcsecurity=true
         CCACHE_COMPILERCHECK: content
         CCACHE_DIR: /cache/xserver/cache
         LC_ALL: C.UTF-8
commit 37e65497e411770bc070ffa493bd757c325b76f0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Jul 23 08:58:15 2024 +0200

    Xext: security: fix missing include of extinit_priv.h
    
    Fix a warning on missing prototype due missing include of extinit_priv.h
    
    Fixes: 33350ef8 - include: move private definitions out of extinit.h
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1617>

diff --git a/Xext/security.c b/Xext/security.c
index c75b50d1c..426dc8601 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
+#include "include/extinit_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
 
commit f94e28089662eb2d52e5c092cedc2d66ffa7372e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Jul 23 08:53:57 2024 +0200

    Xext: fix missing include of <X11/Xmd.h>
    
    Including <X11/extensions/securproto.h> depends on <X11/Xmd.h> has been
    included before.
    
    Bug: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1719
    Fixes: b30edf32 - fix missing includes of <X11/Xfuncproto.h>
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1617>

diff --git a/Xext/security.c b/Xext/security.c
index 4ea3f1c4d..c75b50d1c 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <X11/Xmd.h>
 #include <X11/extensions/securproto.h>
 #include <X11/Xfuncproto.h>