From: Jason Ish <ish@unx.ca>
Date: Mon, 26 Mar 2018 13:55:10 +0000 (-0600)
Subject: suricatasc: move lib to suricata.sc
X-Git-Tag: suricata-4.1.0-rc1~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43617dc11ff37605b27e3c42c354555babaa8694;p=thirdparty%2Fsuricata.git

suricatasc: move lib to suricata.sc

Pull the sc python package under the suricata top level
package. A suricatasc package still exists for compatibility
that pulls in suricata.sc.
---

diff --git a/python/bin/suricatasc.in b/python/bin/suricatasc.in
index 00b39d4d3d..0027469cc2 100755
--- a/python/bin/suricatasc.in
+++ b/python/bin/suricatasc.in
@@ -36,7 +36,7 @@ else:
     if os.path.exists(path):
         sys.path.insert(0, os.path.dirname(path))
 
-from suricatasc import *
+from suricata.sc import *
 
 parser = argparse.ArgumentParser(prog='suricatasc', description='Client for Suricata unix socket')
 parser.add_argument('-v', '--verbose', action='store_const', const=True, help='verbose output (including JSON dump)')
diff --git a/python/setup.py b/python/setup.py
index f6cb3a196c..6a6d2a03f3 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -29,6 +29,7 @@ setup(
     packages=[
         "suricata",
         "suricata.ctl",
+        "suricata.sc",
         "suricatasc",
     ],
     scripts=[
diff --git a/python/suricata/sc/__init__.py b/python/suricata/sc/__init__.py
new file mode 100644
index 0000000000..976e1fc217
--- /dev/null
+++ b/python/suricata/sc/__init__.py
@@ -0,0 +1 @@
+from suricata.sc.suricatasc import *
diff --git a/python/suricatasc/suricatasc.py b/python/suricata/sc/suricatasc.py
similarity index 100%
rename from python/suricatasc/suricatasc.py
rename to python/suricata/sc/suricatasc.py
diff --git a/python/suricatasc/__init__.py b/python/suricatasc/__init__.py
index 1a61f42636..28689843ca 100644
--- a/python/suricatasc/__init__.py
+++ b/python/suricatasc/__init__.py
@@ -1,2 +1 @@
-
-from suricatasc import *
+from suricata.sc import *