archivers/7-zip: regenerate patches

freebsd · Aug 31, 2023 · 6ffebb1 · 6ffebb1
1 parent afb0176
commit 6ffebb1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/archivers/7-zip/files/patch-C_AesOpt.c b/archivers/7-zip/files/patch-C_AesOpt.c
@@ -1,6 +1,6 @@
---- C/AesOpt.c.orig	2022-04-12 15:59:22 UTC
+--- C/AesOpt.c.orig	2023-08-31 09:13:13 UTC
 +++ C/AesOpt.c
-@@ -506,7 +506,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
+@@ -554,7 +554,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
  #endif // ! USE_INTEL_VAES
 
 
@@ -9,7 +9,7 @@
 
    #if defined(__clang__)
      #if (__clang_major__ >= 8) // fix that check
-@@ -773,4 +773,25 @@ AES_FUNC_START2 (AesCtr_Code_HW)
+@@ -828,7 +828,28 @@ AES_FUNC_START2 (AesCtr_Code_HW)
 
  #endif // USE_HW_AES
 
@@ -36,3 +36,6 @@
 +AES_COMPAT_STUB (AesCtr_Code)
 +
 +#endif
+
+ #undef NUM_WAYS
+ #undef WOP_M1
diff --git a/archivers/7-zip/files/patch-C_CpuArch.c b/archivers/7-zip/files/patch-C_CpuArch.c
@@ -1,6 +1,6 @@
---- C/CpuArch.c.orig	2021-12-12 14:45:15 UTC
+--- C/CpuArch.c.orig	2023-08-31 09:13:13 UTC
 +++ C/CpuArch.c
-@@ -417,6 +417,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
+@@ -762,6 +762,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
 
  #include <sys/auxv.h>
 
@@ -32,7 +32,7 @@
  #define USE_HWCAP
 
  #ifdef USE_HWCAP
-@@ -450,6 +475,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
+@@ -795,6 +820,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
  MY_HWCAP_CHECK_FUNC (SHA2)
  MY_HWCAP_CHECK_FUNC (AES)
 

diff --git a/archivers/7-zip/files/patch-C_Sha1Opt.c b/archivers/7-zip/files/patch-C_Sha1Opt.c
@@ -1,6 +1,6 @@
---- C/Sha1Opt.c.orig	2022-04-12 16:00:26 UTC
+--- C/Sha1Opt.c.orig	2023-08-31 09:13:13 UTC
 +++ C/Sha1Opt.c
-@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha1_UpdateBlocks_HW(UInt32 state[5]
+@@ -202,7 +202,7 @@ void Z7_FASTCALL Sha1_UpdateBlocks_HW(UInt32 state[5],
 
  #endif // USE_HW_SHA
 

diff --git a/archivers/7-zip/files/patch-C_Sha256Opt.c b/archivers/7-zip/files/patch-C_Sha256Opt.c
@@ -1,6 +1,6 @@
---- C/Sha256Opt.c.orig	2022-04-12 16:00:07 UTC
+--- C/Sha256Opt.c.orig	2023-08-31 09:13:13 UTC
 +++ C/Sha256Opt.c
-@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[
+@@ -202,7 +202,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8
 
  #endif // USE_HW_SHA