120-use-linux-ether-not-netinet.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. Index: rp-pppoe-3.11/src/configure
  2. ===================================================================
  3. --- rp-pppoe-3.11.orig/src/configure 2016-05-21 23:42:58.142423086 -0400
  4. +++ rp-pppoe-3.11/src/configure 2016-05-21 23:42:58.178423086 -0400
  5. @@ -3646,7 +3646,7 @@
  6. done
  7. -for ac_header in fcntl.h sys/dlpi.h sys/ioctl.h sys/time.h syslog.h unistd.h net/if_arp.h netinet/if_ether.h getopt.h sys/uio.h sys/param.h fcntl.h net/bpf.h netpacket/packet.h net/ethernet.h asm/types.h linux/if_packet.h linux/if_ether.h sys/socket.h sys/cdefs.h net/if.h net/if_dl.h net/if_ether.h net/if_types.h netinet/if_ether.h net/if_types.h net/if_dl.h
  8. +for ac_header in fcntl.h sys/dlpi.h sys/ioctl.h sys/time.h syslog.h unistd.h net/if_arp.h getopt.h sys/uio.h sys/param.h fcntl.h net/bpf.h netpacket/packet.h asm/types.h linux/if_packet.h linux/if_ether.h sys/socket.h sys/cdefs.h net/if.h net/if_dl.h net/if_types.h net/if_types.h net/if_dl.h
  9. do :
  10. as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  11. ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
  12. Index: rp-pppoe-3.11/src/if.c
  13. ===================================================================
  14. --- rp-pppoe-3.11.orig/src/if.c 2012-08-17 14:31:25.000000000 -0400
  15. +++ rp-pppoe-3.11/src/if.c 2016-05-21 23:45:13.546423086 -0400
  16. @@ -30,10 +30,6 @@
  17. #include <linux/if_packet.h>
  18. #endif
  19. -#ifdef HAVE_NET_ETHERNET_H
  20. -#include <net/ethernet.h>
  21. -#endif
  22. -
  23. #ifdef HAVE_ASM_TYPES_H
  24. #include <asm/types.h>
  25. #endif
  26. Index: rp-pppoe-3.11/src/plugin.c
  27. ===================================================================
  28. --- rp-pppoe-3.11.orig/src/plugin.c 2012-08-17 14:31:25.000000000 -0400
  29. +++ rp-pppoe-3.11/src/plugin.c 2016-05-21 23:43:55.314423086 -0400
  30. @@ -49,7 +49,6 @@
  31. #include <unistd.h>
  32. #include <fcntl.h>
  33. #include <signal.h>
  34. -#include <net/ethernet.h>
  35. #include <net/if_arp.h>
  36. #include <linux/ppp_defs.h>
  37. #include <linux/if_pppox.h>