-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This adds back a missing part of the patch that was in 3.7.2. Easier diff for viewing: zaucy/libarchive@b100213...cb2a0d5
- Loading branch information
Showing
6 changed files
with
1,886 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
module( | ||
name = "libarchive", | ||
version = "3.7.4.bcr.2", | ||
compatibility_level = 1, | ||
) | ||
|
||
bazel_dep(name = "bzip2", version = "1.0.8.bcr.1") | ||
bazel_dep(name = "lz4", version = "1.9.4") | ||
bazel_dep(name = "xz", version = "5.4.5.bcr.2") | ||
bazel_dep(name = "zlib", version = "1.3.1.bcr.1") | ||
bazel_dep(name = "zstd", version = "1.5.6") | ||
bazel_dep(name = "platforms", version = "0.0.10") | ||
bazel_dep(name = "rules_cc", version = "0.0.9") | ||
bazel_dep(name = "bazel_skylib", version = "1.6.1") | ||
bazel_dep(name = "mbedtls", version = "3.6.0") |
24 changes: 24 additions & 0 deletions
24
modules/libarchive/3.7.4.bcr.2/patches/archive_hmac_private.h.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h | ||
index d0fda7f9..e41c944d 100644 | ||
--- a/libarchive/archive_hmac_private.h | ||
+++ b/libarchive/archive_hmac_private.h | ||
@@ -40,12 +40,13 @@ | ||
*/ | ||
int __libarchive_hmac_build_hack(void); | ||
|
||
-#ifdef __APPLE__ | ||
-# include <AvailabilityMacros.h> | ||
-# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 | ||
-# define ARCHIVE_HMAC_USE_Apple_CommonCrypto | ||
-# endif | ||
-#endif | ||
+// Don't compile against CommonCrypto. | ||
+// #ifdef __APPLE__ | ||
+// # include <AvailabilityMacros.h> | ||
+// # if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 | ||
+// # define ARCHIVE_HMAC_USE_Apple_CommonCrypto | ||
+// # endif | ||
+// #endif | ||
|
||
#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto | ||
#include <CommonCrypto/CommonHMAC.h> |
Oops, something went wrong.