From 3080abba40c819933d1857abe4abaaa3cf65baab Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sat, 16 Dec 2023 01:00:51 +0000 Subject: gnu: xorgproto: Update to 2023.2. * gnu/packages/xorg.scm (xorgproto): Update to 2023.2. Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d Signed-off-by: John Kehayias --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 382075237a..723b3e0c4e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -245,14 +245,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2022.2") + (version "2023.2") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto" "/xorgproto-" version ".tar.xz")) (sha256 (base32 - "17kbq1x68jl9mz69ays5c0w72lpkqi937raxk0im7y88pvrdn4sx")))) + "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. -- cgit v1.2.3 From 158502e40d800407f1bd697dd5dd0437086730bf Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sat, 16 Dec 2023 01:00:57 +0000 Subject: gnu: xorg-server-xwayland: Update to 23.2.3 [security fixes]. Fixes CVE-2023-5367 and CVE-2023-5380. See the X.Org security advisory for more information. Also fixes CVE-2023-6377 and CVE-2023-6478. See the X.Org security advisory for more information. * gnu/packages/xorg.scm (xorg-server-xwayland): Update to 23.2.3. [inputs]: Add libxcvt. [properties]: Set upstream-name. Change-Id: I05427b1d93d07a4210466f290621c1ca5effb4af Signed-off-by: John Kehayias --- gnu/packages/xorg.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 723b3e0c4e..a761fb2fbd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5250,7 +5250,7 @@ EGLStream families of extensions.") (define-public xorg-server-xwayland (package (name "xorg-server-xwayland") - (version "21.1.3") + (version "23.2.3") (source (origin (method url-fetch) @@ -5258,7 +5258,7 @@ EGLStream families of extensions.") "/xserver/xwayland-" version ".tar.xz")) (sha256 (base32 - "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb")))) + "00p30yyikh7h9xsqgir66xb06pspgjlibv1mi0n42irc4fkrm7gb")))) (inputs (list font-dejavu dbus egl-wayland @@ -5268,6 +5268,7 @@ EGLStream families of extensions.") libepoxy libgcrypt libtirpc + libxcvt libxfont2 libxkbfile pixman @@ -5283,6 +5284,7 @@ EGLStream families of extensions.") wayland wayland-protocols) '()))) + (properties '((upstream-name . "xwayland"))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From bc7713fa8878ab8a2158c8660d9b2bbb8fb2f77e Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 17 Dec 2023 01:11:32 -0500 Subject: gnu: curl: Update to 8.5.0 [security fixes]. Fixes CVE-2023-46218 and CVE-2023-46219. See and respectively. * gnu/packages/curl.scm (curl): Update to 8.5.0. * gnu/packages/patches/curl-use-ssl-cert-env.patch: Update patch. Change-Id: Iaa6aa5de0f45576dc06bf5eca1eec502e5c83332 --- gnu/packages/curl.scm | 11 +++++++--- gnu/packages/patches/curl-use-ssl-cert-env.patch | 26 ++++++++++++------------ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b33f4d36d4..0bf6d996e6 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -65,14 +65,14 @@ (define-public curl (package (name "curl") - (version "8.4.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) + "1sqfflilf7mcz1g03lazyr6v6pf1rsrzprrknsir10hdwawqvas2")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -127,6 +127,9 @@ (if parallel-tests? (number->string (parallel-job-count)) "1"))) + ;; Ignore test 1477 due to a missing file in the 8.5.0 + ;; release. See + ;; . (arguments `("-C" "tests" "test" ,@make-flags ,(if #$(or (system-hurd?) @@ -134,8 +137,10 @@ (target-aarch64?)) ;; protocol FAIL (string-append "TFLAGS=\"~1474 " + "~1477 " job-count "\"") - (string-append "TFLAGS=" job-count))))) + (string-append "TFLAGS=\"~1477 " + job-count "\""))))) ;; The top-level "make check" does "make -C tests quiet-test", which ;; is too quiet. Use the "test" target instead, which is more ;; verbose. diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch b/gnu/packages/patches/curl-use-ssl-cert-env.patch index 24be6e31d9..c39c1f7e98 100644 --- a/gnu/packages/patches/curl-use-ssl-cert-env.patch +++ b/gnu/packages/patches/curl-use-ssl-cert-env.patch @@ -5,37 +5,37 @@ must be called when no other threads exist). This fixes network functionality in rust:cargo, and probably removes the need for other future workarounds. =================================================================== ---- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100 -+++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100 -@@ -134,6 +134,9 @@ - # pragma warning(default:4232) /* MSVC extension, dllimport identity */ +--- curl-8.5.0.orig/lib/easy.c 2023-12-17 00:36:32.400468561 -0500 ++++ curl-8.5.0/lib/easy.c 2023-12-17 00:39:08.898612331 -0500 +@@ -137,6 +137,9 @@ + static char *leakpointer; #endif - + +char * Curl_ssl_cert_dir = NULL; +char * Curl_ssl_cert_file = NULL; + /** * curl_global_init() globally initializes curl given a bitwise set of the * different features of what to initialize. -@@ -155,6 +158,9 @@ - #endif +@@ -163,6 +166,9 @@ + goto fail; } - + + Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); + Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); + if(!Curl_ssl_init()) { DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); - return CURLE_FAILED_INIT; -@@ -260,6 +266,9 @@ + goto fail; +@@ -287,6 +293,9 @@ Curl_ssl_cleanup(); Curl_resolver_global_cleanup(); - + + free(Curl_ssl_cert_dir); + free(Curl_ssl_cert_file); + - #ifdef WIN32 - Curl_win32_cleanup(init_flags); + #ifdef _WIN32 + Curl_win32_cleanup(easy_init_flags); #endif diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c --- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 -- cgit v1.2.3 From 1b0e216ad68cf5a893d4007d1373cdc30c820df6 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 17 Dec 2023 01:12:45 -0500 Subject: gnu: mesa: Update to 23.3.1. * gnu/packages/gl.scm (mesa): Update to 23.3.1. Change-Id: Idf4393b4fa5b7df7a78bd88d7591385023460b5b --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c02a6f0a84..b8827de85e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.2.1") + (version "23.3.1") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1k61pgw0vcjrlb4299q98cy7iqmk2r7jmb5ika91z01dzhb0dpk4")))) + "1rhxnifvzf168lys0qq6by1xrzs15q6climjzq7z5czxf1ni4j3f")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. -- cgit v1.2.3 From d55a4431f3d2b2d61a5b505a8cbbb4cbbd7a8090 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 18 Dec 2023 18:37:11 -0500 Subject: gnu: gtk: Skip failing test. The 'gtk:tools / validate' test started failing for unknown reasons after updating mesa to 23.3.1 and xorgproto to 2023.2. Skip for now. * gnu/packages/gtk.scm (gtk)[arguments]{phases}: Skip the 'gtk:tools / validate' test using the 'patch' phase. Change-Id: I7d0a459c0cbbb979f4589f929eb637f00f642225 --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cc33c9f672..1a3bb56945 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1178,7 +1178,11 @@ application suites.") ;; The unaligned-offscreen test fails for unknown reasons, also ;; on different distributions (see: ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889). - ((" 'unaligned-offscreen',") "")) + ((" 'unaligned-offscreen',") "") + ;; This test, 'gtk:tools / validate', started failing for + ;; unknown reasons after updating mesa to 23.3.1 and xorgproto + ;; to 2023.2. + ((" 'validate',") "")) (substitute* "testsuite/reftests/meson.build" (("[ \t]*'label-wrap-justify.ui',") "") ;; The inscription-markup.ui fails due to /etc/machine-id -- cgit v1.2.3 From ebd3b3e9020f978e65f7be7f4eb0ffff9bbca31f Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 18 Dec 2023 18:49:40 -0500 Subject: gnu: mesa: Enable zink support. * gnu/packages/gl.scm (mesa)[arguments]: Add zink to gallium-drivers in configure-flags. Change-Id: I1fc7e38a8307b589a7c48bc0b923fccd9ffcd8b8 --- gnu/packages/gl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b8827de85e..8c5e61dfd2 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -324,16 +324,16 @@ also known as DXTn or DXTC) for Mesa.") ((target-aarch64?) ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ -panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) +panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl,zink")) ((target-arm32?) ;; Freedreno FTBFS when built on a 64-bit machine. '("-Dgallium-drivers=etnaviv,kmsro,lima,nouveau,panfrost,\ -r300,r600,swrast,tegra,v3d,vc4,virgl")) +r300,r600,swrast,tegra,v3d,vc4,virgl,zink")) ((or (target-ppc64le?) (target-ppc32?) (target-riscv64?)) - '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) + '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl,zink")) (else '("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\ -svga,swrast,virgl"))) +svga,swrast,virgl,zink"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio "-Dplatforms=x11,wayland" -- cgit v1.2.3 From bdab356332e391e09d0feafe0fcac9c52388a07d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Dec 2023 11:36:20 +0200 Subject: gnu: curl: Fix test suite on arm platforms. * gnu/packages/curl.scm (curl)[arguments]: Adjust the flags in the custom 'check phase to skip a test instead of ignoring the test result. Change-Id: Ib2098137b04766988507d2f86832871150cd0af7 --- gnu/packages/curl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 0bf6d996e6..f73aed679d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -136,9 +136,9 @@ (target-arm32?) (target-aarch64?)) ;; protocol FAIL - (string-append "TFLAGS=\"~1474 " - "~1477 " - job-count "\"") + (string-append "TFLAGS=~1474 " + "!1477 " + job-count) (string-append "TFLAGS=\"~1477 " job-count "\""))))) ;; The top-level "make check" does "make -C tests quiet-test", which -- cgit v1.2.3 From 42c448ee6e13d165807d83e8c48941bead4847c1 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 28 Dec 2023 23:49:15 -0500 Subject: gnu: mesa: Update to 23.3.2. * gnu/packages/gl.scm (mesa): Update to 23.3.2. Change-Id: Ic348c48f4045e8766646a5fe62209619a0247059 --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ce99b33441..dfe9be73c0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -294,7 +294,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.3.1") + (version "23.3.2") (source (origin (method url-fetch) @@ -304,7 +304,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1rhxnifvzf168lys0qq6by1xrzs15q6climjzq7z5czxf1ni4j3f")))) + "1p4swrbmz3kb1805kdj973hf8virgmix4m9qprmcb2bgl4gviz1w")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. -- cgit v1.2.3