Merge pull request #3675 from hadfl/aarch64_pkg

aarch64: fix pkg build following 36779395 and 36709307
omniosorg · Aug 26, 2024 · 78523a6 · 78523a6
2 parents 410d465 + 21252ba
commit 78523a6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/build/pkg/build-arch-aarch64.sh b/build/pkg/build-arch-aarch64.sh
@@ -63,7 +63,7 @@ build() {
         python_cross_end
     done
 
-    for d in po man; do
+    for d in po man svc web; do
         logmsg "--- running install in $d"
         logcmd make -C $d -e install CODE_WS=$CODE_WS MACH=$ARCH \
             || logerr "Failed to install $d"

diff --git a/build/python312/pyopenssl/patches.aarch64/cryptography.patch b/build/python312/pyopenssl/patches.aarch64/cryptography.patch
@@ -1,55 +1,79 @@
 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
-@@ -947,7 +947,6 @@ utils.deprecated(
+@@ -968,7 +968,6 @@ utils.deprecated(
          "APIs in cryptography."
      ),
      DeprecationWarning,
 -    name="X509Extension",
  )
 
 
-@@ -2365,7 +2364,6 @@ utils.deprecated(
+@@ -1203,7 +1202,6 @@ utils.deprecated(
+         "in cryptography."
+     ),
+     DeprecationWarning,
+-    name="X509Req",
+ )
+
+
+@@ -2400,7 +2398,6 @@ utils.deprecated(
          "in cryptography."
      ),
      DeprecationWarning,
 -    name="Revoked",
  )
 
 
-@@ -2610,7 +2608,6 @@ utils.deprecated(
+@@ -2645,7 +2642,6 @@ utils.deprecated(
          "in cryptography."
      ),
      DeprecationWarning,
 -    name="CRL",
  )
 
 
-@@ -2863,7 +2860,6 @@ utils.deprecated(
+@@ -2840,7 +2836,6 @@ utils.deprecated(
+         "in cryptography."
+     ),
+     DeprecationWarning,
+-    name="dump_certificate_request",
+ )
+
+
+@@ -2882,7 +2877,6 @@ utils.deprecated(
+         "in cryptography."
+     ),
+     DeprecationWarning,
+-    name="load_certificate_request",
+ )
+
+
+@@ -2926,7 +2920,6 @@ utils.deprecated(
      __name__,
      "sign() is deprecated. Use the equivalent APIs in cryptography.",
      DeprecationWarning,
 -    name="sign",
  )
 
 
-@@ -2910,7 +2906,6 @@ utils.deprecated(
+@@ -2973,7 +2966,6 @@ utils.deprecated(
      __name__,
      "verify() is deprecated. Use the equivalent APIs in cryptography.",
      DeprecationWarning,
 -    name="verify",
  )
 
 
-@@ -2952,7 +2947,6 @@ utils.deprecated(
+@@ -3015,7 +3007,6 @@ utils.deprecated(
          "in cryptography."
      ),
      DeprecationWarning,
 -    name="dump_crl",
  )
 
 
-@@ -2995,5 +2989,4 @@ utils.deprecated(
+@@ -3058,5 +3049,4 @@ utils.deprecated(
          "in cryptography."
      ),
      DeprecationWarning,