suricata-update: bundle suricata update

Add autoconf/automake support for installing suricata-update
if found in the top level suricata-update.

diff --git a/.gitignore b/.gitignore
index e7057d1ddd04a16b33cfd66ba4fee89706d5508a..2a53abc66cad56c9c5787b25e91019bb86dbe922 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ src/suricata
 stamp-h1
 src/build-info.h
 qa/log/
+
+/suricata-update/*
+!/suricata-update/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a980335174440ddb4e14084ce30c228d1df4d2da..e50f24f7067dcf3a78e90e5fda1e02771ce5f63c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \
              classification.config threshold.config \
-             reference.config
-SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib scripts etc python ebpf
+             reference.config $(SURICATA_UPDATE_DIR)
+SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib scripts etc python ebpf \
+          $(SURICATA_UPDATE_DIR)
 
 CLEANFILES = stamp-h[0-9]*
 

diff --git a/configure.ac b/configure.ac
index 6c3380ab711a94ccda8478adbe2f0fd2ffb316b8..278f40894067aa79a64f8594f15a416cae2a04d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1375,6 +1375,13 @@
         AC_CHECK_HEADER(net/netmap_user.h,,[AC_ERROR(net/netmap_user.h not found ...)],)
   ])
 
+  # suricata-update
+  AC_CHECK_FILE([$srcdir/suricata-update/setup.py], [
+      SURICATA_UPDATE_DIR="suricata-update"
+      AC_SUBST(SURICATA_UPDATE_DIR)
+      AC_OUTPUT(suricata-update/Makefile)
+  ])
+
   # libhtp
     AC_ARG_ENABLE(non-bundled-htp,
            AS_HELP_STRING([--enable-non-bundled-htp], [Enable the use of an already installed version of htp]),,[enable_non_bundled_htp=no])

diff --git a/suricata-update/Makefile.am b/suricata-update/Makefile.am
new file mode 100644 (file)
index 0000000..5f6914b
--- /dev/null
+++ b/suricata-update/Makefile.am
@@ -0,0 +1,22 @@
+if HAVE_PYTHON
+
+install-exec-local:
+       cd $(srcdir) && \
+               $(HAVE_PYTHON) setup.py build --build-base $(abs_builddir) \
+               install --prefix $(DESTDIR)$(prefix)
+
+uninstall-local:
+       rm -f $(DESTDIR)$(bindir)/suricata-update
+       rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/suricata-update
+       rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/suricata_update-[0-9]*.egg-info
+
+clean-local:
+       cd $(srcdir) && \
+               $(HAVE_PYTHON) setup.py clean \
+               --build-base $(abs_builddir)
+       rm -rf scripts-* lib* build
+       find . -name \*.pyc -print0 | xargs -0 rm -f
+
+distclean-local:
+
+endif