rust: inherit common package metadata from workspace

.github/workflows/builds.yml

@@ -3137,7 +3137,7 @@ jobs:
           name: prep
           path: prep
       - name: Install Rust
-        run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(grep rust-version rust/Cargo.toml.in|sed 's/\"//g'|awk '{print $3}') -y
+        run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(awk -F '"' '/^rust-version *=/ { print $2 }' rust/Cargo.toml.in) -y
       - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - uses: ./.github/actions/install-cbindgen
       - run: tar xf prep/suricata-update.tar.gz
@@ -3431,7 +3431,7 @@ jobs:
           name: prep
           path: prep
       - name: Install Rust
-        run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(grep rust-version rust/Cargo.toml.in|sed 's/\"//g'|awk '{print $3}') -y
+        run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(awk -F '"' '/^rust-version *=/ { print $2 }' rust/Cargo.toml.in) -y
       - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - uses: ./.github/actions/install-cbindgen
       - run: tar xf prep/suricata-update.tar.gz

.github/workflows/rust-checks.yml

@@ -152,7 +152,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
       - name: Install Minimum Supported Rust Version
         run: |
-          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $(awk -F '"' '/rust-version/ { print $2 }' rust/Cargo.toml.in)
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $(awk -F '"' '/^rust-version *=/ { print $2 }' rust/Cargo.toml.in)
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - name: Configure Suricata
         run: |

rust/Cargo.toml.in

@@ -1,10 +1,10 @@
 [package]
 name = "suricata"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-license = "GPL-2.0-only"
+license.workspace = true
 description = "Suricata Rust components"
-edition = "2021"
+edition.workspace = true
-rust-version = "1.85.0"
+rust-version.workspace = true
 
 [workspace]
 members = [
@@ -23,6 +23,12 @@ default-members = [
     "suricatasc",
 ]
 
+[workspace.package]
+version = "@PACKAGE_VERSION@"
+license = "GPL-2.0-only"
+edition = "2021"
+rust-version = "1.85.0"
+
 [lib]
 crate-type = ["staticlib", "rlib"]
 name = "suricata"

rust/derive/Cargo.toml.in

@@ -1,9 +1,10 @@
 [package]
 name = "suricata-derive"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-license = "GPL-2.0-only"
+license.workspace = true
 description = "Derive macros for Suricata"
-edition = "2021"
+edition.workspace = true
+rust-version.workspace = true
 
 
 [lib]

rust/ffi/Cargo.toml.in

@@ -1,8 +1,9 @@
 [package]
 name = "suricata-ffi"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
-license = "GPL-2.0-only"
+rust-version.workspace = true
+license.workspace = true
 description = "Nice wrappers around Suricata C interface"
 
 [dependencies]

rust/htp/Cargo.toml.in

@@ -1,7 +1,8 @@
 [package]
 name = "suricata-htp"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
+rust-version.workspace = true
 autobins = false
 license-file = "LICENSE"
 description = "Security Aware HTP Protocol parsing library"

rust/suricatactl/Cargo.toml.in

@@ -1,8 +1,9 @@
 [package]
 name = "suricatactl"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
-license = "GPL-2.0-only"
+rust-version.workspace = true
+license.workspace = true
 description = "Suricata control tools"
 
 [[bin]]

rust/suricatasc/Cargo.toml.in

@@ -1,8 +1,9 @@
 [package]
 name = "suricatasc"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
-license = "GPL-2.0-only"
+rust-version.workspace = true
+license.workspace = true
 description = "Suricata socket control program"
 readme = "README.md"
 

rust/sys/Cargo.toml.in

@@ -1,6 +1,7 @@
 [package]
 name = "suricata-sys"
-version = "@PACKAGE_VERSION@"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
-license = "GPL-2.0-only"
+rust-version.workspace = true
+license.workspace = true
 description = "Bindings to Suricata C interface"