Bump sequoia-autocrypt to v0.25 and sequoia-net to v0.27

2 years ago · e31425d4c2
parent 6c20bdc6b0
commit e31425d4c2
3 changed files with 67 additions and 180 deletions
--- a/LICENSE.dependencies
+++ b/LICENSE.dependencies
@ -1,149 +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-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
--- a/rust-sequoia-sq.spec
+++ b/rust-sequoia-sq.spec
@ -1,29 +1,27 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 # * missing dev-dependencies: fehler, subplot-build, subplotlib
 %bcond_with check

 %global crate sequoia-sq

-Name:           rust-%{crate}
+Name:           rust-sequoia-sq
 Version:        0.26.0
 Release:        %autorelease
 Summary:        Command-line frontends for Sequoia

-# Upstream license specification: GPL-2.0-or-later
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            https://crates.io/crates/sequoia-sq
-Source0:        %{crates_source}
-Source1:        LICENSE.dependencies
-# Initial patched metadata
+Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+Patch:          sequoia-sq-fix-metadata.diff
 # * 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
+# * bump sequoia-autocrypt to 0.25
+# * bump sequoia-net to 0.27
+Patch:          0001-build-remove-automated-integration-test-generation.patch

-ExclusiveArch:  %{rust_arches}
-
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  rust-packaging >= 23

 %global _description %{expand:
 Command-line frontends for Sequoia.}
@ -32,23 +30,23 @@ Command-line frontends for Sequoia.}

 %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
-# LGPLv3+
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD OR MIT OR Apache-2.0
+# Apache-2.0
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR 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
+# LGPL-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:        GPLv3 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
+# MIT OR Zlib OR Apache-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License:        GPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-3.0 AND MIT AND Unicode-DFS-2016

 %description -n %{crate} %{_description}

@ -60,7 +58,6 @@ License:        GPLv3 and ASL 2.0 and BSD and CC0 and MIT

 %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
@ -70,6 +67,8 @@ rm -r tests

 %build
 %cargo_build
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies

 %install
 %cargo_install
--- a/sequoia-sq-fix-metadata.diff
+++ b/sequoia-sq-fix-metadata.diff
@ -1,5 +1,5 @@
 --- 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
+++ sequoia-sq-0.26.0/Cargo.toml	2023-04-14T10:24:21.873221+00:00
@@ -23,6 +23,7 @@
 categories = ["cryptography", "authentication", "command-line-utilities"]
 license = "GPL-2.0-or-later"
@ -8,7 +8,40 @@
 
 [[bin]]
 name = "sq"
-@@ -89,9 +90,6 @@
+@@ -50,12 +51,12 @@
+ version = "5.0"
+ 
+ [dependencies.sequoia-autocrypt]
+-version = "0.24"
+version = "0.25"
+ optional = true
+ default-features = false
+ 
+ [dependencies.sequoia-net]
+-version = "0.24"
+version = "0.27"
+ default-features = false
+ 
+ [dependencies.sequoia-openpgp]
+@@ -71,17 +72,7 @@
+ 
+ [dependencies.tokio]
+ version = "1.13.1"
+-[dev-dependencies.assert_cmd]
+-version = "2.0.4"
+ 
+-[dev-dependencies.fehler]
+-version = "1.0.0"
+-
+-[dev-dependencies.predicates]
+-version = "2"
+-
+-[dev-dependencies.subplotlib]
+-version = "0.1.0"
+ [build-dependencies.clap]
+ version = "2.33"
+ 
+@@ -89,13 +80,9 @@
 version = "1.0.0"
 default-features = false
 
@ -18,3 +51,7 @@
 [features]
 autocrypt = ["sequoia-autocrypt"]
 compression-bzip2 = ["buffered-reader/compression-bzip2", "sequoia-openpgp/compression-bzip2"]
+-crypto-cng = ["sequoia-openpgp/crypto-cng"]
+ crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
+ default = ["crypto-nettle", "compression-bzip2", "autocrypt"]
+ [badges.gitlab]