sorry i over-filtered the debdiff, I think this one is correctly filtered.
diff -Nru hippotat-1.1.7/Cargo.toml hippotat-1.1.7+nmu1/Cargo.toml
--- hippotat-1.1.7/Cargo.toml 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/Cargo.toml 2023-06-11 19:36:36.000000000 +0000
@@ -30,7 +30,7 @@
# versions specified here are mostly just guesses at what is needed
# (or currently available):
backtrace = "0.3"
-base64 = "0.13" # 0.20 has substantially incompatible API (there's no 0.14)
+base64 = "0.21" # 0.20 has substantially incompatible API (there's no 0.14)
clap = { version = "3", features = ["derive"] }
easy-ext = "1"
educe = "0.4"
diff -Nru hippotat-1.1.7/client/client.rs hippotat-1.1.7+nmu1/client/client.rs
--- hippotat-1.1.7/client/client.rs 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/client/client.rs 2023-06-11 19:36:38.000000000
+0000
@@ -71,7 +71,7 @@
//dbg!(DumpHex(&hmac));
let mut token = time_t;
write!(token, " ").unwrap();
- base64::encode_config_buf(hmac, BASE64_CONFIG, &mut token);
+ BASE64_CONFIG.encode_string(hmac, &mut token);
let req_num = { *req_num += 1; *req_num };
diff -Nru hippotat-1.1.7/debian/changelog hippotat-1.1.7+nmu1/debian/changelog
--- hippotat-1.1.7/debian/changelog 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/debian/changelog 2023-06-11 19:36:38.000000000
+0000
@@ -1,3 +1,11 @@
+hippotat (1.1.7+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump base64 dependency to 0.21 and fix code to build with it.
+ * Make debian dependency on base64 match the versioing in Cargo.toml.
+
+ -- Peter Michael Green <[email protected]> Sun, 11 Jun 2023 19:36:38 +0000
+
hippotat (1.1.7) unstable; urgency=medium
Build system:
diff -Nru hippotat-1.1.7/debian/control hippotat-1.1.7+nmu1/debian/control
--- hippotat-1.1.7/debian/control 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/debian/control 2023-06-11 19:36:29.000000000 +0000
@@ -9,7 +9,7 @@
moreutils, libssl-dev (>= 1.1), pkg-config,
# debian/update-build-deps manages these:
librust-backtrace-dev <!upstream-cargo>,
- librust-base64-dev <!upstream-cargo>,
+ librust-base64-0.21-dev <!upstream-cargo>,
librust-clap-3+derive-dev <!upstream-cargo>,
librust-easy-ext-dev <!upstream-cargo>,
librust-educe-dev <!upstream-cargo>,
diff -Nru hippotat-1.1.7/server/sweb.rs hippotat-1.1.7+nmu1/server/sweb.rs
--- hippotat-1.1.7/server/sweb.rs 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/server/sweb.rs 2023-06-11 19:36:38.000000000 +0000
@@ -121,7 +121,7 @@
let time_t = u64::from_str_radix(time_t, 16).context("parse time_t")?;
let l = io::copy(
&mut base64::read::DecoderReader::new(&mut hmac_b64.as_bytes(),
- BASE64_CONFIG),
+ &BASE64_CONFIG),
&mut &mut hmac_got[..]
).context("parse b64 token")?;
let l = l.try_into()?;
diff -Nru hippotat-1.1.7/src/prelude.rs hippotat-1.1.7+nmu1/src/prelude.rs
--- hippotat-1.1.7/src/prelude.rs 2023-01-12 18:50:36.000000000 +0000
+++ hippotat-1.1.7+nmu1/src/prelude.rs 2023-06-11 19:36:38.000000000 +0000
@@ -83,6 +83,7 @@
pub const MAX_OVERHEAD: usize = 2_000;
-pub use base64::STANDARD as BASE64_CONFIG;
+pub use base64::engine::Engine;
+pub use base64::engine::general_purpose::STANDARD as BASE64_CONFIG;
pub fn default<T:Default>() -> T { Default::default() }
