mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-12 14:56:53 +02:00
252 lines
6.3 KiB
Diff
252 lines
6.3 KiB
Diff
Link with system-provided openssl instead of bundling rustls.
|
|
|
|
--- a/vendor/rustic_core/crates/backend/Cargo.toml
|
|
+++ b/vendor/rustic_core/crates/backend/Cargo.toml
|
|
@@ -74,7 +74,7 @@ walkdir = "2.5.0"
|
|
|
|
# rest backend
|
|
backoff = { version = "0.4.0", optional = true }
|
|
-reqwest = { version = "0.12.8", default-features = false, features = ["json", "rustls-tls-native-roots", "stream", "blocking"], optional = true }
|
|
+reqwest = { version = "0.12.8", default-features = false, features = ["json", "native-tls", "stream", "blocking"], optional = true }
|
|
|
|
# rclone backend
|
|
rand = { version = "0.8.5", optional = true }
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -17,6 +17,10 @@ description = """
|
|
rustic - fast, encrypted, deduplicated backups powered by Rust
|
|
"""
|
|
|
|
+[patch.crates-io]
|
|
+rustic_backend = { path = "vendor/rustic_core/crates/backend" }
|
|
+rustic_core = { path = "vendor/rustic_core/crates/core" }
|
|
+
|
|
[features]
|
|
default = ["tui", "webdav"]
|
|
mimalloc = ["dep:mimalloc"]
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1567,6 +1567,21 @@ version = "0.1.3"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
|
|
|
|
+[[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.1"
|
|
@@ -2078,7 +2093,6 @@ dependencies = [
|
|
"hyper 1.4.1",
|
|
"hyper-util",
|
|
"rustls 0.23.14",
|
|
- "rustls-native-certs",
|
|
"rustls-pki-types",
|
|
"tokio",
|
|
"tokio-rustls",
|
|
@@ -2086,6 +2100,22 @@ dependencies = [
|
|
"webpki-roots 0.26.6",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "hyper-tls"
|
|
+version = "0.6.0"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
|
|
+dependencies = [
|
|
+ "bytes",
|
|
+ "http-body-util",
|
|
+ "hyper 1.4.1",
|
|
+ "hyper-util",
|
|
+ "native-tls",
|
|
+ "tokio",
|
|
+ "tokio-native-tls",
|
|
+ "tower-service",
|
|
+]
|
|
+
|
|
[[package]]
|
|
name = "hyper-util"
|
|
version = "0.1.9"
|
|
@@ -2600,6 +2630,23 @@ dependencies = [
|
|
"version_check",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "native-tls"
|
|
+version = "0.2.12"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
|
|
+dependencies = [
|
|
+ "libc",
|
|
+ "log",
|
|
+ "openssl",
|
|
+ "openssl-probe",
|
|
+ "openssl-sys",
|
|
+ "schannel",
|
|
+ "security-framework",
|
|
+ "security-framework-sys",
|
|
+ "tempfile",
|
|
+]
|
|
+
|
|
[[package]]
|
|
name = "nix"
|
|
version = "0.29.0"
|
|
@@ -2901,12 +2948,50 @@ dependencies = [
|
|
"vec-strings",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "openssl"
|
|
+version = "0.10.66"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
|
|
+dependencies = [
|
|
+ "bitflags 2.6.0",
|
|
+ "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.79",
|
|
+]
|
|
+
|
|
[[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.103"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
|
|
+dependencies = [
|
|
+ "cc",
|
|
+ "libc",
|
|
+ "pkg-config",
|
|
+ "vcpkg",
|
|
+]
|
|
+
|
|
[[package]]
|
|
name = "option-ext"
|
|
version = "0.2.0"
|
|
@@ -3588,17 +3673,18 @@ dependencies = [
|
|
"http-body-util",
|
|
"hyper 1.4.1",
|
|
"hyper-rustls",
|
|
+ "hyper-tls",
|
|
"hyper-util",
|
|
"ipnet",
|
|
"js-sys",
|
|
"log",
|
|
"mime",
|
|
+ "native-tls",
|
|
"once_cell",
|
|
"percent-encoding",
|
|
"pin-project-lite",
|
|
"quinn",
|
|
"rustls 0.23.14",
|
|
- "rustls-native-certs",
|
|
"rustls-pemfile 2.2.0",
|
|
"rustls-pki-types",
|
|
"serde",
|
|
@@ -3606,6 +3692,7 @@ dependencies = [
|
|
"serde_urlencoded",
|
|
"sync_wrapper",
|
|
"tokio",
|
|
+ "tokio-native-tls",
|
|
"tokio-rustls",
|
|
"tokio-util",
|
|
"tower-service",
|
|
@@ -3830,8 +3917,6 @@ dependencies = [
|
|
[[package]]
|
|
name = "rustic_backend"
|
|
version = "0.4.1"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "d7d5efc9f8d081134827cbe44b064eefad0864da4d33f37bd66147d80b57eb3e"
|
|
dependencies = [
|
|
"aho-corasick",
|
|
"anyhow",
|
|
@@ -3864,8 +3949,6 @@ dependencies = [
|
|
[[package]]
|
|
name = "rustic_core"
|
|
version = "0.5.3"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "11529c7b9a74297cb6c36f89d3746eb6a1112b8d309d5b25b338a9fedef0ff02"
|
|
dependencies = [
|
|
"aes256ctr_poly1305aes",
|
|
"anyhow",
|
|
@@ -3973,19 +4056,6 @@ dependencies = [
|
|
"zeroize",
|
|
]
|
|
|
|
-[[package]]
|
|
-name = "rustls-native-certs"
|
|
-version = "0.8.0"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
|
|
-dependencies = [
|
|
- "openssl-probe",
|
|
- "rustls-pemfile 2.2.0",
|
|
- "rustls-pki-types",
|
|
- "schannel",
|
|
- "security-framework",
|
|
-]
|
|
-
|
|
[[package]]
|
|
name = "rustls-pemfile"
|
|
version = "1.0.4"
|
|
@@ -4783,6 +4853,16 @@ dependencies = [
|
|
"syn 2.0.79",
|
|
]
|
|
|
|
+[[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.26.0"
|
|
@@ -5126,6 +5206,12 @@ version = "1.9.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
|
|
|
|
+[[package]]
|
|
+name = "vcpkg"
|
|
+version = "0.2.15"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
|
+
|
|
[[package]]
|
|
name = "vec-strings"
|
|
version = "0.4.8"
|