Merge branch '3.11' of github.com:holzschu/cpython into 3.11

Author: N-Holzschuch

Lib/mimetypes.py

@@ -45,17 +45,21 @@
     "suffix_map", "encodings_map", "types_map", "common_types"
 ]
 
-knownfiles = [
-    "/etc/mime.types",
-    "/etc/httpd/mime.types",                    # Mac OS X
-    "/etc/httpd/conf/mime.types",               # Apache
-    "/etc/apache/mime.types",                   # Apache 1
-    "/etc/apache2/mime.types",                  # Apache 2
-    "/usr/local/etc/httpd/conf/mime.types",
-    "/usr/local/lib/netscape/mime.types",
-    "/usr/local/etc/httpd/conf/mime.types",     # Apache 1.2
-    "/usr/local/etc/mime.types",                # Apache 1.3
-    ]
+# This fixes an issue when running on the Arm macs with iPad compatibility mode. No change on iOS (all these files are unreadable anyway)
+if (sys.platform == "darwin"):
+    knownfiles = []
+else:
+    knownfiles = [
+            "/etc/mime.types",
+            "/etc/httpd/mime.types",                    # Mac OS X
+            "/etc/httpd/conf/mime.types",               # Apache
+            "/etc/apache/mime.types",                   # Apache 1
+            "/etc/apache2/mime.types",                  # Apache 2
+            "/usr/local/etc/httpd/conf/mime.types",
+            "/usr/local/lib/netscape/mime.types",
+            "/usr/local/etc/httpd/conf/mime.types",     # Apache 1.2
+            "/usr/local/etc/mime.types",                # Apache 1.3
+            ]
 
 inited = False
 _db = None

buildForOSX.sh

@@ -329,7 +329,7 @@ then
         if os.path.isfile(full_path):\
             return load_lib(full_path, cdecl)\
     # Not iOS case: test all possible suffixes and libraries:\
-/&' lib/Crypto/Util/_raw_api.py  >> $PREFIX/make_install_osx.log 2>&1
+&/' lib/Crypto/Util/_raw_api.py  >> $PREFIX/make_install_osx.log 2>&1
 	fi
 	rm -rf build/* >> $PREFIX/make_install_osx.log 2>&1
 	env CC=clang CXX=clang++ CFLAGS="-I$PREFIX/ -I/usr/local/include/" LDFLAGS="-L$PREFIX/ -L/usr/local/lib" python3.11 setup.py build >> $PREFIX/make_install_osx.log 2>&1