Merge ~juliank/ubuntu/+source/rust-sequoia-sqv:ubuntu/devel into ubuntu/+source/rust-sequoia-sqv:ubuntu/devel

Proposed by Julian Andres Klode
Status: Needs review
Proposed branch: ~juliank/ubuntu/+source/rust-sequoia-sqv:ubuntu/devel
Merge into: ubuntu/+source/rust-sequoia-sqv:ubuntu/devel
Diff against target: 1414 lines (+1361/-16)
4 files modified
debian/control (+2/-13)
debian/patches/remove-dependencies.patch (+1303/-0)
debian/patches/series (+1/-1)
debian/rules (+55/-2)
Reviewer Review Type Date Requested Status
Lukas Märdian (community) Needs Fixing
git-ubuntu import Pending
Review via email: mp+479448@code.launchpad.net

Description of the change

Vendorize the dependencies. We deviate from the previous progress here that removes unused crates to simply emptying them, like cargo-vendor-filterer does, such as to avoid having to patch all the other crates that depend on them.

To post a comment you must log in.
d84750a... by Julian Andres Klode

Use cargo-vendor-filterer directly

I just packed it, hooray

Revision history for this message
Lukas Märdian (slyon) wrote :

Hi Julian,

thank you very much for getting sequoia in shape for Ubuntu! This generally LGTM and IMO is a good example of how we do Rust packaging in Ubuntu main. It follows best-practices from https://github.com/canonical/ubuntu-mir/blob/main/vendoring/Rust.md – especially the .orig-rust-vendor.tar.xz vendoring tarball.

A small nitpick (non-blocking): You might want to add a debian/README.source file, describing of how the vendoring tarball is created and how (vendored) dependencies can be updated. (Along the lines of https://git.launchpad.net/ubuntu/+source/s390-tools/tree/debian/README.source)

Another non-blocking nitpick can be found in-line below.

The one blocking issue I discovered is that it FTBFS with the following error:
[...]
  run pkg_config fail: Could not run `PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 pkg-config --libs --cflags openssl`
  The pkg-config command could not be found.
[...]

Adding "pkgconf" as a B-D (to find openssl system lib) fixes this. And you should probably do that.

Once that pkg-config issue is fixed. Feel free to upload!

review: Needs Fixing

Unmerged commits

d84750a... by Julian Andres Klode

Use cargo-vendor-filterer directly

I just packed it, hooray

600a48a... by Julian Andres Klode

Vendor the crates

Instead of the previous approach of deleting the unwanted crates and
then patching all the other crates to remove the dependencies on them,
we simply empty the crates, similar to `cargo-vendor-filterer`, this
way we can save all the patching :)

The list of unwanted crates can be calculated by running

    debian/rules vendor-filterer

Assuming you have `cargo-vendor-filterer` installed.

Our patching is slightly different when it comes to custom build
scripts and links: We don't patch Cargo.toml to remove them, instead
we simply create an empty build.rs which is sufficient.

Remove relax-deps.patch from the series as we do not need to relax
the deps when vendoring crates.

c56da13... by Julian Andres Klode

d/p/remove-dependencies.patch: Remove unused crypto backends

This avoids `cargo vendor` even downloading them

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/control b/debian/control
index 6c38562..2029532 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,7 @@ Build-Depends: debhelper-compat (= 13),
5 dh-sequence-cargo,5 dh-sequence-cargo,
6 cargo:native,6 cargo:native,
7 rustc:native (>= 1.70),7 rustc:native (>= 1.70),
8 libstd-rust-dev,8 libssl-dev,
9 librust-anyhow-1+default-dev (>= 1.0.18-~~),
10 librust-chrono-0.4+default-dev (>= 0.4.10-~~),
11 librust-clap-4+default-dev,
12 librust-clap-4+derive-dev,
13 librust-clap-4+string-dev,
14 librust-clap-4+wrap-help-dev,
15 librust-clap-complete-4+default-dev,
16 librust-clap-mangen-0.2+default-dev,
17 librust-sequoia-openpgp-1+crypto-openssl-dev,
18 librust-sequoia-openpgp-1-dev,
19 librust-sequoia-policy-config-0.7+default-dev,
20 librust-sequoia-policy-config-0.7+default-dev | librust-sequoia-policy-config-0.6+default-dev,
21 bash-completion9 bash-completion
22Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>10Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
23XSBC-Original-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>11XSBC-Original-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
@@ -30,6 +18,7 @@ Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/sequoia-sqv]
30Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/sequoia-sqv18Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/sequoia-sqv
31Homepage: https://sequoia-pgp.org/19Homepage: https://sequoia-pgp.org/
32X-Cargo-Crate: sequoia-sqv20X-Cargo-Crate: sequoia-sqv
21XS-Vendored-Sources-Rust: aho-corasick@1.1.3, anstream@0.6.13, anstyle-parse@0.2.3, anstyle-query@1.0.2, anstyle@1.0.6, anyhow@1.0.76, ascii-canvas@3.0.0, assert_cmd@2.0.13, autocfg@1.2.0, base64@0.22.0, bit-set@0.5.3, bit-vec@0.6.3, bitflags@2.5.0, block-buffer@0.10.4, bstr@1.9.1, buffered-reader@1.3.1, cc@1.0.94, cfg-if@1.0.0, chrono@0.4.38, clap@4.4.18, clap_builder@4.4.18, clap_complete@4.4.10, clap_derive@4.4.7, clap_lex@0.6.0, clap_mangen@0.2.19, colorchoice@1.0.0, crunchy@0.2.2, crypto-common@0.1.6, difflib@0.4.0, digest@0.10.7, dirs-next@2.0.0, dirs-sys-next@0.1.2, doc-comment@0.3.3, dyn-clone@1.0.17, either@1.11.0, ena@0.14.2, equivalent@1.0.1, errno@0.3.8, fixedbitset@0.4.2, float-cmp@0.9.0, foreign-types-shared@0.1.1, foreign-types@0.3.2, generic-array@0.14.7, hashbrown@0.14.3, heck@0.4.1, iana-time-zone@0.1.60, idna@0.5.0, indexmap@2.2.6, itertools@0.11.0, lalrpop-util@0.20.2, lalrpop@0.20.2, lazy_static@1.4.0, libc@0.2.153, linux-raw-sys@0.4.13, lock_api@0.4.11, log@0.4.21, memchr@2.7.2, memsec@0.6.3, new_debug_unreachable@1.0.6, normalize-line-endings@0.3.0, num-traits@0.2.18, once_cell@1.19.0, openssl-macros@0.1.1, openssl-sys@0.9.102, openssl@0.10.64, parking_lot@0.12.1, parking_lot_core@0.9.9, petgraph@0.6.4, phf_shared@0.10.0, pkg-config@0.3.30, precomputed-hash@0.1.1, predicates-core@1.0.6, predicates-tree@1.0.9, predicates@3.1.0, proc-macro2@1.0.81, quote@1.0.36, regex-automata@0.4.6, regex-syntax@0.8.3, regex@1.10.4, roff@0.2.1, rustix@0.38.32, same-file@1.0.6, scopeguard@1.2.0, sequoia-openpgp@1.20.0, sequoia-policy-config@0.6.0, serde@1.0.198, sha1collisiondetection@0.3.4, siphasher@0.3.11, smallvec@1.13.2, string_cache@0.8.7, strsim@0.10.0, syn@2.0.60, term@0.7.0, terminal_size@0.3.0, termtree@0.4.1, thiserror-impl@1.0.58, thiserror@1.0.58, tiny-keccak@2.0.2, tinyvec@1.6.0, tinyvec_macros@0.1.1, toml@0.5.11, typenum@1.17.0, unicode-bidi@0.3.15, unicode-ident@1.0.12, unicode-normalization@0.1.23, unicode-xid@0.2.4, utf8parse@0.2.1, vcpkg@0.2.15, version_check@0.9.4, wait-timeout@0.2.0, walkdir@2.5.0, xxhash-rust@0.8.10
33Rules-Requires-Root: no22Rules-Requires-Root: no
3423
35Package: sqv24Package: sqv
diff --git a/debian/patches/remove-dependencies.patch b/debian/patches/remove-dependencies.patch
36new file mode 10064425new file mode 100644
index 0000000..7fbd1af
--- /dev/null
+++ b/debian/patches/remove-dependencies.patch
@@ -0,0 +1,1303 @@
1Description: Remove unused dependencies from Cargo.toml
2 This avoids having to rebuild them. Cargo.lock is recreated automatically by
3 cargo, but we ship the diff here so it works
4Author: Julian Andres Klode <juliank@ubuntu.com>
5Forwarded: not-needed
6diff --git a/Cargo.lock b/Cargo.lock
7index fccfe2c..68b8276 100644
8--- a/Cargo.lock
9+++ b/Cargo.lock
10@@ -2,42 +2,6 @@
11 # It is not intended for manual editing.
12 version = 3
13
14-[[package]]
15-name = "aead"
16-version = "0.5.2"
17-source = "registry+https://github.com/rust-lang/crates.io-index"
18-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
19-dependencies = [
20- "crypto-common",
21- "generic-array",
22-]
23-
24-[[package]]
25-name = "aes"
26-version = "0.8.4"
27-source = "registry+https://github.com/rust-lang/crates.io-index"
28-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
29-dependencies = [
30- "cfg-if",
31- "cipher",
32- "cpufeatures",
33- "zeroize",
34-]
35-
36-[[package]]
37-name = "aes-gcm"
38-version = "0.10.3"
39-source = "registry+https://github.com/rust-lang/crates.io-index"
40-checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
41-dependencies = [
42- "aead",
43- "aes",
44- "cipher",
45- "ctr",
46- "ghash",
47- "subtle",
48-]
49-
50 [[package]]
51 name = "aho-corasick"
52 version = "1.1.3"
53@@ -146,44 +110,12 @@ version = "1.2.0"
54 source = "registry+https://github.com/rust-lang/crates.io-index"
55 checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
56
57-[[package]]
58-name = "base16ct"
59-version = "0.2.0"
60-source = "registry+https://github.com/rust-lang/crates.io-index"
61-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
62-
63 [[package]]
64 name = "base64"
65 version = "0.22.0"
66 source = "registry+https://github.com/rust-lang/crates.io-index"
67 checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
68
69-[[package]]
70-name = "base64ct"
71-version = "1.6.0"
72-source = "registry+https://github.com/rust-lang/crates.io-index"
73-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
74-
75-[[package]]
76-name = "bindgen"
77-version = "0.68.1"
78-source = "registry+https://github.com/rust-lang/crates.io-index"
79-checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
80-dependencies = [
81- "bitflags 2.5.0",
82- "cexpr",
83- "clang-sys",
84- "lazy_static",
85- "lazycell",
86- "peeking_take_while",
87- "proc-macro2",
88- "quote",
89- "regex",
90- "rustc-hash",
91- "shlex",
92- "syn",
93-]
94-
95 [[package]]
96 name = "bit-set"
97 version = "0.5.3"
98@@ -220,40 +152,6 @@ dependencies = [
99 "generic-array",
100 ]
101
102-[[package]]
103-name = "block-padding"
104-version = "0.3.3"
105-source = "registry+https://github.com/rust-lang/crates.io-index"
106-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
107-dependencies = [
108- "generic-array",
109-]
110-
111-[[package]]
112-name = "blowfish"
113-version = "0.9.1"
114-source = "registry+https://github.com/rust-lang/crates.io-index"
115-checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
116-dependencies = [
117- "byteorder",
118- "cipher",
119-]
120-
121-[[package]]
122-name = "botan"
123-version = "0.10.7"
124-source = "registry+https://github.com/rust-lang/crates.io-index"
125-checksum = "350081af1a3c6883f8a1f863ac553bfe6922589aad60008a70947765ed57c53e"
126-dependencies = [
127- "botan-sys",
128-]
129-
130-[[package]]
131-name = "botan-sys"
132-version = "0.10.5"
133-source = "registry+https://github.com/rust-lang/crates.io-index"
134-checksum = "9f49dde1b8ebd2996cc41c55c39f6ef8b54e38148d8973aeba0792b87b1621ca"
135-
136 [[package]]
137 name = "bstr"
138 version = "1.9.1"
139@@ -281,55 +179,12 @@ version = "3.16.0"
140 source = "registry+https://github.com/rust-lang/crates.io-index"
141 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
142
143-[[package]]
144-name = "byteorder"
145-version = "1.5.0"
146-source = "registry+https://github.com/rust-lang/crates.io-index"
147-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
148-
149-[[package]]
150-name = "camellia"
151-version = "0.1.0"
152-source = "registry+https://github.com/rust-lang/crates.io-index"
153-checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30"
154-dependencies = [
155- "byteorder",
156- "cipher",
157-]
158-
159-[[package]]
160-name = "cast5"
161-version = "0.11.1"
162-source = "registry+https://github.com/rust-lang/crates.io-index"
163-checksum = "26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911"
164-dependencies = [
165- "cipher",
166-]
167-
168 [[package]]
169 name = "cc"
170 version = "1.0.94"
171 source = "registry+https://github.com/rust-lang/crates.io-index"
172 checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
173
174-[[package]]
175-name = "cexpr"
176-version = "0.6.0"
177-source = "registry+https://github.com/rust-lang/crates.io-index"
178-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
179-dependencies = [
180- "nom",
181-]
182-
183-[[package]]
184-name = "cfb-mode"
185-version = "0.8.2"
186-source = "registry+https://github.com/rust-lang/crates.io-index"
187-checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330"
188-dependencies = [
189- "cipher",
190-]
191-
192 [[package]]
193 name = "cfg-if"
194 version = "1.0.0"
195@@ -350,28 +205,6 @@ dependencies = [
196 "windows-targets 0.52.5",
197 ]
198
199-[[package]]
200-name = "cipher"
201-version = "0.4.4"
202-source = "registry+https://github.com/rust-lang/crates.io-index"
203-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
204-dependencies = [
205- "crypto-common",
206- "inout",
207- "zeroize",
208-]
209-
210-[[package]]
211-name = "clang-sys"
212-version = "1.7.0"
213-source = "registry+https://github.com/rust-lang/crates.io-index"
214-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
215-dependencies = [
216- "glob",
217- "libc",
218- "libloading",
219-]
220-
221 [[package]]
222 name = "clap"
223 version = "4.4.18"
224@@ -432,62 +265,24 @@ dependencies = [
225 "roff",
226 ]
227
228-[[package]]
229-name = "cmac"
230-version = "0.7.2"
231-source = "registry+https://github.com/rust-lang/crates.io-index"
232-checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa"
233-dependencies = [
234- "cipher",
235- "dbl",
236- "digest",
237-]
238-
239 [[package]]
240 name = "colorchoice"
241 version = "1.0.0"
242 source = "registry+https://github.com/rust-lang/crates.io-index"
243 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
244
245-[[package]]
246-name = "const-oid"
247-version = "0.9.6"
248-source = "registry+https://github.com/rust-lang/crates.io-index"
249-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
250-
251 [[package]]
252 name = "core-foundation-sys"
253 version = "0.8.6"
254 source = "registry+https://github.com/rust-lang/crates.io-index"
255 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
256
257-[[package]]
258-name = "cpufeatures"
259-version = "0.2.12"
260-source = "registry+https://github.com/rust-lang/crates.io-index"
261-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
262-dependencies = [
263- "libc",
264-]
265-
266 [[package]]
267 name = "crunchy"
268 version = "0.2.2"
269 source = "registry+https://github.com/rust-lang/crates.io-index"
270 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
271
272-[[package]]
273-name = "crypto-bigint"
274-version = "0.5.5"
275-source = "registry+https://github.com/rust-lang/crates.io-index"
276-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
277-dependencies = [
278- "generic-array",
279- "rand_core",
280- "subtle",
281- "zeroize",
282-]
283-
284 [[package]]
285 name = "crypto-common"
286 version = "0.1.6"
287@@ -495,76 +290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
288 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
289 dependencies = [
290 "generic-array",
291- "rand_core",
292 "typenum",
293 ]
294
295-[[package]]
296-name = "ctr"
297-version = "0.9.2"
298-source = "registry+https://github.com/rust-lang/crates.io-index"
299-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
300-dependencies = [
301- "cipher",
302-]
303-
304-[[package]]
305-name = "curve25519-dalek"
306-version = "4.1.2"
307-source = "registry+https://github.com/rust-lang/crates.io-index"
308-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
309-dependencies = [
310- "cfg-if",
311- "cpufeatures",
312- "curve25519-dalek-derive",
313- "digest",
314- "fiat-crypto",
315- "platforms",
316- "rustc_version",
317- "subtle",
318- "zeroize",
319-]
320-
321-[[package]]
322-name = "curve25519-dalek-derive"
323-version = "0.1.1"
324-source = "registry+https://github.com/rust-lang/crates.io-index"
325-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
326-dependencies = [
327- "proc-macro2",
328- "quote",
329- "syn",
330-]
331-
332-[[package]]
333-name = "dbl"
334-version = "0.3.2"
335-source = "registry+https://github.com/rust-lang/crates.io-index"
336-checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9"
337-dependencies = [
338- "generic-array",
339-]
340-
341-[[package]]
342-name = "der"
343-version = "0.7.9"
344-source = "registry+https://github.com/rust-lang/crates.io-index"
345-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
346-dependencies = [
347- "const-oid",
348- "pem-rfc7468",
349- "zeroize",
350-]
351-
352-[[package]]
353-name = "des"
354-version = "0.8.1"
355-source = "registry+https://github.com/rust-lang/crates.io-index"
356-checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e"
357-dependencies = [
358- "cipher",
359-]
360-
361 [[package]]
362 name = "difflib"
363 version = "0.4.0"
364@@ -578,9 +306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
365 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
366 dependencies = [
367 "block-buffer",
368- "const-oid",
369 "crypto-common",
370- "subtle",
371 ]
372
373 [[package]]
374@@ -610,116 +336,18 @@ version = "0.3.3"
375 source = "registry+https://github.com/rust-lang/crates.io-index"
376 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
377
378-[[package]]
379-name = "dsa"
380-version = "0.6.3"
381-source = "registry+https://github.com/rust-lang/crates.io-index"
382-checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689"
383-dependencies = [
384- "digest",
385- "num-bigint-dig",
386- "num-traits",
387- "pkcs8",
388- "rfc6979",
389- "sha2",
390- "signature",
391- "zeroize",
392-]
393-
394 [[package]]
395 name = "dyn-clone"
396 version = "1.0.17"
397 source = "registry+https://github.com/rust-lang/crates.io-index"
398 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
399
400-[[package]]
401-name = "eax"
402-version = "0.5.0"
403-source = "registry+https://github.com/rust-lang/crates.io-index"
404-checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28"
405-dependencies = [
406- "aead",
407- "cipher",
408- "cmac",
409- "ctr",
410- "subtle",
411-]
412-
413-[[package]]
414-name = "ecb"
415-version = "0.1.2"
416-source = "registry+https://github.com/rust-lang/crates.io-index"
417-checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7"
418-dependencies = [
419- "cipher",
420-]
421-
422-[[package]]
423-name = "ecdsa"
424-version = "0.16.9"
425-source = "registry+https://github.com/rust-lang/crates.io-index"
426-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
427-dependencies = [
428- "der",
429- "digest",
430- "elliptic-curve",
431- "rfc6979",
432- "signature",
433- "spki",
434-]
435-
436-[[package]]
437-name = "ed25519"
438-version = "2.2.3"
439-source = "registry+https://github.com/rust-lang/crates.io-index"
440-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
441-dependencies = [
442- "pkcs8",
443- "signature",
444-]
445-
446-[[package]]
447-name = "ed25519-dalek"
448-version = "2.1.1"
449-source = "registry+https://github.com/rust-lang/crates.io-index"
450-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
451-dependencies = [
452- "curve25519-dalek",
453- "ed25519",
454- "rand_core",
455- "serde",
456- "sha2",
457- "subtle",
458- "zeroize",
459-]
460-
461 [[package]]
462 name = "either"
463 version = "1.11.0"
464 source = "registry+https://github.com/rust-lang/crates.io-index"
465 checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
466
467-[[package]]
468-name = "elliptic-curve"
469-version = "0.13.8"
470-source = "registry+https://github.com/rust-lang/crates.io-index"
471-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
472-dependencies = [
473- "base16ct",
474- "crypto-bigint",
475- "digest",
476- "ff",
477- "generic-array",
478- "group",
479- "hkdf",
480- "pem-rfc7468",
481- "pkcs8",
482- "rand_core",
483- "sec1",
484- "subtle",
485- "zeroize",
486-]
487-
488 [[package]]
489 name = "ena"
490 version = "0.14.2"
491@@ -745,28 +373,6 @@ dependencies = [
492 "windows-sys 0.52.0",
493 ]
494
495-[[package]]
496-name = "fastrand"
497-version = "2.0.2"
498-source = "registry+https://github.com/rust-lang/crates.io-index"
499-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
500-
501-[[package]]
502-name = "ff"
503-version = "0.13.0"
504-source = "registry+https://github.com/rust-lang/crates.io-index"
505-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
506-dependencies = [
507- "rand_core",
508- "subtle",
509-]
510-
511-[[package]]
512-name = "fiat-crypto"
513-version = "0.2.7"
514-source = "registry+https://github.com/rust-lang/crates.io-index"
515-checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
516-
517 [[package]]
518 name = "fixedbitset"
519 version = "0.4.2"
520@@ -805,7 +411,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
521 dependencies = [
522 "typenum",
523 "version_check",
524- "zeroize",
525 ]
526
527 [[package]]
528@@ -821,33 +426,6 @@ dependencies = [
529 "wasm-bindgen",
530 ]
531
532-[[package]]
533-name = "ghash"
534-version = "0.5.1"
535-source = "registry+https://github.com/rust-lang/crates.io-index"
536-checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
537-dependencies = [
538- "opaque-debug",
539- "polyval",
540-]
541-
542-[[package]]
543-name = "glob"
544-version = "0.3.1"
545-source = "registry+https://github.com/rust-lang/crates.io-index"
546-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
547-
548-[[package]]
549-name = "group"
550-version = "0.13.0"
551-source = "registry+https://github.com/rust-lang/crates.io-index"
552-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
553-dependencies = [
554- "ff",
555- "rand_core",
556- "subtle",
557-]
558-
559 [[package]]
560 name = "hashbrown"
561 version = "0.14.3"
562@@ -860,24 +438,6 @@ version = "0.4.1"
563 source = "registry+https://github.com/rust-lang/crates.io-index"
564 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
565
566-[[package]]
567-name = "hkdf"
568-version = "0.12.4"
569-source = "registry+https://github.com/rust-lang/crates.io-index"
570-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
571-dependencies = [
572- "hmac",
573-]
574-
575-[[package]]
576-name = "hmac"
577-version = "0.12.1"
578-source = "registry+https://github.com/rust-lang/crates.io-index"
579-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
580-dependencies = [
581- "digest",
582-]
583-
584 [[package]]
585 name = "iana-time-zone"
586 version = "0.1.60"
587@@ -901,15 +461,6 @@ dependencies = [
588 "cc",
589 ]
590
591-[[package]]
592-name = "idea"
593-version = "0.5.1"
594-source = "registry+https://github.com/rust-lang/crates.io-index"
595-checksum = "075557004419d7f2031b8bb7f44bb43e55a83ca7b63076a8fb8fe75753836477"
596-dependencies = [
597- "cipher",
598-]
599-
600 [[package]]
601 name = "idna"
602 version = "0.5.0"
603@@ -930,16 +481,6 @@ dependencies = [
604 "hashbrown",
605 ]
606
607-[[package]]
608-name = "inout"
609-version = "0.1.3"
610-source = "registry+https://github.com/rust-lang/crates.io-index"
611-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
612-dependencies = [
613- "block-padding",
614- "generic-array",
615-]
616-
617 [[package]]
618 name = "itertools"
619 version = "0.11.0"
620@@ -993,15 +534,6 @@ name = "lazy_static"
621 version = "1.4.0"
622 source = "registry+https://github.com/rust-lang/crates.io-index"
623 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
624-dependencies = [
625- "spin",
626-]
627-
628-[[package]]
629-name = "lazycell"
630-version = "1.3.0"
631-source = "registry+https://github.com/rust-lang/crates.io-index"
632-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
633
634 [[package]]
635 name = "libc"
636@@ -1009,22 +541,6 @@ version = "0.2.153"
637 source = "registry+https://github.com/rust-lang/crates.io-index"
638 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
639
640-[[package]]
641-name = "libloading"
642-version = "0.8.3"
643-source = "registry+https://github.com/rust-lang/crates.io-index"
644-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
645-dependencies = [
646- "cfg-if",
647- "windows-targets 0.52.5",
648-]
649-
650-[[package]]
651-name = "libm"
652-version = "0.2.8"
653-source = "registry+https://github.com/rust-lang/crates.io-index"
654-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
655-
656 [[package]]
657 name = "libredox"
658 version = "0.1.3"
659@@ -1057,16 +573,6 @@ version = "0.4.21"
660 source = "registry+https://github.com/rust-lang/crates.io-index"
661 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
662
663-[[package]]
664-name = "md-5"
665-version = "0.10.6"
666-source = "registry+https://github.com/rust-lang/crates.io-index"
667-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
668-dependencies = [
669- "cfg-if",
670- "digest",
671-]
672-
673 [[package]]
674 name = "memchr"
675 version = "2.7.2"
676@@ -1079,98 +585,18 @@ version = "0.6.3"
677 source = "registry+https://github.com/rust-lang/crates.io-index"
678 checksum = "0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c"
679
680-[[package]]
681-name = "minimal-lexical"
682-version = "0.2.1"
683-source = "registry+https://github.com/rust-lang/crates.io-index"
684-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
685-
686-[[package]]
687-name = "nettle"
688-version = "7.4.0"
689-source = "registry+https://github.com/rust-lang/crates.io-index"
690-checksum = "44e6ff4a94e5d34a1fd5abbd39418074646e2fa51b257198701330f22fcd6936"
691-dependencies = [
692- "getrandom",
693- "libc",
694- "nettle-sys",
695- "thiserror",
696- "typenum",
697-]
698-
699-[[package]]
700-name = "nettle-sys"
701-version = "2.3.0"
702-source = "registry+https://github.com/rust-lang/crates.io-index"
703-checksum = "b495053a10a19a80e3a26bf1212e92e29350797b5f5bdc58268c3f3f818e66ec"
704-dependencies = [
705- "bindgen",
706- "cc",
707- "libc",
708- "pkg-config",
709- "tempfile",
710- "vcpkg",
711-]
712-
713 [[package]]
714 name = "new_debug_unreachable"
715 version = "1.0.6"
716 source = "registry+https://github.com/rust-lang/crates.io-index"
717 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
718
719-[[package]]
720-name = "nom"
721-version = "7.1.3"
722-source = "registry+https://github.com/rust-lang/crates.io-index"
723-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
724-dependencies = [
725- "memchr",
726- "minimal-lexical",
727-]
728-
729 [[package]]
730 name = "normalize-line-endings"
731 version = "0.3.0"
732 source = "registry+https://github.com/rust-lang/crates.io-index"
733 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
734
735-[[package]]
736-name = "num-bigint-dig"
737-version = "0.8.4"
738-source = "registry+https://github.com/rust-lang/crates.io-index"
739-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
740-dependencies = [
741- "byteorder",
742- "lazy_static",
743- "libm",
744- "num-integer",
745- "num-iter",
746- "num-traits",
747- "rand",
748- "smallvec",
749- "zeroize",
750-]
751-
752-[[package]]
753-name = "num-integer"
754-version = "0.1.46"
755-source = "registry+https://github.com/rust-lang/crates.io-index"
756-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
757-dependencies = [
758- "num-traits",
759-]
760-
761-[[package]]
762-name = "num-iter"
763-version = "0.1.44"
764-source = "registry+https://github.com/rust-lang/crates.io-index"
765-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
766-dependencies = [
767- "autocfg",
768- "num-integer",
769- "num-traits",
770-]
771-
772 [[package]]
773 name = "num-traits"
774 version = "0.2.18"
775@@ -1178,7 +604,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
776 checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
777 dependencies = [
778 "autocfg",
779- "libm",
780 ]
781
782 [[package]]
783@@ -1187,12 +612,6 @@ version = "1.19.0"
784 source = "registry+https://github.com/rust-lang/crates.io-index"
785 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
786
787-[[package]]
788-name = "opaque-debug"
789-version = "0.3.1"
790-source = "registry+https://github.com/rust-lang/crates.io-index"
791-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
792-
793 [[package]]
794 name = "openssl"
795 version = "0.10.64"
796@@ -1231,18 +650,6 @@ dependencies = [
797 "vcpkg",
798 ]
799
800-[[package]]
801-name = "p256"
802-version = "0.13.2"
803-source = "registry+https://github.com/rust-lang/crates.io-index"
804-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
805-dependencies = [
806- "ecdsa",
807- "elliptic-curve",
808- "primeorder",
809- "sha2",
810-]
811-
812 [[package]]
813 name = "parking_lot"
814 version = "0.12.1"
815@@ -1266,21 +673,6 @@ dependencies = [
816 "windows-targets 0.48.5",
817 ]
818
819-[[package]]
820-name = "peeking_take_while"
821-version = "0.1.2"
822-source = "registry+https://github.com/rust-lang/crates.io-index"
823-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
824-
825-[[package]]
826-name = "pem-rfc7468"
827-version = "0.7.0"
828-source = "registry+https://github.com/rust-lang/crates.io-index"
829-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
830-dependencies = [
831- "base64ct",
832-]
833-
834 [[package]]
835 name = "petgraph"
836 version = "0.6.4"
837@@ -1300,57 +692,12 @@ dependencies = [
838 "siphasher",
839 ]
840
841-[[package]]
842-name = "pkcs1"
843-version = "0.7.5"
844-source = "registry+https://github.com/rust-lang/crates.io-index"
845-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
846-dependencies = [
847- "der",
848- "pkcs8",
849- "spki",
850-]
851-
852-[[package]]
853-name = "pkcs8"
854-version = "0.10.2"
855-source = "registry+https://github.com/rust-lang/crates.io-index"
856-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
857-dependencies = [
858- "der",
859- "spki",
860-]
861-
862 [[package]]
863 name = "pkg-config"
864 version = "0.3.30"
865 source = "registry+https://github.com/rust-lang/crates.io-index"
866 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
867
868-[[package]]
869-name = "platforms"
870-version = "3.4.0"
871-source = "registry+https://github.com/rust-lang/crates.io-index"
872-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
873-
874-[[package]]
875-name = "polyval"
876-version = "0.6.2"
877-source = "registry+https://github.com/rust-lang/crates.io-index"
878-checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
879-dependencies = [
880- "cfg-if",
881- "cpufeatures",
882- "opaque-debug",
883- "universal-hash",
884-]
885-
886-[[package]]
887-name = "ppv-lite86"
888-version = "0.2.17"
889-source = "registry+https://github.com/rust-lang/crates.io-index"
890-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
891-
892 [[package]]
893 name = "precomputed-hash"
894 version = "0.1.1"
895@@ -1387,15 +734,6 @@ dependencies = [
896 "termtree",
897 ]
898
899-[[package]]
900-name = "primeorder"
901-version = "0.13.6"
902-source = "registry+https://github.com/rust-lang/crates.io-index"
903-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
904-dependencies = [
905- "elliptic-curve",
906-]
907-
908 [[package]]
909 name = "proc-macro2"
910 version = "1.0.81"
911@@ -1414,35 +752,6 @@ dependencies = [
912 "proc-macro2",
913 ]
914
915-[[package]]
916-name = "rand"
917-version = "0.8.5"
918-source = "registry+https://github.com/rust-lang/crates.io-index"
919-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
920-dependencies = [
921- "rand_chacha",
922- "rand_core",
923-]
924-
925-[[package]]
926-name = "rand_chacha"
927-version = "0.3.1"
928-source = "registry+https://github.com/rust-lang/crates.io-index"
929-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
930-dependencies = [
931- "ppv-lite86",
932- "rand_core",
933-]
934-
935-[[package]]
936-name = "rand_core"
937-version = "0.6.4"
938-source = "registry+https://github.com/rust-lang/crates.io-index"
939-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
940-dependencies = [
941- "getrandom",
942-]
943-
944 [[package]]
945 name = "redox_syscall"
946 version = "0.4.1"
947@@ -1492,66 +801,12 @@ version = "0.8.3"
948 source = "registry+https://github.com/rust-lang/crates.io-index"
949 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
950
951-[[package]]
952-name = "rfc6979"
953-version = "0.4.0"
954-source = "registry+https://github.com/rust-lang/crates.io-index"
955-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
956-dependencies = [
957- "hmac",
958- "subtle",
959-]
960-
961-[[package]]
962-name = "ripemd"
963-version = "0.1.3"
964-source = "registry+https://github.com/rust-lang/crates.io-index"
965-checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
966-dependencies = [
967- "digest",
968-]
969-
970 [[package]]
971 name = "roff"
972 version = "0.2.1"
973 source = "registry+https://github.com/rust-lang/crates.io-index"
974 checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
975
976-[[package]]
977-name = "rsa"
978-version = "0.9.6"
979-source = "registry+https://github.com/rust-lang/crates.io-index"
980-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
981-dependencies = [
982- "const-oid",
983- "digest",
984- "num-bigint-dig",
985- "num-integer",
986- "num-traits",
987- "pkcs1",
988- "pkcs8",
989- "rand_core",
990- "signature",
991- "spki",
992- "subtle",
993- "zeroize",
994-]
995-
996-[[package]]
997-name = "rustc-hash"
998-version = "1.1.0"
999-source = "registry+https://github.com/rust-lang/crates.io-index"
1000-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
1001-
1002-[[package]]
1003-name = "rustc_version"
1004-version = "0.4.0"
1005-source = "registry+https://github.com/rust-lang/crates.io-index"
1006-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
1007-dependencies = [
1008- "semver",
1009-]
1010-
1011 [[package]]
1012 name = "rustix"
1013 version = "0.38.32"
1014@@ -1586,83 +841,31 @@ version = "1.2.0"
1015 source = "registry+https://github.com/rust-lang/crates.io-index"
1016 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
1017
1018-[[package]]
1019-name = "sec1"
1020-version = "0.7.3"
1021-source = "registry+https://github.com/rust-lang/crates.io-index"
1022-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
1023-dependencies = [
1024- "base16ct",
1025- "der",
1026- "generic-array",
1027- "pkcs8",
1028- "subtle",
1029- "zeroize",
1030-]
1031-
1032-[[package]]
1033-name = "semver"
1034-version = "1.0.22"
1035-source = "registry+https://github.com/rust-lang/crates.io-index"
1036-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
1037-
1038 [[package]]
1039 name = "sequoia-openpgp"
1040 version = "1.20.0"
1041 source = "registry+https://github.com/rust-lang/crates.io-index"
1042 checksum = "06f82708c8568218b8544b4abbba1f6483067dca0a946a54991c1d3f424dcade"
1043 dependencies = [
1044- "aes",
1045- "aes-gcm",
1046 "anyhow",
1047 "base64",
1048- "block-padding",
1049- "blowfish",
1050- "botan",
1051 "buffered-reader",
1052- "camellia",
1053- "cast5",
1054- "cfb-mode",
1055 "chrono",
1056- "cipher",
1057- "des",
1058- "digest",
1059- "dsa",
1060 "dyn-clone",
1061- "eax",
1062- "ecb",
1063- "ecdsa",
1064- "ed25519",
1065- "ed25519-dalek",
1066 "getrandom",
1067- "idea",
1068 "idna",
1069 "lalrpop",
1070 "lalrpop-util",
1071 "lazy_static",
1072 "libc",
1073- "md-5",
1074 "memsec",
1075- "nettle",
1076- "num-bigint-dig",
1077 "once_cell",
1078 "openssl",
1079 "openssl-sys",
1080- "p256",
1081- "rand",
1082- "rand_core",
1083 "regex",
1084 "regex-syntax",
1085- "ripemd",
1086- "rsa",
1087 "sha1collisiondetection",
1088- "sha2",
1089 "thiserror",
1090- "twofish",
1091- "typenum",
1092- "win-crypto-ng",
1093- "winapi",
1094- "x25519-dalek",
1095 "xxhash-rust",
1096 ]
1097
1098@@ -1721,38 +924,10 @@ version = "0.3.4"
1099 source = "registry+https://github.com/rust-lang/crates.io-index"
1100 checksum = "1f606421e4a6012877e893c399822a4ed4b089164c5969424e1b9d1e66e6964b"
1101 dependencies = [
1102- "const-oid",
1103 "digest",
1104 "generic-array",
1105 ]
1106
1107-[[package]]
1108-name = "sha2"
1109-version = "0.10.8"
1110-source = "registry+https://github.com/rust-lang/crates.io-index"
1111-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
1112-dependencies = [
1113- "cfg-if",
1114- "cpufeatures",
1115- "digest",
1116-]
1117-
1118-[[package]]
1119-name = "shlex"
1120-version = "1.3.0"
1121-source = "registry+https://github.com/rust-lang/crates.io-index"
1122-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
1123-
1124-[[package]]
1125-name = "signature"
1126-version = "2.2.0"
1127-source = "registry+https://github.com/rust-lang/crates.io-index"
1128-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
1129-dependencies = [
1130- "digest",
1131- "rand_core",
1132-]
1133-
1134 [[package]]
1135 name = "siphasher"
1136 version = "0.3.11"
1137@@ -1765,22 +940,6 @@ version = "1.13.2"
1138 source = "registry+https://github.com/rust-lang/crates.io-index"
1139 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
1140
1141-[[package]]
1142-name = "spin"
1143-version = "0.5.2"
1144-source = "registry+https://github.com/rust-lang/crates.io-index"
1145-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
1146-
1147-[[package]]
1148-name = "spki"
1149-version = "0.7.3"
1150-source = "registry+https://github.com/rust-lang/crates.io-index"
1151-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
1152-dependencies = [
1153- "base64ct",
1154- "der",
1155-]
1156-
1157 [[package]]
1158 name = "string_cache"
1159 version = "0.8.7"
1160@@ -1800,12 +959,6 @@ version = "0.10.0"
1161 source = "registry+https://github.com/rust-lang/crates.io-index"
1162 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
1163
1164-[[package]]
1165-name = "subtle"
1166-version = "2.5.0"
1167-source = "registry+https://github.com/rust-lang/crates.io-index"
1168-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
1169-
1170 [[package]]
1171 name = "syn"
1172 version = "2.0.60"
1173@@ -1817,18 +970,6 @@ dependencies = [
1174 "unicode-ident",
1175 ]
1176
1177-[[package]]
1178-name = "tempfile"
1179-version = "3.10.1"
1180-source = "registry+https://github.com/rust-lang/crates.io-index"
1181-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
1182-dependencies = [
1183- "cfg-if",
1184- "fastrand",
1185- "rustix",
1186- "windows-sys 0.52.0",
1187-]
1188-
1189 [[package]]
1190 name = "term"
1191 version = "0.7.0"
1192@@ -1909,15 +1050,6 @@ dependencies = [
1193 "serde",
1194 ]
1195
1196-[[package]]
1197-name = "twofish"
1198-version = "0.7.1"
1199-source = "registry+https://github.com/rust-lang/crates.io-index"
1200-checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013"
1201-dependencies = [
1202- "cipher",
1203-]
1204-
1205 [[package]]
1206 name = "typenum"
1207 version = "1.17.0"
1208@@ -1951,16 +1083,6 @@ version = "0.2.4"
1209 source = "registry+https://github.com/rust-lang/crates.io-index"
1210 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
1211
1212-[[package]]
1213-name = "universal-hash"
1214-version = "0.5.1"
1215-source = "registry+https://github.com/rust-lang/crates.io-index"
1216-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
1217-dependencies = [
1218- "crypto-common",
1219- "subtle",
1220-]
1221-
1222 [[package]]
1223 name = "utf8parse"
1224 version = "0.2.1"
1225@@ -2058,19 +1180,6 @@ version = "0.2.92"
1226 source = "registry+https://github.com/rust-lang/crates.io-index"
1227 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
1228
1229-[[package]]
1230-name = "win-crypto-ng"
1231-version = "0.5.1"
1232-source = "registry+https://github.com/rust-lang/crates.io-index"
1233-checksum = "99abfb435a71e54ab2971d8d8c32f1a7e006cdbf527f71743b1d45b93517bb92"
1234-dependencies = [
1235- "cipher",
1236- "doc-comment",
1237- "rand_core",
1238- "winapi",
1239- "zeroize",
1240-]
1241-
1242 [[package]]
1243 name = "winapi"
1244 version = "0.3.9"
1245@@ -2250,39 +1359,8 @@ version = "0.52.5"
1246 source = "registry+https://github.com/rust-lang/crates.io-index"
1247 checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
1248
1249-[[package]]
1250-name = "x25519-dalek"
1251-version = "2.0.1"
1252-source = "registry+https://github.com/rust-lang/crates.io-index"
1253-checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
1254-dependencies = [
1255- "curve25519-dalek",
1256- "rand_core",
1257- "zeroize",
1258-]
1259-
1260 [[package]]
1261 name = "xxhash-rust"
1262 version = "0.8.10"
1263 source = "registry+https://github.com/rust-lang/crates.io-index"
1264 checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
1265-
1266-[[package]]
1267-name = "zeroize"
1268-version = "1.7.0"
1269-source = "registry+https://github.com/rust-lang/crates.io-index"
1270-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
1271-dependencies = [
1272- "zeroize_derive",
1273-]
1274-
1275-[[package]]
1276-name = "zeroize_derive"
1277-version = "1.4.2"
1278-source = "registry+https://github.com/rust-lang/crates.io-index"
1279-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
1280-dependencies = [
1281- "proc-macro2",
1282- "quote",
1283- "syn",
1284-]
1285diff --git a/Cargo.toml b/Cargo.toml
1286index 16b6c6c..e78a065 100644
1287--- a/Cargo.toml
1288+++ b/Cargo.toml
1289@@ -98,13 +98,8 @@ default-features = false
1290 version = "0.6"
1291
1292 [features]
1293-crypto-botan = ["sequoia-openpgp/crypto-botan"]
1294-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
1295-crypto-cng = ["sequoia-openpgp/crypto-cng"]
1296-crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
1297 crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
1298-crypto-rust = ["sequoia-openpgp/crypto-rust"]
1299-default = ["crypto-nettle"]
1300+default = ["crypto-openssl"]
1301
1302 [badges.gitlab]
1303 repository = "sequoia-pgp/sequoia"
diff --git a/debian/patches/series b/debian/patches/series
index bdddf05..89a4dbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
1relax-deps.patch1remove-dependencies.patch
diff --git a/debian/rules b/debian/rules
index 59b895d..666fa6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,58 @@ execute_after_dh_auto_configure:
14%:14%:
15 dh $@ --buildsystem cargo --with bash-completion15 dh $@ --buildsystem cargo --with bash-completion
1616
17override_dh_auto_install:17export CARGO = /usr/share/cargo/bin/cargo
18 dh_auto_install -- --features=crypto-openssl --no-default-features18export CARGO_VENDOR_DIR = rust-vendor
19export CARGO_HOME = $(CURDIR)/debian/cargo_home
20
21include /usr/share/rustc/architecture.mk
22export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
23
24VENDOR_TARBALL = $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig-$(CARGO_VENDOR_DIR).tar.xz
25
26vendor-tarball-quick-check:
27 if [ -e ../$(VENDOR_TARBALL) ]; then echo "../$(VENDOR_TARBALL) already exists, bailing!"; exit 1; fi
28
29vendor-deps-cargo:
30 if QUILT_PATCHES=debian/patches quilt applied | grep vendor-remove-unused-deps ; then \
31 echo "Detecting patch on vendor dir applied, aborting."; \
32 exit 1; \
33 fi
34 # We need to have the dependencies removed in the top-level Cargo.toml or we vendor too much
35 QUILT_PATCHES=debian/patches quilt applied | grep remove-dependencies.patch || QUILT_PATCHES=debian/patches quilt push remove-dependencies.patch
36 rm -rf $(CARGO_VENDOR_DIR)
37 # Deliberately don't use the wrapper, as it expects the configure step
38 # to have occurred already.
39 # If you have to modify the path here, don't forget to change the README.source doc
40 # as well.
41 env -i cargo-vendor-filterer -F crypto-openssl --no-default-features --tier 2 --platform '*-*-linux-gnu' --platform '*-*-linux-gnueabi' $(CARGO_VENDOR_DIR)
42
43vendor-deps: vendor-deps-cargo
44 # Remove unused and undesirable data files (e.g. test data for vendored crates)
45 # The sequioia creates have a custom build script that uses the tests, so we keep them.
46 mv $(CARGO_VENDOR_DIR)/sequoia-policy-config/tests $(CARGO_VENDOR_DIR)/sequoia-policy-config/tests.bak
47 mv $(CARGO_VENDOR_DIR)/sequoia-openpgp/tests $(CARGO_VENDOR_DIR)/sequoia-openpgp/tests.bak
48 rm -r \
49 $(CARGO_VENDOR_DIR)/*/test-data \
50 $(CARGO_VENDOR_DIR)/*/tests
51 mv $(CARGO_VENDOR_DIR)/sequoia-policy-config/tests.bak $(CARGO_VENDOR_DIR)/sequoia-policy-config/tests
52 mv $(CARGO_VENDOR_DIR)/sequoia-openpgp/tests.bak $(CARGO_VENDOR_DIR)/sequoia-openpgp/tests
53 # Remove the checksum files to allow us to patch the crates to remove extraneous dependencies
54 for crate in $(CARGO_VENDOR_DIR)/*; do \
55 sed -i 's/^{"files":.*"package":"\([a-z0-9]\+\)"}$$/{"files":{},"package":"\1"}/' $$crate/.cargo-checksum.json; \
56 done
57 # Cleanup temp files
58 rm -rf $(CARGO_HOME)
59
60vendor-tarball: vendor-tarball-quick-check vendor-deps
61 tar --sort=name --mtime=@0 --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime -caf ../$(VENDOR_TARBALL) $(CARGO_VENDOR_DIR)
62
63override_dh_auto_configure:
64 DEB_CARGO_CRATE=sequoia-sqv_$(shell dpkg-parsechangelog --show-field Version) \
65 $(CARGO) prepare-debian $(CARGO_VENDOR_DIR)
66# /usr/share/cargo/bin/dh-cargo-vendored-sources
67 dh_auto_configure
68
69override_dh_clean:
70 dh_clean
71 rm -rf $(CARGO_HOME)

Subscribers

People subscribed via source and target branches