From fbd6258d6a9f40698363d9119b1d1445f1166002 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 25 Oct 2023 19:49:49 +0200 Subject: [PATCH] Update to version 0.101.7; Fixes RHBZ#2219642 --- .gitignore | 1 + rust-rustls-webpki.spec | 17 +---------------- rust2rpm.toml | 8 -------- rustls-webpki-fix-metadata.diff | 11 ----------- sources | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 rustls-webpki-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 693fe76..ad4cb64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rustls-webpki-0.100.1.crate /rustls-webpki-0.100.2.crate /rustls-webpki-0.100.3.crate +/rustls-webpki-0.101.7.crate diff --git a/rust-rustls-webpki.spec b/rust-rustls-webpki.spec index bb92ad4..cce4a72 100644 --- a/rust-rustls-webpki.spec +++ b/rust-rustls-webpki.spec @@ -5,25 +5,14 @@ %global crate rustls-webpki -# compile and run tests only on supported architectures -%global supported_arches x86_64 %{ix86} aarch64 %{arm} - Name: rust-rustls-webpki -Version: 0.100.3 +Version: 0.101.7 Release: %autorelease Summary: Web PKI X.509 Certificate Verification -# * rustls-webpki itself is licensed under the terms of the ISC license -# * third-party data from chromium is licensed under a 3-Clause-BSD license, -# but it is only used for integration tests and not included in RPM packages License: ISC URL: https://crates.io/crates/rustls-webpki Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * specify license with SPDX identifier in crate metadata: -# https://github.com/rustls/webpki/issues/101 -# https://github.com/rustls/webpki/pull/102 -Patch: rustls-webpki-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -95,19 +84,15 @@ rm tests/integration.rs %cargo_generate_buildrequires %build -%ifarch %{supported_arches} %cargo_build -%endif %install %cargo_install %if %{with check} -%ifarch %{supported_arches} %check %cargo_test %endif -%endif %changelog %autochangelog diff --git a/rust2rpm.toml b/rust2rpm.toml index 93fd6c5..0401e67 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,11 +1,3 @@ -[package] -supported-arches = [ - "x86_64", - "%{ix86}", - "aarch64", - "%{arm}", -] - [tests] run = ["none"] comments = ["missing dev-dependencies: rcgen ^0.11.1"] diff --git a/rustls-webpki-fix-metadata.diff b/rustls-webpki-fix-metadata.diff deleted file mode 100644 index 0756ad8..0000000 --- a/rustls-webpki-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- rustls-webpki-0.100.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rustls-webpki-0.100.3/Cargo.toml 2023-10-10T09:34:41.893429+00:00 -@@ -55,7 +55,7 @@ - "cryptography", - "no-std", - ] --license-file = "LICENSE" -+license = "ISC" - repository = "https://github.com/rustls/webpki" - - [package.metadata.docs.rs] diff --git a/sources b/sources index 8c92827..b500303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustls-webpki-0.100.3.crate) = 0f9a321a0004691fbede43c0c7d8ea5ef97c36db755f78342aec4465dc1b476cd071338cc09543e03e49ab134a57e855bcd15854344ba95d3375a99bac25b090 +SHA512 (rustls-webpki-0.101.7.crate) = 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68