Control: tags -1 +patch +pending Dear maintainer,
I've prepared an NMU for vbetool (versioned as 1.1-6) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru vbetool-1.1/debian/changelog vbetool-1.1/debian/changelog
--- vbetool-1.1/debian/changelog 2020-05-02 11:45:10.000000000 -0400
+++ vbetool-1.1/debian/changelog 2025-01-26 20:01:54.000000000 -0500
@@ -1,3 +1,12 @@
+vbetool (1.1-6) unstable; urgency=medium
+
+ * Take over package maintenance via ITS process. (Closes: #1092448)
+
+ [ Andrew Bower ]
+ * Fix FTBFS with GCC 14. (Closes: #1075615)
+
+ -- Boyuan Yang <by...@debian.org> Sun, 26 Jan 2025 20:01:54 -0500
+
vbetool (1.1-5) unstable; urgency=medium
* New maintainer (Closes: #674887)
diff -Nru vbetool-1.1/debian/control vbetool-1.1/debian/control
--- vbetool-1.1/debian/control 2020-05-02 11:45:10.000000000 -0400
+++ vbetool-1.1/debian/control 2025-01-26 19:58:38.000000000 -0500
@@ -1,7 +1,7 @@
Source: vbetool
Section: utils
Priority: optional
-Maintainer: Seunghun Han <kkama...@gmail.com>
+Maintainer: Boyuan Yang <by...@debian.org>
Build-Depends: debhelper-compat (= 12),
libx86-dev,
libpci-dev
diff -Nru vbetool-1.1/debian/patches/10_fix_literal_pointer_errors.diff
vbetool-1.1/debian/patches/10_fix_literal_pointer_errors.diff
--- vbetool-1.1/debian/patches/10_fix_literal_pointer_errors.diff
1969-12-31 19:00:00.000000000 -0500
+++ vbetool-1.1/debian/patches/10_fix_literal_pointer_errors.diff
2025-01-26 20:00:53.000000000 -0500
@@ -0,0 +1,25 @@
+From: Andrew Bower <and...@bower.uk>
+Date: Mon, 9 Dec 2024 07:50:54 +0000
+Forwarded: no
+Subject: cast literal to pointer before passing to m(un)map
+
+Appease [-Wint-conversion] to fix FTBFS for GCC-14. (Closes: #1075615)
+---
+ vbetool.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vbetool.c b/vbetool.c
+index f6eee59..1567a77 100644
+--- a/vbetool.c
++++ b/vbetool.c
+@@ -117,8 +117,8 @@ int main(int argc, char *argv[])
+ void *rc;
+ int romfd = open (argv[2], O_RDWR);
+
+- munmap(0xc0000, 64*1024);
+- rc = mmap(0xc0000, 64*1024,
++ munmap((void *) 0xc0000, 64*1024);
++ rc = mmap((void *) 0xc0000, 64*1024,
+ PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_FIXED|MAP_PRIVATE, romfd, 0);
+ }
diff -Nru vbetool-1.1/debian/patches/11_fix_compiler_warnings.diff
vbetool-1.1/debian/patches/11_fix_compiler_warnings.diff
--- vbetool-1.1/debian/patches/11_fix_compiler_warnings.diff 1969-12-31
19:00:00.000000000 -0500
+++ vbetool-1.1/debian/patches/11_fix_compiler_warnings.diff 2025-01-26
20:00:53.000000000 -0500
@@ -0,0 +1,54 @@
+From: Andrew Bower <and...@bower.uk>
+Date: Mon, 9 Dec 2024 07:57:32 +0000
+Forwarded: no
+Subject: handle errors from mmap() and short writes,
+ avoiding [-Wunused-but-set-variable]
+
+And use correct format specifier for size_t, avoiding [-Wformat=].
+With this patch, compilation on i386 is free from warnings.
+---
+ vbetool.c | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/vbetool.c b/vbetool.c
+index 1567a77..8a7002c 100644
+--- a/vbetool.c
++++ b/vbetool.c
+@@ -121,6 +121,10 @@ int main(int argc, char *argv[])
+ rc = mmap((void *) 0xc0000, 64*1024,
+ PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_FIXED|MAP_PRIVATE, romfd, 0);
++ if (rc == MAP_FAILED) {
++ perror("mmap - ");
++ return 1;
++ }
+ }
+
+ return do_post();
+@@ -356,11 +360,13 @@ void save_state(void)
+ {
+ int size;
+ char *buffer = __save_state(&size);
+- ssize_t num_written;
++ ssize_t num_written = 0;
+
+- if (buffer)
+- /* FIXME: should retry on short write); */
+- num_written = write(1, buffer, size);
++ for (; buffer && size && num_written >= 0; buffer += num_written)
++ if ((num_written = write(1, buffer, size)) == -1)
++ perror("Writing out of state failed - ");
++ else
++ size -= num_written;
+ }
+
+ int do_blank(int state)
+@@ -529,7 +535,7 @@ int do_get_panel_id(int just_dimensions)
+ r.edi = (unsigned long)(id-LRMI_base_addr()) & 0xf;
+
+ if(sizeof(struct panel_id) != 32)
+- return fprintf(stderr, "oops: panel_id, sizeof struct panel_id != 32,
it's %ld...\n", sizeof(struct panel_id)), 7;
++ return fprintf(stderr, "oops: panel_id, sizeof struct panel_id != 32,
it's %zd...\n", sizeof(struct panel_id)), 7;
+
+ if(real_mode_int(0x10, &r))
+ return fprintf(stderr, "Can't get panel id (vm86 failure)\n"), 8;
diff -Nru vbetool-1.1/debian/patches/series vbetool-1.1/debian/patches/series
--- vbetool-1.1/debian/patches/series 2020-05-02 11:37:02.000000000 -0400
+++ vbetool-1.1/debian/patches/series 2025-01-26 20:00:53.000000000 -0500
@@ -1,2 +1,4 @@
00_misc_fixes.diff
01_fix_manpage.diff
+10_fix_literal_pointer_errors.diff
+11_fix_compiler_warnings.diff
signature.asc
Description: This is a digitally signed message part
