Update libgit2

ehuss · Apr 16, 2022 · 5443555 · 5443555
1 parent f269dc4
commit 5443555
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git2"
-version = "0.14.2"
+version = "0.14.3"
 authors = ["Josh Triplett <josh@joshtriplett.org>", "Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -20,7 +20,7 @@ url = "2.0"
 bitflags = "1.1.0"
 libc = "0.2"
 log = "0.4.8"
-libgit2-sys = { path = "libgit2-sys", version = "0.13.2" }
+libgit2-sys = { path = "libgit2-sys", version = "0.13.3" }
 
 [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
 openssl-sys = { version = "0.9.0", optional = true }

diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libgit2-sys"
-version = "0.13.2+1.4.2"
+version = "0.13.3+1.4.3"
 authors = ["Josh Triplett <josh@joshtriplett.org>", "Alex Crichton <alex@alexcrichton.com>"]
 links = "git2"
 build = "build.rs"

diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
@@ -158,9 +158,26 @@ fn main() {
     cfg.define("SHA1DC_NO_STANDARD_INCLUDES", "1");
     cfg.define("SHA1DC_CUSTOM_INCLUDE_SHA1_C", "\"common.h\"");
     cfg.define("SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C", "\"common.h\"");
-    cfg.file("libgit2/src/util/hash/sha1/collisiondetect.c");
-    cfg.file("libgit2/src/util/hash/sha1/sha1dc/sha1.c");
-    cfg.file("libgit2/src/util/hash/sha1/sha1dc/ubc_check.c");
+    cfg.file("libgit2/src/util/hash/collisiondetect.c");
+    cfg.file("libgit2/src/util/hash/sha1dc/sha1.c");
+    cfg.file("libgit2/src/util/hash/sha1dc/ubc_check.c");
+
+    if https {
+        if windows {
+            features.push_str("#define GIT_SHA256_WIN32 1\n");
+            cfg.file("libgit2/src/util/hash/win32.c");
+        } else if target.contains("apple") {
+            features.push_str("#define GIT_SHA256_COMMON_CRYPTO 1\n");
+            cfg.file("libgit2/src/util/hash/common_crypto.c");
+        } else {
+            features.push_str("#define GIT_SHA256_OPENSSL 1\n");
+            cfg.file("libgit2/src/util/hash/openssl.c");
+        }
+    } else {
+        features.push_str("#define GIT_SHA256_BUILTIN 1\n");
+        cfg.file("libgit2/src/util/hash/builtin.c");
+        cfg.file("libgit2/src/util/hash/rfc6234/sha224-256.c");
+    }
 
     if let Some(path) = env::var_os("DEP_Z_INCLUDE") {
         cfg.include(path);

diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2
+78 −0		.github/workflows/benchmark.yml
+2 −1		.github/workflows/main.yml
+3 −1		.github/workflows/nightly.yml
+2 −1		CMakeLists.txt
+40 −0		COPYING
+4 −3		ci/build.sh
+3 −1		ci/setup-mingw-build.sh
+6 −0		ci/setup-osx-benchmark.sh
+1 −1		ci/setup-osx-build.sh
+20 −0		ci/setup-ubuntu-benchmark.sh
+9 −0		ci/setup-win32-benchmark.sh
+1 −1		cmake/SelectHTTPSBackend.cmake
+62 −11		cmake/SelectHashes.cmake
+ −		fuzzers/corpora/midx/666a779eed16847c6930a71c0547a34e52db409e
+11 −1		include/git2/common.h
+2 −0		include/git2/deprecated.h
+3 −2		include/git2/errors.h
+8 −0		src/features.h.in
+9 −5		src/libgit2/config.c
+5 −0		src/libgit2/diff_print.c
+5 −2		src/libgit2/fetch.c
+8 −0		src/libgit2/libgit2.c
+8 −3		src/libgit2/midx.c
+5 −2		src/libgit2/remote.c
+104 −22		src/libgit2/repository.c
+1 −0		src/libgit2/repository.h
+25 −11		src/util/CMakeLists.txt
+213 −54		src/util/fs_path.c
+28 −8		src/util/fs_path.h
+17 −1		src/util/hash.c
+4 −2		src/util/hash.h
+53 −0		src/util/hash/builtin.c
+6 −6		src/util/hash/builtin.h
+1 −1		src/util/hash/collisiondetect.c
+3 −3		src/util/hash/collisiondetect.h
+55 −0		src/util/hash/common_crypto.c
+11 −3		src/util/hash/common_crypto.h
+46 −0		src/util/hash/mbedtls.c
+14 −4		src/util/hash/mbedtls.h
+194 −0		src/util/hash/openssl.c
+45 −0		src/util/hash/openssl.h
+355 −0		src/util/hash/rfc6234/sha.h
+601 −0		src/util/hash/rfc6234/sha224-256.c
+70 −0		src/util/hash/sha.h
+0 −40		src/util/hash/sha1.h
+0 −300		src/util/hash/sha1/generic.c
+0 −19		src/util/hash/sha1/generic.h
+0 −59		src/util/hash/sha1/openssl.c
+0 −333		src/util/hash/sha1/win32.c
+0 −128		src/util/hash/sha1/win32.h
+0 −0		src/util/hash/sha1dc/sha1.c
+0 −0		src/util/hash/sha1dc/sha1.h
+0 −0		src/util/hash/sha1dc/ubc_check.c
+0 −0		src/util/hash/sha1dc/ubc_check.h
+549 −0		src/util/hash/win32.c
+60 −0		src/util/hash/win32.h
+2 −0		tests/README.md
+121 −0		tests/benchmarks/README.md
+298 −0		tests/benchmarks/benchmark.sh
+363 −0		tests/benchmarks/benchmark_helpers.sh
+7 −0		tests/benchmarks/hash-object__text_100kb
+7 −0		tests/benchmarks/hash-object__text_10mb
+7 −0		tests/benchmarks/hash-object__text_1kb
+7 −0		tests/benchmarks/hash-object__text_cached_100kb
+7 −0		tests/benchmarks/hash-object__text_cached_10mb
+7 −0		tests/benchmarks/hash-object__text_cached_1kb
+9 −0		tests/benchmarks/hash-object__write_text_100kb
+9 −0		tests/benchmarks/hash-object__write_text_10mb
+9 −0		tests/benchmarks/hash-object__write_text_1kb
+9 −0		tests/benchmarks/hash-object__write_text_cached_100kb
+9 −0		tests/benchmarks/hash-object__write_text_cached_10mb
+9 −0		tests/benchmarks/hash-object__write_text_cached_1kb
+5 −0		tests/clar/clar_libgit2.c
+1 −0		tests/clar/clar_libgit2.h
+1 −0		tests/clar/main.c
+26 −0		tests/libgit2/diff/parse.c
+5 −3		tests/libgit2/diff/workdir.c
+8 −8		tests/libgit2/online/clone.c
+29 −0		tests/libgit2/online/fetch.c
+9 −0		tests/libgit2/patch/patch_common.h
+0 −1		tests/libgit2/repo/config.c
+147 −0		tests/libgit2/repo/open.c
+0 −0		tests/resources/sha1/empty
+14 −5		tests/util/copy.c
+25 −0		tests/util/path.c
+30 −0		tests/util/sha1.c
+113 −0		tests/util/sha256.c