File: netwatch.diff

package info (click to toggle)
netdiag 1.2-1
  • links: PTS
  • area: main
  • in suites: buster
  • size: 3,268 kB
  • sloc: ansic: 23,895; sh: 5,544; makefile: 328; awk: 130
file content (73 lines) | stat: -rw-r--r-- 2,660 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
Description: Make program compile and work on Linux.
Author: Michael Meskes <meskes@debian.org>
--- netdiag-1.2/netwatch-1.3.1-2/netwatch.c	2018-02-09 13:21:34.776552036 +0100
+++ netdiag-1.2/netwatch-1.3.1-2/netwatch.c	2018-02-09 13:37:37.061365992 +0100
@@ -1995,8 +1995,8 @@
       close (1);
       dup2 (osocket[1], 1);
       close (osocket[1]);
-      execlp ("netresolv", "netresolv", NULL);
-      perror ("exec netresolv");
+      execlp ("/usr/lib/netdiag/netresolv", "netresolv", NULL);
+      perror ("exec /usr/lib/netdiag/netresolv");
       exit (1);
     }
     close (msocket[0]);
--- netdiag-1.2/netwatch-1.3.1-2/processinetrc.c	2018-02-09 13:21:34.808552357 +0100
+++ netdiag-1.2/netwatch-1.3.1-2/processinetrc.c	2018-02-09 13:38:03.433595232 +0100
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <linux/if.h>
 
 FILE *fp;
 extern char configfile[];
@@ -81,7 +82,7 @@
   char buf[255];
   int cnt = 0;
   int num;
-  char devname[10], dest[20], gateway[20], flags[10], ref[10];
+  char devname[IFNAMSIZ], dest[20], gateway[20], flags[10], ref[10];
   char met[10], use[10], mask[20], rest[80];
 
 
--- netdiag-1.2/netwatch-1.3.1-2/Makefile.in	2018-02-09 13:21:34.812552397 +0100
+++ netdiag-1.2/netwatch-1.3.1-2/Makefile.in	2018-02-09 14:08:13.507208829 +0100
@@ -11,7 +11,7 @@
 # CFLAGS=
 DEFS= curs.h netwatch.h
 OBJECTS= curs.o dispdata.o services.o netwatch.o processinetrc.o gh.o warning.o semaphore.o
-INSTALLDIR=$(bindir)
+INSTALLDIR=/usr
 
 all:	$(EXEC)
 
@@ -23,12 +23,11 @@
 
 install:	$(EXEC)
 	install --owner=root --group=root --mode=0755 -d $(INSTALLDIR)
-	install --owner=root --group=root --mode=0755 -d $(mandir)/man1
-	install --owner=root --group=root --mode=0700  netwatch $(INSTALLDIR)
-	install --owner=root --group=root --mode=0700  netresolv $(INSTALLDIR)
-	bzip2 netwatch.1
-	install -D  netwatch.1.bz2 $(mandir)/man1
-	bunzip2 netwatch.1.bz2
+	install --owner=root --group=root --mode=0755 -d $(INSTALLDIR)/share/man/man1
+	install --owner=root --group=root --mode=0700  netwatch $(INSTALLDIR)/sbin
+	install --owner=root --group=root --mode=0700  netresolv $(INSTALLDIR)/lib/netdiag
+	install -D  netwatch.1 $(INSTALLDIR)/share/man/man1
+	gzip $(INSTALLDIR)/share/man/man1/netwatch.1
 	
 tar:
 	tar -C .. -czf ../netwatch-$(VERSION)-$(RELEASE).tgz netwatch-$(VERSION)
--- netdiag-1.2/netwatch-1.3.1-2/netwatch.1	2018-02-09 13:21:34.776552036 +0100
+++ netdiag-1.2/netwatch-1.3.1-2/netwatch.1	2018-02-09 13:37:37.061365992 +0100
@@ -1,5 +1,5 @@
 .\" "%W% %G%"
-.TH NETWATCH\ Version 1.0c
+.TH NETWATCH
 .SH NAME
 Netwatch \- Ethernet Internet Protocol Monitor
 .SH SYNOPSIS