git: 277a646b3dc4 - 2026Q4 - lang/python312: use upstream commits for divert(4) fix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Oct 2026 02:56:13 UTC
The branch 2026Q4 has been updated by vishwin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=277a646b3dc42c9f93135b56f11ad7b7d9aff6bd
commit 277a646b3dc42c9f93135b56f11ad7b7d9aff6bd
Author: Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2026-10-13 19:51:17 +0000
Commit: Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2026-10-14 02:54:47 +0000
lang/python312: use upstream commits for divert(4) fix
Backport of:
https://github.com/python/cpython/pull/142993
https://github.com/python/cpython/pull/143514
PR: 298106
(cherry picked from commit 116481e77a3208112c01816f466540d1d4c0780a)
---
lang/python312/Makefile | 2 ++
lang/python312/distinfo | 6 +++++-
lang/python312/files/patch-Modules__socketmodule.c | 14 --------------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/lang/python312/Makefile b/lang/python312/Makefile
index c5415b4d1cce..181666fdeff5 100644
--- a/lang/python312/Makefile
+++ b/lang/python312/Makefile
@@ -8,6 +8,8 @@ DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
PATCH_SITES= https://github.com/python/cpython/commit/
+PATCHFILES= 7f936694dbc0dc0dbb07d98fa668776c4e4ca595.patch:-p1 \
+ 43e495d6f4e0efe6e7a54625d559f2f656f36916.patch:-p1
MAINTAINER= python@FreeBSD.org
COMMENT= Interpreted object-oriented programming language
diff --git a/lang/python312/distinfo b/lang/python312/distinfo
index 0daa0360c46e..9e370f2eebdb 100644
--- a/lang/python312/distinfo
+++ b/lang/python312/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1786762511
+TIMESTAMP = 1791920830
SHA256 (python/Python-3.12.14.tar.xz) = 5c8462af5790baf43a321a1559dbe0db06d1be4300fb85fb53c40060668e548a
SIZE (python/Python-3.12.14.tar.xz) = 20820300
+SHA256 (python/7f936694dbc0dc0dbb07d98fa668776c4e4ca595.patch) = 489dcef57f3a208c4f5767bd5703b625f9f79248f69d207e101f31cb47b6cdbe
+SIZE (python/7f936694dbc0dc0dbb07d98fa668776c4e4ca595.patch) = 1757
+SHA256 (python/43e495d6f4e0efe6e7a54625d559f2f656f36916.patch) = 733978a65d2ef56ae0ec953a4f6130665090a266ec63b4c52ee9b3bd5263839f
+SIZE (python/43e495d6f4e0efe6e7a54625d559f2f656f36916.patch) = 876
diff --git a/lang/python312/files/patch-Modules__socketmodule.c b/lang/python312/files/patch-Modules__socketmodule.c
deleted file mode 100644
index 30d277760692..000000000000
--- a/lang/python312/files/patch-Modules__socketmodule.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- Modules/socketmodule.c
-+++ Modules/socketmodule.c
-@@ -2656,6 +2656,11 @@
- /* RDS sockets use sockaddr_in: fall-through */
- #endif /* AF_RDS */
-
-+#ifdef AF_DIVERT
-+ case AF_DIVERT:
-+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
-+#endif /* AF_DIVERT */
-+
- case AF_INET:
- {
- *len_ret = sizeof (struct sockaddr_in);