Skip to content

CVPN-1893 Support building on tvOS #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kp-thomas-yau merged 4 commits into from
Mar 31, 2025
Merged

CVPN-1893 Support building on tvOS #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fa0887
workspace: bump wolfssl to support build x86_64 tvOS
kp-thomas-yau Mar 31, 2025
5c2b163
app-utils: use patched fs-mistrust to support tvOS
kp-thomas-yau Mar 27, 2025
50dd7f2
app-utils: update rust-tun to support tvOS
kp-thomas-yau Mar 31, 2025
96ba542
workspace: use PR#128 from ctrlc to support tvOS
kp-thomas-yau Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ async-trait = "0.1.77"
bytes = "1.5.0"
bytesize = { version = "1.3.0", features = ["serde"] }
clap = { version = "4.4.7", features = ["derive"] }
ctrlc = { version = "3.4.2", features = ["termination"] }
# ctrlc = { version = "3.4.2", features = ["termination"] }
ctrlc = { git = "https://github.com/Detegr/rust-ctrlc.git", rev = "refs/pull/128/head"}
Copy link
Contributor

@xv-thomas-leong xv-thomas-leong Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we pinning at a specific merged branch but not master?

Copy link
Contributor Author

@kp-thomas-yau kp-thomas-yau Mar 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pinning on a specific pull request Detegr/rust-ctrlc#128 's head commit, not the merged branch. Since this PR has already been merged, there's no way for someone else to modify the head commit of this PR, whereas pinning it at the master might be a security issue as someone could push a new commits to the master and do something weird/funky on it

FYI: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#choice-of-commit

delegate = "0.12.0"
educe = { version = "0.6.0", default-features = false, features = ["Debug"] }
ipnet = { version = "2.8.0", features = ["serde"]}
Expand Down
2 changes: 2 additions & 0 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [
"https://github.com/expressvpn/wolfssl-rs",
"https://gitlab.torproject.org/tpo/core/arti",
"https://github.com/Detegr/rust-ctrlc"
]

# See https://github.com/briansmith/ring/blob/main/LICENSE Ring
Expand Down
4 changes: 3 additions & 1 deletion lightway-app-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ workspace = true
anyhow.workspace = true
bytes.workspace = true
clap.workspace = true
fs-mistrust = { version = "0.9.0", default-features = false }
# Gitlab can only make reference to commits on the main branch only, so we are using the commit hash for the merge request on main
# https://gitlab.torproject.org/tpo/core/arti/-/commit/0f13b7a0e19b3fae163e76c8ade6499244abf834
fs-mistrust = { git = "https://gitlab.torproject.org/tpo/core/arti.git", rev = "0f13b7a0e19b3fae163e76c8ade6499244abf834", default-features = false }
humantime = "2.1.0"
io-uring = { version = "0.7.0", optional = true }
ipnet.workspace = true
Expand Down