Update crate dependencies

The original goal was to update linux-packaging-rs to instead point to
indygreg/linux-packaging-rs#27, but that caused
some dependency conflicts, so it's easier to just update everything in
one go.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Author: refi64

Cargo.lock

@@ -8,7 +8,8 @@ members = [
   "aptly-rest-mock",
   "aptly-latest-snapshots"
 ]
+resolver = "2"
 
 [workspace.dependencies]
-# We need the fixes in https://github.com/indygreg/linux-packaging-rs/pull/11
-debian-packaging = { git = "https://github.com/indygreg/linux-packaging-rs.git", rev = "0a04d6178876046f2e312702a8821f19d454d0c9" }
+# We need the fixes in https://github.com/indygreg/linux-packaging-rs/pull/27
+debian-packaging = { git = "https://github.com/refi64/linux-packaging-rs.git", rev = "4a6dadef906b099d05d2bf004ed557fbfeae1b10" }

Cargo.toml

@@ -6,18 +6,18 @@ edition = "2021"
 
 [dependencies]
 aptly-rest = { path = "../aptly-rest", version = "0.1.0" }
-async-trait = "0.1.58"
+async-trait = "0.1.88"
 clap = { version = "4", features = ["derive", "env"] }
-color-eyre = "0.6.2"
+color-eyre = "0.6.4"
 debian-packaging = { workspace = true }
-futures = "0.3.21"
-http = "0.2.9"
-leon = "2.0.1"
-reqwest = "0.11.18"
-serde = "1.0.143"
+futures = "0.3.31"
+http = "1.3.1"
+leon = "3.0.2"
+reqwest = "0.12.15"
+serde = "1.0.219"
 sync2aptly = { path = "../sync2aptly" }
-tokio = { version = "1.19.2", features = ["full"] }
-tracing = "0.1.37"
-tracing-error = "0.2.0"
-tracing-subscriber = "0.3.16"
-url = "2.2.2"
+tokio = { version = "1.45.1", features = ["full"] }
+tracing = "0.1.41"
+tracing-error = "0.2.1"
+tracing-subscriber = "0.3.19"
+url = "2.5.4"

apt2aptly/Cargo.toml

@@ -5,17 +5,17 @@ license = "MIT OR Apache-2.0"
 edition = "2021"
 
 [dependencies]
-aptly-rest = { path = "../aptly-rest", version = "0.1.0" }
-axum = "0.6.20"
-axum-extra = { version = "0.7.7", features = ["typed-routing"] }
+aptly-rest = { path = "../aptly-rest" }
+axum = "0.8.4"
+axum-extra = { version = "0.10.1", features = ["typed-routing"] }
 clap = { version = "4", features = ["derive", "env"] }
-color-eyre = "0.6.2"
-once_cell = "1.18.0"
-regex = "1.9.3"
-serde = "1.0.143"
-thiserror = "1.0.44"
-tokio = { version = "1.19.2", features = ["full"] }
-tracing = "0.1.37"
-tracing-error = "0.2.0"
-tracing-subscriber = "0.3.16"
-url = "2.2.2"
+color-eyre = "0.6.4"
+once_cell = "1.21.3"
+regex = "1.11.1"
+serde = "1.0.219"
+thiserror = "2.0.12"
+tokio = { version = "1.45.1", features = ["full"] }
+tracing = "0.1.41"
+tracing-error = "0.2.1"
+tracing-subscriber = "0.3.19"
+url = "2.5.4"

aptly-latest-snapshots/Cargo.toml

@@ -107,7 +107,7 @@ async fn get_healthz(Healthz: Healthz) -> String {
 }
 
 #[derive(TypedPath, Deserialize)]
-#[typed_path("/latest/:dist")]
+#[typed_path("/latest/{dist}")]
 struct LatestSnapshot {
     dist: String,
 }
@@ -181,11 +181,11 @@ async fn main() -> Result<()> {
             latest_snapshots_by_dist,
         });
 
-    let server = axum::Server::try_bind(&opts.bind_addr)?;
+    let listener = tokio::net::TcpListener::bind(&opts.bind_addr).await?;
     info!("Starting server on {}...", opts.bind_addr);
 
     tokio::select! {
-        r = server.serve(app.into_make_service()) => {
+        r = axum::serve(listener, app.into_make_service()) => {
             Err(r.wrap_err("Failed to run server").unwrap_err())
         }
         r = refresh_handle => {

aptly-latest-snapshots/src/main.rs

@@ -7,8 +7,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-http-types = "2.12.0"
-serde = "1.0.137"
-serde_json = "1.0.81"
-url = "2.2.2"
-wiremock = "0.5.13"
+http = "1.3.1"
+serde = "1.0.219"
+serde_json = "1.0.140"
+url = "2.5.4"
+wiremock = "0.6.3"

aptly-rest-mock/Cargo.toml

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::RwLock;
 
-use http_types::StatusCode;
+use http::StatusCode;
 use pool::Package;
 use repo::Repositories;
 use serde::Deserialize;
@@ -47,7 +47,7 @@ impl AptlyRestMock {
         Mock::given(method("GET"))
             .and(path("api/version"))
             .respond_with(
-                ResponseTemplate::new(StatusCode::Ok)
+                ResponseTemplate::new(StatusCode::OK)
                     .set_body_json(json!({ "Version": APTLY_VERSION })),
             )
             .mount(&server.server)

aptly-rest-mock/src/lib.rs

@@ -7,26 +7,26 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.125", features = [ "derive" ] }
-reqwest = { version = "0.11.10", features = [ "json", "multipart" ] }
-tokio = { version = "1.19.2", features = [ "full" ] }
-url = "2.2.2"
-serde_json = "1.0.81"
+base16ct = { version = "0.2.0", features = ["alloc"] }
 clap = { version = "4", features = ["derive"] }
 debian-packaging = { workspace = true }
-thiserror = "1.0.31"
+digest = "0.10.7"
 fnv = "1.0.7"
-futures = "0.3.21"
-tokio-util = { version = "0.7.3", features = ["compat"] }
-md-5 = "0.10.1"
-sha2 = "0.10.2"
-sha1 = "0.10.1"
-digest = "0.10.3"
-base16ct = { version = "0.1.1", features = [ "alloc" ] }
-walkdir = "2.3.3"
-serde_with = "1.14.0"
+futures = "0.3.31"
+md-5 = "0.10.6"
+reqwest = { version = "0.12.15", features = ["json", "multipart", "stream"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
+serde_with = "3.12.0"
+sha1 = "0.10.6"
+sha2 = "0.10.9"
+thiserror = "2.0.12"
+tokio = { version = "1.45.1", features = ["full"] }
+tokio-util = { version = "0.7.15", features = ["compat"] }
+url = "2.5.4"
+walkdir = "2.5.0"
 
 [dev-dependencies]
-anyhow = "1.0.58"
+anyhow = "1.0.98"
 aptly-rest-mock = { path = "../aptly-rest-mock", version = "0.0.1" }
-paste = "1.0.7"
+paste = "1.0.15"

aptly-rest/Cargo.toml

@@ -67,7 +67,7 @@ impl AptlyRest {
 
     pub async fn db_cleanup(&self) -> Result<(), AptlyRestError> {
         let url = self.url(&["api", "db", "cleanup"]);
-        self.post(url).await?;
+        self.post::<()>(url).await?;
         Ok(())
     }
 

aptly-rest/src/lib.rs

@@ -10,11 +10,11 @@ edition = "2021"
 aptly-rest = { path = "../aptly-rest", version = "0.1.0" }
 aptly-rest-mock = { version = "0.0.1", path = "../aptly-rest-mock" }
 clap = { version = "4", features = ["derive", "env"] }
-color-eyre = "0.6.2"
-http = "0.2.9"
-serde_json = "1.0.83"
-tokio = { version = "1.19.2", features = ["full"] }
-tracing = "0.1.37"
-tracing-error = "0.2.0"
-tracing-subscriber = "0.3.16"
-url = "2.2.2"
+color-eyre = "0.6.4"
+http = "1.3.1"
+serde_json = "1.0.140"
+tokio = { version = "1.45.1", features = ["full"] }
+tracing = "0.1.41"
+tracing-error = "0.2.1"
+tracing-subscriber = "0.3.19"
+url = "2.5.4"