 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.82 2021/06/23 18:30:24 schmonz Exp $
+$NetBSD: distinfo,v 1.83 2021/09/28 12:31:25 jperkin Exp $
 SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b
 RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad
 SHA512 (Python-2.7.18.tar.xz) = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 Size (Python-2.7.18.tar.xz) = 12854736 bytes
 SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
 SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
 SHA1 (patch-Lib___osx__support.py) = 4389472565616b3875c699f6e3e74850d5fde712
 SHA1 (patch-Lib_ctypes_____init____.py) = 31dd0546bbe29ad1b1d481edc525ba43479c06da
 SHA1 (patch-Lib_ctypes_macholib_dyld.py) = 9b7e972d4c71311742ca8b3501382182a4c9e2fe
 SHA1 (patch-Lib_ctypes_test_test__macholib.py) = 4479d315cd037f4c9138e8f5baa8eb1685932baa
 SHA1 (patch-Lib_ctypes_util.py) = 6fa516c7b43f08992427a0afcbe80c17bcc070f1
 SHA1 (patch-Lib_distutils_command_build__ext.py) = ea4feba4e93dbcff07050c82a00d591bb650e934
 @@ -38,14 +38,14 @@ SHA1 (patch-Modules___multiprocessing_mu
 SHA1 (patch-Modules___multiprocessing_semaphore.c) = 03b9c33ef38da383d5f7c2c84c17fe38cdd2911e
 SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c
 SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
 SHA1 (patch-Modules_getpath.c) = 4e6445be9da49626800c03eaaab28fb3826be9f9
 SHA1 (patch-Modules_makesetup) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
 SHA1 (patch-Modules_nismodule.c) = 129ef7b32779944c2f1827c6b078a3aafab60729
 SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
 SHA1 (patch-Modules_selectmodule.c) = 01e113b0bd251978b555caaaa60b79c372edebce
 SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
 SHA1 (patch-Modules_sunaudiodev.c) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
 SHA1 (patch-Python_thread__pthread.h) = 517cfefc2f2e13631d22bad28c327513cdf17c10
 SHA1 (patch-configure) = a8bcacd360ca3a451c43a05a4be3bcea56f70617
 SHA1 (patch-pyconfig.h.in) = 66d1a685e17ef7977bf09cdc64bdf80087216bc7
-SHA1 (patch-setup.py) = 19aa0992ea75cd151be7e35f05d9af0a84d07e85
+SHA1 (patch-setup.py) = 4ab14fc01a1622b7a35bfb45b93a12d16dfc8b82

 @@ -1,32 +1,32 @@
-$NetBSD: patch-setup.py,v 1.2 2021/06/23 18:30:24 schmonz Exp $
+$NetBSD: patch-setup.py,v 1.3 2021/09/28 12:31:25 jperkin Exp $
 Disable certain modules, so they can be built as separate packages.
 Only check the BUILDLINK_DIR for libraries etc, do not pick up random
 headers and libraries from the system.
 Do not look for ncursesw.
 Assume panel_library is correct; this is a fix for ncurses' gnupanel
   which will get transformed to panel in buildlink.
-Build the _ssl module with pkgsrc choiced OpenSSL.
+Build the _ssl module with pkgsrc choiced OpenSSL.  Support OpenSSL 3.x
 macOS arm64 support, via MacPorts.
 cygwin 2.7.3-no-libm.patch
---- setup.py.orig	2021-06-22 19:20:43.000000000 +0000
+--- setup.py.orig	2020-04-19 21:13:39.000000000 +0000
 +++ setup.py
 @@ -16,6 +16,7 @@ from distutils.command.build_ext import
  from distutils.command.install import install
  from distutils.command.install_lib import install_lib
  from distutils.spawn import find_executable
 +import distutils.command.config
  cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
 @@ -33,7 +34,7 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "bsddb185", "_curses", "_curses_panel", "_elementtree", "gdbm", "pyexpat", "readline", "_sqlite3", "_tkinter", "linuxaudiodev", "ossaudiodev", "sunaudiodev"]
 @@ -87,36 +87,52 @@ cygwin 2.7.3-no-libm.patch
          if ssl_incs is not None:
              krb5_h = find_file('krb5.h', inc_dirs,
 @@ -867,9 +870,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -888,7 +889,7 @@ class PyBuildExt(build_ext):
+@@ -885,10 +886,12 @@ class PyBuildExt(build_ext):
          openssl_ver = 0
          openssl_ver_re = re.compile(
              '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
 +        openssl_ver_major = re.compile(
 +            '^\s*#\s*define\s+OPENSSL_VERSION_MAJOR\s+([0-9]+)' )
          # look for the openssl version header on the compiler search path.
          opensslv_h = find_file('openssl/opensslv.h', [],
 -                inc_dirs + search_for_ssl_incs_in)
 +                search_for_ssl_incs_in + inc_dirs)
          if opensslv_h:
              name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
              if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -988,175 +989,6 @@ class PyBuildExt(build_ext):
+@@ -899,6 +902,10 @@ class PyBuildExt(build_ext):
                      m = openssl_ver_re.match(line)
                      if m:
                          openssl_ver = eval(m.group(1))
 +                        break
 +                    m = openssl_ver_major.match(line)
 +                    if m and eval(m.group(1)) >= 3:
 +                        openssl_ver = 0x03000000
              except IOError, msg:
                  print "IOError while reading opensshv.h:", msg
                  pass
@@ -988,175 +995,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            # Fink defaults (http://fink.sourceforge.net/)
 @@ -272,27 +288,27 @@ cygwin 2.7.3-no-libm.patch
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 -            dblib_dir = None
 -            missing.append('_bsddb')
+-
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
-@@ -1262,46 +1094,32 @@ class PyBuildExt(build_ext):
+@@ -1262,46 +1100,32 @@ class PyBuildExt(build_ext):
          else:
              missing.append('_sqlite3')
 -        # Look for Berkeley db 1.85.   Note that it is built as a different
 -        # module name so it can be included even when later versions are
 -        # available.  A very restrictive search is performed to avoid
 -        # accidentally building this module with a later version of the
 -        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
 -        # symbols into libc and place the include file in /usr/include.
 -        #
 -        # If the better bsddb library can be built (db_incs is defined)
 -        # we do not build this one.  Otherwise this build will pick up
 -        # the more recent berkeleydb's db.h file first in the include path
 @@ -342,97 +358,97 @@ cygwin 2.7.3-no-libm.patch
 +                    while 1:
 +                        line = input.readline()
 +                        if not line: break
 +                        if re.search('This file is part of GDBM', line):
 +                            ret = None
 +                            break
 +                    input.close()
 +                    break
 +                return ret
++
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1313,7 +1131,7 @@ class PyBuildExt(build_ext):
+@@ -1313,7 +1137,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
 -                    if find_file("ndbm.h", inc_dirs, []) is not None:
 +                    if find_ndbm_h(inc_dirs) is not None:
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -1357,18 +1175,14 @@ class PyBuildExt(build_ext):
+@@ -1357,18 +1181,14 @@ class PyBuildExt(build_ext):
                                  libraries = gdbm_libs)
                              break
                  elif cand == "bdb":
 -                    if db_incs is not None:
 -                        print "building dbm using bdb"
 -                        dbmext = Extension('dbm', ['dbmmodule.c'],
 -                                           library_dirs=dblib_dir,
 -                                           runtime_library_dirs=dblib_dir,
 -                                           include_dirs=db_incs,
 -                                           define_macros=[
 -                                               ('HAVE_BERKDB_H', None),
 -                                               ('DB_DBM_HSEARCH', None),
 -                                               ],
 -                                           libraries=dblibs)
 -                        break
 +		    print "building dbm using bdb"
 +		    dbmext = Extension('dbm', ['dbmmodule.c'],
 +				       define_macros=[
 +					   ('HAVE_BERKDB_H', None),
 +					   ('DB_DBM_HSEARCH', None),
 +					   ],
 +				       libraries=["db"])
 +		    break
              if dbmext is not None:
                  exts.append(dbmext)
              else:
-@@ -1429,8 +1243,7 @@ class PyBuildExt(build_ext):
+@@ -1429,8 +1249,7 @@ class PyBuildExt(build_ext):
              missing.append('_curses')
          # If the curses module is enabled, check for the panel module
 -        if (module_enabled(exts, '_curses') and
 -            self.compiler.find_library_file(lib_dirs, panel_library)):
 +        if (module_enabled(exts, '_curses')):
              exts.append( Extension('_curses_panel', ['_curses_panel.c'],
                                     include_dirs = curses_incs,
                                     libraries = [panel_library] + curses_libs) )
-@@ -2129,6 +1942,7 @@ class PyBuildExt(build_ext):
+@@ -2129,6 +1948,7 @@ class PyBuildExt(build_ext):
          if host_platform == 'darwin':
              sources.append('_ctypes/malloc_closure.c')
 +            extra_compile_args.append('-DUSING_MALLOC_CLOSURE_DOT_C=1')
              sources.append('_ctypes/darwin/dlfcn_simple.c')
              extra_compile_args.append('-DMACOSX')
              include_dirs.append('_ctypes/darwin')
-@@ -2191,6 +2005,16 @@ class PyBuildExt(build_ext):
+@@ -2191,6 +2011,16 @@ class PyBuildExt(build_ext):
                      break
          if ffi_inc and ffi_lib:
 +            config = distutils.command.config.config(self.distribution)
 +            config._check_compiler()
 +            if any(cc in config.compiler.compiler_so for cc in ('gcc', 'clang')):
 +                config.compiler.compiler_so += ["-Wno-unguarded-availability-new", "-Wno-unused-value"]
 +            if config.check_func("ffi_prep_closure_loc", headers=['ffi.h'], include_dirs=[ffi_inc]):
 +                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CLOSURE_LOC=1")
 +            if config.check_func("ffi_prep_cif_var", headers=['ffi.h'], include_dirs=[ffi_inc]):
 +                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
 +            if host_platform == 'darwin' and config.check_func("ffi_closure_alloc", headers=['ffi.h'], include_dirs=[ffi_inc]):
 +                ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1")
              ext.include_dirs.extend(ffi_inc)
              ext.libraries.append(ffi_lib)
              self.use_system_libffi = True
-@@ -2342,9 +2166,9 @@ def main():
+@@ -2342,9 +2172,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.7',
 +                     'Tools/scripts/2to3-2.7',
 +                     'Tools/scripts/smtpd2.7.py']
+         )
  # --install-platlib