From nobody Fri Jan 10 13:21:27 2025 X-Original-To: dev-commits-ports-main@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 4YV2Nm2fXHz5kK3g; Fri, 10 Jan 2025 13:21:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YV2Nl6fxsz4jQX; Fri, 10 Jan 2025 13:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736515287; 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=abM2pSTAimwTosOueLiNs1aBmfmXV2gJviKTsjqkjc8=; b=erUqRb76E6NTG0y7ogt5CgxWQeF+S35+0EHHLulxLTKomjrJs3IL8VmjWbE8q7OopIjytN LVMOOC21BBHRSSrZo1xeQEVJTKGBnGMa6/rj8dAg/VWGQ1CAqDryUY7TZJT8u6CJpjKa4w nqMnYgZxPPNQUYnT90XQzmDHGT/1UUPqJxTun39aPHxGrHeh7ltaPZkTsfPqmNp0dNZTKk bYkQzV0INoM47r1mGib3hBxzU6GQH4HpWnSrwIQUQLdlfJMj5Yf+p6RYmXtjdb3ui/kkqp C5R27IgH+Jj2JvAKRWP+I6GSKUQnPo35eeBZtOlb12UtOV43LINETa18FerFAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736515287; 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=abM2pSTAimwTosOueLiNs1aBmfmXV2gJviKTsjqkjc8=; b=jkUJxntE0j4P8qL315GR7ySilYZUCLfPDgNv/Eg3OFZASrqGfcmAgoIpMDJ5/V6Fv5K9ti TpdH+Aa5c2fBDbEpRgtP8WPv6qUmZYmurcvaMW4+krKmtvNp5nbisPPPJ9l0/bBTjnGReh rZFwFqzrMxBLxVWv4WjFbl3h9mzmiFlj77CBfCM7GGqqL8lsUO98dsJsl0PcD8gRYOVHi3 sFkOC2mRR7izquf4hNJXzx9NnBzmwSuFWwyXzLYpUSsBq5y3syMb4NBwUMwY5/QPkj23Rz ZkwI2YcJDqejKHKRdyPKfR66wj8AUKBT6JARNcb9tWXsNKH0RNDtxr5OMHIfyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736515287; a=rsa-sha256; cv=none; b=mtOc3fbSC3Ph1fm/itGYq9S62qJYBtJ7gY8kVNk1o6rA8do+fnq9Ty4OBhutSlWr/Bkdjz KEfSKKMhWx8Vpxj+OJ+WZKVSxKgP3/aGtsKEupseTej+4Fn30ZPBsdnKbN/EESziyughej sZj1aX8jt/B24pDNmtYap/KXUJ7ke1/V7n4WFSL4kj4onuVyAxEreaJ/YsKbGEmt9T2MtT qxXstv1T6Ed0kwc8P9xS8d1SmOeueUf3qSnl9O9MBCZsgVJJUgmgypOtAjBVkvwD1D9c1B U/6w9Q6gsTcWh+yCfNygVikHgGgYygWrT7aXVYtwb3nsysh1jtVEeHhRvArWww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YV2Nl6BB0z1BP1; Fri, 10 Jan 2025 13:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ADLRpW063729; Fri, 10 Jan 2025 13:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ADLRcK063726; Fri, 10 Jan 2025 13:21:27 GMT (envelope-from git) Date: Fri, 10 Jan 2025 13:21:27 GMT Message-Id: <202501101321.50ADLRcK063726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: 2d8111b2b59b - main - lang/tauthon: Update to latest commit after 2.8.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d8111b2b59b0c9f7d92ef7d3006be04584d65e8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d8111b2b59b0c9f7d92ef7d3006be04584d65e8 commit 2d8111b2b59b0c9f7d92ef7d3006be04584d65e8 Author: Olivier Certner AuthorDate: 2025-01-10 09:55:38 +0000 Commit: Olivier Certner CommitDate: 2025-01-10 13:20:25 +0000 lang/tauthon: Update to latest commit after 2.8.5 Highlights: - email.generator: Fix handling of Unicode messages when not wrapping. - Support compilation by GCC 14. As these changes are very minor and upstream has not created an official patch level for them, Tauthon's internal version/patchlevel has been left unchanged at 2.8.5. This is a maintainer update (olce.freebsd.ports@certner.fr). --- lang/tauthon/Makefile | 5 +-- lang/tauthon/distinfo | 6 +-- lang/tauthon/files/patch-Include_patchlevel.h | 11 +++++ lang/tauthon/files/patch-setup.py | 65 ++++----------------------- 4 files changed, 25 insertions(+), 62 deletions(-) diff --git a/lang/tauthon/Makefile b/lang/tauthon/Makefile index 7fc1266de42f..c8a9eccacfa1 100644 --- a/lang/tauthon/Makefile +++ b/lang/tauthon/Makefile @@ -6,8 +6,7 @@ # -- Olivier Certner PORTNAME= tauthon DISTVERSIONPREFIX= v -DISTVERSION= 2.8.5 -PORTREVISION= 1 +DISTVERSION= 2.8.5-20240706 CATEGORIES= lang python MAINTAINER= olce.freebsd.ports@certner.fr @@ -24,7 +23,7 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in USE_GITHUB= yes GH_ACCOUNT= naftaliharris -GH_PROJECT= tauthon +GH_TAGNAME= b787044f7c9a3728604471119e6d6220d09d6d94 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/lang/tauthon/distinfo b/lang/tauthon/distinfo index 48fdcf4dfa96..24c7526cefe3 100644 --- a/lang/tauthon/distinfo +++ b/lang/tauthon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685108476 -SHA256 (naftaliharris-tauthon-v2.8.5_GH0.tar.gz) = 0d0f2ffd3a912768c138ee7b66e8163df3674f407c92152d09304c3240557dbf -SIZE (naftaliharris-tauthon-v2.8.5_GH0.tar.gz) = 18465302 +TIMESTAMP = 1736502076 +SHA256 (naftaliharris-tauthon-v2.8.5-20240706-b787044f7c9a3728604471119e6d6220d09d6d94_GH0.tar.gz) = e3ae96666d452db5e5ed0d30c514a3e001293b90cb49920ff75cab72416b5dae +SIZE (naftaliharris-tauthon-v2.8.5-20240706-b787044f7c9a3728604471119e6d6220d09d6d94_GH0.tar.gz) = 18481726 diff --git a/lang/tauthon/files/patch-Include_patchlevel.h b/lang/tauthon/files/patch-Include_patchlevel.h new file mode 100644 index 000000000000..bea1139cd0f5 --- /dev/null +++ b/lang/tauthon/files/patch-Include_patchlevel.h @@ -0,0 +1,11 @@ +--- Include/patchlevel.h.orig 2024-07-06 14:55:44 UTC ++++ Include/patchlevel.h +@@ -26,7 +26,7 @@ + #define PY_RELEASE_SERIAL 0 + + /* Version as a string */ +-#define PY_VERSION "2.8.5+" ++#define PY_VERSION "2.8.5" + /*--end constants--*/ + + /* Subversion Revision number of this file (not of the repository). Empty diff --git a/lang/tauthon/files/patch-setup.py b/lang/tauthon/files/patch-setup.py index 7dfa52909d59..351357173ad9 100644 --- a/lang/tauthon/files/patch-setup.py +++ b/lang/tauthon/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2021-06-02 16:51:18.000000000 +0200 -+++ setup.py 2023-06-09 19:32:17.812240000 +0200 +--- setup.py.orig 2024-07-06 14:55:44 UTC ++++ setup.py @@ -15,6 +15,7 @@ from distutils.command.build_ext import build_ext from distutils.command.install import install @@ -15,56 +15,9 @@ -disabled_module_list = [] +disabled_module_list = [%%DISABLED_MODULES%%] - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -886,7 +887,10 @@ - missing.append('_ssl') + exit_status = 0 - # 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 @@ +@@ -1308,7 +1309,7 @@ sysroot = macosx_sdk_root() f = os.path.join(sysroot, f[1:]) @@ -73,7 +26,7 @@ data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1669,9 +1680,10 @@ +@@ -1693,9 +1694,10 @@ else: missing.append('linuxaudiodev') @@ -87,7 +40,7 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -2294,6 +2306,22 @@ +@@ -2294,6 +2296,22 @@ def is_chmod_supported(self): return hasattr(os, 'chmod') @@ -110,7 +63,7 @@ SUMMARY = """ Python is an interpreted, interactive, object-oriented programming language. It is often compared to Tcl, Perl, Scheme or Java. -@@ -2343,7 +2371,9 @@ +@@ -2343,7 +2361,9 @@ platforms = ["Many"], # Build info @@ -121,7 +74,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. -@@ -2351,8 +2381,7 @@ +@@ -2351,8 +2371,7 @@ # Scripts to install scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', @@ -129,5 +82,5 @@ - 'Lib/smtpd.py'] + 'Tools/scripts/2to3'] ) + sys.exit(exit_status) - # --install-platlib