Merge branch '3.9' into backport-f7bfac4-3.9

Author: encukou

.github/workflows/build.yml

@@ -168,7 +168,9 @@ jobs:
             --with-pydebug \
             --with-openssl="$(brew --prefix [email protected])" \
             --with-tcltk-libs="$(pkg-config --libs tk)" \
-            --with-tcltk-includes="$(pkg-config --cflags tk)"
+            --with-tcltk-includes="$(pkg-config --cflags tk)" \
+            --with-dbmliborder=gdbm:ndbm
+        # (--with-dbmliborder needed for homebrew's gdbm 1.24: see gh-89452)
     - name: Build CPython
       run: make -j4
     - name: Display build info

Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst

@@ -0,0 +1 @@
+Fix SSL tests CI for OpenSSL 3.1+

Tools/ssl/multissltests.py

@@ -395,15 +395,15 @@ class BuildOpenSSL(AbstractBuilder):
     install_target = 'install_sw'
 
     def _post_install(self):
-        if self.version.startswith("3.0"):
-            self._post_install_300()
+        if self.version.startswith("3."):
+            self._post_install_3xx()
 
     def _build_src(self, config_args=()):
-        if self.version.startswith("3.0"):
+        if self.version.startswith("3."):
             config_args += ("enable-fips",)
         super()._build_src(config_args)
 
-    def _post_install_300(self):
+    def _post_install_3xx(self):
         # create ssl/ subdir with example configs
         # Install FIPS module
         self._subprocess_call(