I have uploaded a NMU to DELAYED/10 with the changes in the attached debdiff.
diff -Nru nstreams-1.0.4/Makefile nstreams-1.0.4/Makefile
--- nstreams-1.0.4/Makefile 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/Makefile 2000-07-26 16:18:01.000000000 +0000
@@ -4,21 +4,21 @@
nstreams :
cd src && ${MAKE}
-
+
clean :
cd src && ${MAKE} clean
install : all
- $(INSTALL) -m 0755 -d ${DESTDIR}/${prefix}/bin
- $(INSTALL) -m 0755 src/nstreams ${DESTDIR}${prefix}/bin
- $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man
- $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man/man1
- $(INSTALL) -m 0444 docs/nstreams.1 ${DESTDIR}${prefix}/share/man/man1/
- if [ -f ${DESTDIR}/${sysconfdir}/nstreams-services ]; then mv
${DESTDIR}${sysconfdir}/nstreams-services
${DESTDIR}${sysconfdir}/nstreams-services.old;fi
- $(INSTALL) -m 0644 docs/nstreams-services
${DESTDIR}${sysconfdir}/nstreams/nstreams-services
- $(INSTALL) -m 0644 docs/nstreams-networks
${DESTDIR}${sysconfdir}/nstreams/nstreams-networks
-
+ $(INSTALL) -m 0755 -d ${prefix}/bin
+ $(INSTALL) -m 0755 src/nstreams ${prefix}/bin
+ $(INSTALL) -m 0755 -d ${prefix}/man
+ $(INSTALL) -m 0755 -d ${prefix}/man/man1
+ $(INSTALL) -m 0444 docs/nstreams.1 ${prefix}/man/man1/
+ if [ -f ${prefix}/etc/nstreams-services ]; then mv
${prefix}/etc/nstreams-services ${prefix}/etc/nstreams-services.old;fi
+ $(INSTALL) -m 0644 docs/nstreams-services
${prefix}/etc/nstreams-services
+ $(INSTALL) -m 0644 docs/nstreams-networks
${prefix}/etc/nstreams-networks.sample
+
distclean : clean
rm -f includes/config.h config.cache config.status config.log
nstreams.tmpl
-
+
diff -Nru nstreams-1.0.4/configure nstreams-1.0.4/configure
--- nstreams-1.0.4/configure 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/configure 2000-08-01 09:57:19.000000000 +0000
@@ -117,7 +117,6 @@
*=*) ;;
*) ac_optarg=yes ;;
esac
-
eval "enable_${ac_feature}='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -523,7 +522,7 @@
fi
-# From configure.in Revision: 1.7 ac_aux_dir=
+# From configure.in Revision: 1.1.1.1 ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
@@ -1134,13 +1133,13 @@
test "$prefix" = NONE && prefix=/usr/local
-#sysconfdir=${prefix}/etc
+sysconfdir=${prefix}/etc
cat >> confdefs.h <<EOF
-#define ETC_NSTREAMS_NETWORKS "${sysconfdir}/nstreams/nstreams-networks"
+#define ETC_NSTREAMS_NETWORKS "${prefix}/etc/nstreams-networks"
EOF
cat >> confdefs.h <<EOF
-#define ETC_NSTREAMS_SERVICES "${sysconfdir}/nstreams/nstreams-services"
+#define ETC_NSTREAMS_SERVICES "${prefix}/etc/nstreams-services"
EOF
for ac_func in bzero inet_ntoa
diff -Nru nstreams-1.0.4/configure.in nstreams-1.0.4/configure.in
--- nstreams-1.0.4/configure.in 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/configure.in 2000-08-01 09:57:19.000000000 +0000
@@ -30,8 +30,8 @@
test "$prefix" = NONE && prefix=/usr/local
sysconfdir=${prefix}/etc
-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS,
"${sysconfdir}/nstreams/nstreams-networks")
-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES,
"${sysconfdir}/nstreams/nstreams-services")
+AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS, "${prefix}/etc/nstreams-networks")
+AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES, "${prefix}/etc/nstreams-services")
AC_CHECK_FUNCS(bzero inet_ntoa)
AC_SUBST(PWDD)
AC_OUTPUT(nstreams.tmpl)
diff -Nru nstreams-1.0.4/debian/changelog nstreams-1.0.4/debian/changelog
--- nstreams-1.0.4/debian/changelog 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/debian/changelog 2024-03-23 14:59:32.000000000 +0000
@@ -1,3 +1,14 @@
+nstreams (1.0.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Convert to source format 3.0 (Closes: #1007384)
+ * Declare missing function prototype (Closes: #1066194)
+
+ [ Helmut Grohne ]
+ * FTCBFS: Let dpkg's buildtools.mk supply a CC to configure (Closes: #939158)
+
+ -- Bastian Germann <[email protected]> Sat, 23 Mar 2024 14:59:32 +0000
+
nstreams (1.0.4-1) unstable; urgency=medium
* New upstream version
diff -Nru nstreams-1.0.4/debian/patches/debian.patch
nstreams-1.0.4/debian/patches/debian.patch
--- nstreams-1.0.4/debian/patches/debian.patch 1970-01-01 00:00:00.000000000
+0000
+++ nstreams-1.0.4/debian/patches/debian.patch 2024-03-23 14:59:32.000000000
+0000
@@ -0,0 +1,84 @@
+--- nstreams-1.0.4.orig/Makefile
++++ nstreams-1.0.4/Makefile
+@@ -4,17 +4,17 @@ all : nstreams
+ clean :
+ cd src && ${MAKE} clean
+
+
+ install : all
+- $(INSTALL) -m 0755 -d ${prefix}/bin
+- $(INSTALL) -m 0755 src/nstreams ${prefix}/bin
+- $(INSTALL) -m 0755 -d ${prefix}/man
+- $(INSTALL) -m 0755 -d ${prefix}/man/man1
+- $(INSTALL) -m 0444 docs/nstreams.1 ${prefix}/man/man1/
+- if [ -f ${prefix}/etc/nstreams-services ]; then mv
${prefix}/etc/nstreams-services ${prefix}/etc/nstreams-services.old;fi
+- $(INSTALL) -m 0644 docs/nstreams-services
${prefix}/etc/nstreams-services
+- $(INSTALL) -m 0644 docs/nstreams-networks
${prefix}/etc/nstreams-networks.sample
+-
++ $(INSTALL) -m 0755 -d ${DESTDIR}/${prefix}/bin
++ $(INSTALL) -m 0755 src/nstreams ${DESTDIR}${prefix}/bin
++ $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man
++ $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man/man1
++ $(INSTALL) -m 0444 docs/nstreams.1 ${DESTDIR}${prefix}/share/man/man1/
++ if [ -f ${DESTDIR}/${sysconfdir}/nstreams-services ]; then mv
${DESTDIR}${sysconfdir}/nstreams-services
${DESTDIR}${sysconfdir}/nstreams-services.old;fi
++ $(INSTALL) -m 0644 docs/nstreams-services
${DESTDIR}${sysconfdir}/nstreams/nstreams-services
++ $(INSTALL) -m 0644 docs/nstreams-networks
${DESTDIR}${sysconfdir}/nstreams/nstreams-networks
++
+ distclean : clean
+ rm -f includes/config.h config.cache config.status config.log
nstreams.tmpl
+
+--- nstreams-1.0.4.orig/configure.in
++++ nstreams-1.0.4/configure.in
+@@ -30,8 +30,8 @@ AC_CHECK_LIB(pcap, pcap_open_live,,AC_ER
+
+ test "$prefix" = NONE && prefix=/usr/local
+ sysconfdir=${prefix}/etc
+-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS, "${prefix}/etc/nstreams-networks")
+-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES, "${prefix}/etc/nstreams-services")
++AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS,
"${sysconfdir}/nstreams/nstreams-networks")
++AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES,
"${sysconfdir}/nstreams/nstreams-services")
+ AC_CHECK_FUNCS(bzero inet_ntoa)
+ AC_SUBST(PWDD)
+ AC_OUTPUT(nstreams.tmpl)
+--- nstreams-1.0.4.orig/docs/nstreams.1
++++ nstreams-1.0.4/docs/nstreams.1
+@@ -1,6 +1,6 @@
+ .TH nstreams 1 "July 1999" "nstreams" "Users Manuals"
+ .SH NAME
+-network streams - a tcpdump output analyzer
++nstreams \- a tcpdump output analyzer
+ .SH SYNOPSIS
+ .B nstreams
+ [ -v ] [ -c
+--- nstreams-1.0.4.orig/nstreams.tmpl.in
++++ nstreams-1.0.4/nstreams.tmpl.in
+@@ -20,5 +20,7 @@ infodir=@infodir@
+ mandir=@mandir@
+ CC=@CC@
+ CFLAGS=@CFLAGS@ $(CWARN) -I$(includedir) -I$(rootdir)/includes
++LDFLAGS=@LDFLAGS@
+ DEFS=$(CFLAGS)
+ INSTALL=./install-sh -c
++DESTDIR=$(DESTDIR)
+--- nstreams-1.0.4.orig/src/Makefile
++++ nstreams-1.0.4/src/Makefile
+@@ -4,18 +4,18 @@ OBJS=nstreams.o parse_tcpdump.o config_r
+ networks.o output.o read_pcap.o
+
+ COMPILE=$(CC) $(CFLAGS)
+-LIBS=-lpcap
++LIBS=-lpcap $(LDFLAGS)
+ all : nstreams
+
+ nstreams : $(OBJS)
+ $(COMPILE) $(OBJS) -o nstreams $(LIBS)
+
+ nstreams.o : nstreams.c
+ $(COMPILE) -c nstreams.c
+
+ parse_tcpdump.o : parse_tcpdump.c
+ $(COMPILE) -c parse_tcpdump.c
+
+ read_pcap.o : read_pcap.c
+ $(COMPILE) -c read_pcap.c
+
diff -Nru nstreams-1.0.4/debian/patches/define-int2proto.patch
nstreams-1.0.4/debian/patches/define-int2proto.patch
--- nstreams-1.0.4/debian/patches/define-int2proto.patch 1970-01-01
00:00:00.000000000 +0000
+++ nstreams-1.0.4/debian/patches/define-int2proto.patch 2024-03-23
14:59:32.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Declare int2proto prototype
+Author: Bastian Germann <[email protected]>
+Bug-Debian: https://bugs.debian.org/1066194
+
+---
+
+--- nstreams-1.0.4.orig/includes/includes.h
++++ nstreams-1.0.4/includes/includes.h
+@@ -65,4 +65,6 @@ extern char * optarg;
+ #include <ctype.h>
+ #endif
+
++char * int2proto(int proto);
++
+ #endif
diff -Nru nstreams-1.0.4/debian/patches/series
nstreams-1.0.4/debian/patches/series
--- nstreams-1.0.4/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ nstreams-1.0.4/debian/patches/series 2024-03-23 14:59:32.000000000
+0000
@@ -0,0 +1,2 @@
+debian.patch
+define-int2proto.patch
diff -Nru nstreams-1.0.4/debian/rules nstreams-1.0.4/debian/rules
--- nstreams-1.0.4/debian/rules 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/debian/rules 2024-03-23 14:59:32.000000000 +0000
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+-include /usr/share/dpkg/buildtools.mk
+export CC
+
%:
dh $@ --with autotools_dev
diff -Nru nstreams-1.0.4/debian/source/format
nstreams-1.0.4/debian/source/format
--- nstreams-1.0.4/debian/source/format 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/debian/source/format 2024-03-23 14:54:46.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru nstreams-1.0.4/docs/nstreams.1 nstreams-1.0.4/docs/nstreams.1
--- nstreams-1.0.4/docs/nstreams.1 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/docs/nstreams.1 2000-07-26 16:18:01.000000000 +0000
@@ -1,6 +1,6 @@
.TH nstreams 1 "July 1999" "nstreams" "Users Manuals"
.SH NAME
-nstreams \- a tcpdump output analyzer
+network streams - a tcpdump output analyzer
.SH SYNOPSIS
.B nstreams
[ -v ] [ -c
diff -Nru nstreams-1.0.4/nstreams.tmpl.in nstreams-1.0.4/nstreams.tmpl.in
--- nstreams-1.0.4/nstreams.tmpl.in 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/nstreams.tmpl.in 2000-07-26 16:18:01.000000000 +0000
@@ -20,7 +20,5 @@
mandir=@mandir@
CC=@CC@
CFLAGS=@CFLAGS@ $(CWARN) -I$(includedir) -I$(rootdir)/includes
-LDFLAGS=@LDFLAGS@
DEFS=$(CFLAGS)
INSTALL=./install-sh -c
-DESTDIR=$(DESTDIR)
diff -Nru nstreams-1.0.4/src/Makefile nstreams-1.0.4/src/Makefile
--- nstreams-1.0.4/src/Makefile 2024-03-23 15:45:41.000000000 +0000
+++ nstreams-1.0.4/src/Makefile 2000-07-26 16:18:01.000000000 +0000
@@ -4,18 +4,18 @@
networks.o output.o read_pcap.o
COMPILE=$(CC) $(CFLAGS)
-LIBS=-lpcap $(LDFLAGS)
+LIBS=-lpcap
all : nstreams
nstreams : $(OBJS)
$(COMPILE) $(OBJS) -o nstreams $(LIBS)
-
+
nstreams.o : nstreams.c
$(COMPILE) -c nstreams.c
parse_tcpdump.o : parse_tcpdump.c
$(COMPILE) -c parse_tcpdump.c
-
+
read_pcap.o : read_pcap.c
$(COMPILE) -c read_pcap.c
@@ -24,16 +24,16 @@
ports.o : ports.c
$(COMPILE) -c ports.c
-
+
cache.o : cache.c
$(COMPILE) -c cache.c
-
+
networks.o : networks.c
$(COMPILE) -c networks.c
output.o : output.c output.h
$(COMPILE) -c output.c
-
-
+
+
clean :
rm -f $(OBJS) nstreams
