Merge branch 'wxsBSD-0.5.31-update', update .gitignore

MITRECND · Oct 18, 2019 · 169eba2 · 169eba2
2 parents 846bc37 + 9a76b10
commit 169eba2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-libhtp-0.5.25
+libhtp-0.*/
 build/*
 *.swp
diff --git a/htpy.c b/htpy.c
@@ -29,7 +29,7 @@
 #include "htp.h"
 #include "htp_private.h"
 
-#define HTPY_VERSION "0.25.1"
+#define HTPY_VERSION "0.26"
 
 static PyObject *htpy_error;
 static PyObject *htpy_stop;

diff --git a/libhtp-0.5.25.tar.gz b/libhtp-0.5.25.tar.gz
diff --git a/libhtp-0.5.31.tar.gz b/libhtp-0.5.31.tar.gz
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 pathjoin = os.path.join
 
-GITVER   = '0.5.25'
+GITVER   = '0.5.31'
 PKGNAME  = 'libhtp-' + GITVER
 PKGTAR   = PKGNAME + '.tar.gz'
 BUILDDIR = 'libhtp-' + GITVER
@@ -19,7 +19,7 @@
 class htpyMaker(build):
     HTPTAR = PKGTAR
     HTPDIR = BUILDDIR
-    include_dirs = [ pathjoin(HTPDIR, 'htp') ]
+    include_dirs = [ HTPDIR, pathjoin(HTPDIR, 'htp') ]
     library_dirs = []
     extra_objects  = [ pathjoin(HTPDIR, 'htp/.libs', 'libhtp.a') ]
     libhtp = pathjoin(HTPDIR, 'htp/.libs', 'libhtp.a')
@@ -51,7 +51,7 @@ def run(self):
 
 setup (# Distribution meta-data
         name = "htpy",
-        version = "0.25.1",
+        version = "0.26",
         description = "python bindings for libhtp",
         author = "Wesley Shields",
         author_email = "wxs@atarininja.org",