diff --git a/.gitignore b/.gitignore index 063e5ca..165d5b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /sequoia-sq-0.25.0.crate +/sequoia-sq-0.26.0.crate diff --git a/0001-build-remove-automated-integration-test-generation.patch b/0001-build-remove-automated-integration-test-generation.patch new file mode 100644 index 0000000..dd42be2 --- /dev/null +++ b/0001-build-remove-automated-integration-test-generation.patch @@ -0,0 +1,37 @@ +From 5daffba8dd7b00739507c74b5ce28d18597e7be9 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Wed, 16 Mar 2022 12:10:07 +0100 +Subject: [PATCH] build: remove automated integration test generation + +--- + build.rs | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/build.rs b/build.rs +index 71399d4..cc4c687 100644 +--- a/build.rs ++++ b/build.rs +@@ -1,7 +1,6 @@ + use std::env; + use std::fs; + use std::io::{self, Write}; +-use std::path::Path; + use clap::Shell; + + mod sq_cli { +@@ -11,12 +10,6 @@ mod sq_cli { + fn main() { + println!("cargo:rerun-if-changed=build.rs"); + +- // XXX: Revisit once +- // https://github.com/rust-lang/rust/issues/44732 is stabilized. +- +- subplot_build::codegen(Path::new("sq-subplot.md")) +- .expect("failed to generate code with Subplot"); +- + let mut sq = sq_cli::configure( + clap::App::new("sq").set_term_width(80), + cfg!(feature = "autocrypt"), +-- +2.35.1 + diff --git a/LICENSE.dependencies b/LICENSE.dependencies new file mode 100644 index 0000000..63cec1c --- /dev/null +++ b/LICENSE.dependencies @@ -0,0 +1,149 @@ +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-fastrand 1.7.0 +ASL 2.0 or MIT: rust-fnv 1.0.7 +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-pin-project-lite 0.2.8 +ASL 2.0 or MIT: rust-rustc-hash 1.1.0 +ASL 2.0: rust-clang-sys 1.3.1 +ASL 2.0: rust-openssl 0.10.38 +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-autocrypt 0.24.0 +LGPLv2+: rust-sequoia-net 0.24.0 +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 +LGPLv3+: rust-zbase32 0.1.2 +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-bzip2 0.4.3 +MIT or ASL 2.0: rust-bzip2-sys 0.1.11 +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-chrono 0.4.19 +MIT or ASL 2.0: rust-crc32fast 1.3.2 +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-flate2 1.0.22 +MIT or ASL 2.0: rust-foreign-types-shared0.1 0.1.1 +MIT or ASL 2.0: rust-foreign-types0.3 0.3.2 +MIT or ASL 2.0: rust-form_urlencoded 1.0.1 +MIT or ASL 2.0: rust-futures-channel 0.3.21 +MIT or ASL 2.0: rust-futures-core 0.3.21 +MIT or ASL 2.0: rust-futures-macro 0.3.21 +MIT or ASL 2.0: rust-futures-sink 0.3.21 +MIT or ASL 2.0: rust-futures-task 0.3.21 +MIT or ASL 2.0: rust-futures-util 0.3.21 +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-http 0.2.6 +MIT or ASL 2.0: rust-httparse 1.6.0 +MIT or ASL 2.0: rust-httpdate 1.0.2 +MIT or ASL 2.0: rust-hyper-tls 0.5.0 +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-itertools0.9 0.9.0 +MIT or ASL 2.0: rust-itoa 1.0.1 +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-native-tls 0.2.8 +MIT or ASL 2.0: rust-num-integer 0.1.44 +MIT or ASL 2.0: rust-num-traits 0.2.14 +MIT or ASL 2.0: rust-once_cell 1.10.0 +MIT or ASL 2.0: rust-openssl-probe 0.1.5 +MIT or ASL 2.0: rust-percent-encoding 2.1.0 +MIT or ASL 2.0: rust-petgraph 0.5.1 +MIT or ASL 2.0: rust-pin-utils 0.1.0 +MIT or ASL 2.0: rust-pkg-config 0.3.24 +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-remove_dir_all 0.7.0 +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-socket2 0.4.4 +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-tempfile 3.3.0 +MIT or ASL 2.0: rust-term 0.7.0 +MIT or ASL 2.0: rust-term_size 0.3.2 +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-time0.1 0.1.44 +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-width 0.1.9 +MIT or ASL 2.0: rust-unicode-xid 0.2.2 +MIT or ASL 2.0: rust-url 2.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-bytes 1.1.0 +MIT: rust-clap2 2.34.0 +MIT: rust-crunchy 0.2.2 +MIT: rust-generic-array 0.14.5 +MIT: rust-h2 0.3.11 +MIT: rust-http-body 0.4.4 +MIT: rust-hyper 0.14.17 +MIT: rust-matches 0.1.9 +MIT: rust-memsec 0.6.0 +MIT: rust-mio 0.8.1 +MIT: rust-new_debug_unreachable 1.0.4 +MIT: rust-nom 7.1.0 +MIT: rust-openssl-sys 0.9.72 +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-slab 0.4.5 +MIT: rust-strsim 0.10.0 +MIT: rust-textwrap0.11 0.11.0 +MIT: rust-tokio 1.17.0 +MIT: rust-tokio-macros 1.7.0 +MIT: rust-tokio-native-tls 0.3.0 +MIT: rust-tokio-util 0.6.9 +MIT: rust-tower-service 0.3.1 +MIT: rust-tracing 0.1.31 +MIT: rust-tracing-core 0.1.22 +MIT: rust-try-lock 0.2.3 +MIT: rust-want 0.3.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-sq.spec b/rust-sequoia-sq.spec index 6bb8d9c..3544be9 100644 --- a/rust-sequoia-sq.spec +++ b/rust-sequoia-sq.spec @@ -1,27 +1,29 @@ -# Generated by rust2rpm 16 -%bcond_without check -%global __cargo_skip_build 0 +# Generated by rust2rpm 21 +# * missing dev-dependencies: fehler, subplot-build, subplotlib +%bcond_with check %global crate sequoia-sq Name: rust-%{crate} -Version: 0.25.0 +Version: 0.26.0 Release: %autorelease Summary: Command-line frontends for Sequoia # Upstream license specification: GPL-2.0-or-later -# https://gitlab.com/sequoia-pgp/sequoia/-/issues/708 License: GPLv2+ URL: https://crates.io/crates/sequoia-sq -Source: %{crates_source} +Source0: %{crates_source} +Source1: LICENSE.dependencies # Initial patched metadata # * exclude files that are only useful for upstream development # * prevent manpages from getting installed twice +# * drop automated generation of upstream integration tests Patch0: sequoia-sq-fix-metadata.diff +Patch1: 0001-build-remove-automated-integration-test-generation.patch ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Command-line frontends for Sequoia.} @@ -36,6 +38,7 @@ Summary: %{summary} # BSD # CC0 # GPLv2+ +# LGPLv2+ # LGPLv3 or GPLv2 or GPLv3 # LGPLv3+ # MIT @@ -44,16 +47,20 @@ Summary: %{summary} # 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 LGPLv3+ and MIT +License: GPLv3 and ASL 2.0 and BSD and CC0 and MIT +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} +%license LICENSE.txt +%license LICENSE.dependencies %{_bindir}/sq %{_mandir}/man1/sq* %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 +cp %{SOURCE1} . # remove integration tests (assert-cli is broken during RPM builds) rm -r tests %cargo_prep diff --git a/sequoia-sq-fix-metadata.diff b/sequoia-sq-fix-metadata.diff index 4c38fbf..b121cb4 100644 --- a/sequoia-sq-fix-metadata.diff +++ b/sequoia-sq-fix-metadata.diff @@ -1,10 +1,20 @@ ---- sequoia-sq-0.25.0/Cargo.toml 2021-03-05T14:32:49+00:00 -+++ sequoia-sq-0.25.0/Cargo.toml 2021-04-08T21:49:05.202328+00:00 -@@ -24,6 +24,7 @@ +--- sequoia-sq-0.26.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-sq-0.26.0/Cargo.toml 2022-03-16T11:12:29.513034+00:00 +@@ -23,6 +23,7 @@ categories = ["cryptography", "authentication", "command-line-utilities"] license = "GPL-2.0-or-later" repository = "https://gitlab.com/sequoia-pgp/sequoia" -+exclude = ["man-*", "Makefile"] ++exclude = ["man-*", "Makefile", "sq-subplot.md", "subplot/"] [[bin]] name = "sq" +@@ -89,9 +90,6 @@ + version = "1.0.0" + default-features = false + +-[build-dependencies.subplot-build] +-version = "0.1.0" +- + [features] + autocrypt = ["sequoia-autocrypt"] + compression-bzip2 = ["buffered-reader/compression-bzip2", "sequoia-openpgp/compression-bzip2"] diff --git a/sources b/sources index 1d5d20d..f556818 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-sq-0.25.0.crate) = 21bf5c9a48b9ea7f0bea46c520d13af4c2ce965b6b859035f69a8b5f83c65a6c9c90605870d7ff96956a123f18e15ac347c16794daf912783d59c53f3b202e71 +SHA512 (sequoia-sq-0.26.0.crate) = 4e5431050809ca82922eeda6252ba16abc505dea2cfdbd5964169b98b19933088ebc95065e9624d98545678bcd741c7d5185eb8699fc968ab62272d7ce6bb310