0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. From 154cf0312b3652bdfdf241e6883d7c6de9b85e01 Mon Sep 17 00:00:00 2001
  2. From: "Maya Dagon (mdagon)" <mdagon@cisco.com>
  3. Date: Mon, 24 Jul 2023 08:06:50 +0000
  4. Subject: [PATCH] Pull request #3925: build: fix cstdint related clearlinux
  5. errors
  6. Merge in SNORT/snort3 from ~MDAGON/snort3:clearlinux to master
  7. Squashed commit of the following:
  8. commit 7ef2bc13851ffa2bf7908964242859a8c05ddd96
  9. Author: maya dagon <mdagon@cisco.com>
  10. Date: Thu Jul 20 14:34:01 2023 -0400
  11. build: fix cstdint related clearlinux errors
  12. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  13. Upstream: https://github.com/snort3/snort3/commit/154cf0312b3652bdfdf241e6883d7c6de9b85e01
  14. ---
  15. src/js_norm/js_identifier_ctx.h | 1 +
  16. src/packet_io/sfdaq_config.h | 1 +
  17. src/service_inspectors/wizard/magic.h | 1 +
  18. 3 files changed, 3 insertions(+)
  19. diff --git a/src/utils/js_identifier_ctx.h b/src/utils/js_identifier_ctx.h
  20. index b8d5121a2c..6ef1ce2b23 100644
  21. --- a/src/utils/js_identifier_ctx.h
  22. +++ b/src/utils/js_identifier_ctx.h
  23. @@ -20,6 +20,7 @@
  24. #ifndef JS_IDENTIFIER_CTX
  25. #define JS_IDENTIFIER_CTX
  26. +#include <cstdint>
  27. #include <list>
  28. #include <string>
  29. #include <unordered_map>
  30. diff --git a/src/packet_io/sfdaq_config.h b/src/packet_io/sfdaq_config.h
  31. index 990c45785b..f4c1042bc3 100644
  32. --- a/src/packet_io/sfdaq_config.h
  33. +++ b/src/packet_io/sfdaq_config.h
  34. @@ -21,6 +21,7 @@
  35. #ifndef SFDAQ_CONFIG_H
  36. #define SFDAQ_CONFIG_H
  37. +#include <cstdint>
  38. #include <string>
  39. #include <vector>
  40. diff --git a/src/service_inspectors/wizard/magic.h b/src/service_inspectors/wizard/magic.h
  41. index fa24d0b5a4..b9477eb95c 100644
  42. --- a/src/service_inspectors/wizard/magic.h
  43. +++ b/src/service_inspectors/wizard/magic.h
  44. @@ -21,6 +21,7 @@
  45. #define MAGIC_H
  46. #include <cassert>
  47. +#include <cstdint>
  48. #include <string>
  49. #include <vector>