package/network/utils/iputils/patches/010-include.patch

   1 Index: iputils-s20101006/tracepath.c
   2 ===================================================================
   3 --- iputils-s20101006.orig/tracepath.c
   4 +++ iputils-s20101006/tracepath.c
   5 @@ -14,13 +14,13 @@
   6  #include <unistd.h>
   7  #include <sys/socket.h>
   8  #include <linux/types.h>
   9 +#include <sys/time.h>
  10  #include <linux/errqueue.h>
  11  #include <errno.h>
  12  #include <string.h>
  13  #include <netdb.h>
  14  #include <netinet/in.h>
  15  #include <resolv.h>
  16 -#include <sys/time.h>
  17  #include <sys/uio.h>
  18  #include <arpa/inet.h>
  19
  20 Index: iputils-s20101006/ping_common.h
  21 ===================================================================
  22 --- iputils-s20101006.orig/ping_common.h
  23 +++ iputils-s20101006/ping_common.h
  24 @@ -7,11 +7,11 @@
  25  #include <linux/sockios.h>
  26  #include <sys/file.h>
  27  #include <sys/time.h>
  28 -#include <sys/signal.h>
  29 +#include <signal.h>
  30  #include <sys/ioctl.h>
  31  #include <net/if.h>
  32  #include <sys/uio.h>
  33 -#include <sys/poll.h>
  34 +#include <poll.h>
  35  #include <ctype.h>
  36  #include <errno.h>
  37  #include <string.h>
  38 @@ -20,7 +20,9 @@
  39  #include <netinet/in.h>
  40  #include <arpa/inet.h>
  41  #include <linux/types.h>
  42 +#include <sys/types.h>
  43  #include <linux/errqueue.h>
  44 +#include <asm/param.h>
  45
  46  #include "SNAPSHOT.h"
  47
  48 Index: iputils-s20101006/clockdiff.c
  49 ===================================================================
  50 --- iputils-s20101006.orig/clockdiff.c
  51 +++ iputils-s20101006/clockdiff.c
  52 @@ -14,7 +14,6 @@
  53  #include <netinet/ip.h>
  54  #include <netinet/ip_icmp.h>
  55  #define TSPTYPES
  56 -#include <protocols/timed.h>
  57  #include <fcntl.h>
  58  #include <netdb.h>
  59  #include <arpa/inet.h>
  60 Index: iputils-s20101006/Makefile
  61 ===================================================================
  62 --- iputils-s20101006.orig/Makefile
  63 +++ iputils-s20101006/Makefile
  64 @@ -16,7 +16,7 @@ CC=gcc
  65  CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
  66  CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
  67
  68 -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
  69 +IPV4_TARGETS=tracepath ping clockdiff arping tftpd
  70  IPV6_TARGETS=tracepath6 traceroute6 ping6
  71  TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
  72
  73 @@ -27,9 +27,11 @@ all: $(TARGETS)
  74
  75
  76  tftpd: tftpd.o tftpsubs.o
  77 -arping: arping.o -lsysfs
  78 +arping: arping.o
  79 +       $(CC) $(CFLAGS) -o $@ arping.o -lsysfs
  80  ping: ping.o ping_common.o
  81 -ping6: ping6.o ping_common.o -lresolv -lcrypto
  82 +ping6: ping6.o ping_common.o
  83 +       $(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto
  84  ping.o ping6.o ping_common.o: ping_common.h
  85  tftpd.o tftpsubs.o: tftp.h
  86
  87 Index: iputils-s20101006/arping.c
  88 ===================================================================
  89 --- iputils-s20101006.orig/arping.c
  90 +++ iputils-s20101006/arping.c
  91 @@ -15,7 +15,7 @@
  92  #include <linux/sockios.h>
  93  #include <sys/file.h>
  94  #include <sys/time.h>
  95 -#include <sys/signal.h>
  96 +#include <signal.h>
  97  #include <sys/ioctl.h>
  98  #include <linux/if.h>
  99  #include <linux/if_packet.h>