diff --git a/u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch b/u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch index c631aa3..46326ca 100644 --- a/u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch +++ b/u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch @@ -24,11 +24,11 @@ Reviewed-by: Stefan Dirsch os/auth.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 141 insertions(+), 7 deletions(-) -Index: xorg-server-1.20.5/configure.ac +Index: xorg-server-21.1.9/configure.ac =================================================================== ---- xorg-server-1.20.5.orig/configure.ac -+++ xorg-server-1.20.5/configure.ac -@@ -134,7 +134,7 @@ AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [ +--- xorg-server-21.1.9.orig/configure.ac ++++ xorg-server-21.1.9/configure.ac +@@ -132,7 +132,7 @@ AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [ AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h \ @@ -37,20 +37,11 @@ Index: xorg-server-1.20.5/configure.ac dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -@@ -166,7 +166,7 @@ AC_REPLACE_FUNCS([reallocarray strcasecm - AM_CONDITIONAL(POLL, [test "x$ac_cv_func_poll" = "xyes"]) - - AC_CHECK_LIB([bsd], [arc4random_buf]) --AC_CHECK_FUNCS([arc4random_buf]) -+AC_CHECK_FUNCS([arc4random_buf getentropy]) - - AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include ]]) - -Index: xorg-server-1.20.5/include/dix-config.h.in +Index: xorg-server-21.1.9/include/dix-config.h.in =================================================================== ---- xorg-server-1.20.5.orig/include/dix-config.h.in -+++ xorg-server-1.20.5/include/dix-config.h.in -@@ -155,6 +155,9 @@ +--- xorg-server-21.1.9.orig/include/dix-config.h.in ++++ xorg-server-21.1.9/include/dix-config.h.in +@@ -149,6 +149,9 @@ /* Define to 1 if you have the `arc4random_buf' function. */ #undef HAVE_ARC4RANDOM_BUF @@ -60,7 +51,7 @@ Index: xorg-server-1.20.5/include/dix-config.h.in /* Define to use libc SHA1 functions */ #undef HAVE_SHA1_IN_LIBC -@@ -232,6 +235,9 @@ +@@ -226,6 +229,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_UTSNAME_H @@ -70,22 +61,22 @@ Index: xorg-server-1.20.5/include/dix-config.h.in /* Define to 1 if you have the `timingsafe_memcmp' function. */ #undef HAVE_TIMINGSAFE_MEMCMP -Index: xorg-server-1.20.5/os/auth.c +Index: xorg-server-21.1.9/os/auth.c =================================================================== ---- xorg-server-1.20.5.orig/os/auth.c -+++ xorg-server-1.20.5/os/auth.c -@@ -49,6 +49,10 @@ from The Open Group. - #ifdef HAVE_LIBBSD - #include /* for arc4random_buf() */ +--- xorg-server-21.1.9.orig/os/auth.c ++++ xorg-server-21.1.9/os/auth.c +@@ -34,6 +34,10 @@ from The Open Group. + #ifdef HAVE_DIX_CONFIG_H + #include #endif +#include +#ifdef HAVE_SYS_SYSCALL_H +#include +#endif - struct protocol { - unsigned short name_length; -@@ -310,16 +314,140 @@ GenerateAuthorization(unsigned name_leng + #include + #include +@@ -308,16 +312,140 @@ GenerateAuthorization(unsigned name_leng #endif /* XCSECURITY */ diff --git a/xorg-server-21.1.8.tar.xz b/xorg-server-21.1.8.tar.xz deleted file mode 100644 index 48d79b4..0000000 --- a/xorg-server-21.1.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 -size 4980208 diff --git a/xorg-server-21.1.8.tar.xz.sig b/xorg-server-21.1.8.tar.xz.sig deleted file mode 100644 index 6161a16..0000000 Binary files a/xorg-server-21.1.8.tar.xz.sig and /dev/null differ diff --git a/xorg-server-21.1.9.tar.xz b/xorg-server-21.1.9.tar.xz new file mode 100644 index 0000000..4fb2f17 --- /dev/null +++ b/xorg-server-21.1.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a +size 4935860 diff --git a/xorg-server-21.1.9.tar.xz.sig b/xorg-server-21.1.9.tar.xz.sig new file mode 100644 index 0000000..2311151 Binary files /dev/null and b/xorg-server-21.1.9.tar.xz.sig differ diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 41f0733..9072a33 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Oct 25 11:05:06 UTC 2023 - Stefan Dirsch + +- Update to version 21.1.9 + * This release contains fixes for CVE-2023-5367 and CVE-2023-5380 as + reported in today's security advisory: + https://lists.x.org/archives/xorg-announce/2023-October/003430.html +- adjusted u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch + ------------------------------------------------------------------- Sat Apr 1 13:42:37 UTC 2023 - Bjørn Lie diff --git a/xorg-x11-server.keyring b/xorg-x11-server.keyring index 779646a..ec70e44 100644 Binary files a/xorg-x11-server.keyring and b/xorg-x11-server.keyring differ diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 6bbf9b9..878b5a7 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -36,7 +36,7 @@ %endif Name: xorg-x11-server -Version: 21.1.8 +Version: 21.1.9 Release: 0 URL: http://xorg.freedesktop.org/ Summary: X