The package rpms/rust-sequoia-octopus-librnp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-sequoia-octopus-librnp.git/comm....
Change: +ExcludeArch: %{ix86} %{arm} s390x
Thanks.
Full change: ============
commit 1abb41cbdf0c25021f360098dc5c773ed2a4ff5f Author: Fabio Valentini decathorpe@gmail.com Date: Thu Dec 14 19:44:13 2023 +0100
Update to version 1.6.1; Fixes RHBZ#2254574
diff --git a/.gitignore b/.gitignore index a9c198c..07de4b2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /sequoia-octopus-librnp-1.4.0.crate /sequoia-octopus-librnp-1.4.1.crate /sequoia-octopus-librnp-1.5.0.crate +/sequoia-octopus-librnp-1.6.0.crate +/sequoia-octopus-librnp-1.6.1.crate diff --git a/0001-drop-broken-build-script-based-git-versioning.patch b/0001-drop-broken-build-script-based-git-versioning.patch index e39436d..201461c 100644 --- a/0001-drop-broken-build-script-based-git-versioning.patch +++ b/0001-drop-broken-build-script-based-git-versioning.patch @@ -1,6 +1,6 @@ -From d764f2851a83e8e7917295701927d78184ee44f4 Mon Sep 17 00:00:00 2001 +From 827d480233c72419f94f862b9a7da510f0d7b586 Mon Sep 17 00:00:00 2001 From: Fabio Valentini decathorpe@gmail.com -Date: Fri, 14 Apr 2023 15:30:51 +0200 +Date: Thu, 14 Dec 2023 17:50:33 +0100 Subject: [PATCH] drop broken build-script based git versioning
--- @@ -11,7 +11,7 @@ Subject: [PATCH] drop broken build-script based git versioning
diff --git a/build.rs b/build.rs deleted file mode 100644 -index 5ba50b4..0000000 +index 8cf944b..0000000 --- a/build.rs +++ /dev/null @@ -1,19 +0,0 @@ @@ -21,9 +21,6 @@ index 5ba50b4..0000000 -} - -fn vergen() { -- let mut config = vergen::Config::default(); -- // Change the SHA output to the short variant -- *config.git_mut().sha_kind_mut() = vergen::ShaKind::Short; - // Generate the "cargo:" instruction cargo:rustc-env=VERGEN_GIT_SHA=<SHA> - // - // If the source directory is not a git repository, e.g. a tarball, this @@ -32,17 +29,20 @@ index 5ba50b4..0000000 - // than VERGEN_GIT_SHA and only use it if it is set (see - // rnp_version_string_full in src/version.rs). - // Upstream issue: https://github.com/rustyhorde/vergen/issues/124 -- let _ = vergen::vergen(config); +- let _ = vergen::EmitBuilder::builder() +- .git_sha(/* short */ true) +- .emit(); -} +- diff --git a/src/version.rs b/src/version.rs -index 11af6b8..5af56f7 100644 +index 3b5bbe9..576d634 100644 --- a/src/version.rs +++ b/src/version.rs -@@ -38,23 +38,11 @@ pub unsafe extern "C" fn rnp_version( - pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char { - lazy_static::lazy_static! { - static ref VERSION: Vec<u8> = { -- let mut b = match option_env!("VERGEN_GIT_SHA_SHORT") { +@@ -41,23 +41,11 @@ pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char { + static VERSION: OnceLock<Vec<u8>> = OnceLock::new(); + VERSION.get_or_init( + || { +- let mut b = match option_env!("VERGEN_GIT_SHA") { - Some(git_sha) => { - format!( - "{}-{}+sequoia-openpgp-{}", @@ -66,7 +66,7 @@ index 11af6b8..5af56f7 100644 + ).into_bytes(); b.push(0); // Sentinel. b - }; + }) -- -2.40.0 +2.43.0
diff --git a/rust-sequoia-octopus-librnp.spec b/rust-sequoia-octopus-librnp.spec index 32b0fee..81a89ba 100644 --- a/rust-sequoia-octopus-librnp.spec +++ b/rust-sequoia-octopus-librnp.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check
%global crate sequoia-octopus-librnp @@ -7,9 +7,9 @@ %global __provides_exclude_from ^%{tb_plugindir}/.*\.so$
Name: rust-sequoia-octopus-librnp -Version: 1.5.0 +Version: 1.6.1 Release: %autorelease -Summary: Reimplementation of RNP's interface using Sequoia +Summary: Reimplementation of RNP's interface using Sequoia for use with Thunderbird
License: LGPL-2.0-or-later URL: https://crates.io/crates/sequoia-octopus-librnp @@ -19,18 +19,15 @@ Source: %{crates_source} # fixes undefined references to rand::thread_rng # * exclude files only useful for upstream development # * do not use bundled sqlite in rusqlite -# * bump sequoia-autocrypt to 0.25 -# * bump sequoia-ipc to 0.30 -# * bump sequoia-net to 0.27 # * drop build script and build-dependencies: # git repository is not available when building from published crates Patch: sequoia-octopus-librnp-fix-metadata.diff Patch: 0001-drop-broken-build-script-based-git-versioning.patch
# exclude architectures where thunderbird is not available -ExcludeArch: %{arm} s390x +ExcludeArch: %{ix86} %{arm} s390x
-BuildRequires: rust-packaging >= 23 +BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand: Reimplementation of RNP's interface using Sequoia for use with @@ -40,24 +37,26 @@ Thunderbird.}
%package -n %{crate} Summary: %{summary} +# (Apache-2.0 OR MIT) AND BSD-3-Clause # (MIT OR Apache-2.0) AND Unicode-DFS-2016 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT # BSL-1.0 # LGPL-2.0-or-later # LGPL-3.0 OR GPL-2.0 OR GPL-3.0 -# LGPL-3.0+ # MIT # MIT OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib # MIT OR LGPL-3.0-or-later # MIT OR Zlib OR Apache-2.0 +# MPL-2.0 # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-3.0+ AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT) +License: LGPL-2.0-or-later AND Apache-2.0 AND BSD-3-Clause AND BSL-1.0 AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown
Requires: thunderbird%{?_isa} @@ -74,7 +73,7 @@ Conflicts: thunderbird-librnp%{?_isa} %{tb_plugindir}/librnp.so
%prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep
%generate_buildrequires @@ -82,7 +81,7 @@ Conflicts: thunderbird-librnp%{?_isa}
%build %cargo_build -%cargo_license_summary +%{cargo_license_summary} %{cargo_license} > LICENSE.dependencies
%install @@ -91,8 +90,7 @@ cp -pav target/release/libsequoia_octopus_librnp.so %{buildroot}/%{tb_plugindir}
%if %{with check} %check -# * skip a test that fails with recent sequoia-openpgp versions -%cargo_test -- -- --skip keystore::tests::same_grip_same_cert +%cargo_test %endif
%changelog diff --git a/sequoia-octopus-librnp-fix-metadata.diff b/sequoia-octopus-librnp-fix-metadata.diff index 093a6a1..eb859ca 100644 --- a/sequoia-octopus-librnp-fix-metadata.diff +++ b/sequoia-octopus-librnp-fix-metadata.diff @@ -1,5 +1,5 @@ ---- sequoia-octopus-librnp-1.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sequoia-octopus-librnp-1.5.0/Cargo.toml 2023-04-14T13:18:42.517732+00:00 +--- sequoia-octopus-librnp-1.6.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-octopus-librnp-1.6.1/Cargo.toml 2023-12-19T16:40:40.717767+00:00 @@ -20,7 +20,6 @@ "Nora Widdecke nora@sequoia-pgp.org", "Wiktor Kwapisiewicz wiktor@sequoia-pgp.org", @@ -8,58 +8,55 @@ description = "Reimplementation of RNP's interface using Sequoia for use with Thunderbird" homepage = "https://sequoia-pgp.org/" readme = "README.md" -@@ -38,6 +37,7 @@ +@@ -38,6 +37,11 @@ ] license = "LGPL-2.0-or-later" repository = "https://gitlab.com/sequoia-pgp/sequoia-octopus-librnp" -+exclude = ["notes.org"] ++exclude = [ ++ "/README-Debian.md", ++ "/build.rs", ++ "/notes.org", ++]
[lib] crate-type = ["cdylib"] -@@ -76,27 +76,24 @@ +@@ -72,15 +76,12 @@ + "std", "std_rng", ] - optional = true -default-features = false
[dependencies.rand_distr] version = "0.4" - optional = true -default-features = false
[dependencies.rusqlite] - version = ">=0.24, <0.29" + version = ">=0.24, <0.31" -features = ["bundled"]
[dependencies.sequoia-autocrypt] --version = "0.24" -+version = "0.25" - default-features = false - - [dependencies.sequoia-ipc] --version = "0.28" -+version = "0.30" - default-features = false - - [dependencies.sequoia-net] --version = ">=0.24, <0.26" -+version = ">=0.24, <0.28" - optional = true - default-features = false - -@@ -127,25 +124,14 @@ + version = ">=0.24, <0.26" +@@ -123,27 +124,7 @@ + [dependencies.tokio] version = "1" - optional = true
--[build-dependencies.libgit2-sys] --version = "=0.11" -- -[build-dependencies.vergen] --version = ">=5, <7" --features = ["git"] +-version = "8" +-features = [ +- "git", +- "git2", +-] -default-features = false - [features] +-crypto-botan = [ +- "sequoia-openpgp/compression", +- "sequoia-openpgp/crypto-botan", +-] +-crypto-botan2 = [ +- "sequoia-openpgp/compression", +- "sequoia-openpgp/crypto-botan2", +-] -crypto-cng = [ - "sequoia-openpgp/compression", - "sequoia-openpgp/crypto-cng", @@ -67,10 +64,15 @@ crypto-nettle = [ "sequoia-openpgp/compression", "sequoia-openpgp/crypto-nettle", +@@ -152,7 +133,10 @@ + "sequoia-openpgp/compression", + "sequoia-openpgp/crypto-openssl", ] - default = [ - "sequoia-openpgp/default", +-default = ["sequoia-openpgp/default"] ++default = [ + "crypto-nettle", - "net", - ] - net = [ ++ "sequoia-openpgp/default", ++] + + [badges.gitlab] + repository = "sequoia-pgp/sequoia-octopus-librnp" diff --git a/sources b/sources index eb71ba5..f871a92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-octopus-librnp-1.5.0.crate) = 889d153a5370255548cf89557ae34d047bd49f316fe616593c90b53fff30b5303e4b1a5f0c0c11687b12a33165e78d269710c90f1155e5bf10c180d99098f8ba +SHA512 (sequoia-octopus-librnp-1.6.1.crate) = d87f9764237b92711e8502be8467c5f052cd0e25e6c12cadf35ba424495f70d4c1880252d547fcba007ff144d942ed3dd1c68bd99dd43fe9bfeb047bec599928
arch-excludes@lists.fedoraproject.org