From 19ee6ed27b6e5e544b5a0d64faacae228a11140f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 3 Jan 2025 11:34:51 +0100 Subject: [PATCH] Reformat patch 446 --- 00446-Resolve-sinpi-name-clash-with-libm.patch | 7 ++----- python3.6.spec | 11 ++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/00446-Resolve-sinpi-name-clash-with-libm.patch b/00446-Resolve-sinpi-name-clash-with-libm.patch index 6cece53..6ff4d00 100644 --- a/00446-Resolve-sinpi-name-clash-with-libm.patch +++ b/00446-Resolve-sinpi-name-clash-with-libm.patch @@ -1,4 +1,4 @@ -From d2e9c370cfd415f72a8fa4fb5a16d05b4420a18b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 18 Dec 2024 14:31:08 +0100 Subject: [PATCH] 00446: Resolve sinpi name clash with libm @@ -20,7 +20,7 @@ Co-authored-by: Victor Stinner 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c -index 95ea4f7fef8..670f1a04ad6 100644 +index 95ea4f7fef..670f1a04ad 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -67,7 +67,7 @@ static const double sqrtpi = 1.772453850905516027298167483341145182798; @@ -59,6 +59,3 @@ index 95ea4f7fef8..670f1a04ad6 100644 if (Py_IS_INFINITY(r)) errno = ERANGE; return r; --- -2.47.1 - diff --git a/python3.6.spec b/python3.6.spec index 73b2e92..e629350 100644 --- a/python3.6.spec +++ b/python3.6.spec @@ -786,8 +786,17 @@ Patch443: 00443-gh-124651-quote-template-strings-in-venv-activation-scripts.patc # Tests are adjusted because Python <3.9 don't support scoped IPv6 addresses. Patch444: 00444-security-fix-for-cve-2024-11168.patch -# 00446 # f1f8bcec93f3ec6027ddfb523a0faf9ddd9c72d6 +# 00446 # f5cc2c3be4273be70cdcdf9eb95abf425808f752 # Resolve sinpi name clash with libm +# +# bpo-36106: Resolve sinpi name clash with libm (IEEE-754 violation). (GH-12027) +# +# The standard math library (libm) may follow IEEE-754 recommendation to +# include an implementation of sinPi(), i.e. sinPi(x):=sin(pi*x). +# And this triggers a name clash, found by FreeBSD developer +# Steve Kargl, who worken on putting sinpi into libm used on FreeBSD +# (it has to be named "sinpi", not "sinPi", cf. e.g. +# https://en.cppreference.com/w/c/experimental/fpext4). Patch446: 00446-Resolve-sinpi-name-clash-with-libm.patch # (New patches go here ^^^)