suricata 2.0.7

Version bump, build fixes.

Closes #38536

1 files changed, 48 insertions, 60 deletions

diff --git a/Library/Formula/suricata.rb b/Library/Formula/suricata.rb
index e520eca5c..bc89b89d4 100644
--- a/Library/Formula/suricata.rb
+++ b/Library/Formula/suricata.rb
@@ -1,9 +1,7 @@
-require "formula"
-
 class Suricata < Formula
   homepage "http://suricata-ids.org"
-  url "http://www.openinfosecfoundation.org/download/suricata-2.0.tar.gz"
-  sha1 "37819a0d6ecb7ebd4201bc32dec40824c145da98"
+  url "http://www.openinfosecfoundation.org/download/suricata-2.0.7.tar.gz"
+  sha256 "c5c3ccebeecbace39df0ff2d50ec4515b541103ffaa5e33cd1dc79d4955c0dfd"
 
   bottle do
     sha1 "e696fc00b003d1ea19631e385f4dc84631eb2c64" => :mavericks
@@ -11,25 +9,52 @@ class Suricata < Formula
     sha1 "3fcae2900b1f4070c48bb8d0720869b8364a9202" => :lion
   end
 
+  depends_on :python if MacOS.version <= :snow_leopard
   depends_on "pkg-config" => :build
   depends_on "libmagic"
   depends_on "libnet"
   depends_on "libyaml"
   depends_on "pcre"
   depends_on "geoip" => :optional
+  depends_on "lua" => :optional
+  depends_on "luajit" => :optional
+
+  resource "argparse" do
+    url "https://pypi.python.org/packages/source/a/argparse/argparse-1.3.0.tar.gz"
+    sha256 "b3a79a23d37b5a02faa550b92cbbbebeb4aa1d77e649c3eb39c19abf5262da04"
+  end
 
-  # Use clang provided strl* functions. Reported upstream:
-  # https://redmine.openinfosecfoundation.org/issues/1192
-  patch :DATA
+  resource "simplejson" do
+    url "https://pypi.python.org/packages/source/s/simplejson/simplejson-3.6.5.tar.gz"
+    sha256 "2a3189f79d1c7b8a2149a0e783c0b4217fad9b30a6e7d60450f2553dc2c0e57e"
+  end
 
   def install
     libnet = Formula["libnet"]
-    args = ["--disable-debug",
-            "--disable-dependency-tracking",
-            "--disable-silent-rules",
-            "--prefix=#{prefix}",
-            "--with-libnet-includes=#{libnet.opt_include}",
-            "--with-libnet-libs=#{libnet.opt_lib}"]
+    libmagic = Formula["libmagic"]
+
+    ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
+    resources.each do |r|
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
+    end
+
+    args = %W[
+      --disable-debug
+      --disable-dependency-tracking
+      --disable-silent-rules
+      --prefix=#{prefix}
+      --sysconfdir=#{etc}
+      --localstatedir=#{var}
+      --with-libnet-includes=#{libnet.opt_include}
+      --with-libnet-libs=#{libnet.opt_lib}
+      --with-libmagic-includes=#{libmagic.opt_include}
+      --with-libmagic-libraries=#{libmagic.opt_lib}
+    ]
+
+    args << "--enable-lua" if build.with? "lua"
+    args << "--enable-luajit" if build.with? "luajit"
 
     if build.with? "geoip"
       geoip = Formula["geoip"]
@@ -39,52 +64,15 @@ class Suricata < Formula
     end
 
     system "./configure", *args
-    system "make", "install"
+    system "make", "install-full"
+
+    bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
+
+    # Leave the magic-file: prefix in otherwise it overrides a commented out line rather than intended line.
+    inreplace etc/"suricata/suricata.yaml", "magic-file: /usr/share/file/magic", "magic-file: #{libmagic.opt_share}/misc/magic"
   end
-end
 
-__END__
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 32cb702..68ef842 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -266,7 +266,6 @@ am_suricata_OBJECTS = alert-debuglog.$(OBJEXT) alert-fastlog.$(OBJEXT) \
- 	util-signal.$(OBJEXT) util-spm-bm.$(OBJEXT) \
- 	util-spm-bs2bm.$(OBJEXT) util-spm-bs.$(OBJEXT) \
- 	util-spm.$(OBJEXT) util-storage.$(OBJEXT) \
--	util-strlcatu.$(OBJEXT) util-strlcpyu.$(OBJEXT) \
- 	util-syslog.$(OBJEXT) util-threshold-config.$(OBJEXT) \
- 	util-time.$(OBJEXT) util-unittest.$(OBJEXT) \
- 	util-unittest-helper.$(OBJEXT) util-affinity.$(OBJEXT) \
-@@ -862,8 +861,6 @@ util-spm-bs2bm.c util-spm-bs2bm.h \
- util-spm-bs.c util-spm-bs.h \
- util-spm.c util-spm.h util-clock.h \
- util-storage.c util-storage.h \
--util-strlcatu.c \
--util-strlcpyu.c \
- util-syslog.c util-syslog.h \
- util-threshold-config.c util-threshold-config.h \
- util-time.c util-time.h \
-@@ -1353,8 +1350,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-spm-bs2bm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-spm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-storage.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-strlcatu.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-strlcpyu.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-syslog.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-threshold-config.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-time.Po@am__quote@
-diff --git a/src/suricata-common.h b/src/suricata-common.h
-index 43c76c1..b6010f4 100644
---- a/src/suricata-common.h
-+++ b/src/suricata-common.h
-@@ -323,9 +323,6 @@ typedef enum PacketProfileDetectId_ {
- #include "util-path.h"
- #include "util-conf.h"
- 
--size_t strlcat(char *, const char *src, size_t siz);
--size_t strlcpy(char *dst, const char *src, size_t siz);
--
- extern int coverage_unittests;
- extern int g_ut_modules;
- extern int g_ut_covered;
+  test do
+    assert_match /#{version}/, shell_output("#{bin}/suricata --build-info")
+  end
+end