* [ptxdist] [PATCH] qemu: Version bump. 7.0.0 -> 7.1.0
@ 2022-09-22 8:39 Christian Melki
2022-09-22 14:48 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2022-09-22 8:39 UTC (permalink / raw)
To: ptxdist
https://wiki.qemu.org/ChangeLog/7.1
Fixes CVE-2022-35414.
* Removed a few deprecated configure options.
* Remove a patch which is now included.
* Forward the two ptxdist specific patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...-compile-the-common-user-code-if-hav.patch | 32 -------------------
...symlinks-for-security_model-mapped-f.patch | 0
.../0101-let-ninja-use-the-jobserver.patch | 4 +--
patches/{qemu-7.0.0 => qemu-7.1.0}/series | 3 +-
rules/qemu.make | 7 ++--
5 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
rename patches/{qemu-7.0.0 => qemu-7.1.0}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%)
rename patches/{qemu-7.0.0 => qemu-7.1.0}/0101-let-ninja-use-the-jobserver.patch (90%)
rename patches/{qemu-7.0.0 => qemu-7.1.0}/series (64%)
diff --git a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch b/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
deleted file mode 100644
index 50e73f714..000000000
--- a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Thomas Huth <thuth@redhat.com>
-Date: Wed, 22 Jun 2022 16:03:28 +0200
-Subject: [PATCH] common-user: Only compile the common user code if have_user
- is set
-
-There is no need to waste cycles here if we only compile the system
-binaries or tools. Additionally, this change is even a hard requirement
-for building the tools on systems that do not have an entry in the
-common-user/host/ folder (since common-user/meson.build is trying
-to add such a path via the include_directories() command).
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Zhang Chen <chen.zhang@intel.com>
-Message-Id: <20220622140328.383961-1-thuth@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
----
- common-user/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/common-user/meson.build b/common-user/meson.build
-index 26212dda5c7a..ac9de5b9e3f5 100644
---- a/common-user/meson.build
-+++ b/common-user/meson.build
-@@ -1,3 +1,7 @@
-+if not have_user
-+ subdir_done()
-+endif
-+
- common_user_inc += include_directories('host/' / host_arch)
-
- user_ss.add(files(
diff --git a/patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 100%
rename from patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
diff --git a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
similarity index 90%
rename from patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch
rename to patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
index 14559418f..d54558a93 100644
--- a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
@@ -20,6 +20,6 @@ index e5fd1ebdf619..23128172d02a 100644
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
- $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
+ $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \
-
+ -d keepdepfile
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
- ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
+ ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))))
diff --git a/patches/qemu-7.0.0/series b/patches/qemu-7.1.0/series
similarity index 64%
rename from patches/qemu-7.0.0/series
rename to patches/qemu-7.1.0/series
index 4b1e373cf..ec7952135 100644
--- a/patches/qemu-7.0.0/series
+++ b/patches/qemu-7.1.0/series
@@ -1,8 +1,7 @@
# generated by git-ptx-patches
#tag:base --start-number 1
#tag:upstream --start-number 1
-0001-common-user-Only-compile-the-common-user-code-if-hav.patch
#tag:ptxdist --start-number 100
0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
0101-let-ninja-use-the-jobserver.patch
-# c72c8a5f60a89d87f9a2f2626984b5e1 - git-ptx-patches magic
+# d0eda0596eed74d4819c34cafa02bf39 - git-ptx-patches magic
diff --git a/rules/qemu.make b/rules/qemu.make
index 6e8445124..579715684 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
#
# Paths and names
#
-QEMU_VERSION := 7.0.0
-QEMU_MD5 := bfb5b09a0d1f887c8c42a6d5f26971ab
+QEMU_VERSION := 7.1.0
+QEMU_MD5 := 3be5458a9171b4ec5220c65d5d52bdcf
QEMU := qemu-$(QEMU_VERSION)
QEMU_SUFFIX := tar.xz
QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
@@ -133,7 +133,6 @@ QEMU_CONF_OPT := \
--disable-virtiofsd \
--disable-vnc \
--disable-vnc-jpeg \
- --disable-vnc-png \
--disable-vnc-sasl \
--disable-vte \
--disable-whpx \
@@ -157,8 +156,6 @@ QEMU_CONF_OPT := \
--disable-rdma \
--disable-pvrdma \
--enable-vhost-net \
- --enable-vhost-vsock \
- --enable-vhost-scsi \
--disable-vhost-crypto \
--enable-vhost-kernel \
--disable-vhost-user \
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] qemu: Version bump. 7.0.0 -> 7.1.0
2022-09-22 8:39 [ptxdist] [PATCH] qemu: Version bump. 7.0.0 -> 7.1.0 Christian Melki
@ 2022-09-22 14:48 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-09-22 14:48 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Sep 22, 2022 at 10:39:23AM +0200, Christian Melki wrote:
> https://wiki.qemu.org/ChangeLog/7.1
> Fixes CVE-2022-35414.
>
> * Removed a few deprecated configure options.
Please remove those options from host-qemu as well.
Michael
> * Remove a patch which is now included.
> * Forward the two ptxdist specific patches.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...-compile-the-common-user-code-if-hav.patch | 32 -------------------
> ...symlinks-for-security_model-mapped-f.patch | 0
> .../0101-let-ninja-use-the-jobserver.patch | 4 +--
> patches/{qemu-7.0.0 => qemu-7.1.0}/series | 3 +-
> rules/qemu.make | 7 ++--
> 5 files changed, 5 insertions(+), 41 deletions(-)
> delete mode 100644 patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
> rename patches/{qemu-7.0.0 => qemu-7.1.0}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%)
> rename patches/{qemu-7.0.0 => qemu-7.1.0}/0101-let-ninja-use-the-jobserver.patch (90%)
> rename patches/{qemu-7.0.0 => qemu-7.1.0}/series (64%)
>
> diff --git a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch b/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
> deleted file mode 100644
> index 50e73f714..000000000
> --- a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From: Thomas Huth <thuth@redhat.com>
> -Date: Wed, 22 Jun 2022 16:03:28 +0200
> -Subject: [PATCH] common-user: Only compile the common user code if have_user
> - is set
> -
> -There is no need to waste cycles here if we only compile the system
> -binaries or tools. Additionally, this change is even a hard requirement
> -for building the tools on systems that do not have an entry in the
> -common-user/host/ folder (since common-user/meson.build is trying
> -to add such a path via the include_directories() command).
> -
> -Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> -Signed-off-by: Thomas Huth <thuth@redhat.com>
> -Reviewed-by: Zhang Chen <chen.zhang@intel.com>
> -Message-Id: <20220622140328.383961-1-thuth@redhat.com>
> -Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ----
> - common-user/meson.build | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/common-user/meson.build b/common-user/meson.build
> -index 26212dda5c7a..ac9de5b9e3f5 100644
> ---- a/common-user/meson.build
> -+++ b/common-user/meson.build
> -@@ -1,3 +1,7 @@
> -+if not have_user
> -+ subdir_done()
> -+endif
> -+
> - common_user_inc += include_directories('host/' / host_arch)
> -
> - user_ss.add(files(
> diff --git a/patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> similarity index 100%
> rename from patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> rename to patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> diff --git a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
> similarity index 90%
> rename from patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch
> rename to patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
> index 14559418f..d54558a93 100644
> --- a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch
> +++ b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch
> @@ -20,6 +20,6 @@ index e5fd1ebdf619..23128172d02a 100644
> NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
> - $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
> + $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \
> -
> + -d keepdepfile
> ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
> - ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
> + ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))))
> diff --git a/patches/qemu-7.0.0/series b/patches/qemu-7.1.0/series
> similarity index 64%
> rename from patches/qemu-7.0.0/series
> rename to patches/qemu-7.1.0/series
> index 4b1e373cf..ec7952135 100644
> --- a/patches/qemu-7.0.0/series
> +++ b/patches/qemu-7.1.0/series
> @@ -1,8 +1,7 @@
> # generated by git-ptx-patches
> #tag:base --start-number 1
> #tag:upstream --start-number 1
> -0001-common-user-Only-compile-the-common-user-code-if-hav.patch
> #tag:ptxdist --start-number 100
> 0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> 0101-let-ninja-use-the-jobserver.patch
> -# c72c8a5f60a89d87f9a2f2626984b5e1 - git-ptx-patches magic
> +# d0eda0596eed74d4819c34cafa02bf39 - git-ptx-patches magic
> diff --git a/rules/qemu.make b/rules/qemu.make
> index 6e8445124..579715684 100644
> --- a/rules/qemu.make
> +++ b/rules/qemu.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
> #
> # Paths and names
> #
> -QEMU_VERSION := 7.0.0
> -QEMU_MD5 := bfb5b09a0d1f887c8c42a6d5f26971ab
> +QEMU_VERSION := 7.1.0
> +QEMU_MD5 := 3be5458a9171b4ec5220c65d5d52bdcf
> QEMU := qemu-$(QEMU_VERSION)
> QEMU_SUFFIX := tar.xz
> QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
> @@ -133,7 +133,6 @@ QEMU_CONF_OPT := \
> --disable-virtiofsd \
> --disable-vnc \
> --disable-vnc-jpeg \
> - --disable-vnc-png \
> --disable-vnc-sasl \
> --disable-vte \
> --disable-whpx \
> @@ -157,8 +156,6 @@ QEMU_CONF_OPT := \
> --disable-rdma \
> --disable-pvrdma \
> --enable-vhost-net \
> - --enable-vhost-vsock \
> - --enable-vhost-scsi \
> --disable-vhost-crypto \
> --enable-vhost-kernel \
> --disable-vhost-user \
> --
> 2.34.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-22 14:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-22 8:39 [ptxdist] [PATCH] qemu: Version bump. 7.0.0 -> 7.1.0 Christian Melki
2022-09-22 14:48 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox