summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/bc-fix-cross-compilation.patch189
-rw-r--r--gnu/packages/patches/cyrus-sasl-fix-time-h.patch59
-rw-r--r--gnu/packages/patches/hare-fallback-cache.patch33
-rw-r--r--gnu/packages/patches/hare-toolpath.patch72
-rw-r--r--gnu/packages/patches/libvpx-CVE-2025-5262.patch75
-rw-r--r--gnu/packages/patches/qemu-disable-bios-tables-test.patch49
-rw-r--r--gnu/packages/patches/qemu-disable-migration-test.patch57
-rw-r--r--gnu/packages/patches/qemu-fix-test-virtio-version.patch29
-rw-r--r--gnu/packages/patches/qemu-glibc-2.41.patch52
9 files changed, 193 insertions, 422 deletions
diff --git a/gnu/packages/patches/bc-fix-cross-compilation.patch b/gnu/packages/patches/bc-fix-cross-compilation.patch
deleted file mode 100644
index 04f2c92abf..0000000000
--- a/gnu/packages/patches/bc-fix-cross-compilation.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Patch adapted from Nix.
-Upstream-status: Submitted to bug-bc@gnu.org.
-
-diff --git a/bc/Makefile.am b/bc/Makefile.am
-index d9d412e..13f2b1e 100644
---- a/bc/Makefile.am
-+++ b/bc/Makefile.am
-@@ -8,7 +8,7 @@ EXTRA_DIST = bc.h bcdefs.h const.h fix-libmath_h global.h libmath.b proto.h \
- sbc.y
- noinst_HEADERS = libmath.h
-
--DISTCLEANFILES = sbc sbc.c sbc.h libmath.h
-+DISTCLEANFILES = fbc sbc sbc.c sbc.h libmath.h
-
- MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
- bc.y bcdefs.h const.h execute.c fix-libmath_h \
-@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
-
- AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h
- LIBBC = ../lib/libbc.a
-+LIBBC_HOST = ../lib/libbc_host.a
- LIBL = @LEXLIB@
- LDADD = $(LIBBC) $(LIBL) @READLINELIB@
-
-@@ -29,15 +30,22 @@ $(PROGRAMS): libmath.h $(LIBBC)
- scan.o: bc.h
- global.o: libmath.h
-
--fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host: %.c
-+ $(COMPILE) -c -o $@ $<
-
--libmath.h: libmath.b $(fbcOBJ) $(LIBBC)
-- echo '{0}' > libmath.h
-- $(MAKE) global.o
-- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS)
-- ./fbc -c $(srcdir)/libmath.b </dev/null >libmath.h
-+fbcOBJ = $(addsuffix _host,\
-+ main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o)
-+
-+global_host.c: global.c
-+ sed 's/#include "libmath.h"/{0}/' $< > $@
-+
-+fbc: $(fbcOBJ) global_host.o_host $(LIBBC_HOST) $(LIBS)
-+ $(CC_FOR_BUILD) $(LIBL) $(READLINELIB) -o $@ $^
-+
-+libmath.h: libmath.b fbc $(LIBBC_HOST)
-+ ./fbc -c $(srcdir)/libmath.b < /dev/null > libmath.h
- $(srcdir)/fix-libmath_h
-- rm -f ./fbc ./global.o
-
- sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \
- warranty.o
-diff --git a/configure.ac b/configure.ac
-index fc74573..5cabb73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1)
-
- AC_INIT([bc],[bc_version])
- AC_CONFIG_SRCDIR(doc/bc.1)
-+AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_HEADERS(config.h)
-
-@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT],
- [Define the dc copyright line.])
-
- AC_PROG_CC
-+AX_CC_FOR_BUILD
- AC_USE_SYSTEM_EXTENSIONS
-
- AM_PROG_LEX
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ec4bf59..24c9f42 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
--noinst_LIBRARIES = libbc.a
-+noinst_LIBRARIES = libbc.a libbc_host.a
-
- AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h
-
-@@ -7,8 +7,6 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c
-
- DEFS = @DEFS@ $(DEFSADD)
-
--AM_CFLAGS = @CFLAGS@
--
- MAINTAINERCLEANFILES = Makefile.in number.c
- CLEANFILES = testmul specialnumber muldigits.h
-
-@@ -24,3 +22,11 @@ testmul: testmul.o number.o
-
- specialnumber: newnumber.o
- cp newnumber.o number.o
-+
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host : %.c
-+ $(COMPILE) -c -o $@ $<
-+
-+libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS))
-+ ar cru $@ $+
-+ ranlib $@
-diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4
-new file mode 100644
-index 0000000..c62ffad
---- /dev/null
-+++ b/m4/cc_for_build.m4
-@@ -0,0 +1,77 @@
-+# ===========================================================================
-+# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_CC_FOR_BUILD
-+#
-+# DESCRIPTION
-+#
-+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2010 Reuben Thomas <rrt@sc3d.org>
-+# Copyright (c) 1999 Richard Henderson <rth@redhat.com>
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation, either version 3 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program. If not, see <https://www.gnu.org/licenses/>.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright owner
-+# gives unlimited permission to copy, distribute and modify the configure
-+# scripts that are the output of Autoconf when processing the Macro. You
-+# need not follow the terms of the GNU General Public License when using
-+# or distributing such scripts, even though portions of the text of the
-+# Macro appear in them. The GNU General Public License (GPL) does govern
-+# all other use of the material that constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the Autoconf
-+# Macro released by the Autoconf Archive. When you make and distribute a
-+# modified version of the Autoconf Macro, you may extend this special
-+# exception to the GPL to apply to your modified version as well.
-+
-+#serial 3
-+
-+dnl Get a default for CC_FOR_BUILD to put into Makefile.
-+AC_DEFUN([AX_CC_FOR_BUILD],
-+[# Put a plausible default for CC_FOR_BUILD in Makefile.
-+if test -z "$CC_FOR_BUILD"; then
-+ if test "x$cross_compiling" = "xno"; then
-+ CC_FOR_BUILD='$(CC)'
-+ else
-+ CC_FOR_BUILD=gcc
-+ fi
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+# Also set EXEEXT_FOR_BUILD.
-+if test "x$cross_compiling" = "xno"; then
-+ EXEEXT_FOR_BUILD='$(EXEEXT)'
-+else
-+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-+ [rm -f conftest*
-+ echo 'int main () { return 0; }' > conftest.c
-+ bfd_cv_build_exeext=
-+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
-+ for file in conftest.*; do
-+ case $file in
-+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
-+ esac
-+ done
-+ rm -f conftest*
-+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-+ EXEEXT_FOR_BUILD=""
-+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-+fi
-+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
diff --git a/gnu/packages/patches/cyrus-sasl-fix-time-h.patch b/gnu/packages/patches/cyrus-sasl-fix-time-h.patch
new file mode 100644
index 0000000000..27c6a7b578
--- /dev/null
+++ b/gnu/packages/patches/cyrus-sasl-fix-time-h.patch
@@ -0,0 +1,59 @@
+Patch applied upstream afer the 2.1.28 release.
+
+From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Feb 2022 00:45:15 +0000
+Subject: [PATCH] Fix <time.h> check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're conditionally including based on HAVE_TIME_H in a bunch of places,
+but we're not actually checking for time.h, so that's never going to be defined.
+
+While at it, add in a missing include in the cram plugin.
+
+This fixes a bunch of implicit declaration warnings:
+```
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ plugins/cram.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1bf53b6..ad781830 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
+
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
++AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
+
+ IPv6_CHECK_SS_FAMILY()
+ IPv6_CHECK_SA_LEN()
+diff --git a/plugins/cram.c b/plugins/cram.c
+index d02e9baa..695aaa91 100644
+--- a/plugins/cram.c
++++ b/plugins/cram.c
+@@ -53,6 +53,10 @@
+ #endif
+ #include <fcntl.h>
+
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
+ #include <sasl.h>
+ #include <saslplug.h>
+ #include <saslutil.h>
diff --git a/gnu/packages/patches/hare-fallback-cache.patch b/gnu/packages/patches/hare-fallback-cache.patch
new file mode 100644
index 0000000000..b6a99d7d9a
--- /dev/null
+++ b/gnu/packages/patches/hare-fallback-cache.patch
@@ -0,0 +1,33 @@
+From 04fb25e334492432c0c1a09e1abb4c506fb1e710 Mon Sep 17 00:00:00 2001
+Message-ID: <04fb25e334492432c0c1a09e1abb4c506fb1e710.1754429792.git.lilah@lunabee.space>
+From: Lilah Tascheter <lilah@lunabee.space>
+Date: Tue, 5 Aug 2025 16:35:24 -0500
+Subject: [PATCH] dirs::xdg: Fallback to cwd.
+
+Guix builds take place without a valid HOME, which will immediately prevent hare
+from functioning. Provide a usable, if unfortunate, default.
+---
+ dirs/xdg.ha | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/dirs/xdg.ha b/dirs/xdg.ha
+index 9dc6c3b9..65eb92db 100644
+--- a/dirs/xdg.ha
++++ b/dirs/xdg.ha
+@@ -29,7 +29,12 @@ fn lookup(prog: str, var: str, default: str) str = {
+ case void => void;
+ };
+
+- const home = os::getenv("HOME") as str;
++ let home = os::getenv("HOME") as str;
++ if(match(os::stat(home)) {
++ case let err: fs::error => yield true;
++ case let st: fs::filestat => yield !fs::isdir(st.mode);
++ }){ home = "."; };
++
+ const path = path::set(&buf, home, default, prog)!;
+ match (os::mkdirs(path, 0o755)) {
+ case let err: fs::error =>
+--
+2.50.0
+
diff --git a/gnu/packages/patches/hare-toolpath.patch b/gnu/packages/patches/hare-toolpath.patch
new file mode 100644
index 0000000000..872ae0ef55
--- /dev/null
+++ b/gnu/packages/patches/hare-toolpath.patch
@@ -0,0 +1,72 @@
+From 98677305eba7acd487803b6670a1bd67e1fc2796 Mon Sep 17 00:00:00 2001
+Message-ID: <98677305eba7acd487803b6670a1bd67e1fc2796.1754431105.git.lilah@lunabee.space>
+From: Lilah Tascheter <lilah@lunabee.space>
+Date: Tue, 5 Aug 2025 16:42:50 -0500
+Subject: [PATCH] cmd::hare::tool: Use HARE_TOOLPATH when available.
+
+Some distros, like Guix, do not have set search paths, and instead rely on
+environment variables. Allow tools to be specified through a new variable,
+HARE_TOOLPATH.
+---
+ cmd/hare/tool.ha | 35 +++++++++++++++++++++--------------
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/cmd/hare/tool.ha b/cmd/hare/tool.ha
+index b14250fc..b7e4e2ff 100644
+--- a/cmd/hare/tool.ha
++++ b/cmd/hare/tool.ha
+@@ -7,6 +7,7 @@ use getopt;
+ use os;
+ use os::exec;
+ use path;
++use strings;
+
+ fn tool(name: str, cmd: *getopt::command) (void | error) = {
+ if (len(cmd.args) < 1) {
+@@ -19,23 +20,29 @@ fn tool(name: str, cmd: *getopt::command) (void | error) = {
+ args = cmd.args[1..];
+ };
+
+- const path = path::init(TOOLDIR)?;
++ const paths = strings::tokenize(os::tryenv("HARE_TOOLPATH", TOOLDIR), ":");
+ const tool = cmd.args[0];
+ const name = fmt::asprintf("hare-{}", tool)!;
+ defer free(name);
+- path::push(&path, name)?;
+-
+- const cmd = match (exec::cmd(path::string(&path), args...)) {
+- case let cmd: exec::command =>
+- yield cmd;
+- case errors::noentry =>
+- fmt::fatalf("hare tool {}: tool not found", tool);
+- case let err: exec::error =>
+- return err;
++
++ for(const segment => strings::next_token(&paths)) {
++ const path = path::init(segment)?;
++ path::push(&path, name)?;
++
++ const cmd = match (exec::cmd(path::string(&path), args...)) {
++ case let cmd: exec::command =>
++ yield cmd;
++ case errors::noentry =>
++ continue;
++ case let err: exec::error =>
++ return err;
++ };
++
++ const argv0 = fmt::asprintf("hare tool {}", tool)!;
++ exec::setname(&cmd, argv0)!;
++ const err = exec::exec(&cmd);
++ fmt::fatalf("exec {}: {}", path::string(&path), exec::strerror(err));
+ };
+
+- const argv0 = fmt::asprintf("hare tool {}", tool)!;
+- exec::setname(&cmd, argv0)!;
+- const err = exec::exec(&cmd);
+- fmt::fatalf("exec {}: {}", path::string(&path), exec::strerror(err));
++ fmt::fatalf("hare tool {}: tool not found", tool);
+ };
+--
+2.50.0
+
diff --git a/gnu/packages/patches/libvpx-CVE-2025-5262.patch b/gnu/packages/patches/libvpx-CVE-2025-5262.patch
deleted file mode 100644
index 413487126b..0000000000
--- a/gnu/packages/patches/libvpx-CVE-2025-5262.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Copied from <https://chromium.googlesource.com/webm/libvpx/+/1c758781c428c0e895645b95b8ff1512b6bdcecb%5E%21/>
-See also: <https://www.mozilla.org/en-US/security/advisories/mfsa2025-44/#CVE-2025-5262>
- and: <https://hg-edge.mozilla.org/releases/mozilla-esr128/rev/69f53ce5ef0bca2816a3b13cae570e835938c010>
-
-Author: James Zern <jzern@google.com> Thu May 01 02:28:48 2025
-
-vpx_codec_enc_init_multi: fix double free on init failure
-
-In `vp8e_init()`, the encoder would take ownership of
-`mr_cfg.mr_low_res_mode_info` even if `vp8_create_compressor()` failed.
-This caused confusion at the call site as other failures in
-`vp8e_init()` did not result in ownership transfer and the caller would
-free the memory. In the case of `vp8_create_compressor()` failure both
-the caller and `vpx_codec_destroy()` would free the memory, causing a
-crash. `mr_*` related variables are now cleared on failure to prevent
-this situation.
-
-Bug: webm:413411335
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1962421
-Change-Id: Ie951d42b9029a586bf9059b650bd8863db9f9ffc
-
---- a/vp8/vp8_cx_iface.c
-+++ b/vp8/vp8_cx_iface.c
-@@ -727,17 +727,27 @@ static vpx_codec_err_t vp8e_init(vpx_cod
- priv->pts_offset_initialized = 0;
- priv->timestamp_ratio.den = priv->cfg.g_timebase.den;
- priv->timestamp_ratio.num = (int64_t)priv->cfg.g_timebase.num;
- priv->timestamp_ratio.num *= TICKS_PER_SEC;
- reduce_ratio(&priv->timestamp_ratio);
-
- set_vp8e_config(&priv->oxcf, priv->cfg, priv->vp8_cfg, mr_cfg);
- priv->cpi = vp8_create_compressor(&priv->oxcf);
-- if (!priv->cpi) res = VPX_CODEC_MEM_ERROR;
-+ if (!priv->cpi) {
-+#if CONFIG_MULTI_RES_ENCODING
-+ // Release ownership of mr_cfg->mr_low_res_mode_info on failure. This
-+ // prevents ownership confusion with the caller and avoids a double
-+ // free when vpx_codec_destroy() is called on this instance.
-+ priv->oxcf.mr_total_resolutions = 0;
-+ priv->oxcf.mr_encoder_id = 0;
-+ priv->oxcf.mr_low_res_mode_info = NULL;
-+#endif
-+ res = VPX_CODEC_MEM_ERROR;
-+ }
- }
- }
-
- return res;
- }
-
- static vpx_codec_err_t vp8e_destroy(vpx_codec_alg_priv_t *ctx) {
- #if CONFIG_MULTI_RES_ENCODING
---- a/vpx/src/vpx_encoder.c
-+++ b/vpx/src/vpx_encoder.c
-@@ -109,16 +109,19 @@ vpx_codec_err_t vpx_codec_enc_init_multi
- mr_cfg.mr_down_sampling_factor.num = dsf->num;
- mr_cfg.mr_down_sampling_factor.den = dsf->den;
-
- ctx->iface = iface;
- ctx->name = iface->name;
- ctx->priv = NULL;
- ctx->init_flags = flags;
- ctx->config.enc = cfg;
-+ // ctx takes ownership of mr_cfg.mr_low_res_mode_info if and only if
-+ // this call succeeds. The first ctx entry in the array is
-+ // responsible for freeing the memory.
- res = ctx->iface->init(ctx, &mr_cfg);
- }
-
- if (res) {
- const char *error_detail = ctx->priv ? ctx->priv->err_detail : NULL;
- /* Destroy current ctx */
- ctx->err_detail = error_detail;
- vpx_codec_destroy(ctx);
-
diff --git a/gnu/packages/patches/qemu-disable-bios-tables-test.patch b/gnu/packages/patches/qemu-disable-bios-tables-test.patch
deleted file mode 100644
index ba89b91099..0000000000
--- a/gnu/packages/patches/qemu-disable-bios-tables-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The bios-tables-test may fail; disable it (see: https://gitlab.com/qemu-project/qemu/-/issues/1098)
-
-diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
-index 2f0d3ef080..e3c33a86b5 100644
---- a/tests/qtest/meson.build
-+++ b/tests/qtest/meson.build
-@@ -1,6 +1,5 @@
- slow_qtests = {
- 'aspeed_smc-test': 360,
-- 'bios-tables-test' : 910,
- 'cdrom-test' : 610,
- 'device-introspect-test' : 720,
- 'migration-test' : 480,
-@@ -86,9 +85,6 @@ qtests_i386 = \
- config_all_devices.has_key('CONFIG_Q35') and \
- config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \
- slirp.found() ? ['virtio-net-failover'] : []) + \
-- (unpack_edk2_blobs and \
-- config_all_devices.has_key('CONFIG_HPET') and \
-- config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \
- qtests_pci + \
- qtests_cxl + \
- ['fdc-test',
-@@ -235,7 +231,6 @@ qtests_arm = \
-
- # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
- qtests_aarch64 = \
-- (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
- (config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \
- ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \
- (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
-@@ -260,9 +255,6 @@ qtests_s390x = \
- qtests_riscv32 = \
- (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
-
--qtests_riscv64 = \
-- (unpack_edk2_blobs ? ['bios-tables-test'] : [])
--
- qos_test_ss = ss.source_set()
- qos_test_ss.add(
- 'ac97-test.c',
-@@ -328,7 +320,6 @@ if gnutls.found()
- endif
-
- qtests = {
-- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
- 'cdrom-test': files('boot-sector.c'),
- 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
- 'erst-test': files('erst-test.c'),
diff --git a/gnu/packages/patches/qemu-disable-migration-test.patch b/gnu/packages/patches/qemu-disable-migration-test.patch
deleted file mode 100644
index 2a30d26f55..0000000000
--- a/gnu/packages/patches/qemu-disable-migration-test.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
-index e3c33a86b5..a3bbf9c841 100644
---- a/tests/qtest/meson.build
-+++ b/tests/qtest/meson.build
-@@ -2,7 +2,6 @@ slow_qtests = {
- 'aspeed_smc-test': 360,
- 'cdrom-test' : 610,
- 'device-introspect-test' : 720,
-- 'migration-test' : 480,
- 'npcm7xx_pwm-test': 300,
- 'npcm7xx_watchdog_timer-test': 120,
- 'qom-test' : 900,
-@@ -100,7 +99,6 @@ qtests_i386 = \
- 'cpu-plug-test',
- 'q35-test',
- 'vmgenid-test',
-- 'migration-test',
- 'test-x86-cpuid-compat',
- 'numa-test'
- ]
-@@ -173,7 +171,7 @@ qtests_ppc64 = \
- (slirp.found() ? ['pxe-test'] : []) + \
- (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
- (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
-- qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del-test']
-+ qtests_pci + ['numa-test', 'cpu-plug-test', 'drive_del-test']
-
- qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
- qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
-@@ -240,8 +238,7 @@ qtests_aarch64 = \
- config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
- ['arm-cpu-features',
- 'numa-test',
-- 'boot-serial-test',
-- 'migration-test']
-+ 'boot-serial-test']
-
- qtests_s390x = \
- qtests_filter + \
-@@ -249,8 +246,7 @@ qtests_s390x = \
- 'drive_del-test',
- 'device-plug-test',
- 'virtio-ccw-test',
-- 'cpu-plug-test',
-- 'migration-test']
-+ 'cpu-plug-test']
-
- qtests_riscv32 = \
- (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
-@@ -324,7 +320,6 @@ qtests = {
- 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
- 'erst-test': files('erst-test.c'),
- 'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'],
-- 'migration-test': migration_files,
- 'pxe-test': files('boot-sector.c'),
- 'qos-test': [chardev, io, qos_test_ss.apply({}).sources()],
- 'tpm-crb-swtpm-test': [io, tpmemu_files],
diff --git a/gnu/packages/patches/qemu-fix-test-virtio-version.patch b/gnu/packages/patches/qemu-fix-test-virtio-version.patch
new file mode 100644
index 0000000000..8e466324e7
--- /dev/null
+++ b/gnu/packages/patches/qemu-fix-test-virtio-version.patch
@@ -0,0 +1,29 @@
+Upstream-status: Sent to qemu-devel@nongnu.org
+Message-ID: <20250831125255.7066-1-maxim@guixotic.coop>
+
+There were some discussion in <https://gitlab.com/qemu-project/qemu/-/issues/1626>.
+
+diff --git a/tests/functional/test_virtio_version.py b/tests/functional/test_virtio_version.py
+index a5ea73237f..501545f655 100755
+--- a/tests/functional/test_virtio_version.py
++++ b/tests/functional/test_virtio_version.py
+@@ -10,6 +10,8 @@
+ # This work is licensed under the terms of the GNU GPL, version 2 or
+ # later. See the COPYING file in the top-level directory.
+
++import os
++
+ from qemu.machine import QEMUMachine
+ from qemu_test import QemuSystemTest
+
+@@ -68,7 +70,9 @@ def run_device(self, devtype, opts=None, machine='pc'):
+ """
+ Run QEMU with `-device DEVTYPE`, return device info from `query-pci`
+ """
+- with QEMUMachine(self.qemu_bin) as vm:
++ with QEMUMachine(
++ self.qemu_bin,
++ base_temp_dir=os.environ.get('TMPDIR', '/var/tmp')) as vm:
+ vm.set_machine(machine)
+ if opts:
+ devtype += ',' + opts
diff --git a/gnu/packages/patches/qemu-glibc-2.41.patch b/gnu/packages/patches/qemu-glibc-2.41.patch
deleted file mode 100644
index 56beab690e..0000000000
--- a/gnu/packages/patches/qemu-glibc-2.41.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-from https://gitlab.com/qemu-project/qemu/-/commit/27a8d899c7a100fd5aa040a8b993bb257687c393
-
-From 27a8d899c7a100fd5aa040a8b993bb257687c393 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Feb 2025 16:09:20 +0000
-Subject: [PATCH] linux-user: Do not define struct sched_attr if libc headers
- do
-
-glibc 2.41+ has added [1] definitions for sched_setattr and
-sched_getattr functions and struct sched_attr. Therefore, it needs
-to be checked for here as well before defining sched_attr, to avoid
-a compilation failure.
-
-Define sched_attr conditionally only when SCHED_ATTR_SIZE_VER0 is
-not defined.
-
-[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2799
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- linux-user/syscall.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 6ee02383daf..df5ed18062c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -360,7 +360,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
- #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
- _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
- unsigned long *, user_mask_ptr);
--/* sched_attr is not defined in glibc */
-+/* sched_attr is not defined in glibc < 2.41 */
-+#ifndef SCHED_ATTR_SIZE_VER0
- struct sched_attr {
- uint32_t size;
- uint32_t sched_policy;
-@@ -373,6 +374,7 @@ struct sched_attr {
- uint32_t sched_util_min;
- uint32_t sched_util_max;
- };
-+#endif
- #define __NR_sys_sched_getattr __NR_sched_getattr
- _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
- unsigned int, size, unsigned int, flags);
---
-GitLab
-
generated by cgit v1.2.3 (git 2.50.1) at 2025-09-04 00:41:32 +0000