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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
Index: iputils-s20101006/tracepath.c
===================================================================
--- iputils-s20101006.orig/tracepath.c
+++ iputils-s20101006/tracepath.c
@@ -14,13 +14,13 @@
#include <unistd.h>
#include <sys/socket.h>
#include <linux/types.h>
+#include <sys/time.h>
#include <linux/errqueue.h>
#include <errno.h>
#include <string.h>
#include <netdb.h>
#include <netinet/in.h>
#include <resolv.h>
-#include <sys/time.h>
#include <sys/uio.h>
#include <arpa/inet.h>
Index: iputils-s20101006/ping_common.h
===================================================================
--- iputils-s20101006.orig/ping_common.h
+++ iputils-s20101006/ping_common.h
@@ -7,11 +7,11 @@
#include <linux/sockios.h>
#include <sys/file.h>
#include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <sys/uio.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <ctype.h>
#include <errno.h>
#include <string.h>
@@ -20,7 +20,9 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <linux/types.h>
+#include <sys/types.h>
#include <linux/errqueue.h>
+#include <asm/param.h>
#include "SNAPSHOT.h"
Index: iputils-s20101006/clockdiff.c
===================================================================
--- iputils-s20101006.orig/clockdiff.c
+++ iputils-s20101006/clockdiff.c
@@ -14,7 +14,6 @@
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#define TSPTYPES
-#include <protocols/timed.h>
#include <fcntl.h>
#include <netdb.h>
#include <arpa/inet.h>
Index: iputils-s20101006/Makefile
===================================================================
--- iputils-s20101006.orig/Makefile
+++ iputils-s20101006/Makefile
@@ -16,7 +16,7 @@ CC=gcc
CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+IPV4_TARGETS=tracepath ping clockdiff arping tftpd
IPV6_TARGETS=tracepath6 traceroute6 ping6
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
@@ -27,9 +27,11 @@ all: $(TARGETS)
tftpd: tftpd.o tftpsubs.o
-arping: arping.o -lsysfs
+arping: arping.o
+ $(CC) $(CFLAGS) -o $@ arping.o -lsysfs
ping: ping.o ping_common.o
-ping6: ping6.o ping_common.o -lresolv -lcrypto
+ping6: ping6.o ping_common.o
+ $(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto
ping.o ping6.o ping_common.o: ping_common.h
tftpd.o tftpsubs.o: tftp.h
Index: iputils-s20101006/arping.c
===================================================================
--- iputils-s20101006.orig/arping.c
+++ iputils-s20101006/arping.c
@@ -15,7 +15,7 @@
#include <linux/sockios.h>
#include <sys/file.h>
#include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/ioctl.h>
#include <linux/if.h>
#include <linux/if_packet.h>
|
