From nobody Tue Jun 13 10:06:29 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QgPN561kFz4cfkY; Tue, 13 Jun 2023 10:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QgPN54cr9z4bw4; Tue, 13 Jun 2023 10:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686650789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5CVH4G+YpdnFQXVgqCzbrxFo586f2bi/cs44WkAw3w=; b=Ewp9Puxuu8mlt3ovuK5V1baEGXD1gP5wgzKc9+h00rAu0m4DkKAko4kxs5/VcR4qJoeBtG CMQTl14iN+Fj0mTMkzS7AoE+eTxQevPujdEiM1UOf1wIhd949EDaVj8SNgLpDgFZIPRf8L jYtPwmQO4VU40qyySquLbLdrNAMfyMseJfSCv2vskllT9olvbAjwrUIiMSailt9aECMv1z Xg6l9ll7gsh9xM5RXaI/wa9es/oMEWpghAQLFxSnRWTtX4CG6cf6J7Wf8RLmLX+U44JTRE boOEdUCrGUpuqXPsoKNNMHC5ZeVGeVod8AzyUQPgfdp+Mbqq39lRWOX2I2covg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686650789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5CVH4G+YpdnFQXVgqCzbrxFo586f2bi/cs44WkAw3w=; b=Ulz/7Z7FhuXvIrM7xomCTHQdU9/ey7UA+rYZwfn5cdUeAV2enow2W33JQjokR9BTnbiyRw TRxh1v5Xyl2zwUy7DM6Ey31fyhjt7NRePXBYOWOzYMGbfLL70Is6Ew9XRIHBNeEmlg8hod F0AoYd522h/Hd224qdjT1fomIzGlHoO5HNS0CEaTTxMZrYNWY7+U1ikUZimVAJ7niIWJiH Por4vwHpYxr9QFqUHfF1jajt9pRuHbTnwfHyPmXgRRvbnuM79UiqMCBtYX3GsVvsZ08WOP JU4jNeE/QzcWLnSecyWkWOIuYrofMegwNbsdlyo/diiTwQqlVTq5FNafXl2Xcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686650789; a=rsa-sha256; cv=none; b=xxT3lOGGHAlZd4T4DodoTFjUWRfcxAea1COI7S1boDJg8OZR3sOAiKPqng5qhUdx02WoQf ytcJW3VyIoatMHvj1hNI7U+HkpVaMtubl317zh43+Vw2p17BtXUem1wXGWBE2BKrBGBL9G Gudv5xmZa3kQ4v68Yc2rXF8ONIhz3mC2mtJf2nxHLbkllXOzf8sONckWNbihtM+/rRpM+A ClHsZSUPZXHlr0EEq64X9kn9zMYONldEHTxAf9zlA6Z01tHyT12YZE1K2FVtl0HyOZYgih GgXiot0V6lHBt+navmW7NA4pS+eV4ceBB0xh0oFiZuKm8yilhYHT2Cy6RqJdog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QgPN53kjSzJHP; Tue, 13 Jun 2023 10:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35DA6T2J095683; Tue, 13 Jun 2023 10:06:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DA6TnN095682; Tue, 13 Jun 2023 10:06:29 GMT (envelope-from git) Date: Tue, 13 Jun 2023 10:06:29 GMT Message-Id: <202306131006.35DA6TnN095682@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4a604327b563 - main - lang/tauthon: Fix build woth OpenSSL 3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a604327b563c2ccf03f95569107e7c4380a1a09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a604327b563c2ccf03f95569107e7c4380a1a09 commit 4a604327b563c2ccf03f95569107e7c4380a1a09 Author: Olivier Certner AuthorDate: 2023-06-13 09:10:20 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-13 10:06:15 +0000 lang/tauthon: Fix build woth OpenSSL 3 PR: 271961 --- lang/tauthon/files/patch-setup.py | 72 ++++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/lang/tauthon/files/patch-setup.py b/lang/tauthon/files/patch-setup.py index 7d2b60e29d67..7dfa52909d59 100644 --- a/lang/tauthon/files/patch-setup.py +++ b/lang/tauthon/files/patch-setup.py @@ -1,13 +1,6 @@ -# Description: Partial script installation backport from Python3 -# Submitted by: mva - -# Description: Some modules are installed via other ports - -# Description: ossaudiodev detection fix backport - ---- setup.py.orig 2017-04-22 03:42:03 UTC -+++ setup.py -@@ -15,6 +15,7 @@ from distutils.core import Extension, se +--- setup.py.orig 2021-06-02 16:51:18.000000000 +0200 ++++ setup.py 2023-06-09 19:32:17.812240000 +0200 +@@ -15,6 +15,7 @@ from distutils.command.build_ext import build_ext from distutils.command.install import install from distutils.command.install_lib import install_lib @@ -15,7 +8,7 @@ from distutils.spawn import find_executable cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ -@@ -33,7 +34,7 @@ host_platform = get_platform() +@@ -33,7 +34,7 @@ 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. @@ -24,7 +17,54 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -1234,7 +1235,7 @@ class PyBuildExt(build_ext): +@@ -886,7 +887,10 @@ + missing.append('_ssl') + + # find out which version of OpenSSL we have ++ openssl_major = -1 + openssl_ver = 0 ++ openssl_major_re = re.compile( ++ '^\s*#\s*define\s+OPENSSL_VERSION_MAJOR\s+([0-9]+)' ) + openssl_ver_re = re.compile( + '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' ) + +@@ -900,17 +904,22 @@ + try: + incfile = open(name, 'r') + for line in incfile: ++ m = openssl_major_re.match(line) ++ if m: ++ openssl_major = int(m.group(1)) + m = openssl_ver_re.match(line) + if m: +- openssl_ver = eval(m.group(1)) ++ openssl_ver = int(m.group(1), 0) + except IOError, msg: + print "IOError while reading opensshv.h:", msg + pass + ++ min_openssl_major = 1 + min_openssl_ver = 0x00907000 + have_any_openssl = ssl_incs is not None and ssl_libs is not None + have_usable_openssl = (have_any_openssl and +- openssl_ver >= min_openssl_ver) ++ (openssl_ver >= min_openssl_ver or ++ openssl_major >= min_openssl_major)) + + if have_any_openssl: + if have_usable_openssl: +@@ -935,7 +944,9 @@ + depends = ['md5.h']) ) + + min_sha2_openssl_ver = 0x00908000 +- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: ++ if COMPILED_WITH_PYDEBUG or \ ++ (openssl_ver < min_sha2_openssl_ver and ++ openssl_major < min_openssl_major): + # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash + exts.append( Extension('_sha256', ['sha256module.c']) ) + exts.append( Extension('_sha512', ['sha512module.c']) ) +@@ -1284,7 +1295,7 @@ sysroot = macosx_sdk_root() f = os.path.join(sysroot, f[1:]) @@ -33,7 +73,7 @@ data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1624,9 +1625,10 @@ class PyBuildExt(build_ext): +@@ -1669,9 +1680,10 @@ else: missing.append('linuxaudiodev') @@ -47,7 +87,7 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -2200,6 +2202,22 @@ class PyBuildInstallLib(install_lib): +@@ -2294,6 +2306,22 @@ def is_chmod_supported(self): return hasattr(os, 'chmod') @@ -70,7 +110,7 @@ SUMMARY = """ Python is an interpreted, interactive, object-oriented programming language. It is often compared to Tcl, Perl, Scheme or Java. -@@ -2245,7 +2263,9 @@ def main(): +@@ -2343,7 +2371,9 @@ platforms = ["Many"], # Build info @@ -81,7 +121,7 @@ 'install_lib':PyBuildInstallLib}, # The struct module is defined here, because build_ext won't be # called unless there's at least one extension module defined. -@@ -2253,8 +2273,7 @@ def main(): +@@ -2351,8 +2381,7 @@ # Scripts to install scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',