[packages/xorg-xserver-server] up to 21.1.22 (multiple security fixes)

[atler]

commit 95a5e8cd629fcf88d04983c11fb895d22c701a8f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Apr 14 17:13:30 2026 +0200

    up to 21.1.22 (multiple security fixes)
    
    CVE-2026-33999
    CVE-2026-34000
    CVE-2026-34001
    CVE-2026-34002
    CVE-2026-34003

 xorg-xserver-server-builtin-SHA1.patch | 9 +++++++--
 xorg-xserver-server.spec               | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index e8376bb..1cdc281 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -35,12 +35,12 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	21.1.21
+Version:	21.1.22
 Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.xz
-# Source0-md5:	95c0a1c7869eebcd1ad6176f2cc9094e
+# Source0-md5:	41e2be04926974403dfb99f04827440b
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
diff --git a/xorg-xserver-server-builtin-SHA1.patch b/xorg-xserver-server-builtin-SHA1.patch
index be0a404..44b7ebe 100644
--- a/xorg-xserver-server-builtin-SHA1.patch
+++ b/xorg-xserver-server-builtin-SHA1.patch
@@ -188,7 +188,7 @@ diff -urN xorg-server-1.17.0.org/os/Makefile.am xorg-server-1.17.0/os/Makefile.a
 diff -urN xorg-server-1.17.0.org/os/xsha1.c xorg-server-1.17.0/os/xsha1.c
 --- xorg-server-1.17.0.org/os/xsha1.c	2015-01-18 00:42:52.000000000 +0100
 +++ xorg-server-1.17.0/os/xsha1.c	2015-02-04 19:34:23.455234679 +0100
-@@ -23,326 +23,3 @@
+@@ -23,331 +23,3 @@
   * DEALINGS IN THE SOFTWARE.
   */
  
@@ -321,7 +321,8 @@ diff -urN xorg-server-1.17.0.org/os/xsha1.c xorg-server-1.17.0/os/xsha1.c
 -
 -#elif defined(HAVE_SHA1_IN_LIBNETTLE)   /* Use libnettle for SHA1 */
 -
--#include <nettle/sha.h>
+-#include <nettle/sha1.h>
+-#include <nettle/version.h>
 -
 -void *
 -x_sha1_init(void)
@@ -344,7 +345,11 @@ diff -urN xorg-server-1.17.0.org/os/xsha1.c xorg-server-1.17.0/os/xsha1.c
 -int
 -x_sha1_final(void *ctx, unsigned char result[20])
 -{
+-#if NETTLE_VERSION_MAJOR < 4
 -    sha1_digest(ctx, 20, result);
+-#else
+-    sha1_digest(ctx, result);
+-#endif
 -    free(ctx);
 -    return 1;
 -}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/95a5e8cd629fcf88d04983c11fb895d22c701a8f