Skip to content

Commit add20f7

Browse files
authored
Bump OpenSSL to 3.2.1 (#229)
Plus some fixes I needed to build this locally
1 parent 47d047a commit add20f7

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[package]
22
name = "openssl-src"
3-
version = "300.2.1+3.2.0"
3+
version = "300.2.2+3.2.1"
44
authors = ["Alex Crichton <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
readme = "README.md"
77
repository = "https://github.com/alexcrichton/openssl-src-rs"
8+
edition = "2021"
89
description = """
910
Source of OpenSSL and logic to build it.
1011
"""

openssl

Submodule openssl updated 201 files

src/lib.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,21 @@ fn cp_r(src: &Path, dst: &Path) {
636636
}
637637

638638
let dst = dst.join(name);
639-
if f.file_type().unwrap().is_dir() {
639+
let ty = f.file_type().unwrap();
640+
if ty.is_dir() {
640641
fs::create_dir_all(&dst).unwrap();
641642
cp_r(&path, &dst);
643+
} else if ty.is_symlink() {
644+
// not needed to build
645+
if path.iter().any(|p| p == "cloudflare-quiche") {
646+
continue;
647+
}
648+
panic!("can't copy symlink {path:?}");
642649
} else {
643650
let _ = fs::remove_file(&dst);
644-
fs::copy(&path, &dst).unwrap();
651+
if let Err(e) = fs::copy(&path, &dst) {
652+
panic!("failed to copy {path:?} to {dst:?}: {e}");
653+
}
645654
}
646655
}
647656
}

0 commit comments

Comments
 (0)