Package: netdiag Version: 0.7-7.1 Severity: normal Tags: patch Hi,
Attached is the diff for my netdiag 0.7-7.2 NMU. Is this package still being maintained? It's been a slightly while since it was uploaded, though I do see you responding to a few bugs in the BTS. -- see shy jo
diff -u netdiag-0.7/tcpspray/tcpspray.c netdiag-0.7/tcpspray/tcpspray.c
--- netdiag-0.7/tcpspray/tcpspray.c
+++ netdiag-0.7/tcpspray/tcpspray.c
@@ -20,6 +20,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
+#include <sys/wait.h>
+#include <signal.h>
#include <netinet/in.h>
@@ -234,6 +236,8 @@
while (bytes_left) {
if ((cnt = read(sock, buf, bytes_left)) == -1) {
perror("receive:");
+ kill(pid, SIGTERM);
+ wait(NULL);
exit(2);
}
@@ -261,6 +265,8 @@
if ((cnt = read(sock, buf, bytes_left)) == -1) {
perror("receive:");
+ kill(pid, SIGTERM);
+ wait(NULL);
exit(2);
}
bytes_left -= cnt;
diff -u netdiag-0.7/debian/changelog netdiag-0.7/debian/changelog
--- netdiag-0.7/debian/changelog
+++ netdiag-0.7/debian/changelog
@@ -1,3 +1,16 @@
+netdiag (0.7-7.2) unstable; urgency=low
+
+ * NMU
+ * Patch from Rémi Denis-Courmont fixing tcpspray to kill background
+ processes if the foreground process dies. Closes: #12254
+ * Current standards version.
+ * Remove netload from the binary package as it will not work with 2.6
+ kernels. Closes: #23183
+ * Patch from Justin Pryzby fixing bad indentation in tcpspray man page.
+ Closes: #364208
+
+ -- Joey Hess <[EMAIL PROTECTED]> Tue, 27 Feb 2007 20:52:41 -0500
+
netdiag (0.7-7.1) unstable; urgency=low
* Don't set DESTDIR when building strobe, avoids strobe trying to read
diff -u netdiag-0.7/debian/README.debian netdiag-0.7/debian/README.debian
--- netdiag-0.7/debian/README.debian
+++ netdiag-0.7/debian/README.debian
@@ -6,7 +6,6 @@
statnet Shows network status
netwatch Shows network status in color. More info than statnet.
tcpblast Actively try to figure out maximum throughput on a link.
-netload Shows network status/troughput based on kernel stats.
All of these come with manpages some are constructed by Christoph Lameter
<[EMAIL PROTECTED]> since they were lacking.
diff -u netdiag-0.7/debian/control netdiag-0.7/debian/control
--- netdiag-0.7/debian/control
+++ netdiag-0.7/debian/control
@@ -14,3 +14,3 @@
system is showing strange network behaviour and you want to find out what
- your network is doing. The included tools are tcpblast, netload, trafshow,
+ your network is doing. The included tools are tcpblast, trafshow,
netwatch, strobe, statnet, and tcpspray.
diff -u netdiag-0.7/debian/menu netdiag-0.7/debian/menu
--- netdiag-0.7/debian/menu
+++ netdiag-0.7/debian/menu
@@ -7,2 +6,0 @@
-?package(netdiag):needs=text section="Apps/System" title="Network load on ppp0" \
- command="/usr/bin/netload ppp0"
diff -u netdiag-0.7/debian/rules netdiag-0.7/debian/rules
--- netdiag-0.7/debian/rules
+++ netdiag-0.7/debian/rules
@@ -16,7 +16,7 @@
cd trafshow*;make
cd netwatch;./configure;make
cd tcpblast;gcc -s -O2 -o tcpblast tcpblast*.c
- cd netload*;make
+# cd netload*;make
touch build
@@ -30,7 +30,7 @@
-cd trafshow*;make realclean
-cd netwatch;make clean
-cd tcpblast;rm tcpblast
- -cd netload*;make clean
+# -cd netload*;make clean
dh_clean
# Build architecture-independent files here.
@@ -52,7 +52,7 @@
install netwatch/netresolv debian/tmp/usr/lib/netdiag
install trafshow*/trafshow debian/tmp/usr/sbin
install tcpblast/tcpblast debian/tmp/usr/bin
- install netload*/netload debian/tmp/usr/bin
+# install netload*/netload debian/tmp/usr/bin
install diagperm debian/tmp/usr/sbin
dh_installdocs
@@ -60,7 +60,7 @@
dh_installmenu
# dh_installinit
dh_installcron
- dh_installmanpages
+ dh_installmanpages netload-0.92/netload.1
rm debian/tmp/usr/share/man/man1/statnet.1.proto
ln -s statnet.1.gz debian/tmp/usr/share/man/man1/statnetd.1.gz
# dh_undocumented
only in patch2:
unchanged:
--- netdiag-0.7.orig/tcpspray/tcpspray.1
+++ netdiag-0.7/tcpspray/tcpspray.1
@@ -67,7 +67,7 @@
.BI \-d " delay"
Sets the time in microseconds to wait between successive buffer
transmissions. The default is no delay.
-.TP
+
\".SH EXAMPLES
\".SH FILES
.SH SEE ALSO
signature.asc
Description: Digital signature
