public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-pbkdf2] epel9: Update to version 0.13.0; Fixes RHBZ#2460142
@ 2026-06-23 6:02 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-23 6:02 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-pbkdf2
Branch : epel9
Commit : badadb02e02d273076f506a3cf2f474fd644e62f
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-06-22T10:36:16+01:00
Stats : +82/-88 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-pbkdf2/c/badadb02e02d273076f506a3cf2f474fd644e62f?branch=epel9
Log:
Update to version 0.13.0; Fixes RHBZ#2460142
---
diff --git a/.gitignore b/.gitignore
index e92b6fa..9c46b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/pbkdf2-0.11.0.crate
/pbkdf2-0.12.1.crate
/pbkdf2-0.12.2.crate
+/pbkdf2-0.13.0.crate
diff --git a/pbkdf2-0.12.2-no-streebog.patch b/pbkdf2-0.12.2-no-streebog.patch
deleted file mode 100644
index 83aa2b4..0000000
--- a/pbkdf2-0.12.2-no-streebog.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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-0.13.0-no-belt-hash.patch b/pbkdf2-0.13.0-no-belt-hash.patch
new file mode 100644
index 0000000..b1014b8
--- /dev/null
+++ b/pbkdf2-0.13.0-no-belt-hash.patch
@@ -0,0 +1,21 @@
+diff -Naur pbkdf2-0.13.0-original/tests/pbkdf2.rs pbkdf2-0.13.0/tests/pbkdf2.rs
+--- pbkdf2-0.13.0-original/tests/pbkdf2.rs 2006-07-24 02:21:28.000000000 +0100
++++ pbkdf2-0.13.0/tests/pbkdf2.rs 2026-06-08 11:33:09.636156376 +0100
+@@ -3,6 +3,8 @@
+ #![cfg(feature = "hmac")]
+ #![allow(clippy::unwrap_used)]
+
++// Downstream-only: avoid packaging the belt-hash crate solely as a dev-dependency
++#[cfg(false)]
+ use belt_hash::BeltHash;
+ use hex_literal::hex;
+ #[cfg(all(feature = "sha2", feature = "phc"))]
+@@ -86,6 +88,8 @@
+
+ /// Test vector from STB 34.101.45-2013 (page 33):
+ /// <https://apmi.bsu.by/assets/files/std/bign-spec294.pdf>
++// Downstream-only: avoid packaging the belt-hash crate solely as a dev-dependency
++#[cfg(false)]
+ #[test]
+ fn pbkdf2_belt() {
+ test!(
diff --git a/pbkdf2-fix-metadata.diff b/pbkdf2-fix-metadata.diff
index 26e2756..681589c 100644
--- a/pbkdf2-fix-metadata.diff
+++ b/pbkdf2-fix-metadata.diff
@@ -1,21 +1,12 @@
---- pbkdf2-0.12.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pbkdf2-0.12.2/Cargo.toml 2026-06-08T10:41:03.225889+00:00
-@@ -69,7 +69,7 @@
+--- pbkdf2-0.13.0/Cargo.toml 2006-07-24T01:21:28+00:00
++++ pbkdf2-0.13.0/Cargo.toml 2026-06-22T09:36:12.259166+00:00
+@@ -110,9 +110,6 @@
+ optional = true
default-features = false
- [dev-dependencies.hex-literal]
--version = "0.4.0"
-+version = ">=0.4.0, <2.0"
-
- [dev-dependencies.hmac]
- version = "0.12"
-@@ -78,9 +78,6 @@
- version = "0.10"
-
- [dev-dependencies.sha2]
--version = "0.10"
+-[dev-dependencies.belt-hash]
+-version = "0.2"
-
--[dev-dependencies.streebog]
- version = "0.10"
+ [dev-dependencies.hex-literal]
+ version = "1"
- [features]
diff --git a/rust-pbkdf2.spec b/rust-pbkdf2.spec
index bc23d7e..e7392f5 100644
--- a/rust-pbkdf2.spec
+++ b/rust-pbkdf2.spec
@@ -5,7 +5,7 @@
%global crate pbkdf2
Name: rust-pbkdf2
-Version: 0.12.2
+Version: 0.13.0
Release: %autorelease
Summary: Generic implementation of PBKDF2
@@ -13,13 +13,10 @@ License: MIT OR Apache-2.0
URL: https://crates.io/crates/pbkdf2
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
+# * Drop belt-hash dev-dependency to avoid packaging it
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
+# * Downstream-only: omit a few tests that would require packaging belt-hash
+Patch10: pbkdf2-0.13.0-no-belt-hash.patch
BuildRequires: cargo-rpm-macros >= 24
@@ -56,100 +53,112 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+hmac-devel
+%package -n %{name}+alloc-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+hmac-devel %{_description}
+%description -n %{name}+alloc-devel %{_description}
This package contains library source intended for building other packages which
-use the "hmac" feature of the "%{crate}" crate.
+use the "alloc" feature of the "%{crate}" crate.
-%files -n %{name}+hmac-devel
+%files -n %{name}+alloc-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+parallel-devel
+%package -n %{name}+getrandom-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+parallel-devel %{_description}
+%description -n %{name}+getrandom-devel %{_description}
This package contains library source intended for building other packages which
-use the "parallel" feature of the "%{crate}" crate.
+use the "getrandom" feature of the "%{crate}" crate.
-%files -n %{name}+parallel-devel
+%files -n %{name}+getrandom-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+password-hash-devel
+%package -n %{name}+hmac-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+password-hash-devel %{_description}
+%description -n %{name}+hmac-devel %{_description}
This package contains library source intended for building other packages which
-use the "password-hash" feature of the "%{crate}" crate.
+use the "hmac" feature of the "%{crate}" crate.
-%files -n %{name}+password-hash-devel
+%files -n %{name}+hmac-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+rayon-devel
+%package -n %{name}+kdf-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+rayon-devel %{_description}
+%description -n %{name}+kdf-devel %{_description}
This package contains library source intended for building other packages which
-use the "rayon" feature of the "%{crate}" crate.
+use the "kdf" feature of the "%{crate}" crate.
-%files -n %{name}+rayon-devel
+%files -n %{name}+kdf-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+sha1-devel
+%package -n %{name}+mcf-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+sha1-devel %{_description}
+%description -n %{name}+mcf-devel %{_description}
This package contains library source intended for building other packages which
-use the "sha1" feature of the "%{crate}" crate.
+use the "mcf" feature of the "%{crate}" crate.
-%files -n %{name}+sha1-devel
+%files -n %{name}+mcf-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+sha2-devel
+%package -n %{name}+password-hash-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+sha2-devel %{_description}
+%description -n %{name}+password-hash-devel %{_description}
This package contains library source intended for building other packages which
-use the "sha2" feature of the "%{crate}" crate.
+use the "password-hash" feature of the "%{crate}" crate.
-%files -n %{name}+sha2-devel
+%files -n %{name}+password-hash-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+phc-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+phc-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "phc" feature of the "%{crate}" crate.
+
+%files -n %{name}+phc-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+simple-devel
+%package -n %{name}+rand_core-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+simple-devel %{_description}
+%description -n %{name}+rand_core-devel %{_description}
This package contains library source intended for building other packages which
-use the "simple" feature of the "%{crate}" crate.
+use the "rand_core" feature of the "%{crate}" crate.
-%files -n %{name}+simple-devel
+%files -n %{name}+rand_core-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+std-devel
+%package -n %{name}+sha2-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+std-devel %{_description}
+%description -n %{name}+sha2-devel %{_description}
This package contains library source intended for building other packages which
-use the "std" feature of the "%{crate}" crate.
+use the "sha2" feature of the "%{crate}" crate.
-%files -n %{name}+std-devel
+%files -n %{name}+sha2-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 0a65f36..6b20e48 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,18 +1,11 @@
[package]
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",
+ "Drop belt-hash dev-dependency to avoid packaging it",
]
[[package.extra-patches]]
number = 10
-file = "pbkdf2-0.12.2-no-streebog.patch"
+file = "pbkdf2-0.13.0-no-belt-hash.patch"
comments = [
- """\
-Downstream-only: omit a few tests that would require a rust-streebog0.10 compat \
-package\
-""",
+ "Downstream-only: omit a few tests that would require packaging belt-hash",
]
diff --git a/sources b/sources
index 448ffd6..1c40a86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pbkdf2-0.12.2.crate) = 5360a661db8ef11586badfa2623dc409e34f3e2f79254cebcb5fb68bfb20c3be47def7bbb16f7779facb42a92bb789cf0e71947d1c4c6f5b1ecb8d358f6b41ef
+SHA512 (pbkdf2-0.13.0.crate) = a263e706bec60d288c1e0bad1a1a35844cc66f00154139a5c42272006911bc2d921535237f01728724ab016ce4569cd6821d3f6203413a89faa03abb6b76b055
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-23 6:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-23 6:02 [rpms/rust-pbkdf2] epel9: Update to version 0.13.0; Fixes RHBZ#2460142 Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox