Re: sysutils/firmware/vmm: update to 1.16.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/firmware/vmm/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 14 Jul 2023 09:13:57 -0000 1.31
+++ Makefile 2 Sep 2023 16:07:23 -0000
@@ -13,10 +13,9 @@ COMPILER_LANGS= c
# alignments. As a result, this project can not be built.

FW_DRIVER= vmm
-FW_VER= 1.14.0
+FW_VER= 1.16.2
SB_VER= 20180715
DISTNAME= seabios-${FW_VER}
-REVISION= 4
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sgabios-${SB_VER}{72f39d48bedf044e202fd51fecf3e2218fc2ae66}.tar.gz:0

Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/firmware/vmm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Sep 2021 11:04:21 -0000 1.5
+++ distinfo 2 Sep 2023 15:56:19 -0000
@@ -1,4 +1,4 @@
-SHA256 (firmware/seabios-1.14.0.tar.gz) = 63DMYrKaqD4QplMjOs6/S7FU0A0Mh9wqLG4tp15egf0=
+SHA256 (firmware/seabios-1.16.2.tar.gz) = 76jVKUQq0WgFb5SsZmaxs1Q8Yv969tngIFYfTQ4y+Vk=
SHA256 (firmware/sgabios-20180715.tar.gz) = a9r+PdIplwrxyPRinx3TbRGUvu/wU+/6PBh7Sj1iGLA=
-SIZE (firmware/seabios-1.14.0.tar.gz) = 628985
+SIZE (firmware/seabios-1.16.2.tar.gz) = 635918
SIZE (firmware/sgabios-20180715.tar.gz) = 31205
Index: patches/patch-src_boot_c
===================================================================
RCS file: /cvs/ports/sysutils/firmware/vmm/patches/patch-src_boot_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_boot_c
--- patches/patch-src_boot_c 7 Mar 2022 22:03:32 -0000 1.4
+++ patches/patch-src_boot_c 2 Sep 2023 15:58:52 -0000
@@ -1,7 +1,7 @@
Index: src/boot.c
--- src/boot.c.orig
+++ src/boot.c
-@@ -909,7 +909,7 @@ boot_cdrom(struct drive_s *drive)
+@@ -919,7 +919,7 @@ boot_cdrom(struct drive_s *drive)
{
if (! CONFIG_CDROM_BOOT)
return;
@@ -10,7 +10,7 @@ Index: src/boot.c

int status = cdrom_boot(drive);
if (status) {
-@@ -935,7 +935,7 @@ boot_cbfs(struct cbfs_file *file)
+@@ -945,7 +945,7 @@ boot_cbfs(struct cbfs_file *file)
{
if (!CONFIG_COREBOOT_FLASH)
return;
@@ -19,7 +19,7 @@ Index: src/boot.c
cbfs_run_payload(file);
}

-@@ -943,7 +943,7 @@ boot_cbfs(struct cbfs_file *file)
+@@ -953,7 +953,7 @@ boot_cbfs(struct cbfs_file *file)
static void
boot_rom(u32 vector)
{
@@ -28,7 +28,7 @@ Index: src/boot.c
struct segoff_s so;
so.segoff = vector;
call_boot_entry(so, 0);
-@@ -983,11 +983,11 @@ do_boot(int seq_nr)
+@@ -993,11 +993,11 @@ do_boot(int seq_nr)
struct bev_s *ie = &BEV[seq_nr];
switch (ie->type) {
case IPL_TYPE_FLOPPY:
On Sat, Sep 02, 2023 at 12:26:07PM -0400, Dave Voutila wrote:
>
> Klemens Nanni <kn@openbsd.org> writes:
>
> > On Sat, Sep 02, 2023 at 05:06:04PM +0100, Klemens Nanni wrote:
> >> https://www.seabios.org/Releases#SeaBIOS_1.16.0
> >>
> >> $ make package
> >> # fw_update /usr/ports/packages/amd64/all/vmm-firmware-1.16.2p4.tgz
> >>
> >> works for me.
> >> Feedback? OK?
> >
> > Now with old REVISION removed.
> >
>
> Neither apply cleanly for me for some reason. Only one failing hunk:

Base patch(1) works just fine for me.

Perhaps these two mails of mine got mangled, unlike all the others I send?
Same diff attached.

>
> Hmm... The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: patches/patch-src_boot_c
> |===================================================================
> |RCS file: /cvs/ports/sysutils/firmware/vmm/patches/patch-src_boot_c,v
> |retrieving revision 1.4
> |diff -u -p -r1.4 patch-src_boot_c
> |--- patches/patch-src_boot_c 7 Mar 2022 22:03:32 -0000 1.4
> |+++ patches/patch-src_boot_c 2 Sep 2023 15:58:52 -0000
> --------------------------
> Patching file patches/patch-src_boot_c using Plan A...
> Hunk #1 succeeded at 1.
> Hunk #2 succeeded at 10 with fuzz 1.
> Hunk #3 failed at 19.
> Hunk #4 succeeded at 28.
> 1 out of 4 hunks failed
> done
>