Control: tags 1075266 + patch

Dear maintainer,

to fix the issues with this package, I've prepared an NMU for mgetty
(versioned as 1.2.1-1.4), debdiff below. An upload to DELAYED/1 will
follow shortly. Please feel free to tell me if I should delay it
longer.

Regards,

    Christoph

diff -Nru mgetty-1.2.1/debian/changelog mgetty-1.2.1/debian/changelog
--- mgetty-1.2.1/debian/changelog       2023-12-23 19:26:37.000000000 +0100
+++ mgetty-1.2.1/debian/changelog       2024-11-06 20:21:52.000000000 +0100
@@ -1,3 +1,11 @@
+mgetty (1.2.1-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add explicit type declarations to fix build error with GCC-14.
+    Closes: #1075266
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de>  Wed, 06 Nov 2024 
20:21:52 +0100
+
 mgetty (1.2.1-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru mgetty-1.2.1/debian/patches/90-gcc-14 
mgetty-1.2.1/debian/patches/90-gcc-14
--- mgetty-1.2.1/debian/patches/90-gcc-14       1970-01-01 01:00:00.000000000 
+0100
+++ mgetty-1.2.1/debian/patches/90-gcc-14       2024-11-06 20:21:52.000000000 
+0100
@@ -0,0 +1,101 @@
+Subject: Fixing build error with GCC-14
+Origin: upstream, commit mgetty_1_2_0-39-g823fb8d
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Date: Mon Oct 28 08:24:03 2024 +0100
+Bug-Debian: https://bugs.debian.org/1075266
+
+    Greetings,
+
+    Debian bug report <https://bugs.debian.org/1075266>:
+
+    The GCC version 14 implemented stricter checks and/or Debian changed the
+    default compile options. As a result, mgetty no longer builds for
+    various -Wimplicit-int in contrib/g3toxwd.c and ontrib/g3tolj.c and
+    other warnings.
+
+    The patch attached add[s] the missing declarations. It's untested but still
+    should do the right things.
+
+    Cheers,
+
+        Christoph
+
+--- a/contrib/g3tolj.c
++++ b/contrib/g3tolj.c
+@@ -66,6 +66,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ typedef unsigned char bit;
+ 
+@@ -361,8 +362,8 @@
+ 
+ static int dpi = 300;
+ static int doubleheight = 1;
+-static hscale = 100;
+-static vscale = 100;
++static int hscale = 100;
++static int vscale = 100;
+ static int cmode = 0;         /* compression mode, 1=rll, 2=tiff */
+ 
+ static void putinit (), putbit (), putrest (), putitem ();
+@@ -427,7 +428,7 @@
+     return b;
+ }
+ 
+-addtohash (hash, te, n, a, b)
++void addtohash (hash, te, n, a, b)
+      tableentry *hash[];
+      tableentry *te;
+      int n, a, b;
+@@ -463,7 +464,7 @@
+     return ((te && te->length == length && te->code == code) ? te : 0);
+ }
+ 
+-getfaxrow (row, bitrow)
++int getfaxrow (row, bitrow)
+      int row;
+      bit *bitrow;
+ {
+@@ -675,7 +676,7 @@
+ static int lncnt = 0;
+ static int maxline = 11 * 300;
+ 
+-newpage (FILE * fd)
++void newpage (FILE * fd)
+ {
+     int i;
+ 
+--- a/contrib/g3toxwd.c
++++ b/contrib/g3toxwd.c
+@@ -415,8 +415,8 @@
+ }
+ 
+ static int doubleheight = 1;
+-static hscale = 100;
+-static vscale = 100;
++static int hscale = 100;
++static int vscale = 100;
+ 
+ static void putinit (), putbit (), putrest (), putitem ();
+ static int item, bitsperitem;
+@@ -480,7 +480,7 @@
+     return b;
+ }
+ 
+-addtohash (hash, te, n, a, b)
++void addtohash (hash, te, n, a, b)
+      tableentry *hash[];
+      tableentry *te;
+      int n, a, b;
+@@ -516,7 +516,7 @@
+     return ((te && te->length == length && te->code == code) ? te : 0);
+ }
+ 
+-getfaxrow (row, bitrow)
++int getfaxrow (row, bitrow)
+      int row;
+      bit *bitrow;
+ {
diff -Nru mgetty-1.2.1/debian/patches/series mgetty-1.2.1/debian/patches/series
--- mgetty-1.2.1/debian/patches/series  2022-04-14 15:50:17.000000000 +0200
+++ mgetty-1.2.1/debian/patches/series  2024-11-06 20:21:52.000000000 +0100
@@ -30,3 +30,4 @@
 78-insecure-tmp-usage
 
 80-ppc64el
+90-gcc-14

Attachment: signature.asc
Description: PGP signature

Reply via email to