Merge ~liushuyu-011/ubuntu/+source/netdiag:ubuntu/devel into ubuntu/+source/netdiag:ubuntu/devel

[Zixing Liu]

This MP adds a patch to fix FTBFS on armhf due to various instances of missing headers and missing prototypes.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15925969/+listing-archive-extra

[Vladimir Petko (vpa1977)]

a couple of minor nits, but nothing blocking.

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you!!!

diff --git a/debian/changelog b/debian/changelog
index b4e23ee..d25883d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netdiag (1.2-1.2ubuntu1) noble; urgency=medium
+
+  * debian/patches/gcc13.patch: Add multiple missing headers and
+    function prototypes.  Closes LP: #2060901.
+
+ -- Zixing Liu <[e-mail]>  Wed, 10 Apr 2024 21:26:00 -0600
+
 netdiag (1.2-1.2build2) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/gcc13.patch b/debian/patches/gcc13.patch
 new file mode 100644
index 0000000..63ac846
--- /dev/null
+++ b/debian/patches/gcc13.patch
@@ -0,0 +1,106 @@
+Description: Add multiple missing headers and function prototypes
+Author: Zixing Liu <[e-mail]>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066694
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/netdiag/+bug/2060901
+Forwarded: no
+Last-Update: 2024-04-10
+Index: netdiag/netwatch-1.3.1-2/netwatch.h
+===================================================================
+--- netdiag.orig/netwatch-1.3.1-2/netwatch.h
++++ netdiag/netwatch-1.3.1-2/netwatch.h
+@@ -38,6 +38,10 @@
+ #define SN_PROT_LOOP		164	/* Pseudo protocol for Loopback */
+ 
+ #include <sys/types.h>
++#include <time.h>
++#include <ctype.h>
++#include <unistd.h>
++#include <stdlib.h>
+ #include "config.h"
+ /*
+ #ifdef NETINET_SUPP_socket
+@@ -84,6 +88,11 @@ typedef unsigned short  sa_family_t;
+ 
+ 
+ #include "core.h"
++int dokeyin(int force);
++int doeth();
++int gh (int opt);
++void setuphelp();
++void uthread_wait(long usec);
+ void dispdata(int errnum);
+ void services();
+ void usage(char *arg);
+Index: netdiag/statnet-3.8/statnet.c
+===================================================================
+--- netdiag.orig/statnet-3.8/statnet.c
++++ netdiag/statnet-3.8/statnet.c
+@@ -7,7 +7,6 @@
+ #define MAIN_LINE 1
+ 
+ #include <values.h>
+-#include "stat.h"
+ 
+ #include "curs.h"
+ #include <signal.h>
+@@ -33,6 +32,8 @@
+ #endif
+ 
+ #include <sys/shm.h>
++#include <curses.h>
++#include "stat.h"
+ 
+ #define Stringify(X)	#X
+ #define Quoteify(X)	Stringify(X)
+Index: netdiag/statnet-3.8/getservent.c
+===================================================================
+--- netdiag.orig/statnet-3.8/getservent.c
++++ netdiag/statnet-3.8/getservent.c
+@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)getservent.c
+ #endif /* LIBC_SCCS and not lint */
+ 
+ #include "inetprivate.h"
+-
++#include <stdlib.h>
+ #define	MAXALIASES	35
+ 
+ static char SERVDB[] = _PATH_SERVICES;
+Index: netdiag/statnet-3.8/itstime.c
+===================================================================
+--- netdiag.orig/statnet-3.8/itstime.c
++++ netdiag/statnet-3.8/itstime.c
+@@ -8,7 +8,7 @@
+ #include "stat.h"
+ #include <errno.h>
+ #include <signal.h>
+-
++#include <unistd.h>
+ extern struct StatMemStruct *StatMem;	/* pointer to shared memory segment */
+ 
+ void itstime (int errnum)
+Index: netdiag/statnet-3.8/stat.h
+===================================================================
+--- netdiag.orig/statnet-3.8/stat.h
++++ netdiag/statnet-3.8/stat.h
+@@ -197,7 +197,7 @@ void set_null ( struct StatMemStruct *St
+ void services ();
+ void stat_delta ( struct StatMemStruct *New, struct StatMemStruct *Prev, struct StatMemStruct *Delta );
+ void usage (char *arg);
+-#ifdef WINDOW
++#if CURSES_H
+ void win_show_stat( WINDOW *win, int X, int Y, int noframes, struct Tally *Now_ts, struct Tally *Prev_ts, struct Tally *Delta_ts, short rewrite_labels, short *update_labels, void *show_labels );
+ #endif
+ 
+@@ -226,10 +226,10 @@ void tally_ntoh ( int bytecode,
+         struct Tally *New_t, 
+         struct Tally *Prev_t );
+ 
+-#ifdef WINDOW
++#if CURSES_H
+ void tally_label ( struct Tally *Now_ts, WINDOW *win, int width, int height );
+ #endif
+-
++int tally (int type_wanted, struct Tally *tally);
+ 
+ /* Now some redefinitions of <netdb.h> stuff.  With the Berkeley notice... */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2e4ffbe..db294ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ clang-ftbfs.diff
 gcc-10.diff
 pcap_init.diff
 gcc12.patch
+gcc13.patch