rust/htp: follow suricata versioning

Have htp follow Suricata versioning so we don't have to worry about
version updates as it changes.

For example, between 8.0.0-beta1 and 8.0.0-rc1 there were changes to
the htp, however the version stayed at 2.0.0 making it impossible to
publish these changes to crates.io.

diff --git a/configure.ac b/configure.ac
index 17bb5ecc112bef312461f77244b3b8e2c371cdd0..919866cde080a62887f5e7fbd41b14abc6b60a59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2537,6 +2537,7 @@ AC_CONFIG_FILES(Makefile src/Makefile rust/Makefile rust/Cargo.lock rust/Cargo.t
 AC_CONFIG_FILES(rust/sys/Makefile rust/sys/Cargo.toml)
 AC_CONFIG_FILES(rust/suricatactl/Makefile rust/suricatactl/Cargo.toml)
 AC_CONFIG_FILES(rust/suricatasc/Makefile rust/suricatasc/Cargo.toml)
+AC_CONFIG_FILES(rust/htp/Makefile rust/htp/Cargo.toml)
 AC_CONFIG_FILES(qa/Makefile qa/coccinelle/Makefile)
 AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile)
 AC_CONFIG_FILES(suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service)

diff --git a/rust/Cargo.lock.in b/rust/Cargo.lock.in
index 51972efc8a51274c7861cacdd450ff7858a7fd13..8d8539b02f342431bd330ec0c503d12bb9ea6969 100644 (file)
--- a/rust/Cargo.lock.in
+++ b/rust/Cargo.lock.in
@@ -1569,7 +1569,7 @@ dependencies = [
 
 [[package]]
 name = "suricata-htp"
-version = "2.0.0"
+version = "8.0.0-dev"
 dependencies = [
  "base64",
  "brotli",

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index bddc8cd79836f508f49a0c99e04dcb33c6289ae3..4d656df7f6b9499182266a64c48c0108df918940 100644 (file)
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -87,7 +87,7 @@ suricata-sys = { path = "./sys", version = "@PACKAGE_VERSION@" }
 
 suricata-lua-sys = { version = "5.4.8002" }
 
-htp = { package = "suricata-htp", path = "./htp", version = "2.0.0" }
+htp = { package = "suricata-htp", path = "./htp", version = "@PACKAGE_VERSION@" }
 
 [dev-dependencies]
 test-case = "~3.3.1"

diff --git a/rust/Makefile.am b/rust/Makefile.am
index e7f176c7eafd15511581e955b106a101cc98f94b..2dccf1209cd513db40d4131f00616124ac8c034f 100644 (file)
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS =      sys \
+SUBDIRS =      htp \
+               sys \
                suricatasc \
                suricatactl
 
@@ -13,8 +14,7 @@ EXTRA_DIST =  src derive htp \
                sys \
                sys/Cargo.toml \
                suricatasc \
-               suricatactl \
-               htp/Cargo.toml
+               suricatactl
 
 if !DEBUG
 RELEASE = --release

diff --git a/rust/htp/.gitignore b/rust/htp/.gitignore
deleted file mode 100644 (file)
index 01c3566..0000000
--- a/rust/htp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!Cargo.toml

diff --git a/rust/htp/Cargo.toml b/rust/htp/Cargo.toml.in
similarity index 96%
rename from rust/htp/Cargo.toml
rename to rust/htp/Cargo.toml.in
index 2c9a7f90268ff31f44bc3b73d97157b73982a220..883182e0808ef448fb40dcf3b67d7808b4d30cf3 100644 (file)
--- a/rust/htp/Cargo.toml
+++ b/rust/htp/Cargo.toml.in
@@ -1,6 +1,6 @@
 [package]
 name = "suricata-htp"
-version = "2.0.0"
+version = "@PACKAGE_VERSION@"
 edition = "2021"
 autobins = false
 license-file = "LICENSE"

diff --git a/rust/htp/Makefile.am b/rust/htp/Makefile.am
new file mode 100644 (file)
index 0000000..acf00ae
--- /dev/null
+++ b/rust/htp/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST =   Cargo.toml
+
+all-local: Cargo.toml