Here is an update to QEMU 8.1.2.
CVE-2023-3354
https://wiki.qemu.org/ChangeLog/8.1
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
diff -u -p -u -p -r1.234 Makefile
--- Makefile 21 Sep 2023 13:10:26 -0000 1.234
+++ Makefile 4 Nov 2023 06:39:02 -0000
@@ -6,12 +6,11 @@ USE_NOBTCFI= Yes
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 8.0.2
+VERSION= 8.1.2
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.qemu.org/
@@ -39,6 +38,7 @@ MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
devel/ninja \
shells/bash \
+ sysutils/py-distlib${MODPY_FLAVOR} \
textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2 \
textproc/py-sphinx_rtd_theme${MODPY_FLAVOR}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
diff -u -p -u -p -r1.70 distinfo
--- distinfo 18 Aug 2023 11:20:17 -0000 1.70
+++ distinfo 4 Nov 2023 06:37:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-8.0.2.tar.xz) = 8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU=
-SIZE (qemu-8.0.2.tar.xz) = 126707132
+SHA256 (qemu-8.1.2.tar.xz) = VBUmp2RXbrSU0v9exGrrJT5i6ikDXRwjwKivTmzU8Ic=
+SIZE (qemu-8.1.2.tar.xz) = 123553328
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
diff -u -p -u -p -r1.77 patch-configure
--- patches/patch-configure 18 Aug 2023 11:20:17 -0000 1.77
+++ patches/patch-configure 4 Nov 2023 06:50:07 -0000
@@ -6,15 +6,15 @@ Revert..
Index: configure
--- configure.orig
+++ configure
-@@ -81,6 +81,7 @@ TMPC="${TMPDIR1}/${TMPB}.c"
+@@ -79,6 +79,7 @@ TMPB="qemu-conf"
+ TMPC="${TMPDIR1}/${TMPB}.c"
TMPO="${TMPDIR1}/${TMPB}.o"
- TMPM="${TMPDIR1}/${TMPB}.m"
TMPE="${TMPDIR1}/${TMPB}.exe"
+TMPTXT="${TMPDIR1}/${TMPB}.txt"
rm -f config.log
-@@ -1330,7 +1331,6 @@ if test "$static" = "yes" ; then
+@@ -1102,7 +1103,6 @@ if test "$static" = "yes" ; then
plugins="no"
fi
fi
@@ -22,7 +22,7 @@ Index: configure
cat > $TMPC << EOF
-@@ -1475,6 +1475,56 @@ if ! has "$pkg_config_exe"; then
+@@ -1230,6 +1230,56 @@ if ! compile_object "-Werror"; then
fi
##########################################
@@ -76,10 +76,10 @@ Index: configure
+fi
+
+##########################################
- # glib support probe
+ # functions to probe cross compilers
- # When bumping glib_req_ver, please check also whether we should increase
-@@ -2404,6 +2454,15 @@ fi
+ container="no"
+@@ -1752,6 +1802,15 @@ fi
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
Index: patches/patch-meson_build
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_build,v
diff -u -p -u -p -r1.11 patch-meson_build
--- patches/patch-meson_build 18 Aug 2023 11:20:17 -0000 1.11
+++ patches/patch-meson_build 4 Nov 2023 06:49:52 -0000
@@ -4,7 +4,7 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -1802,7 +1802,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
+@@ -2039,7 +2039,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
@@ -13,7 +13,7 @@ Index: meson.build
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
-@@ -3810,9 +3810,6 @@ if targetos == 'darwin'
+@@ -4069,9 +4069,6 @@ if targetos == 'darwin'
summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
endif
option_cflags = (get_option('debug') ? ['-g'] : [])
@@ -21,5 +21,5 @@ Index: meson.build
- option_cflags += ['-O' + get_option('optimization')]
-endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args') + option_cflags)}
- if link_language == 'cpp'
+ if 'cpp' in all_languages
summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args') + option_cflags)}
Index: patches/patch-meson_mesonbuild_compilers_cpp_py
===================================================================
RCS file: patches/patch-meson_mesonbuild_compilers_cpp_py
diff -N patches/patch-meson_mesonbuild_compilers_cpp_py
--- patches/patch-meson_mesonbuild_compilers_cpp_py 4 Jan 2023 21:33:42 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: meson/mesonbuild/compilers/cpp.py
---- meson/mesonbuild/compilers/cpp.py.orig
-+++ meson/mesonbuild/compilers/cpp.py
-@@ -254,7 +254,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
- search_dirs: T.List[str] = []
- for d in self.get_compiler_dirs(env, 'libraries'):
- search_dirs.append(f'-L{d}')
-- return search_dirs + ['-lstdc++']
-+ return search_dirs + ['-lc++']
-
-
- class AppleClangCPPCompiler(ClangCPPCompiler):
-@@ -418,7 +418,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
- search_dirs: T.List[str] = []
- for d in self.get_compiler_dirs(env, 'libraries'):
- search_dirs.append(f'-L{d}')
-- return ['-lstdc++']
-+ return ['-lestdc++']
-
-
- class PGICPPCompiler(PGICompiler, CPPCompiler):
Index: patches/patch-qga_commands-posix_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qga_commands-posix_c,v
diff -u -p -u -p -r1.8 patch-qga_commands-posix_c
--- patches/patch-qga_commands-posix_c 23 Apr 2023 19:07:49 -0000 1.8
+++ patches/patch-qga_commands-posix_c 11 Aug 2023 22:57:17 -0000
@@ -17,7 +17,7 @@ Index: qga/commands-posix.c
static void ga_wait_child(pid_t pid, int *status, Error **errp)
{
pid_t rpid;
-@@ -2743,7 +2748,7 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp
+@@ -2747,7 +2752,7 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp
return head;
}
@@ -26,7 +26,7 @@ Index: qga/commands-posix.c
void qmp_guest_suspend_disk(Error **errp)
{
-@@ -2762,10 +2767,99 @@ void qmp_guest_suspend_hybrid(Error **errp)
+@@ -2766,10 +2771,99 @@ void qmp_guest_suspend_hybrid(Error **errp)
GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp)
{
@@ -126,7 +126,7 @@ Index: qga/commands-posix.c
int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)
{
error_setg(errp, QERR_UNSUPPORTED);
-@@ -3060,11 +3154,245 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inter
+@@ -3064,11 +3158,245 @@ GuestNetworkInterfaceList *qmp_guest_network_get_inter
#if !defined(CONFIG_FSFREEZE)
@@ -372,7 +372,7 @@ Index: qga/commands-posix.c
GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **errp)
{
-@@ -3130,12 +3458,21 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)
+@@ -3134,12 +3462,21 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)
{
#if !defined(__linux__)
{
@@ -394,7 +394,7 @@ Index: qga/commands-posix.c
char **p = (char **)list;
while (*p) {
-@@ -3151,11 +3488,19 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)
+@@ -3155,11 +3492,19 @@ GList *ga_command_init_blockedrpcs(GList *blockedrpcs)
#if !defined(CONFIG_FSFREEZE)
{
Index: patches/patch-qga_main_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qga_main_c,v
diff -u -p -u -p -r1.7 patch-qga_main_c
--- patches/patch-qga_main_c 23 Apr 2023 19:07:49 -0000 1.7
+++ patches/patch-qga_main_c 11 Aug 2023 22:57:17 -0000
@@ -15,7 +15,7 @@ Index: qga/main.c
#define QGA_STATE_RELATIVE_DIR "run"
#else
#define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"
-@@ -1524,7 +1528,11 @@ int main(int argc, char **argv)
+@@ -1597,7 +1601,11 @@ int main(int argc, char **argv)
}
if (config->method == NULL) {
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST-main,v
diff -u -p -u -p -r1.15 PLIST-main
--- pkg/PLIST-main 18 Aug 2023 11:20:17 -0000 1.15
+++ pkg/PLIST-main 20 Aug 2023 01:27:35 -0000
@@ -128,7 +128,9 @@ share/doc/qemu/devel/modules.html
share/doc/qemu/devel/multi-process.html
share/doc/qemu/devel/multi-thread-tcg.html
share/doc/qemu/devel/qapi-code-gen.html
+share/doc/qemu/devel/qdev-api.html
share/doc/qemu/devel/qgraph.html
+share/doc/qemu/devel/qom-api.html
share/doc/qemu/devel/qom.html
share/doc/qemu/devel/qtest.html
share/doc/qemu/devel/replay.html
@@ -150,6 +152,7 @@ share/doc/qemu/devel/ui.html
share/doc/qemu/devel/vfio-migration.html
share/doc/qemu/devel/virtio-backends.html
share/doc/qemu/devel/writing-monitor-commands.html
+share/doc/qemu/devel/zoned-storage.html
share/doc/qemu/genindex.html
share/doc/qemu/index.html
share/doc/qemu/interop/barrier.html
@@ -162,6 +165,7 @@ share/doc/qemu/interop/live-block-operat
share/doc/qemu/interop/pr-helper.html
share/doc/qemu/interop/qemu-qmp-ref.html
share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html
+share/doc/qemu/interop/qmp-spec.html
share/doc/qemu/interop/vhost-user-gpu.html
share/doc/qemu/interop/vhost-user.html
share/doc/qemu/interop/vhost-vdpa.html
@@ -180,6 +184,9 @@ share/doc/qemu/specs/acpi_nvdimm.html
share/doc/qemu/specs/acpi_pci_hotplug.html
share/doc/qemu/specs/fw_cfg.html
share/doc/qemu/specs/index.html
+share/doc/qemu/specs/pci-ids.html
+share/doc/qemu/specs/pci-serial.html
+share/doc/qemu/specs/pci-testdev.html
share/doc/qemu/specs/ppc-spapr-hcalls.html
share/doc/qemu/specs/ppc-spapr-hotplug.html
share/doc/qemu/specs/ppc-spapr-numa.html
@@ -191,6 +198,7 @@ share/doc/qemu/specs/tpm.html
share/doc/qemu/system/
share/doc/qemu/system/arm/
share/doc/qemu/system/arm/aspeed.html
+share/doc/qemu/system/arm/bananapi_m2u.html
share/doc/qemu/system/arm/collie.html
share/doc/qemu/system/arm/cpu-features.html
share/doc/qemu/system/arm/cubieboard.html
@@ -221,6 +229,7 @@ share/doc/qemu/system/arm/sx1.html
share/doc/qemu/system/arm/versatile.html
share/doc/qemu/system/arm/vexpress.html
share/doc/qemu/system/arm/virt.html
+share/doc/qemu/system/arm/xenpvh.html
share/doc/qemu/system/arm/xlnx-versal-virt.html
share/doc/qemu/system/arm/xscale.html
share/doc/qemu/system/authz.html
@@ -236,8 +245,10 @@ share/doc/qemu/system/devices/ccid.html
share/doc/qemu/system/devices/cxl.html
share/doc/qemu/system/devices/igb.html
share/doc/qemu/system/devices/ivshmem.html
+share/doc/qemu/system/devices/keyboard.html
share/doc/qemu/system/devices/net.html
share/doc/qemu/system/devices/nvme.html
+share/doc/qemu/system/devices/usb-u2f.html
share/doc/qemu/system/devices/usb.html
share/doc/qemu/system/devices/vhost-user-rng.html
share/doc/qemu/system/devices/vhost-user.html
No comments:
Post a Comment