--- a/components/snort/patches/solaris-build.patch Mon Nov 10 15:24:46 2014 -0800
+++ b/components/snort/patches/solaris-build.patch Mon Nov 10 19:14:43 2014 -0800
@@ -6,12 +6,12 @@
3/ Removed the need to define lines like "CFLAGS += -Du_int8_t=uint8_t"
in the snort component Makefile.
-It has been sent upstream for consideration by the snort maintainers for
+It has been sent upstream for consideration by the snort maintainers for
a future release.
---- snort-2.9.2/configure.in.orig 2013-06-04 14:05:22.814684109 -0700
-+++ snort-2.9.2/configure.in 2013-06-04 14:41:42.703306013 -0700
-@@ -686,27 +686,8 @@
+--- configure.in.orig 2014-09-25 08:05:35.171512464 -0700
++++ configure.in 2014-09-25 08:06:12.896272259 -0700
+@@ -746,27 +746,8 @@
AC_MSG_RESULT(no)
fi
@@ -41,9 +41,9 @@
# modified from gnulib/m4/visibility.m4
AC_DEFUN([CC_VISIBILITY],
---- snort-2.9.2/src/cpuclock.h.orig 2013-06-04 12:30:59.362777817 -0700
-+++ snort-2.9.2/src/cpuclock.h 2013-06-04 14:19:42.869930833 -0700
-@@ -83,26 +83,15 @@
+--- src/cpuclock.h.orig 2014-09-25 08:07:00.139948870 -0700
++++ src/cpuclock.h 2014-09-25 08:08:38.401237764 -0700
+@@ -84,26 +84,15 @@
val = ((uint64_t)tbl) | (((uint64_t)tbu0) << 32); \
}
#else
@@ -74,9 +74,9 @@
#endif /* POWERPC || PPC */
#endif /* IA64 && HPUX */
#endif /* IA64 && GNUC */
---- snort-2.9.2/src/sfutil/sf_ip.h.orig 2013-06-04 12:33:38.923475148 -0700
-+++ snort-2.9.2/src/sfutil/sf_ip.h 2013-06-04 12:33:52.951704625 -0700
-@@ -38,6 +38,7 @@
+--- src/sfutil/sf_ip.h.orig 2014-09-25 08:09:20.181312683 -0700
++++ src/sfutil/sf_ip.h 2014-09-25 08:09:41.442009279 -0700
+@@ -39,6 +39,7 @@
#endif
#include "snort_debug.h" /* for inline definition */