mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
226 lines
5.5 KiB
Diff
226 lines
5.5 KiB
Diff
Link with system-provided openssl instead of bundling rustls.
|
|
|
|
This depends on rustic_core-add-tls-native.patch.
|
|
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -102,7 +102,7 @@
|
|
[target.'cfg(not(windows))'.dependencies]
|
|
libc = "0.2.150"
|
|
[workspace.dependencies]
|
|
-rustic_core = { version = "0.1.2", features = ["cli"] }
|
|
+rustic_core = { version = "0.1.2", default-features = false, features = ["cli", "tls-native"] }
|
|
abscissa_core = { version = "0.7.0", default-features = false, features = ["application"] }
|
|
|
|
# logging
|
|
@@ -200,3 +200,6 @@
|
|
lto = true
|
|
debug-assertions = false
|
|
codegen-units = 1
|
|
+
|
|
+[patch.crates-io]
|
|
+rustic_core = { path = "vendor/rustic_core" }
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1080,6 +1080,21 @@
|
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|
|
|
[[package]]
|
|
+name = "foreign-types"
|
|
+version = "0.3.2"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
|
+dependencies = [
|
|
+ "foreign-types-shared",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
+name = "foreign-types-shared"
|
|
+version = "0.1.1"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
|
+
|
|
+[[package]]
|
|
name = "form_urlencoded"
|
|
version = "1.2.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -1360,6 +1375,19 @@
|
|
]
|
|
|
|
[[package]]
|
|
+name = "hyper-tls"
|
|
+version = "0.5.0"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
|
|
+dependencies = [
|
|
+ "bytes",
|
|
+ "hyper",
|
|
+ "native-tls",
|
|
+ "tokio",
|
|
+ "tokio-native-tls",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "iana-time-zone"
|
|
version = "0.1.58"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -1681,6 +1709,24 @@
|
|
]
|
|
|
|
[[package]]
|
|
+name = "native-tls"
|
|
+version = "0.2.11"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
|
|
+dependencies = [
|
|
+ "lazy_static",
|
|
+ "libc",
|
|
+ "log",
|
|
+ "openssl",
|
|
+ "openssl-probe",
|
|
+ "openssl-sys",
|
|
+ "schannel",
|
|
+ "security-framework",
|
|
+ "security-framework-sys",
|
|
+ "tempfile",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "nix"
|
|
version = "0.27.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -1757,12 +1803,50 @@
|
|
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
|
|
|
[[package]]
|
|
+name = "openssl"
|
|
+version = "0.10.62"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
|
|
+dependencies = [
|
|
+ "bitflags 2.4.1",
|
|
+ "cfg-if 1.0.0",
|
|
+ "foreign-types",
|
|
+ "libc",
|
|
+ "once_cell",
|
|
+ "openssl-macros",
|
|
+ "openssl-sys",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
+name = "openssl-macros"
|
|
+version = "0.1.1"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
|
+dependencies = [
|
|
+ "proc-macro2",
|
|
+ "quote",
|
|
+ "syn 2.0.39",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "openssl-probe"
|
|
version = "0.1.5"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
|
|
|
[[package]]
|
|
+name = "openssl-sys"
|
|
+version = "0.9.98"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
|
|
+dependencies = [
|
|
+ "cc",
|
|
+ "libc",
|
|
+ "pkg-config",
|
|
+ "vcpkg",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "option-ext"
|
|
version = "0.2.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -2112,21 +2196,23 @@
|
|
"http-body",
|
|
"hyper",
|
|
"hyper-rustls",
|
|
+ "hyper-tls",
|
|
"ipnet",
|
|
"js-sys",
|
|
"log",
|
|
"mime",
|
|
+ "native-tls",
|
|
"once_cell",
|
|
"percent-encoding",
|
|
"pin-project-lite",
|
|
"rustls",
|
|
- "rustls-native-certs",
|
|
"rustls-pemfile",
|
|
"serde",
|
|
"serde_json",
|
|
"serde_urlencoded",
|
|
"system-configuration",
|
|
"tokio",
|
|
+ "tokio-native-tls",
|
|
"tokio-rustls",
|
|
"tokio-util",
|
|
"tower-service",
|
|
@@ -2239,8 +2325,6 @@
|
|
[[package]]
|
|
name = "rustic_core"
|
|
version = "0.1.2"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "a5932066f9e144fc15043c4e0b9a82bfa16c83910243318bdafbb38496c1518a"
|
|
dependencies = [
|
|
"aes256ctr_poly1305aes",
|
|
"aho-corasick",
|
|
@@ -2327,18 +2411,6 @@
|
|
]
|
|
|
|
[[package]]
|
|
-name = "rustls-native-certs"
|
|
-version = "0.6.3"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
|
|
-dependencies = [
|
|
- "openssl-probe",
|
|
- "rustls-pemfile",
|
|
- "schannel",
|
|
- "security-framework",
|
|
-]
|
|
-
|
|
-[[package]]
|
|
name = "rustls-pemfile"
|
|
version = "1.0.4"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -2960,6 +3032,16 @@
|
|
]
|
|
|
|
[[package]]
|
|
+name = "tokio-native-tls"
|
|
+version = "0.3.1"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
|
|
+dependencies = [
|
|
+ "native-tls",
|
|
+ "tokio",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "tokio-rustls"
|
|
version = "0.24.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -3193,6 +3275,12 @@
|
|
version = "0.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
|
|
+
|
|
+[[package]]
|
|
+name = "vcpkg"
|
|
+version = "0.2.15"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
|
|
|
[[package]]
|
|
name = "version_check"
|