On Sat, 17 Jun 2023 at 07:29:42 -0400, Brad Smith wrote:
> Here is an update to QEMU 8.0.2.
>
> CVE-2023-0330
>
>
> https://marc.info/?l=qemu-devel&m=168562843012586&w=2
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/Makefile,v
> retrieving revision 1.231
> diff -u -p -u -p -r1.231 Makefile
> --- Makefile 23 Apr 2023 19:07:49 -0000 1.231
> +++ Makefile 17 Jun 2023 06:12:16 -0000
> @@ -4,7 +4,7 @@ DPB_PROPERTIES= parallel
> COMMENT-main= multi system emulator
> COMMENT-ga= QEMU guest agent
>
> -VERSION= 8.0.0
> +VERSION= 8.0.2
> DISTNAME= qemu-${VERSION}
> CATEGORIES= emulators
> MASTER_SITES= https://download.qemu.org/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/distinfo,v
> retrieving revision 1.69
> diff -u -p -u -p -r1.69 distinfo
> --- distinfo 23 Apr 2023 19:07:49 -0000 1.69
> +++ distinfo 17 Jun 2023 06:12:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qemu-8.0.0.tar.xz) = u2DwNBUxGB1sw5ad0ZoBPQQnqH+RgZOXDZrbkRMeVtA=
> -SIZE (qemu-8.0.0.tar.xz) = 127835148
> +SHA256 (qemu-8.0.2.tar.xz) = 8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU=
> +SIZE (qemu-8.0.2.tar.xz) = 126707132
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/patches/patch-configure,v
> retrieving revision 1.76
> diff -u -p -u -p -r1.76 patch-configure
> --- patches/patch-configure 23 Apr 2023 19:07:49 -0000 1.76
> +++ patches/patch-configure 17 Jun 2023 06:12:16 -0000
> @@ -14,7 +14,7 @@ Index: configure
>
> rm -f config.log
>
> -@@ -1329,7 +1330,6 @@ if test "$static" = "yes" ; then
> +@@ -1330,7 +1331,6 @@ if test "$static" = "yes" ; then
> plugins="no"
> fi
> fi
> @@ -22,7 +22,7 @@ Index: configure
>
> cat > $TMPC << EOF
>
> -@@ -1474,6 +1474,56 @@ if ! has "$pkg_config_exe"; then
> +@@ -1475,6 +1475,56 @@ if ! has "$pkg_config_exe"; then
> fi
>
> ##########################################
> @@ -79,7 +79,7 @@ Index: configure
> # glib support probe
>
> # When bumping glib_req_ver, please check also whether we should increase
> -@@ -2403,6 +2453,15 @@ fi
> +@@ -2404,6 +2454,15 @@ fi
>
> if test "$plugins" = "yes" ; then
> echo "CONFIG_PLUGIN=y" >> $config_host_mak
> Index: patches/patch-meson_build
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/patches/patch-meson_build,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 patch-meson_build
> --- patches/patch-meson_build 23 Apr 2023 19:07:49 -0000 1.10
> +++ patches/patch-meson_build 17 Jun 2023 06:12:16 -0000
> @@ -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'))
>
> -@@ -3805,9 +3805,6 @@ if targetos == 'darwin'
> +@@ -3810,9 +3810,6 @@ if targetos == 'darwin'
> summary_info += {'Objective-C compiler': '
> '.join(meson.get_compiler('objc').cmd_array())}
> endif
> option_cflags = (get_option('debug') ? ['-g'] : [])
>
Hi Brad!
I think update plist is missing and portcheck complains about:
hardcoded paths detected in pkg/README-main, consider using SUBST_VARS and
TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.231
diff -u -p -r1.231 Makefile
--- Makefile 23 Apr 2023 19:07:49 -0000 1.231
+++ Makefile 17 Aug 2023 21:30:17 -0000
@@ -4,7 +4,7 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 8.0.0
+VERSION= 8.0.2
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.69
diff -u -p -r1.69 distinfo
--- distinfo 23 Apr 2023 19:07:49 -0000 1.69
+++ distinfo 17 Aug 2023 21:30:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-8.0.0.tar.xz) = u2DwNBUxGB1sw5ad0ZoBPQQnqH+RgZOXDZrbkRMeVtA=
-SIZE (qemu-8.0.0.tar.xz) = 127835148
+SHA256 (qemu-8.0.2.tar.xz) = 8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU=
+SIZE (qemu-8.0.2.tar.xz) = 126707132
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.76
diff -u -p -r1.76 patch-configure
--- patches/patch-configure 23 Apr 2023 19:07:49 -0000 1.76
+++ patches/patch-configure 17 Aug 2023 21:30:17 -0000
@@ -14,7 +14,7 @@ Index: configure
rm -f config.log
-@@ -1329,7 +1330,6 @@ if test "$static" = "yes" ; then
+@@ -1330,7 +1331,6 @@ if test "$static" = "yes" ; then
plugins="no"
fi
fi
@@ -22,7 +22,7 @@ Index: configure
cat > $TMPC << EOF
-@@ -1474,6 +1474,56 @@ if ! has "$pkg_config_exe"; then
+@@ -1475,6 +1475,56 @@ if ! has "$pkg_config_exe"; then
fi
##########################################
@@ -79,7 +79,7 @@ Index: configure
# glib support probe
# When bumping glib_req_ver, please check also whether we should increase
-@@ -2403,6 +2453,15 @@ fi
+@@ -2404,6 +2454,15 @@ fi
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-meson_build,v
retrieving revision 1.10
diff -u -p -r1.10 patch-meson_build
--- patches/patch-meson_build 23 Apr 2023 19:07:49 -0000 1.10
+++ patches/patch-meson_build 17 Aug 2023 21:30:17 -0000
@@ -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'))
-@@ -3805,9 +3805,6 @@ if targetos == 'darwin'
+@@ -3810,9 +3810,6 @@ if targetos == 'darwin'
summary_info += {'Objective-C compiler': '
'.join(meson.get_compiler('objc').cmd_array())}
endif
option_cflags = (get_option('debug') ? ['-g'] : [])
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/qemu/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST-main
--- pkg/PLIST-main 23 Apr 2023 19:07:49 -0000 1.14
+++ pkg/PLIST-main 17 Aug 2023 21:30:18 -0000
@@ -51,6 +51,7 @@ share/applications/qemu.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/doc/qemu/.buildinfo
share/doc/qemu/_static/
+share/doc/qemu/_static/_sphinx_javascript_frameworks_compat.js
share/doc/qemu/_static/basic.css
share/doc/qemu/_static/css/
share/doc/qemu/_static/css/badge_only.css
@@ -77,6 +78,7 @@ share/doc/qemu/_static/custom.js
share/doc/qemu/_static/doctools.js
share/doc/qemu/_static/documentation_options.js
share/doc/qemu/_static/file.png
+share/doc/qemu/_static/jquery.js
share/doc/qemu/_static/js/
share/doc/qemu/_static/js/badge_only.js
share/doc/qemu/_static/js/theme.js
--
%gonzalo
