From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 9 Apr 2025 15:57:48 +0000 (-0600)
Subject: htp: rename to suricata-htp; allow publishing to crates.io
X-Git-Tag: suricata-8.0.0-rc1~476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a400a5811f1f4c8da008de8ec8c77cc3732cae;p=thirdparty%2Fsuricata.git

htp: rename to suricata-htp; allow publishing to crates.io

As the "suricata" crate depends on htp, we need to publish htp to
crates.io first, however "htp" name is already taken. So rename "htp" to
"suricata-htp".
---

diff --git a/rust/Cargo.lock.in b/rust/Cargo.lock.in
index d2258cbd46..ad15091453 100644
--- a/rust/Cargo.lock.in
+++ b/rust/Cargo.lock.in
@@ -659,22 +659,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "htp"
-version = "2.0.0"
-dependencies = [
- "base64",
- "bstr",
- "cdylib-link-lines",
- "flate2",
- "lazy_static",
- "libc",
- "lzma-rs",
- "nom",
- "rstest",
- "time",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.7.1"
@@ -1552,7 +1536,6 @@ dependencies = [
  "flate2",
  "hex",
  "hkdf",
- "htp",
  "ipsec-parser",
  "kerberos-parser",
  "lazy_static",
@@ -1576,6 +1559,7 @@ dependencies = [
  "sha2",
  "snmp-parser",
  "suricata-derive",
+ "suricata-htp",
  "suricata-lua-sys",
  "suricata-sys",
  "test-case",
@@ -1596,6 +1580,22 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "suricata-htp"
+version = "2.0.0"
+dependencies = [
+ "base64",
+ "bstr",
+ "cdylib-link-lines",
+ "flate2",
+ "lazy_static",
+ "libc",
+ "lzma-rs",
+ "nom",
+ "rstest",
+ "time",
+]
+
 [[package]]
 name = "suricata-lua-sys"
 version = "0.1.0-alpha.6"
diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 693b80cec1..e920212ef5 100644
--- 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 = "0.1.0-alpha.6" }
 
-htp = { path = "./htp", version = "2.0.0" }
+htp = { package = "suricata-htp", path = "./htp", version = "2.0.0" }
 
 [dev-dependencies]
 test-case = "~3.3.1"
diff --git a/rust/htp/Cargo.toml b/rust/htp/Cargo.toml
index 6d9a75f09e..6d451fc2ec 100644
--- a/rust/htp/Cargo.toml
+++ b/rust/htp/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
-name = "htp"
+name = "suricata-htp"
 authors = ["ivanr = Ivan Ristic <ivanr@webkreator.com>", "cccs = Canadian Centre for Cyber Security"]
 version = "2.0.0"
-publish = false
 edition = "2021"
 autobins = false
 license-file = "LICENSE"