Merge pull request #3399 from hadfl/libxml2

fix aarch64 builds
omniosorg · Nov 23, 2023 · c2d39f0 · c2d39f0
2 parents 507dfe7 + cf2148f
commit c2d39f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/build/libxml2/build.sh b/build/libxml2/build.sh
@@ -33,6 +33,8 @@ CONFIGURE_OPTS+="
 
 TESTSUITE_FILTER="^(Total|[Tt]esting|Ran)"
 
+CFLAGS[aarch64]+=" -mtls-dialect=trad"
+
 init
 download_source $PROG $PROG $VER
 patch_source

diff --git a/build/python311/pyopenssl/patches.aarch64/cryptography.patch b/build/python311/pyopenssl/patches.aarch64/cryptography.patch
@@ -1,21 +1,13 @@
-diff -wpruN '--exclude=*.orig' a~/src/OpenSSL/crypto.py a/src/OpenSSL/crypto.py
+diff -wpruN --no-dereference '--exclude=*.orig' a~/src/OpenSSL/crypto.py a/src/OpenSSL/crypto.py
 --- a~/src/OpenSSL/crypto.py	1970-01-01 00:00:00
 +++ a/src/OpenSSL/crypto.py	1970-01-01 00:00:00
-@@ -3257,8 +3257,7 @@ utils.deprecated(
-         "PKCS#7 support in pyOpenSSL is deprecated. You should use the APIs "
+@@ -2840,8 +2840,7 @@ utils.deprecated(
+         "PKCS#12 support in pyOpenSSL is deprecated. You should use the APIs "
          "in cryptography."
      ),
 -    DeprecationWarning,
--    name="load_pkcs7_data",
+-    name="PKCS12",
 +    DeprecationWarning
  )
 
 
-@@ -3356,6 +3355,5 @@ utils.deprecated(
-         "PKCS#12 support in pyOpenSSL is deprecated. You should use the APIs "
-         "in cryptography."
-     ),
--    DeprecationWarning,
--    name="load_pkcs12",
-+    DeprecationWarning
- )