From: Jason Ish Date: Mon, 26 Mar 2018 13:38:54 +0000 (-0600) Subject: suricatasc: move into python/ X-Git-Tag: suricata-4.1.0-rc1~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7d90162d13d08161fa27f1f53766601bef07ba0;p=thirdparty%2Fsuricata.git suricatasc: move into python/ Will be built and installed as part of the Python code used for suricatactl, which is intended to be the generic place for all Python utility code that gets installed with Suricata. No change to suricatasc code. --- diff --git a/Makefile.am b/Makefile.am index e50f24f706..322ad39998 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \ classification.config threshold.config \ reference.config $(SURICATA_UPDATE_DIR) -SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib scripts etc python ebpf \ +SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib etc python ebpf \ $(SURICATA_UPDATE_DIR) CLEANFILES = stamp-h[0-9]* diff --git a/configure.ac b/configure.ac index 1696623b73..ce16fb56ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2263,7 +2263,7 @@ AC_SUBST(CONFIGURE_SYSCONDIR) AC_SUBST(CONFIGURE_LOCALSTATEDIR) AC_SUBST(PACKAGE_VERSION) -AC_OUTPUT(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/.cargo/config qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile doc/userguide/Makefile contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile contrib/tile_pcie_logd/Makefile suricata.yaml scripts/Makefile scripts/suricatasc/Makefile scripts/suricatasc/suricatasc etc/Makefile etc/suricata.logrotate etc/suricata.service python/Makefile ebpf/Makefile) +AC_OUTPUT(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/.cargo/config qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile doc/userguide/Makefile contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile contrib/tile_pcie_logd/Makefile suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service python/Makefile python/bin/suricatasc ebpf/Makefile) SURICATA_BUILD_CONF="Suricata Configuration: AF_PACKET support: ${enable_af_packet} diff --git a/python/.gitignore b/python/.gitignore index 05b2dbafde..6dead4f6ab 100644 --- a/python/.gitignore +++ b/python/.gitignore @@ -1,3 +1,7 @@ *.pyc .cache build +lib/ +scripts-*/ +bin/suricatasc +!bin/suricatasc.in diff --git a/python/Makefile.am b/python/Makefile.am index e9b6bb63dc..59d195f290 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,6 +1,7 @@ EXTRA_DIST = setup.py \ bin \ - suricata + suricata \ + suricatasc if HAVE_PYTHON all-local: @@ -14,7 +15,9 @@ install-exec-local: uninstall-local: rm -f $(DESTDIR)$(bindir)/suricatactl + rm -f $(DESTDIR)$(bindir)/suricatasc rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/suricata + rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/suricatasc rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/suricata-[0-9]*.egg-info clean-local: diff --git a/scripts/suricatasc/suricatasc.in b/python/bin/suricatasc.in similarity index 100% rename from scripts/suricatasc/suricatasc.in rename to python/bin/suricatasc.in diff --git a/python/setup.py b/python/setup.py index eca9a92483..f6cb3a196c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -21,12 +21,29 @@ if version is None: setup( name="suricata", + description="Suricata control tools", version=version, + author='OISF Developers, Eric Leblond', + author_email='oisf-devel@lists.openinfosecfoundation.org, eric@regit.org', + url='https://www.suricata-ids.org/', packages=[ "suricata", "suricata.ctl", + "suricatasc", ], scripts=[ "bin/suricatactl", - ] + "bin/suricatasc", + ], + provides=['suricatactl', 'suricatasc'], + requires=['argparse','simplejson'], + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Console', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Operating System :: POSIX', + 'Programming Language :: Python', + 'Topic :: System :: Systems Administration', + ], ) diff --git a/scripts/suricatasc/src/__init__.py b/python/suricatasc/__init__.py similarity index 100% rename from scripts/suricatasc/src/__init__.py rename to python/suricatasc/__init__.py diff --git a/scripts/suricatasc/src/suricatasc.py b/python/suricatasc/suricatasc.py similarity index 100% rename from scripts/suricatasc/src/suricatasc.py rename to python/suricatasc/suricatasc.py diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 96bd22215b..0000000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS=suricatasc diff --git a/scripts/suricatasc/Makefile.am b/scripts/suricatasc/Makefile.am deleted file mode 100644 index 09fca4c5fc..0000000000 --- a/scripts/suricatasc/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -EXTRA_DIST = setup.py suricatasc.in src/__init__.py src/suricatasc.py - -if HAVE_PYTHON -all-local: - mkdir -p $(top_builddir)/scripts/suricatasc/src - $(HAVE_PYTHON) $(srcdir)/setup.py build; - -install-exec-local: - $(HAVE_PYTHON) $(srcdir)/setup.py install --prefix $(DESTDIR)$(prefix) - -clean-local: - $(HAVE_PYTHON) $(srcdir)/setup.py clean; - rm -rf $(top_builddir)/scripts/suricatasc/build - -uninstall-local: - [ ! -f "$(DESTDIR)$(prefix)/bin/suricatasc" ] || rm -f "$(DESTDIR)$(prefix)/bin/suricatasc" - find "$(DESTDIR)$(prefix)/lib" -name "suricatasc-*.egg-info" -print0 | xargs -0 rm -f ||true - -endif diff --git a/scripts/suricatasc/setup.py b/scripts/suricatasc/setup.py deleted file mode 100755 index 2d37919bf9..0000000000 --- a/scripts/suricatasc/setup.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -from distutils.core import setup - -SURICATASC_VERSION = "0.9" - -setup(name='suricatasc', - version=SURICATASC_VERSION, - description='Suricata unix socket client', - author='Eric Leblond', - author_email='eric@regit.org', - url='https://www.suricata-ids.org/', - scripts=['suricatasc'], - packages=['suricatasc'], - package_dir={'suricatasc':'src'}, - provides=['suricatasc'], - requires=['argparse','simplejson'], - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Operating System :: POSIX', - 'Programming Language :: Python', - 'Topic :: System :: Systems Administration', - ], - )