From 949e4e4fa0b813b094f5c1744368f5c15e216426 Mon Sep 17 00:00:00 2001 From: Collin Date: Thu, 26 Jun 2025 22:24:51 -0500 Subject: [PATCH 1/3] Update build-xserver.yml to have correct permissions to resolve CodeQL alert https://github.com/HaplessIdiot/xserver/security/code-scanning/16 Adds permissions to build in read only to support ubuntu package standards. --- .github/workflows/build-xserver.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml index 417db1bfd..d86ebb379 100644 --- a/.github/workflows/build-xserver.yml +++ b/.github/workflows/build-xserver.yml @@ -1,5 +1,8 @@ name: Build X servers +permissions: + contents: read + env: MESON_BUILDDIR: "build" X11_PREFIX: /home/runner/x11 From d441e4783ee7ad8f9e81e9ad7d332eadc98391b3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 30 Jun 2025 12:37:35 +0200 Subject: [PATCH 2/3] .github: 01-bug-report: use 25.0.0.X instead of listing all minor releases Listing all patchlevels in the ticket form would quickly explode it. Users are expected to always run the latest patchlevel (4th digit), because they're only receiving urgent bug and security fixes, not getting anything new, that could break other things. Signed-off-by: Enrico Weigelt, metux IT consult --- .github/ISSUE_TEMPLATE/01-bug-report.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml index 890e9568e..2f9159f78 100644 --- a/.github/ISSUE_TEMPLATE/01-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml @@ -14,8 +14,7 @@ body: attributes: label: Select the version options: - - 25.0.0.0 - - 25.0.0.1 + - 25.0.0.X - Git master branch - other or don't know default: 1 From d08631bef1f4d4d8617e19af7b5c579f45b91686 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 30 Jun 2025 12:44:10 +0200 Subject: [PATCH 3/3] minor release 25.0.0.2 minor bugfix release. Signed-off-by: Enrico Weigelt, metux IT consult --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 2a5500635..433bfaf8a 100644 --- a/meson.build +++ b/meson.build @@ -3,10 +3,10 @@ project('xserver', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '25.0.0.1', + version: '25.0.0.2', meson_version: '>= 0.58.0', ) -release_date = '2025-06-21' +release_date = '2025-06-30' add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) cc = meson.get_compiler('c')