Bump OpenSSL to 3.2.1 (#229)

Plus some fixes I needed to build this locally
alexcrichton · Jan 30, 2024 · add20f7 · add20f7
1 parent 47d047a
commit add20f7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -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.
 """

diff --git a/openssl b/openssl
diff --git a/src/lib.rs b/src/lib.rs
@@ -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() {
+            // 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}");
+            }
         }
     }
 }