Merge pull request #329823 from ExpidusOS/fix/pkgsllvm/elfutils
[NixPkgs.git] / pkgs / by-name / fi / fido2luks / 0001-libcryptsetup-rs-bump-version-to-0.9-55.patch
blob0d40ae23f345fc16cd4c4da64e8b12e113a4ee19
1 From 21d57c61575e76d80f812ff332b808bcc714a47b Mon Sep 17 00:00:00 2001
2 From: Quantenzitrone <general@dev.quantenzitrone.eu>
3 Date: Tue, 19 Mar 2024 17:46:17 +0100
4 Subject: [PATCH 1/2] libcryptsetup-rs: bump version to 0.9 #55
6 ---
7 Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++++-------------
8 Cargo.toml | 2 +-
9 2 files changed, 111 insertions(+), 37 deletions(-)
11 diff --git a/Cargo.lock b/Cargo.lock
12 index 530d1d4..343390f 100644
13 --- a/Cargo.lock
14 +++ b/Cargo.lock
15 @@ -73,25 +73,51 @@ version = "0.59.2"
16 source = "registry+https://github.com/rust-lang/crates.io-index"
17 checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
18 dependencies = [
19 - "bitflags",
20 + "bitflags 1.3.2",
21 "cexpr",
22 "clang-sys",
23 "lazy_static",
24 "lazycell",
25 "peeking_take_while",
26 - "proc-macro2 1.0.44",
27 - "quote 1.0.21",
28 + "proc-macro2 1.0.79",
29 + "quote 1.0.35",
30 "regex",
31 "rustc-hash",
32 "shlex",
35 +[[package]]
36 +name = "bindgen"
37 +version = "0.68.1"
38 +source = "registry+https://github.com/rust-lang/crates.io-index"
39 +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
40 +dependencies = [
41 + "bitflags 2.5.0",
42 + "cexpr",
43 + "clang-sys",
44 + "lazy_static",
45 + "lazycell",
46 + "peeking_take_while",
47 + "proc-macro2 1.0.79",
48 + "quote 1.0.35",
49 + "regex",
50 + "rustc-hash",
51 + "shlex",
52 + "syn 2.0.53",
55 [[package]]
56 name = "bitflags"
57 version = "1.3.2"
58 source = "registry+https://github.com/rust-lang/crates.io-index"
59 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
61 +[[package]]
62 +name = "bitflags"
63 +version = "2.5.0"
64 +source = "registry+https://github.com/rust-lang/crates.io-index"
65 +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
67 [[package]]
68 name = "bstr"
69 version = "0.2.17"
70 @@ -166,7 +192,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
71 dependencies = [
72 "ansi_term",
73 "atty",
74 - "bitflags",
75 + "bitflags 1.3.2",
76 "strsim 0.8.0",
77 "textwrap",
78 "unicode-width",
79 @@ -179,7 +205,7 @@ version = "0.0.3"
80 source = "registry+https://github.com/rust-lang/crates.io-index"
81 checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
82 dependencies = [
83 - "bitflags",
84 + "bitflags 1.3.2",
87 [[package]]
88 @@ -317,8 +343,8 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
89 dependencies = [
90 "fnv",
91 "ident_case",
92 - "proc-macro2 1.0.44",
93 - "quote 1.0.21",
94 + "proc-macro2 1.0.79",
95 + "quote 1.0.35",
96 "strsim 0.9.3",
97 "syn 1.0.101",
99 @@ -330,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
100 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
101 dependencies = [
102 "darling_core",
103 - "quote 1.0.21",
104 + "quote 1.0.35",
105 "syn 1.0.101",
108 @@ -342,8 +368,8 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
109 dependencies = [
110 "darling",
111 "derive_builder_core",
112 - "proc-macro2 1.0.44",
113 - "quote 1.0.21",
114 + "proc-macro2 1.0.79",
115 + "quote 1.0.35",
116 "syn 1.0.101",
119 @@ -354,8 +380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
120 checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
121 dependencies = [
122 "darling",
123 - "proc-macro2 1.0.44",
124 - "quote 1.0.21",
125 + "proc-macro2 1.0.79",
126 + "quote 1.0.35",
127 "syn 1.0.101",
130 @@ -381,8 +407,8 @@ version = "0.1.8"
131 source = "registry+https://github.com/rust-lang/crates.io-index"
132 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
133 dependencies = [
134 - "proc-macro2 1.0.44",
135 - "quote 1.0.21",
136 + "proc-macro2 1.0.79",
137 + "quote 1.0.35",
138 "syn 1.0.101",
139 "synstructure",
141 @@ -394,7 +420,8 @@ dependencies = [
142 "ctap_hmac",
143 "failure",
144 "hex",
145 - "libcryptsetup-rs",
146 + "libcryptsetup-rs 0.5.1",
147 + "libcryptsetup-rs 0.9.2",
148 "ring",
149 "rpassword",
150 "serde",
151 @@ -500,9 +527,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
153 [[package]]
154 name = "libc"
155 -version = "0.2.133"
156 +version = "0.2.153"
157 source = "registry+https://github.com/rust-lang/crates.io-index"
158 -checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
159 +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
161 [[package]]
162 name = "libcryptsetup-rs"
163 @@ -513,7 +540,25 @@ dependencies = [
164 "either",
165 "lazy_static",
166 "libc",
167 - "libcryptsetup-rs-sys",
168 + "libcryptsetup-rs-sys 0.2.1",
169 + "pkg-config",
170 + "semver",
171 + "serde_json",
172 + "uuid",
175 +[[package]]
176 +name = "libcryptsetup-rs"
177 +version = "0.9.2"
178 +source = "registry+https://github.com/rust-lang/crates.io-index"
179 +checksum = "67dd3f8d51b4feb4acc765c063d45434fb7926fe979b20ee6f95dcd974b4dc0c"
180 +dependencies = [
181 + "bitflags 2.5.0",
182 + "either",
183 + "lazy_static",
184 + "libc",
185 + "libcryptsetup-rs-sys 0.3.0",
186 + "log",
187 "pkg-config",
188 "semver",
189 "serde_json",
190 @@ -526,7 +571,19 @@ version = "0.2.1"
191 source = "registry+https://github.com/rust-lang/crates.io-index"
192 checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe"
193 dependencies = [
194 - "bindgen",
195 + "bindgen 0.59.2",
196 + "cc",
197 + "pkg-config",
198 + "semver",
201 +[[package]]
202 +name = "libcryptsetup-rs-sys"
203 +version = "0.3.0"
204 +source = "registry+https://github.com/rust-lang/crates.io-index"
205 +checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707"
206 +dependencies = [
207 + "bindgen 0.68.1",
208 "cc",
209 "pkg-config",
210 "semver",
211 @@ -542,6 +599,12 @@ dependencies = [
212 "winapi",
215 +[[package]]
216 +name = "log"
217 +version = "0.4.21"
218 +source = "registry+https://github.com/rust-lang/crates.io-index"
219 +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
221 [[package]]
222 name = "maybe-uninit"
223 version = "2.0.0"
224 @@ -636,8 +699,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
225 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
226 dependencies = [
227 "proc-macro-error-attr",
228 - "proc-macro2 1.0.44",
229 - "quote 1.0.21",
230 + "proc-macro2 1.0.79",
231 + "quote 1.0.35",
232 "syn 1.0.101",
233 "version_check",
235 @@ -648,8 +711,8 @@ version = "1.0.4"
236 source = "registry+https://github.com/rust-lang/crates.io-index"
237 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
238 dependencies = [
239 - "proc-macro2 1.0.44",
240 - "quote 1.0.21",
241 + "proc-macro2 1.0.79",
242 + "quote 1.0.35",
243 "version_check",
246 @@ -664,9 +727,9 @@ dependencies = [
248 [[package]]
249 name = "proc-macro2"
250 -version = "1.0.44"
251 +version = "1.0.79"
252 source = "registry+https://github.com/rust-lang/crates.io-index"
253 -checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
254 +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
255 dependencies = [
256 "unicode-ident",
258 @@ -682,11 +745,11 @@ dependencies = [
260 [[package]]
261 name = "quote"
262 -version = "1.0.21"
263 +version = "1.0.35"
264 source = "registry+https://github.com/rust-lang/crates.io-index"
265 -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
266 +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
267 dependencies = [
268 - "proc-macro2 1.0.44",
269 + "proc-macro2 1.0.79",
272 [[package]]
273 @@ -931,8 +994,8 @@ version = "1.0.145"
274 source = "registry+https://github.com/rust-lang/crates.io-index"
275 checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
276 dependencies = [
277 - "proc-macro2 1.0.44",
278 - "quote 1.0.21",
279 + "proc-macro2 1.0.79",
280 + "quote 1.0.35",
281 "syn 1.0.101",
284 @@ -984,8 +1047,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
285 dependencies = [
286 "heck",
287 "proc-macro-error",
288 - "proc-macro2 1.0.44",
289 - "quote 1.0.21",
290 + "proc-macro2 1.0.79",
291 + "quote 1.0.35",
292 "syn 1.0.101",
295 @@ -1006,8 +1069,19 @@ version = "1.0.101"
296 source = "registry+https://github.com/rust-lang/crates.io-index"
297 checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
298 dependencies = [
299 - "proc-macro2 1.0.44",
300 - "quote 1.0.21",
301 + "proc-macro2 1.0.79",
302 + "quote 1.0.35",
303 + "unicode-ident",
306 +[[package]]
307 +name = "syn"
308 +version = "2.0.53"
309 +source = "registry+https://github.com/rust-lang/crates.io-index"
310 +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
311 +dependencies = [
312 + "proc-macro2 1.0.79",
313 + "quote 1.0.35",
314 "unicode-ident",
317 @@ -1017,8 +1091,8 @@ version = "0.12.6"
318 source = "registry+https://github.com/rust-lang/crates.io-index"
319 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
320 dependencies = [
321 - "proc-macro2 1.0.44",
322 - "quote 1.0.21",
323 + "proc-macro2 1.0.79",
324 + "quote 1.0.35",
325 "syn 1.0.101",
326 "unicode-xid 0.2.4",
328 diff --git a/Cargo.toml b/Cargo.toml
329 index 7edf572..9386e13 100644
330 --- a/Cargo.toml
331 +++ b/Cargo.toml
332 @@ -31,7 +31,7 @@ hex = "0.3.2"
333 ring = "0.13.5"
334 failure = "0.1.5"
335 rpassword = "4.0.1"
336 -libcryptsetup-rs = "0.5.1"
337 +libcryptsetup-rs = "0.9"
338 structopt = "0.3.2"
340 [profile.release]
342 2.43.2