Update to 1.1.0 upstream release

Resolves: RHEL-72578
Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
Daiki Ueno 2025-01-06 09:18:46 +09:00
parent e9610d2773
commit 906543368e
4 changed files with 72 additions and 47 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
/sequoia-sq-0.37.0.crate
/rust-sequoia-sq-0.37.0-vendor.tar.xz
/capnproto-c++-1.0.1.tar.gz
/sequoia-sq-1.1.0.crate
/rust-sequoia-sq-1.1.0-vendor.tar.xz

View File

@ -1,5 +1,5 @@
# Generated by rust2rpm 26
%bcond_without check
# Generated by rust2rpm 27
%bcond check 1
%global crate sequoia-sq
@ -15,7 +15,7 @@
%endif
Name: rust-sequoia-sq
Version: 0.37.0
Version: 1.1.0
Release: %autorelease
Summary: Command-line frontends for Sequoia
@ -107,12 +107,14 @@ License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND BSD-3-Clause AN
# drop broken integration tests
rm -vr subplot/
rm -v tests/sq-subplot.rs
# don't lock the dependencies
rm -f Cargo.lock
%else
%cargo_prep
# drop broken integration tests
rm -vr subplot/
rm -v tests/sq-subplot.rs
%generate_buildrequires
%cargo_generate_buildrequires
@ -154,7 +156,25 @@ install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \
%check
# * skip tests that require files which are not included in published crates
# * skip tests that fail because the Fedora crypto policy is too strict
%cargo_test -- -- --exact --skip cli::cert::export::sq_cert_export --skip cli::cert::import::sq_cert_import --skip cli::inspect::sq_inspect --skip cli::key::expire::sq_key_expire --skip cli::key::sq_key_import --skip cli::key::sq_key_list --skip cli::pki::sq_pki_authenticate --skip cli::pki::sq_pki_identify --skip cli::pki::sq_pki_list --skip cli::pki::sq_pki_lookup --skip cli::pki::sq_pki_path --skip sq_sign --skip sq_sign_append --skip sq_sign_append_on_compress_then_sign --skip sq_sign_detached --skip sq_sign_detached_append --skip sq_sign_with_notations --skip sq_autocrypt_import
%{cargo_test -- -- --exact %{shrink:
--skip cli::cert::export::sq_cert_export
--skip cli::cert::import::sq_cert_import
--skip cli::inspect::sq_inspect
--skip cli::key::expire::sq_key_expire
--skip cli::key::sq_key_import
--skip cli::key::sq_key_list
--skip cli::pki::sq_pki_authenticate
--skip cli::pki::sq_pki_identify
--skip cli::pki::sq_pki_list
--skip cli::pki::sq_pki_lookup
--skip cli::pki::sq_pki_path
--skip integration::sq_sign::sq_sign
--skip integration::sq_sign::sq_sign_append
--skip integration::sq_sign::sq_sign_append_on_compress_then_sign
--skip integration::sq_sign::sq_sign_detached
--skip integration::sq_sign::sq_sign_detached_append
--skip integration::sq_sign::sq_sign_with_notations
}}
%endif
%changelog

View File

@ -1,5 +1,5 @@
--- sequoia-sq-0.37.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ sequoia-sq-0.37.0/Cargo.toml 2024-06-15T16:34:04.061673+00:00
--- sequoia-sq-1.1.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ sequoia-sq-1.1.0/Cargo.toml 2025-01-01T19:12:41.953963+00:00
@@ -44,6 +44,12 @@
]
license = "LGPL-2.0-or-later"
@ -11,52 +11,55 @@
+ "/sq-subplot.md",
+]
[profile.release]
debug = true
@@ -76,10 +82,6 @@
[profile.dev.package.aes]
opt-level = 2
@@ -134,11 +140,6 @@
path = "src/main.rs"
bench = false
-[[test]]
-name = "sq-subplot"
-path = "tests/sq-subplot.rs"
-required-features = ["subplot"]
-
[dependencies.aho-corasick]
version = "1"
@@ -162,10 +163,6 @@
"wrap_help",
]
-[dependencies.culpa]
-version = "1"
-optional = true
-
[dependencies.dirs]
version = "5"
-[dependencies.dot-writer]
-version = "0.1.3"
@@ -243,10 +240,6 @@
[dependencies.serde]
version = "1.0.137"
features = ["derive"]
-
-[dependencies.subplotlib]
-version = ">=0.11, <0.13"
-optional = true
-
[dependencies.humantime]
version = "2"
@@ -155,9 +157,6 @@
[dev-dependencies.dircpy]
version = "0.3"
-[dev-dependencies.fehler]
-version = "1.0.0"
-
[dev-dependencies.libc]
version = "0.2"
@@ -166,9 +165,6 @@
[dev-dependencies.regex]
version = "1"
-
-[dev-dependencies.subplotlib]
-version = ">=0.7, <0.10"
[build-dependencies.anyhow]
version = "1.0.18"
@@ -217,10 +213,6 @@
[dependencies.tempfile]
version = "3.1"
@@ -341,10 +334,6 @@
version = "1.0.137"
features = ["derive"]
-[build-dependencies.subplot-build]
-version = ">=0.7, <0.10"
-version = ">=0.11, <0.13"
-optional = true
-
[build-dependencies.terminal_size]
version = ">=0.2.6, <0.4"
version = ">=0.2.6, <0.5"
@@ -228,17 +220,12 @@
version = ">=0.15, <0.17"
@@ -355,18 +344,10 @@
version = "1"
[features]
-crypto-botan = ["sequoia-openpgp/crypto-botan"]
@ -65,13 +68,13 @@
crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
crypto-rust = ["sequoia-openpgp/crypto-rust"]
default = [
- "crypto-nettle",
- "dot-writer",
-default = ["crypto-nettle"]
-subplot = [
- "culpa",
- "subplot-build",
- "subplotlib",
-]
-subplot = ["subplot-build"]
+ "crypto-openssl",
+]
+default = ["crypto-openssl"]
[badges.gitlab]
repository = "sequoia-pgp/sequoia-sq"

View File

@ -1,3 +1,3 @@
SHA512 (sequoia-sq-0.37.0.crate) = c716284bfd1f8492d7f073c07adbbfd73495573a8503d7aa5e24a42873a50392086c69c25a1bd655e3d09df6c369bc2568d02dfda3dc83c189cb9187c440162c
SHA512 (rust-sequoia-sq-0.37.0-vendor.tar.xz) = 27ef8c7dfbb535ce51534b9bd66a5cea2f5fcf779dfd69b95002b0e0e30641f9bc69240d83ed8dc11e07ca79cec1dd067938e4367036d85f8367a2ec6c09e45b
SHA512 (sequoia-sq-1.1.0.crate) = 69b13ecf20c2ada478be69ef87a6d784efbf4108941503f2c00c18961831e95585f770c12801e9239fb4e0440552005335a9093439125ed2a4c9c4b8ea96ce74
SHA512 (rust-sequoia-sq-1.1.0-vendor.tar.xz) = 2eb426d9b25ed115fefad01e3bde962e900c72181eb0d4f28307c3027c8e94d5826146a17aae4060b2f22585c1cc598760d62c1a9859c12c66c4621a6a1e8377
SHA512 (capnproto-c++-1.0.1.tar.gz) = c60291f433eea15a51e480e1679a4b9b3b5e67edebc445e371a7a32fce6ec5a7e4b440b17b2adc0565519ec369e3dae8ea727ae790a082a53ecd0d245b5275a9