You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

52 lines
2.0 KiB

  1. diff -u --recursive snort-3.0.0-vanilla/daqs/daq_file.c snort-3.0.0/daqs/daq_file.c
  2. --- snort-3.0.0-vanilla/daqs/daq_file.c 2018-08-28 02:01:02.000000000 -0400
  3. +++ snort-3.0.0/daqs/daq_file.c 2019-03-28 23:03:25.292770141 -0400
  4. @@ -33,7 +33,7 @@
  5. #include <sys/types.h>
  6. #include <sys/time.h>
  7. -#include <sys/unistd.h>
  8. +#include <unistd.h>
  9. #include <daq_api.h>
  10. #include <sfbpf_dlt.h>
  11. diff -u --recursive snort-3.0.0-vanilla/daqs/daq_hext.c snort-3.0.0/daqs/daq_hext.c
  12. --- snort-3.0.0-vanilla/daqs/daq_hext.c 2018-08-28 02:01:02.000000000 -0400
  13. +++ snort-3.0.0/daqs/daq_hext.c 2019-03-28 22:54:15.738207157 -0400
  14. @@ -35,7 +35,7 @@
  15. #include <arpa/inet.h>
  16. #include <sys/types.h>
  17. #include <sys/time.h>
  18. -#include <sys/unistd.h>
  19. +#include <unistd.h>
  20. #include <sys/socket.h>
  21. #include <daq_api.h>
  22. diff -u --recursive snort-3.0.0-vanilla/src/network_inspectors/appid/service_plugins/service_rpc.cc snort-3.0.0/src/network_inspectors/appid/service_plugins/service_rpc.cc
  23. --- snort-3.0.0-vanilla/src/network_inspectors/appid/service_plugins/service_rpc.cc 2018-08-28 02:01:02.000000000 -0400
  24. +++ snort-3.0.0/src/network_inspectors/appid/service_plugins/service_rpc.cc 2019-03-28 22:32:04.211783669 -0400
  25. @@ -27,6 +27,7 @@
  26. #include <netdb.h>
  27. +#include <tirpc/rpc/rpcent.h>
  28. #if defined(__FreeBSD__) || defined(__OpenBSD__)
  29. #include <rpc/rpc.h>
  30. #elif defined(__sun)
  31. diff -u --recursive snort-3.0.0-vanilla/src/utils/util.cc snort-3.0.0/src/utils/util.cc
  32. --- snort-3.0.0-vanilla/src/utils/util.cc 2018-08-28 02:01:02.000000000 -0400
  33. +++ snort-3.0.0/src/utils/util.cc 2019-03-28 22:16:16.860942230 -0400
  34. @@ -605,13 +605,8 @@
  35. {
  36. static THREAD_LOCAL char buf[128];
  37. -#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE < 200112L && \
  38. - defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 600) || _GNU_SOURCE
  39. - return strerror_r(errnum, buf, sizeof(buf));
  40. -#else
  41. (void)strerror_r(errnum, buf, sizeof(buf));
  42. return buf;
  43. -#endif
  44. }
  45. char* snort_strndup(const char* src, size_t dst_size)