I am uploading a NMU to fix this. The debdiff is attached.
diff -Nru netdiag-1.2/debian/README.source netdiag-1.2/debian/README.source
--- netdiag-1.2/debian/README.source 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff -Nru netdiag-1.2/debian/changelog netdiag-1.2/debian/changelog
--- netdiag-1.2/debian/changelog 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/changelog 2024-06-09 19:19:14.000000000 +0000
@@ -1,3 +1,14 @@
+netdiag (1.2-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0. (Closes: #1054902)
+ + Drop generic quilt description in d/README.source
+
+ [ Zixing Liu ]
+ * Add multiple missing headers and function prototypes. (Closes: #1066694)
+
+ -- Bastian Germann <b...@debian.org> Sun, 09 Jun 2024 19:19:14 +0000
+
netdiag (1.2-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru netdiag-1.2/debian/control netdiag-1.2/debian/control
--- netdiag-1.2/debian/control 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/control 2024-06-09 19:17:21.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Michael Meskes <mes...@debian.org>
Standards-Version: 4.1.3
-Build-Depends: libncurses-dev, debhelper (>= 11), m4, libpcap0.8-dev,
po-debconf (>= 0.5.0), quilt
+Build-Depends: libncurses-dev, debhelper (>= 11), m4, libpcap0.8-dev,
po-debconf (>= 0.5.0)
Package: netdiag
Architecture: any
diff -Nru netdiag-1.2/debian/patches/gcc13.patch
netdiag-1.2/debian/patches/gcc13.patch
--- netdiag-1.2/debian/patches/gcc13.patch 1970-01-01 00:00:00.000000000
+0000
+++ netdiag-1.2/debian/patches/gcc13.patch 2024-06-09 19:15:38.000000000
+0000
@@ -0,0 +1,106 @@
+Description: Add multiple missing headers and function prototypes
+Author: Zixing Liu <zixing....@canonical.com>
+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 -Nru netdiag-1.2/debian/patches/series netdiag-1.2/debian/patches/series
--- netdiag-1.2/debian/patches/series 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/patches/series 2024-06-09 19:15:38.000000000 +0000
@@ -9,3 +9,4 @@
gcc-10.diff
pcap_init.diff
gcc12.patch
+gcc13.patch
diff -Nru netdiag-1.2/debian/rules netdiag-1.2/debian/rules
--- netdiag-1.2/debian/rules 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/rules 2024-06-09 19:19:14.000000000 +0000
@@ -5,7 +5,6 @@
#DH_VERBOSE=1
-include /usr/share/dpkg/buildtools.mk
-include /usr/share/quilt/quilt.make
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
CFLAGS =`dpkg-buildflags --get CPPFLAGS`
@@ -27,7 +26,7 @@
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
-build-stamp: patch configure-stamp
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
@@ -40,7 +39,7 @@
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
diff -Nru netdiag-1.2/debian/source/format netdiag-1.2/debian/source/format
--- netdiag-1.2/debian/source/format 2024-06-09 19:25:34.000000000 +0000
+++ netdiag-1.2/debian/source/format 2024-06-09 19:17:02.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
