public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-pbkdf2] epel9: Avoid the streebog dev-dependency
Date: Tue, 09 Jun 2026 09:23:30 GMT [thread overview]
Message-ID: <178099701089.1.3429545298723185177.rpms-rust-pbkdf2-a1507b2cf17a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-pbkdf2
Branch : epel9
Commit : a1507b2cf17ac2cf6f1b4a881864832d6dcb1e47
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-06-08T11:41:53+01:00
Stats : +47/-1 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/rust-pbkdf2/c/a1507b2cf17ac2cf6f1b4a881864832d6dcb1e47?branch=epel9
Log:
Avoid the streebog dev-dependency
---
diff --git a/pbkdf2-0.12.2-no-streebog.patch b/pbkdf2-0.12.2-no-streebog.patch
new file mode 100644
index 0000000..83aa2b4
--- /dev/null
+++ b/pbkdf2-0.12.2-no-streebog.patch
@@ -0,0 +1,21 @@
+diff -Naur pbkdf2-0.12.2-original/tests/mod.rs pbkdf2-0.12.2/tests/mod.rs
+--- pbkdf2-0.12.2-original/tests/mod.rs 2006-07-24 02:21:28.000000000 +0100
++++ pbkdf2-0.12.2/tests/mod.rs 2026-06-08 11:40:25.779340803 +0100
+@@ -2,6 +2,8 @@
+ use hex_literal::hex;
+ use pbkdf2::pbkdf2_hmac_array as f;
+ use sha1::Sha1;
++// Downstream-only: drop streebog dev-dependency to avoid a compat package
++#[cfg(false)]
+ use streebog::Streebog512;
+
+ /// Tests from RFC 6070:
+@@ -43,6 +45,8 @@
+
+ /// Test vectors from R 50.1.111-2016:
+ /// https://tc26.ru/standard/rs/Р 50.1.111-2016.pdf
++// Downstream-only: drop streebog dev-dependency to avoid a compat package
++#[cfg(false)]
+ #[test]
+ fn gost() {
+ assert_eq!(
diff --git a/pbkdf2-fix-metadata.diff b/pbkdf2-fix-metadata.diff
index bdbdf33..26e2756 100644
--- a/pbkdf2-fix-metadata.diff
+++ b/pbkdf2-fix-metadata.diff
@@ -1,5 +1,5 @@
--- pbkdf2-0.12.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pbkdf2-0.12.2/Cargo.toml 2025-12-03T21:18:57.869426+00:00
++++ pbkdf2-0.12.2/Cargo.toml 2026-06-08T10:41:03.225889+00:00
@@ -69,7 +69,7 @@
default-features = false
@@ -9,3 +9,13 @@
[dev-dependencies.hmac]
version = "0.12"
+@@ -78,9 +78,6 @@
+ version = "0.10"
+
+ [dev-dependencies.sha2]
+-version = "0.10"
+-
+-[dev-dependencies.streebog]
+ version = "0.10"
+
+ [features]
diff --git a/rust-pbkdf2.spec b/rust-pbkdf2.spec
index a02595d..bc23d7e 100644
--- a/rust-pbkdf2.spec
+++ b/rust-pbkdf2.spec
@@ -15,7 +15,11 @@ Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * allow hex-literal 1.0:
# https://github.com/RustCrypto/password-hashes/commit/1dd9906066b561b26ecbfa1bfdf3b91d81ea7566
+# * Drop streebog dev-dependency to avoid a compat package
Patch: pbkdf2-fix-metadata.diff
+# * Downstream-only: omit a few tests that would require a rust-streebog0.10
+# compat package
+Patch10: pbkdf2-0.12.2-no-streebog.patch
BuildRequires: cargo-rpm-macros >= 24
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 2e6fa44..0a65f36 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -4,4 +4,15 @@ cargo-toml-patch-comments = [
allow hex-literal 1.0: \
https://github.com/RustCrypto/password-hashes/commit/1dd9906066b561b26ecbfa1bfdf3b91d81ea7566\
""",
+ "Drop streebog dev-dependency to avoid a compat package",
+]
+
+[[package.extra-patches]]
+number = 10
+file = "pbkdf2-0.12.2-no-streebog.patch"
+comments = [
+ """\
+Downstream-only: omit a few tests that would require a rust-streebog0.10 compat \
+package\
+""",
]
reply other threads:[~2026-06-09 9:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178099701089.1.3429545298723185177.rpms-rust-pbkdf2-a1507b2cf17a@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox