Merge pull request #1 from AndresGuzman-Ballen/3_7_7-patch-refresh

refresh patches
conda-forge · Nov 21, 2024 · b2009bb · b2009bb
2 parents 54c6612 + ffbf29e
commit b2009bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -9,8 +9,8 @@ source:
   sha256: fa62384995e8aa4f5a901c184fb5c91e56a29e24c05b6881a7f8fd5bbea694d2
   patches:
     - patches/0001-Add-lib-to-CMAKE_FIND_LIBRARY_PREFIXES-for-lzma.patch
-    # - patches/0003-VC9-compatibility-test-for-BCryptDeriveKeyPBKDF2.patch
-    # - patches/0004-VC9-compatibility-define-BCRYPT_SUCCESS.patch
+    - patches/0003-VC9-compatibility-test-for-BCryptDeriveKeyPBKDF2.patch
+    - patches/0004-VC9-compatibility-define-BCRYPT_SUCCESS.patch
     # This should not be applied in general. It exists so I can build it for
     # debugging Visual Studio where warnings are errors for some reason.
     # Hiding warnings is poor practice.

diff --git a/recipe/patches/0003-VC9-compatibility-test-for-BCryptDeriveKeyPBKDF2.patch b/recipe/patches/0003-VC9-compatibility-test-for-BCryptDeriveKeyPBKDF2.patch
@@ -17,8 +17,8 @@ diff -urN work.orig/libarchive/archive_cryptor.c work/libarchive/archive_cryptor
  	return 0;
  }
 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_BCRYPT_DERIVE_KEY_PBKDF2)
+-#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA && defined(HAVE_BCRYPT_DERIVE_KEY_PBKDF2)
  #ifdef _MSC_VER
  #pragma comment(lib, "Bcrypt.lib")
  #endif
diff --git a/recipe/patches/0004-VC9-compatibility-define-BCRYPT_SUCCESS.patch b/recipe/patches/0004-VC9-compatibility-define-BCRYPT_SUCCESS.patch
@@ -3,7 +3,7 @@
 @@ -64,12 +64,7 @@
  } archive_crypto_ctx;
 
- #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+ #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
 -#include <bcrypt.h>
 -
 -/* Common in other bcrypt implementations, but missing from VS2008. */
@@ -19,7 +19,7 @@
 @@ -64,7 +64,7 @@
  } archive_crypto_ctx;
 
- #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+ #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
 -#include <bcrypt.h>
 +#include "bcrypt_with_vs2008.h"