mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-14 20:41:20 +02:00
updated python*
This commit is contained in:
20
lang/python38/files/patch-Modules___decimal___decimal.c
Normal file
20
lang/python38/files/patch-Modules___decimal___decimal.c
Normal file
@@ -0,0 +1,20 @@
|
||||
--- Modules/_decimal/_decimal.c.orig 2021-02-17 20:39:05 UTC
|
||||
+++ Modules/_decimal/_decimal.c
|
||||
@@ -3284,7 +3284,7 @@ dec_format(PyObject *dec, PyObject *args)
|
||||
}
|
||||
else {
|
||||
size_t n = strlen(spec.dot);
|
||||
- if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) {
|
||||
+ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) {
|
||||
/* fix locale dependent non-ascii characters */
|
||||
dot = dotsep_as_utf8(spec.dot);
|
||||
if (dot == NULL) {
|
||||
@@ -3293,7 +3293,7 @@ dec_format(PyObject *dec, PyObject *args)
|
||||
spec.dot = PyBytes_AS_STRING(dot);
|
||||
}
|
||||
n = strlen(spec.sep);
|
||||
- if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) {
|
||||
+ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) {
|
||||
/* fix locale dependent non-ascii characters */
|
||||
sep = dotsep_as_utf8(spec.sep);
|
||||
if (sep == NULL) {
|
||||
11
lang/python38/files/patch-configure
Normal file
11
lang/python38/files/patch-configure
Normal file
@@ -0,0 +1,11 @@
|
||||
--- configure.orig 2022-02-23 19:52:00 UTC
|
||||
+++ configure
|
||||
@@ -6625,7 +6625,7 @@ fi
|
||||
|
||||
if test "$Py_LTO" = 'true' ; then
|
||||
case $CC in
|
||||
- *clang*)
|
||||
+ *clang*|cc)
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.
|
||||
107
lang/python38/files/patch-freebsd-12
Normal file
107
lang/python38/files/patch-freebsd-12
Normal file
@@ -0,0 +1,107 @@
|
||||
From 9fa60bf7361d3244c19ed273fd4f1df7dd9698b0 Mon Sep 17 00:00:00 2001
|
||||
From: Yasuhiro Kimura <yasu@utahime.org>
|
||||
Date: Tue, 11 May 2021 04:17:33 +0900
|
||||
Subject: [PATCH] Revert "[3.8] bpo-43799: OpenSSL 3.0.0: declare
|
||||
OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25383)"
|
||||
|
||||
This reverts commit b71aaa0df0f3a9640b034b4774651cd8c54d2fb9.
|
||||
---
|
||||
Modules/_hashopenssl.c | 9 +--------
|
||||
Modules/_ssl.c | 33 +++++++++++++++++++--------------
|
||||
2 files changed, 20 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c
|
||||
index 93bf25fee3..edadbcb393 100644
|
||||
--- Modules/_hashopenssl.c
|
||||
+++ Modules/_hashopenssl.c
|
||||
@@ -11,13 +11,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-/* Don't warn about deprecated functions, */
|
||||
-#ifndef OPENSSL_API_COMPAT
|
||||
- // 0x10101000L == 1.1.1, 30000 == 3.0.0
|
||||
- #define OPENSSL_API_COMPAT 0x10101000L
|
||||
-#endif
|
||||
-#define OPENSSL_NO_DEPRECATED 1
|
||||
-
|
||||
#define PY_SSIZE_T_CLEAN
|
||||
|
||||
#include "Python.h"
|
||||
@@ -31,7 +24,7 @@
|
||||
#include <openssl/hmac.h>
|
||||
/* We use the object interface to discover what hashes OpenSSL supports. */
|
||||
#include <openssl/objects.h>
|
||||
-#include <openssl/err.h>
|
||||
+#include "openssl/err.h"
|
||||
|
||||
#ifndef OPENSSL_THREADS
|
||||
# error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL"
|
||||
diff --git Modules/_ssl.c Modules/_ssl.c
|
||||
index d6a2fb814a..5cbc2b65be 100644
|
||||
--- Modules/_ssl.c
|
||||
+++ Modules/_ssl.c
|
||||
@@ -14,13 +14,6 @@
|
||||
http://bugs.python.org/issue8108#msg102867 ?
|
||||
*/
|
||||
|
||||
-/* Don't warn about deprecated functions, */
|
||||
-#ifndef OPENSSL_API_COMPAT
|
||||
- // 0x10101000L == 1.1.1, 30000 == 3.0.0
|
||||
- #define OPENSSL_API_COMPAT 0x10101000L
|
||||
-#endif
|
||||
-#define OPENSSL_NO_DEPRECATED 1
|
||||
-
|
||||
#define PY_SSIZE_T_CLEAN
|
||||
|
||||
#include "Python.h"
|
||||
@@ -52,6 +45,14 @@ static PySocketModule_APIObject PySocketModule;
|
||||
#include <sys/poll.h>
|
||||
#endif
|
||||
|
||||
+/* Don't warn about deprecated functions */
|
||||
+#ifdef __GNUC__
|
||||
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
+#endif
|
||||
+#ifdef __clang__
|
||||
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
+#endif
|
||||
+
|
||||
/* Include OpenSSL header files */
|
||||
#include "openssl/rsa.h"
|
||||
#include "openssl/crypto.h"
|
||||
@@ -149,20 +150,24 @@ static void _PySSLFixErrno(void) {
|
||||
# define PY_OPENSSL_1_1_API 1
|
||||
#endif
|
||||
|
||||
-/* OpenSSL API 1.1.0+ does not include version methods. Define the methods
|
||||
- * unless OpenSSL is compiled without the methods. It's the easiest way to
|
||||
- * make 1.0.2, 1.1.0, 1.1.1, and 3.0.0 happy without deprecation warnings.
|
||||
- */
|
||||
+/* OpenSSL API compat */
|
||||
+#ifdef OPENSSL_API_COMPAT
|
||||
+#if OPENSSL_API_COMPAT >= 0x10100000L
|
||||
+
|
||||
+/* OpenSSL API 1.1.0+ does not include version methods */
|
||||
#ifndef OPENSSL_NO_TLS1_METHOD
|
||||
-extern const SSL_METHOD *TLSv1_method(void);
|
||||
+#define OPENSSL_NO_TLS1_METHOD 1
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_TLS1_1_METHOD
|
||||
-extern const SSL_METHOD *TLSv1_1_method(void);
|
||||
+#define OPENSSL_NO_TLS1_1_METHOD 1
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_TLS1_2_METHOD
|
||||
-extern const SSL_METHOD *TLSv1_2_method(void);
|
||||
+#define OPENSSL_NO_TLS1_2_METHOD 1
|
||||
#endif
|
||||
|
||||
+#endif /* >= 1.1.0 compcat */
|
||||
+#endif /* OPENSSL_API_COMPAT */
|
||||
+
|
||||
/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
|
||||
#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
# define PY_OPENSSL_1_1_API 1
|
||||
--
|
||||
2.31.1
|
||||
|
||||
199
lang/python38/files/patch-issue40422_issue40423
Normal file
199
lang/python38/files/patch-issue40422_issue40423
Normal file
@@ -0,0 +1,199 @@
|
||||
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
|
||||
index e693e53206..a26ef96e91 100644
|
||||
--- Modules/_posixsubprocess.c
|
||||
+++ Modules/_posixsubprocess.c
|
||||
@@ -21,6 +21,8 @@
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
|
||||
+#include "posixmodule.h"
|
||||
+
|
||||
#ifdef _Py_MEMORY_SANITIZER
|
||||
# include <sanitizer/msan_interface.h>
|
||||
#endif
|
||||
@@ -222,7 +222,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
|
||||
long end_fd = safe_get_max_fd();
|
||||
Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep);
|
||||
Py_ssize_t keep_seq_idx;
|
||||
- int fd_num;
|
||||
/* As py_fds_to_keep is sorted we can loop through the list closing
|
||||
* fds in between any in the keep list falling within our range. */
|
||||
for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) {
|
||||
@@ -230,15 +229,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
|
||||
int keep_fd = PyLong_AsLong(py_keep_fd);
|
||||
if (keep_fd < start_fd)
|
||||
continue;
|
||||
- for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
|
||||
- close(fd_num);
|
||||
- }
|
||||
+ _Py_closerange(start_fd, keep_fd - 1);
|
||||
start_fd = keep_fd + 1;
|
||||
}
|
||||
if (start_fd <= end_fd) {
|
||||
- for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
|
||||
- close(fd_num);
|
||||
- }
|
||||
+ _Py_closerange(start_fd, end_fd);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
|
||||
index 726e3723f9..7ef2dbc854 100644
|
||||
--- Modules/posixmodule.c
|
||||
+++ Modules/posixmodule.c
|
||||
@@ -8555,8 +8555,26 @@ os_close_impl(PyObject *module, int fd)
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
+/* Our selection logic for which function to use is as follows:
|
||||
+ * 1. If close_range(2) is available, always prefer that; it's better for
|
||||
+ * contiguous ranges like this than fdwalk(3) which entails iterating over
|
||||
+ * the entire fd space and simply doing nothing for those outside the range.
|
||||
+ * 2. If closefrom(2) is available, we'll attempt to use that next if we're
|
||||
+ * closing up to sysconf(_SC_OPEN_MAX).
|
||||
+ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX),
|
||||
+ * as that will be more performant if the range happens to have any chunk of
|
||||
+ * non-opened fd in the middle.
|
||||
+ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
|
||||
+ */
|
||||
+#ifdef __FreeBSD__
|
||||
+#define USE_CLOSEFROM
|
||||
+#endif /* __FreeBSD__ */
|
||||
|
||||
#ifdef HAVE_FDWALK
|
||||
+#define USE_FDWALK
|
||||
+#endif /* HAVE_FDWALK */
|
||||
+
|
||||
+#ifdef USE_FDWALK
|
||||
static int
|
||||
_fdwalk_close_func(void *lohi, int fd)
|
||||
{
|
||||
@@ -8569,7 +8587,46 @@ _fdwalk_close_func(void *lohi, int fd)
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
-#endif /* HAVE_FDWALK */
|
||||
+#endif /* USE_FDWALK */
|
||||
+
|
||||
+/* Closes all file descriptors in [first, last], ignoring errors. */
|
||||
+void
|
||||
+_Py_closerange(int first, int last)
|
||||
+{
|
||||
+ first = Py_MAX(first, 0);
|
||||
+ _Py_BEGIN_SUPPRESS_IPH
|
||||
+#ifdef HAVE_CLOSE_RANGE
|
||||
+ if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
|
||||
+ /* Any errors encountered while closing file descriptors are ignored;
|
||||
+ * ENOSYS means no kernel support, though,
|
||||
+ * so we'll fallback to the other methods. */
|
||||
+ }
|
||||
+ else
|
||||
+#endif /* HAVE_CLOSE_RANGE */
|
||||
+#ifdef USE_CLOSEFROM
|
||||
+ if (last >= sysconf(_SC_OPEN_MAX)) {
|
||||
+ /* Any errors encountered while closing file descriptors are ignored */
|
||||
+ closefrom(first);
|
||||
+ }
|
||||
+ else
|
||||
+#endif /* USE_CLOSEFROM */
|
||||
+#ifdef USE_FDWALK
|
||||
+ {
|
||||
+ int lohi[2];
|
||||
+ lohi[0] = first;
|
||||
+ lohi[1] = last + 1;
|
||||
+ fdwalk(_fdwalk_close_func, lohi);
|
||||
+ }
|
||||
+#else
|
||||
+ {
|
||||
+ for (int i = first; i <= last; i++) {
|
||||
+ /* Ignore errors */
|
||||
+ (void)close(i);
|
||||
+ }
|
||||
+ }
|
||||
+#endif /* USE_FDWALK */
|
||||
+ _Py_END_SUPPRESS_IPH
|
||||
+}
|
||||
|
||||
/*[clinic input]
|
||||
os.closerange
|
||||
@@ -8585,22 +8642,8 @@ static PyObject *
|
||||
os_closerange_impl(PyObject *module, int fd_low, int fd_high)
|
||||
/*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
|
||||
{
|
||||
-#ifdef HAVE_FDWALK
|
||||
- int lohi[2];
|
||||
-#else
|
||||
- int i;
|
||||
-#endif
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
- _Py_BEGIN_SUPPRESS_IPH
|
||||
-#ifdef HAVE_FDWALK
|
||||
- lohi[0] = Py_MAX(fd_low, 0);
|
||||
- lohi[1] = fd_high;
|
||||
- fdwalk(_fdwalk_close_func, lohi);
|
||||
-#else
|
||||
- for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
|
||||
- close(i);
|
||||
-#endif
|
||||
- _Py_END_SUPPRESS_IPH
|
||||
+ _Py_closerange(fd_low, fd_high - 1);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h
|
||||
index 1e00562abc..749833f71c 100644
|
||||
--- Modules/posixmodule.h
|
||||
+++ Modules/posixmodule.h
|
||||
@@ -28,6 +28,8 @@ PyAPI_FUNC(int) _Py_Sigset_Converter(PyObject *, void *);
|
||||
#endif /* HAVE_SIGSET_T */
|
||||
#endif /* Py_LIMITED_API */
|
||||
|
||||
+PyAPI_FUNC(void) _Py_closerange(int first, int last);
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
diff --git a/configure b/configure
|
||||
index 96dcd0dcd5..90b61f9f8f 100755
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -11503,8 +11503,8 @@ fi
|
||||
|
||||
# checks for library functions
|
||||
for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
||||
- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
|
||||
- faccessat fchmod fchmodat fchown fchownat \
|
||||
+ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
|
||||
+ explicit_memset faccessat fchmod fchmodat fchown fchownat \
|
||||
fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
|
||||
futimens futimes gai_strerror getentropy \
|
||||
getgrgid_r getgrnam_r \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 18a044629a..fbb051d49c 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -3560,8 +3560,8 @@ fi
|
||||
|
||||
# checks for library functions
|
||||
AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
||||
- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
|
||||
- faccessat fchmod fchmodat fchown fchownat \
|
||||
+ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
|
||||
+ explicit_memset faccessat fchmod fchmodat fchown fchownat \
|
||||
fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
|
||||
futimens futimes gai_strerror getentropy \
|
||||
getgrgid_r getgrnam_r \
|
||||
diff --git a/pyconfig.h.in b/pyconfig.h.in
|
||||
index 4263a712c3..166d278f7c 100644
|
||||
--- pyconfig.h.in
|
||||
+++ pyconfig.h.in
|
||||
@@ -136,6 +136,9 @@
|
||||
/* Define to 1 if you have the `clock_settime' function. */
|
||||
#undef HAVE_CLOCK_SETTIME
|
||||
|
||||
+/* Define to 1 if you have the `close_range' function. */
|
||||
+#undef HAVE_CLOSE_RANGE
|
||||
+
|
||||
/* Define if the C compiler supports computed gotos. */
|
||||
#undef HAVE_COMPUTED_GOTOS
|
||||
|
||||
13
lang/python38/files/patch-libressl
Normal file
13
lang/python38/files/patch-libressl
Normal file
@@ -0,0 +1,13 @@
|
||||
Fix build with LibreSSL 3.5.*
|
||||
|
||||
--- Modules/_hashopenssl.c.orig 2022-03-16 12:22:54 UTC
|
||||
+++ Modules/_hashopenssl.c
|
||||
@@ -37,7 +37,7 @@
|
||||
# error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL"
|
||||
#endif
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
|
||||
/* OpenSSL < 1.1.0 */
|
||||
#define EVP_MD_CTX_new EVP_MD_CTX_create
|
||||
#define EVP_MD_CTX_free EVP_MD_CTX_destroy
|
||||
11
lang/python38/files/patch-setup.py
Normal file
11
lang/python38/files/patch-setup.py
Normal file
@@ -0,0 +1,11 @@
|
||||
--- setup.py.orig 2021-05-03 09:47:56 UTC
|
||||
+++ setup.py
|
||||
@@ -2051,7 +2051,7 @@ class PyBuildExt(build_ext):
|
||||
undef_macros = []
|
||||
if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
|
||||
include_dirs = []
|
||||
- libraries = [':libmpdec.so.2']
|
||||
+ libraries = ['mpdec']
|
||||
sources = ['_decimal/_decimal.c']
|
||||
depends = ['_decimal/docstrings.h']
|
||||
else:
|
||||
Reference in New Issue
Block a user