From f35c94499d9781e73938c153ee958fd57c2d573a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 11 Jan 2023 22:10:45 +0100 Subject: [PATCH] Update to version 1.0.0; Fixes RHBZ#2138837 --- .gitignore | 1 + LICENSE.dependencies | 99 ------------------------ rust-sequoia-keyring-linter.spec | 64 +++++++-------- sequoia-keyring-linter-fix-metadata.diff | 23 ++++-- sources | 2 +- 5 files changed, 44 insertions(+), 145 deletions(-) delete mode 100644 LICENSE.dependencies diff --git a/.gitignore b/.gitignore index 79ece07..9831506 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /sequoia-keyring-linter-0.5.0.crate +/sequoia-keyring-linter-1.0.0.crate diff --git a/LICENSE.dependencies b/LICENSE.dependencies deleted file mode 100644 index 8ba96c4..0000000 --- a/LICENSE.dependencies +++ /dev/null @@ -1,99 +0,0 @@ -0BSD or MIT or ASL 2.0: rust-adler 1.0.2 -ASL 2.0 or MIT: rust-addr2line 0.17.0 -ASL 2.0 or MIT: rust-ascii-canvas 3.0.0 -ASL 2.0 or MIT: rust-autocfg 1.1.0 -ASL 2.0 or MIT: rust-cexpr 0.6.0 -ASL 2.0 or MIT: rust-gimli 0.26.1 -ASL 2.0 or MIT: rust-hashbrown 0.11.2 -ASL 2.0 or MIT: rust-indexmap 1.8.0 -ASL 2.0 or MIT: rust-lalrpop 0.19.7 -ASL 2.0 or MIT: rust-lalrpop-util 0.19.7 -ASL 2.0 or MIT: rust-lock_api 0.4.6 -ASL 2.0 or MIT: rust-object 0.27.1 -ASL 2.0 or MIT: rust-parking_lot0.11 0.11.2 -ASL 2.0 or MIT: rust-parking_lot_core0.8 0.8.5 -ASL 2.0 or MIT: rust-peeking_take_while 0.1.2 -ASL 2.0 or MIT: rust-rustc-hash 1.1.0 -ASL 2.0 or MIT: rust-structopt 0.3.25 -ASL 2.0 or MIT: rust-structopt-derive 0.4.18 -ASL 2.0: rust-clang-sys 1.3.1 -ASL 2.0: rust-rpassword 5.0.1 -BSD: rust-bindgen 0.59.2 -BSD: rust-instant 0.1.12 -CC0: rust-tiny-keccak 2.0.2 -LGPLv2+: rust-buffered-reader 1.1.2 -LGPLv2+: rust-sequoia-openpgp 1.8.0 -LGPLv3 or GPLv2 or GPLv3: rust-nettle 7.1.0 -LGPLv3 or GPLv2 or GPLv3: rust-nettle-sys 2.1.0 -MIT or ASL 2.0 or zlib: rust-tinyvec_macros 0.1.0 -MIT or ASL 2.0: rust-anyhow 1.0.55 -MIT or ASL 2.0: rust-backtrace 0.3.64 -MIT or ASL 2.0: rust-base64 0.13.0 -MIT or ASL 2.0: rust-bit-set 0.5.2 -MIT or ASL 2.0: rust-bit-vec 0.6.3 -MIT or ASL 2.0: rust-bitflags 1.3.2 -MIT or ASL 2.0: rust-cc 1.0.73 -MIT or ASL 2.0: rust-cfg-if 1.0.0 -MIT or ASL 2.0: rust-diff 0.1.12 -MIT or ASL 2.0: rust-digest0.9 0.9.0 -MIT or ASL 2.0: rust-dirs-next 2.0.0 -MIT or ASL 2.0: rust-dirs-sys-next 0.1.2 -MIT or ASL 2.0: rust-dyn-clone 1.0.4 -MIT or ASL 2.0: rust-either 1.6.1 -MIT or ASL 2.0: rust-ena 0.14.0 -MIT or ASL 2.0: rust-fixedbitset 0.3.2 -MIT or ASL 2.0: rust-getrandom 0.2.5 -MIT or ASL 2.0: rust-glob 0.3.0 -MIT or ASL 2.0: rust-heck0.3 0.3.3 -MIT or ASL 2.0: rust-idna 0.2.3 -MIT or ASL 2.0: rust-itertools 0.10.3 -MIT or ASL 2.0: rust-lazy_static 1.4.0 -MIT or ASL 2.0: rust-lazycell 1.3.0 -MIT or ASL 2.0: rust-libc 0.2.119 -MIT or ASL 2.0: rust-log 0.4.14 -MIT or ASL 2.0: rust-minimal-lexical 0.2.1 -MIT or ASL 2.0: rust-petgraph 0.5.1 -MIT or ASL 2.0: rust-pkg-config 0.3.24 -MIT or ASL 2.0: rust-proc-macro-error 1.0.4 -MIT or ASL 2.0: rust-proc-macro-error-attr 1.0.4 -MIT or ASL 2.0: rust-proc-macro2 1.0.36 -MIT or ASL 2.0: rust-quote 1.0.15 -MIT or ASL 2.0: rust-regex 1.5.5 -MIT or ASL 2.0: rust-regex-syntax 0.6.25 -MIT or ASL 2.0: rust-rustc-demangle 0.1.21 -MIT or ASL 2.0: rust-scopeguard 1.1.0 -MIT or ASL 2.0: rust-shlex 1.1.0 -MIT or ASL 2.0: rust-siphasher 0.3.10 -MIT or ASL 2.0: rust-smallvec 1.8.0 -MIT or ASL 2.0: rust-string_cache 0.8.3 -MIT or ASL 2.0: rust-syn 1.0.86 -MIT or ASL 2.0: rust-term 0.7.0 -MIT or ASL 2.0: rust-thiserror 1.0.30 -MIT or ASL 2.0: rust-thiserror-impl 1.0.30 -MIT or ASL 2.0: rust-typenum 1.15.0 -MIT or ASL 2.0: rust-unicode-bidi 0.3.7 -MIT or ASL 2.0: rust-unicode-normalization 0.1.19 -MIT or ASL 2.0: rust-unicode-segmentation 1.9.0 -MIT or ASL 2.0: rust-unicode-width 0.1.9 -MIT or ASL 2.0: rust-unicode-xid 0.2.2 -MIT or ASL 2.0: rust-vec_map 0.8.2 -MIT or ASL 2.0: rust-version_check 0.9.4 -MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4 -MIT: rust-ansi_term 0.12.1 -MIT: rust-atty 0.2.14 -MIT: rust-clap2 2.34.0 -MIT: rust-crunchy 0.2.2 -MIT: rust-generic-array 0.14.5 -MIT: rust-matches 0.1.9 -MIT: rust-memsec 0.6.0 -MIT: rust-new_debug_unreachable 1.0.4 -MIT: rust-nom 7.1.0 -MIT: rust-phf_shared 0.10.0 -MIT: rust-pico-args 0.4.2 -MIT: rust-precomputed-hash 0.1.1 -MIT: rust-sha1collisiondetection 0.2.5 -MIT: rust-strsim 0.10.0 -MIT: rust-textwrap0.11 0.11.0 -Unlicense or MIT: rust-aho-corasick 0.7.18 -Unlicense or MIT: rust-memchr 2.4.1 -zlib or ASL 2.0 or MIT: rust-tinyvec 1.5.1 diff --git a/rust-sequoia-keyring-linter.spec b/rust-sequoia-keyring-linter.spec index e6b9a51..523f6e1 100644 --- a/rust-sequoia-keyring-linter.spec +++ b/rust-sequoia-keyring-linter.spec @@ -1,29 +1,24 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 23 %bcond_without check -%global __cargo_skip_build 0 %global crate sequoia-keyring-linter -Name: rust-%{crate} -Version: 0.5.0 +Name: rust-sequoia-keyring-linter +Version: 1.0.0 Release: %autorelease Summary: Linter for keyrings -# Upstream license specification: GPL-2.0-or-later -# https://gitlab.com/sequoia-pgp/keyring-linter/-/issues/8 -License: GPLv2+ +License: GPL-2.0-or-later URL: https://crates.io/crates/sequoia-keyring-linter -Source0: %{crates_source} -Source1: LICENSE.dependencies -# Initial patched metadata +Source: %{crates_source} +# Manually created patch for downstream crate metadata changes # * exclude files that are only useful for upstream development # * prevent manpages from getting installed twice -# * Bump assert_cmd to 2.0.0 -Patch0: sequoia-keyring-linter-fix-metadata.diff +# * bump assert_cmd to 2.0.0 +# * remove feature for Windows-specific cryptography +Patch: sequoia-keyring-linter-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Linter for keyrings.} @@ -32,26 +27,24 @@ Linter for keyrings.} %package -n %{crate} Summary: %{summary} -# 0BSD or MIT or ASL 2.0 -# ASL 2.0 -# ASL 2.0 or MIT -# BSD -# CC0 -# GPLv2+ -# LGPLv2+ -# LGPLv3 or GPLv2 or GPLv3 +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 +# Apache-2.0 OR MIT +# BSL-1.0 +# GPL-2.0-or-later +# LGPL-2.0-or-later +# LGPL-3.0 OR GPL-2.0 OR GPL-3.0 # MIT -# MIT or ASL 2.0 -# MIT or ASL 2.0 or zlib -# MIT or zlib or ASL 2.0 -# Unlicense or MIT -# zlib or ASL 2.0 or MIT -License: GPLv2+ and ASL 2.0 and BSD and CC0 and MIT -# LICENSE.dependencies contains a full license breakdown +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +License: GPL-2.0 AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016 %description -n %{crate} %{_description} %files -n %{crate} +%license LICENSE.txt %license LICENSE.dependencies %doc README.md %{_bindir}/sq-keyring-linter @@ -59,7 +52,6 @@ License: GPLv2+ and ASL 2.0 and BSD and CC0 and MIT %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -cp %{SOURCE1} . %cargo_prep %generate_buildrequires @@ -67,6 +59,7 @@ cp %{SOURCE1} . %build %cargo_build +%{cargo_license} > LICENSE.dependencies %install %cargo_install @@ -76,13 +69,8 @@ cp -pav sq-keyring-linter.1 %{buildroot}/%{_mandir}/man1/ %if %{with check} %check -%ifarch %{ix86} %{arm} -# integer overflow in test suite on 32-bit architectures: -# https://gitlab.com/sequoia-pgp/keyring-linter/-/issues/9 -%cargo_test -- -- --skip integration::subkey_backsig -%else -%cargo_test -%endif +# * skip a test that should fail but unexpectedly succeeds +%cargo_test -- -- --skip integration::sha1_authentication_subkey %endif %changelog diff --git a/sequoia-keyring-linter-fix-metadata.diff b/sequoia-keyring-linter-fix-metadata.diff index 458e75c..c6091c0 100644 --- a/sequoia-keyring-linter-fix-metadata.diff +++ b/sequoia-keyring-linter-fix-metadata.diff @@ -1,19 +1,28 @@ ---- sequoia-keyring-linter-0.5.0/Cargo.toml 2020-12-18T13:52:36+00:00 -+++ sequoia-keyring-linter-0.5.0/Cargo.toml 2021-11-14T18:38:34.764879+00:00 -@@ -22,6 +22,7 @@ - categories = ["cryptography", "command-line-utilities"] +--- sequoia-keyring-linter-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-keyring-linter-1.0.0/Cargo.toml 2023-01-11T20:53:38.572348+00:00 +@@ -30,6 +30,10 @@ + ] license = "GPL-2.0-or-later" repository = "https://gitlab.com/sequoia-pgp/keyring-linter" -+exclude = ["Makefile", "sq-keyring-linter.1"] ++exclude = [ ++ "Makefile", ++ "sq-keyring-linter.1", ++] [[bin]] name = "sq-keyring-linter" -@@ -48,7 +49,7 @@ - [dependencies.thiserror] +@@ -58,13 +62,12 @@ version = "1" + [dev-dependencies.assert_cmd] -version = "1.0.1" +version = "2.0.0" [dev-dependencies.predicates] version = "1.0.5" + + [features] +-crypto-cng = ["sequoia-openpgp/crypto-cng"] + crypto-nettle = ["sequoia-openpgp/crypto-nettle"] + default = ["crypto-nettle"] + diff --git a/sources b/sources index 7abee3a..ec52beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-keyring-linter-0.5.0.crate) = 34a6afdf2d8dd0f2bc9416b903682adb860fea39ea4a66578f886d216518d36e598fcb1e3e1950d101b2082f83fa85d0bb0a7aaf5b9c479d020e844fc52874bd +SHA512 (sequoia-keyring-linter-1.0.0.crate) = e97396ff0c0a713dfe49c8b0b16166658f56df0c2fd2516f01fee0c1abff052cf15f9ce3b24955b3738bd68d2b550c3232d01563e4d54c8eb1aa90f1c87e07a2