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

Bump OpenSSL to 3.2.1 #229

Merged
merged 1 commit into from
Jan 30, 2024
Merged
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
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "openssl-src"
version = "300.2.1+3.2.0"
version = "300.2.2+3.2.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = "MIT/Apache-2.0"
readme = "README.md"
repository = "https://github.com/alexcrichton/openssl-src-rs"
edition = "2021"
description = """
Source of OpenSSL and logic to build it.
"""
Expand Down
2 changes: 1 addition & 1 deletion openssl
Submodule openssl updated 201 files
13 changes: 11 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -636,12 +636,21 @@ fn cp_r(src: &Path, dst: &Path) {
}

let dst = dst.join(name);
if f.file_type().unwrap().is_dir() {
let ty = f.file_type().unwrap();
if ty.is_dir() {
fs::create_dir_all(&dst).unwrap();
cp_r(&path, &dst);
} else if ty.is_symlink() {
Copy link
Contributor

Choose a reason for hiding this comment

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

This change broke builds under Nix: #235
Builds fail with can't copy symlink "/nix/store/nqxnkxrqi9zx3zd60slbvg6pnyiprysv-crates-io-dependencies/openssl-src-300.2.3+3.2.1-5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843/openssl/README.md

Copy link
Contributor

Choose a reason for hiding this comment

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

Made a fix #236

// not needed to build
if path.iter().any(|p| p == "cloudflare-quiche") {
continue;
}
panic!("can't copy symlink {path:?}");
} else {
let _ = fs::remove_file(&dst);
fs::copy(&path, &dst).unwrap();
if let Err(e) = fs::copy(&path, &dst) {
panic!("failed to copy {path:?} to {dst:?}: {e}");
}
}
}
}
Expand Down