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 00b39d4d3d0fbdd2d3c0938e06ce3930de81f4ed..0027469cc215c7179f1127c73c64c0b3ce69e860 100755 (executable)
--- 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 f6cb3a196c90f8c0447d0ea04fd007feb4a8314a..6a6d2a03f34ec4b4022b2bfd8f4d9270bee079db 100644 (file)
--- 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 (file)
index 0000000..976e1fc
--- /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 1a61f42636f292696d78ba3ff6219fe6387b4dc4..28689843ca6cbed4a9bc24763f3258858e132f69 100644 (file)
--- a/python/suricatasc/__init__.py
+++ b/python/suricatasc/__init__.py
@@ -1,2 +1 @@
-
-from suricatasc import *
+from suricata.sc import *