lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions
depot/third_party/nixpkgs/pkgs/by-name/fi/fido2luks/0001-libcryptsetup-rs-bump-version-to-0.9-55.patch
Default email 587713944a Project import generated by Copybara. 
GitOrigin-RevId: 6143fc5eeb9c4f00163267708e26191d1e918932
2024-04-21 17:54:59 +02:00

343 lines
8.7 KiB
Diff
Raw Blame History

From 21d57c61575e76d80f812ff332b808bcc714a47b Mon Sep 17 00:00:00 2001
From: Quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Mar 2024 17:46:17 +0100
Subject: [PATCH 1/2] libcryptsetup-rs: bump version to 0.9 #55
---
Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++++-------------
Cargo.toml | 2 +-
2 files changed, 111 insertions(+), 37 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 530d1d4..343390f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,25 +73,51 @@ version = "0.59.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
"lazycell",
"peeking_take_while",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"regex",
"rustc-hash",
"shlex",
]
+[[package]]
+name = "bindgen"
+version = "0.68.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
+dependencies = [
+ "bitflags 2.5.0",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "peeking_take_while",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.53",
+]
+
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
[[package]]
name = "bstr"
version = "0.2.17"
@@ -166,7 +192,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"ansi_term",
"atty",
- "bitflags",
+ "bitflags 1.3.2",
"strsim 0.8.0",
"textwrap",
"unicode-width",
@@ -179,7 +205,7 @@ version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -317,8 +343,8 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
dependencies = [
"fnv",
"ident_case",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"strsim 0.9.3",
"syn 1.0.101",
]
@@ -330,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
dependencies = [
"darling_core",
- "quote 1.0.21",
+ "quote 1.0.35",
"syn 1.0.101",
]
@@ -342,8 +368,8 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
dependencies = [
"darling",
"derive_builder_core",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
]
@@ -354,8 +380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
dependencies = [
"darling",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
]
@@ -381,8 +407,8 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
"synstructure",
]
@@ -394,7 +420,8 @@ dependencies = [
"ctap_hmac",
"failure",
"hex",
- "libcryptsetup-rs",
+ "libcryptsetup-rs 0.5.1",
+ "libcryptsetup-rs 0.9.2",
"ring",
"rpassword",
"serde",
@@ -500,9 +527,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.133"
+version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libcryptsetup-rs"
@@ -513,7 +540,25 @@ dependencies = [
"either",
"lazy_static",
"libc",
- "libcryptsetup-rs-sys",
+ "libcryptsetup-rs-sys 0.2.1",
+ "pkg-config",
+ "semver",
+ "serde_json",
+ "uuid",
+]
+
+[[package]]
+name = "libcryptsetup-rs"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dd3f8d51b4feb4acc765c063d45434fb7926fe979b20ee6f95dcd974b4dc0c"
+dependencies = [
+ "bitflags 2.5.0",
+ "either",
+ "lazy_static",
+ "libc",
+ "libcryptsetup-rs-sys 0.3.0",
+ "log",
"pkg-config",
"semver",
"serde_json",
@@ -526,7 +571,19 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe"
dependencies = [
- "bindgen",
+ "bindgen 0.59.2",
+ "cc",
+ "pkg-config",
+ "semver",
+]
+
+[[package]]
+name = "libcryptsetup-rs-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707"
+dependencies = [
+ "bindgen 0.68.1",
"cc",
"pkg-config",
"semver",
@@ -542,6 +599,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
[[package]]
name = "maybe-uninit"
version = "2.0.0"
@@ -636,8 +699,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
"version_check",
]
@@ -648,8 +711,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"version_check",
]
@@ -664,9 +727,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.44"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [
"unicode-ident",
]
@@ -682,11 +745,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
- "proc-macro2 1.0.44",
+ "proc-macro2 1.0.79",
]
[[package]]
@@ -931,8 +994,8 @@ version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
dependencies = [
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
]
@@ -984,8 +1047,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
]
@@ -1006,8 +1069,19 @@ version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+dependencies = [
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"unicode-ident",
]
@@ -1017,8 +1091,8 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
- "proc-macro2 1.0.44",
- "quote 1.0.21",
+ "proc-macro2 1.0.79",
+ "quote 1.0.35",
"syn 1.0.101",
"unicode-xid 0.2.4",
]
diff --git a/Cargo.toml b/Cargo.toml
index 7edf572..9386e13 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ hex = "0.3.2"
ring = "0.13.5"
failure = "0.1.5"
rpassword = "4.0.1"
-libcryptsetup-rs = "0.5.1"
+libcryptsetup-rs = "0.9"
structopt = "0.3.2"
[profile.release]
--
2.43.2
Reference in a new issue View git blame Copy permalink