Skip to content
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.

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

fix(deps): update rust crate openssl to 0.10.62 - autoclosed #1091

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dotenv = "0.15.0"
eyre = "0.6.11"
mimalloc = { version = "0.1.39", default-features = false }
num_cpus = "1.16.0"
openssl = "0.10.61"
openssl = "0.10.62"
promptly = "0.3.1"
serde_json = "1.0.108"
serde_yaml = "0.9.29"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/crates/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ alias(

alias(
name = "openssl",
actual = "@crate_index__openssl-0.10.61//:openssl",
actual = "@crate_index__openssl-0.10.62//:openssl",
tags = ["manual"],
)

Expand Down
8 changes: 4 additions & 4 deletions thirdparty/crates/BUILD.curl-0.4.44.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ rust_library(
] + select({
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__openssl-probe-0.1.5//:openssl_probe", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@crate_index__schannel-0.1.22//:schannel", # cfg(target_env = "msvc")
"@crate_index__winapi-0.3.9//:winapi", # cfg(target_env = "msvc")
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__openssl-probe-0.1.5//:openssl_probe", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"//conditions:default": [],
}),
Expand Down Expand Up @@ -99,10 +99,10 @@ cargo_build_script(
"@crate_index__curl-sys-0.4.65-curl-8.2.1//:curl_sys",
] + select({
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"//conditions:default": [],
}),
Expand Down
8 changes: 4 additions & 4 deletions thirdparty/crates/BUILD.curl-sys-0.4.65+curl-8.2.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ rust_library(
"@crate_index__libz-sys-1.1.12//:libz_sys",
] + select({
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@crate_index__winapi-0.3.9//:winapi", # cfg(windows)
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"//conditions:default": [],
}),
Expand Down Expand Up @@ -108,10 +108,10 @@ cargo_build_script(
"@crate_index__libz-sys-1.1.12//:libz_sys",
] + select({
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(all(unix, not(target_os = "macos")))
],
"//conditions:default": [],
}),
Expand Down
12 changes: 6 additions & 6 deletions thirdparty/crates/BUILD.native-tls-0.2.11.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ rust_library(
],
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__log-0.4.20//:log", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-0.10.61//:openssl", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-0.10.62//:openssl", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-probe-0.1.5//:openssl_probe", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
],
"@rules_rust//rust/platform:x86_64-apple-darwin": [
"@crate_index__lazy_static-1.4.0//:lazy_static", # cfg(any(target_os = "macos", target_os = "ios"))
Expand All @@ -68,9 +68,9 @@ rust_library(
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__log-0.4.20//:log", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-0.10.61//:openssl", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-0.10.62//:openssl", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-probe-0.1.5//:openssl_probe", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
],
"//conditions:default": [],
}),
Expand All @@ -95,10 +95,10 @@ cargo_build_script(
edition = "2015",
link_deps = select({
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crate_index__openssl-sys-0.9.97//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
"@crate_index__openssl-sys-0.9.98//:openssl_sys", # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))
],
"//conditions:default": [],
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rust_library(
name = "openssl",
srcs = glob(["**/*.rs"]),
aliases = {
"@crate_index__openssl-sys-0.9.97//:openssl_sys": "ffi",
"@crate_index__openssl-sys-0.9.98//:openssl_sys": "ffi",
},
compile_data = glob(
include = ["**"],
Expand Down Expand Up @@ -48,15 +48,15 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "0.10.61",
version = "0.10.62",
deps = [
"@crate_index__bitflags-2.4.0//:bitflags",
"@crate_index__cfg-if-1.0.0//:cfg_if",
"@crate_index__foreign-types-0.3.2//:foreign_types",
"@crate_index__libc-0.2.151//:libc",
"@crate_index__once_cell-1.19.0//:once_cell",
"@crate_index__openssl-0.10.61//:build_script_build",
"@crate_index__openssl-sys-0.9.97//:openssl_sys",
"@crate_index__openssl-0.10.62//:build_script_build",
"@crate_index__openssl-sys-0.9.98//:openssl_sys",
],
)

Expand All @@ -81,7 +81,7 @@ cargo_build_script(
),
edition = "2018",
link_deps = [
"@crate_index__openssl-sys-0.9.97//:openssl_sys",
"@crate_index__openssl-sys-0.9.98//:openssl_sys",
],
rustc_flags = [
"--cap-lints=allow",
Expand All @@ -93,7 +93,7 @@ cargo_build_script(
"noclippy",
"norustfmt",
],
version = "0.10.61",
version = "0.10.62",
visibility = ["//visibility:private"],
)

Expand Down
Empty file.
54 changes: 54 additions & 0 deletions thirdparty/crates/BUILD.openssl-sys-0.9.97.bazel.rej
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
--- BUILD.openssl-sys-0.9.96.bazel
+++ BUILD.openssl-sys-0.9.97.bazel
@@ -30,8 +30,20 @@ rust_library(
],
),
crate_root = "src/lib.rs",
+ data = select({
+ "@org_noelware_charted_server//build/settings:nixos": [
+ "@openssl-static//:lib",
+ ],
+ "//conditions:default": [],
+ }),
edition = "2018",
- rustc_flags = ["--cap-lints=allow"],
+ rustc_flags = select({
+ "@org_noelware_charted_server//build/settings:nixos": [
+ "-Lexternal/openssl-static/lib",
+ "--cap-lints=allow",
+ ],
+ "//conditions:default": ["--cap-lints=allow"],
+ }),
tags = [
"cargo-bazel",
"crate-name=openssl-sys",
@@ -49,6 +61,14 @@ rust_library(
cargo_build_script(
name = "openssl-sys_build_script",
srcs = glob(["**/*.rs"]),
+ build_script_env = select({
+ "@org_noelware_charted_server//build/settings:nixos": {
+ "OPENSSL_INCLUDE_DIR": "../openssl-static/include",
+ "OPENSSL_LIB_DIR": "../openssl-static/lib",
+ "OPENSSL_STATIC": "1",
+ },
+ "//conditions:default": {},
+ }),
crate_name = "build_script_main",
crate_root = "build/main.rs",
data = glob(
@@ -61,7 +81,13 @@ cargo_build_script(
"WORKSPACE",
"WORKSPACE.bazel",
],
- ),
+ ) + select({
+ "@org_noelware_charted_server//build/settings:nixos": [
+ "@openssl-static//:include",
+ "@openssl-static//:lib",
+ ],
+ "//conditions:default": [],
+ }),
edition = "2018",
links = "openssl",
rustc_flags = [
Original file line number Diff line number Diff line change
Expand Up @@ -30,45 +30,25 @@ rust_library(
],
),
crate_root = "src/lib.rs",
data = select({
"@org_noelware_charted_server//build/settings:nixos": [
"@openssl-static//:lib",
],
"//conditions:default": [],
}),
edition = "2018",
rustc_flags = select({
"@org_noelware_charted_server//build/settings:nixos": [
"-Lexternal/openssl-static/lib",
"--cap-lints=allow",
],
"//conditions:default": ["--cap-lints=allow"],
}),
rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
"crate-name=openssl-sys",
"manual",
"noclippy",
"norustfmt",
],
version = "0.9.97",
version = "0.9.98",
deps = [
"@crate_index__libc-0.2.151//:libc",
"@crate_index__openssl-sys-0.9.97//:build_script_main",
"@crate_index__openssl-sys-0.9.98//:build_script_main",
],
)

cargo_build_script(
name = "openssl-sys_build_script",
srcs = glob(["**/*.rs"]),
build_script_env = select({
"@org_noelware_charted_server//build/settings:nixos": {
"OPENSSL_INCLUDE_DIR": "../openssl-static/include",
"OPENSSL_LIB_DIR": "../openssl-static/lib",
"OPENSSL_STATIC": "1",
},
"//conditions:default": {},
}),
crate_name = "build_script_main",
crate_root = "build/main.rs",
data = glob(
Expand All @@ -81,13 +61,7 @@ cargo_build_script(
"WORKSPACE",
"WORKSPACE.bazel",
],
) + select({
"@org_noelware_charted_server//build/settings:nixos": [
"@openssl-static//:include",
"@openssl-static//:lib",
],
"//conditions:default": [],
}),
),
edition = "2018",
links = "openssl",
rustc_flags = [
Expand All @@ -100,7 +74,7 @@ cargo_build_script(
"noclippy",
"norustfmt",
],
version = "0.9.97",
version = "0.9.98",
visibility = ["//visibility:private"],
deps = [
"@crate_index__cc-1.0.83//:cc",
Expand Down
24 changes: 12 additions & 12 deletions thirdparty/crates/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ _NORMAL_DEPENDENCIES = {
"eyre": "@crate_index__eyre-0.6.11//:eyre",
"mimalloc": "@crate_index__mimalloc-0.1.39//:mimalloc",
"num_cpus": "@crate_index__num_cpus-1.16.0//:num_cpus",
"openssl": "@crate_index__openssl-0.10.61//:openssl",
"openssl": "@crate_index__openssl-0.10.62//:openssl",
"promptly": "@crate_index__promptly-0.3.1//:promptly",
"serde_json": "@crate_index__serde_json-1.0.108//:serde_json",
"serde_yaml": "@crate_index__serde_yaml-0.9.29//:serde_yaml",
Expand Down Expand Up @@ -4602,12 +4602,12 @@ def crate_repositories():

maybe(
http_archive,
name = "crate_index__openssl-0.10.61",
sha256 = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45",
name = "crate_index__openssl-0.10.62",
sha256 = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671",
type = "tar.gz",
urls = ["https://crates.io/api/v1/crates/openssl/0.10.61/download"],
strip_prefix = "openssl-0.10.61",
build_file = Label("@org_noelware_charted_server//thirdparty/crates:BUILD.openssl-0.10.61.bazel"),
urls = ["https://crates.io/api/v1/crates/openssl/0.10.62/download"],
strip_prefix = "openssl-0.10.62",
build_file = Label("@org_noelware_charted_server//thirdparty/crates:BUILD.openssl-0.10.62.bazel"),
)

maybe(
Expand All @@ -4632,12 +4632,12 @@ def crate_repositories():

maybe(
http_archive,
name = "crate_index__openssl-sys-0.9.97",
sha256 = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b",
name = "crate_index__openssl-sys-0.9.98",
sha256 = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7",
type = "tar.gz",
urls = ["https://crates.io/api/v1/crates/openssl-sys/0.9.97/download"],
strip_prefix = "openssl-sys-0.9.97",
build_file = Label("@org_noelware_charted_server//thirdparty/crates:BUILD.openssl-sys-0.9.97.bazel"),
urls = ["https://crates.io/api/v1/crates/openssl-sys/0.9.98/download"],
strip_prefix = "openssl-sys-0.9.98",
build_file = Label("@org_noelware_charted_server//thirdparty/crates:BUILD.openssl-sys-0.9.98.bazel"),
)

maybe(
Expand Down Expand Up @@ -7460,7 +7460,7 @@ def crate_repositories():
struct(repo = "crate_index__multer-3.0.0", is_dev_dep = False),
struct(repo = "crate_index__num_cpus-1.16.0", is_dev_dep = False),
struct(repo = "crate_index__once_cell-1.19.0", is_dev_dep = False),
struct(repo = "crate_index__openssl-0.10.61", is_dev_dep = False),
struct(repo = "crate_index__openssl-0.10.62", is_dev_dep = False),
struct(repo = "crate_index__paste-1.0.14", is_dev_dep = False),
struct(repo = "crate_index__proc-macro2-1.0.71", is_dev_dep = False),
struct(repo = "crate_index__prometheus-client-0.22.0", is_dev_dep = False),
Expand Down