Skip to content

Commit

Permalink
python313 - update from 3.13.1 to 3.13.2
Browse files Browse the repository at this point in the history
  • Loading branch information
citrus-it committed Feb 10, 2025
1 parent 1a1801f commit bced671
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 67 deletions.
4 changes: 2 additions & 2 deletions build/python313/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# http://www.illumos.org/license/CDDL.
# }}}
#
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
#
. ../../lib/build.sh

PROG=Python
VER=3.13.1
VER=3.13.2
PKG=runtime/python-313
MVER=${VER%.*}
SUMMARY="$PROG $MVER"
Expand Down
2 changes: 1 addition & 1 deletion build/python313/patches/disable_epoll.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ There is no nice way to tell configure that we don't have it
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -5170,8 +5170,8 @@ PY_CHECK_FUNC([symlink], [@%:@include <u
@@ -5191,8 +5191,8 @@ PY_CHECK_FUNC([symlink], [@%:@include <u
PY_CHECK_FUNC([fchdir], [@%:@include <unistd.h>])
PY_CHECK_FUNC([fsync], [@%:@include <unistd.h>])
PY_CHECK_FUNC([fdatasync], [@%:@include <unistd.h>])
Expand Down
20 changes: 0 additions & 20 deletions build/python313/patches/fancy-termios.patch

This file was deleted.

4 changes: 2 additions & 2 deletions build/python313/patches/gethostbyname.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ correct when building with XPG6.
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -5745,26 +5745,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],
@@ -5766,26 +5766,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],

AC_CHECK_FUNC([gethostbyname_r],
[AC_DEFINE([HAVE_GETHOSTBYNAME_R])
Expand All @@ -32,7 +32,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
AC_MSG_CHECKING([gethostbyname_r with 5 args])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
# include <netdb.h>
@@ -5803,7 +5785,6 @@ AC_CHECK_FUNC([gethostbyname_r],
@@ -5824,7 +5806,6 @@ AC_CHECK_FUNC([gethostbyname_r],
AC_MSG_RESULT([no])
])
])
Expand Down
37 changes: 18 additions & 19 deletions build/python313/patches/illumos.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Misc/platform_triplet.c a/Misc/platform_triplet.c
--- a~/Misc/platform_triplet.c 1970-01-01 00:00:00
+++ a/Misc/platform_triplet.c 1970-01-01 00:00:00
@@ -285,6 +285,14 @@ PLATFORM_TRIPLET=wasm64-wasi
# else
# error unknown wasm64 platform
# endif
+#elif defined(__illumos__)
+# if defined(__x86_64__)
+PLATFORM_TRIPLET=x86_64-pc-solaris2
+# elif defined(__aarch64__)
+PLATFORM_TRIPLET=aarch64-unknown-solaris2
+# else
+# error unknown illumos platform
+# endif
#else
# error unknown platform triplet
#endif
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
Expand Down Expand Up @@ -57,22 +75,3 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
*)
# for now, limit cross builds to known configurations
MACHDEP="unknown"
diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
index ec0857a..d4c1bd0 100644
--- a/Misc/platform_triplet.c
+++ b/Misc/platform_triplet.c
@@ -285,6 +285,14 @@ PLATFORM_TRIPLET=wasm64-wasi
# else
# error unknown wasm64 platform
# endif
+#elif defined(__illumos__)
+# if defined(__x86_64__)
+PLATFORM_TRIPLET=x86_64-pc-solaris2
+# elif defined(__aarch64__)
+PLATFORM_TRIPLET=aarch64-unknown-solaris2
+# else
+# error unknown illumos platform
+# endif
#else
# error unknown platform triplet
#endif
4 changes: 2 additions & 2 deletions build/python313/patches/locale-encoding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Include/unicodeobject.h a/Inc
diff -wpruN --no-dereference '--exclude=*.orig' a~/Objects/unicodeobject.c a/Objects/unicodeobject.c
--- a~/Objects/unicodeobject.c 1970-01-01 00:00:00
+++ a/Objects/unicodeobject.c 1970-01-01 00:00:00
@@ -1956,6 +1956,15 @@ unicode_char(Py_UCS4 ch)
@@ -1994,6 +1994,15 @@ unicode_char(Py_UCS4 ch)
return unicode;
}

Expand All @@ -43,7 +43,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Objects/unicodeobject.c a/Obj
PyObject *
PyUnicode_FromWideChar(const wchar_t *u, Py_ssize_t size)
{
@@ -1992,6 +2001,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
@@ -2030,6 +2039,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
return unicode;
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions build/python313/patches/mod-posix-sched_priority.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ However, -1 alongside EINVAL represents an error.
diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modules/posixmodule.c
--- a~/Modules/posixmodule.c 1970-01-01 00:00:00
+++ a/Modules/posixmodule.c 1970-01-01 00:00:00
@@ -8097,7 +8097,11 @@ os_sched_get_priority_max_impl(PyObject
@@ -8100,7 +8100,11 @@ os_sched_get_priority_max_impl(PyObject
int max;

max = sched_get_priority_max(policy);
Expand All @@ -19,7 +19,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
return posix_error();
return PyLong_FromLong(max);
}
@@ -8116,7 +8120,11 @@ os_sched_get_priority_min_impl(PyObject
@@ -8119,7 +8123,11 @@ os_sched_get_priority_min_impl(PyObject
/*[clinic end generated code: output=7595c1138cc47a6d input=21bc8fa0d70983bf]*/
{
int min = sched_get_priority_min(policy);
Expand Down
8 changes: 4 additions & 4 deletions build/python313/patches/restore-dtrace.patch
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Python/bytecodes.c a/Python/b
diff -wpruN --no-dereference '--exclude=*.orig' a~/Python/ceval.c a/Python/ceval.c
--- a~/Python/ceval.c 1970-01-01 00:00:00
+++ a/Python/ceval.c 1970-01-01 00:00:00
@@ -106,6 +106,70 @@
@@ -103,6 +103,70 @@
} while (0)
#endif

Expand Down Expand Up @@ -148,23 +148,23 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Python/ceval.c a/Python/ceval

#ifdef LLTRACE
static void
@@ -732,6 +796,7 @@ _PyEval_EvalFrameDefault(PyThreadState *
@@ -733,6 +797,7 @@ _PyEval_EvalFrameDefault(PyThreadState *
if (_Py_EnterRecursivePy(tstate)) {
goto exit_unwind;
}
+ DTRACE_FUNCTION_ENTRY();
/* Because this avoids the RESUME,
* we need to update instrumentation */
_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
@@ -757,6 +822,7 @@ start_frame:
@@ -758,6 +823,7 @@ start_frame:
}

next_instr = frame->instr_ptr;
+ DTRACE_FUNCTION_ENTRY();
resume_frame:
stack_pointer = _PyFrame_GetStackPointer(frame);

@@ -893,6 +959,7 @@ exception_unwind:
@@ -894,6 +960,7 @@ exception_unwind:
}
assert(STACK_LEVEL() == 0);
_PyFrame_SetStackPointer(frame, stack_pointer);
Expand Down
1 change: 0 additions & 1 deletion build/python313/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ encoding-alias.patch
locale-encoding.patch
pyc-timestamp.patch
asyncio-watcher.patch
fancy-termios.patch
#XXX py_db.patch
restore-dtrace.patch
#
Expand Down
4 changes: 2 additions & 2 deletions build/python313/patches/test-freeze.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Tools/freeze/test/freeze.py a

def get_python_source_dir():
src_dir = sysconfig.get_config_var('abs_srcdir')
@@ -18,7 +18,7 @@ TESTS_DIR = os.path.dirname(__file__)
@@ -18,7 +19,7 @@ TESTS_DIR = os.path.dirname(__file__)
TOOL_ROOT = os.path.dirname(TESTS_DIR)
SRCDIR = get_python_source_dir()

Expand All @@ -26,7 +26,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Tools/freeze/test/freeze.py a
FREEZE = os.path.join(TOOL_ROOT, 'freeze.py')
OUTDIR = os.path.join(TESTS_DIR, 'outdir')

@@ -129,6 +129,7 @@ def prepare(script=None, outdir=None):
@@ -129,6 +130,7 @@ def prepare(script=None, outdir=None):
print(f'configuring python in {builddir}...')
config_args = shlex.split(sysconfig.get_config_var('CONFIG_ARGS') or '')
cmd = [os.path.join(srcdir, 'configure'), *config_args]
Expand Down
2 changes: 1 addition & 1 deletion build/python313/patches/test-opts.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ when a failure occurs.
diff -wpruN --no-dereference '--exclude=*.orig' a~/Lib/test/test_regrtest.py a/Lib/test/test_regrtest.py
--- a~/Lib/test/test_regrtest.py 1970-01-01 00:00:00
+++ a/Lib/test/test_regrtest.py 1970-01-01 00:00:00
@@ -804,7 +804,7 @@ class ProgramsTestCase(BaseTestCase):
@@ -805,7 +805,7 @@ class ProgramsTestCase(BaseTestCase):
self.tests = [self.create_test() for index in range(self.NTEST)]

self.python_args = ['-Wd', '-E', '-bb']
Expand Down
2 changes: 1 addition & 1 deletion build/python313/patches/test-zipfile.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ when the test expects an overflow error.
diff -wpruN --no-dereference '--exclude=*.orig' a~/Lib/test/test_zipfile/test_core.py a/Lib/test/test_zipfile/test_core.py
--- a~/Lib/test/test_zipfile/test_core.py 1970-01-01 00:00:00
+++ a/Lib/test/test_zipfile/test_core.py 1970-01-01 00:00:00
@@ -641,7 +641,7 @@ class StoredTestsWithSourceFile(Abstract
@@ -642,7 +642,7 @@ class StoredTestsWithSourceFile(Abstract
self.skipTest(f'time.localtime({ts}) raises OverflowError')
try:
os.utime(TESTFN, (ts, ts))
Expand Down
18 changes: 9 additions & 9 deletions build/python313/testsuite.log
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
== Tests result: SUCCESS ==

27 tests skipped:
28 tests skipped:
test.test_asyncio.test_windows_events
test.test_asyncio.test_windows_utils test.test_gdb.test_backtrace
test.test_gdb.test_cfunction test.test_gdb.test_cfunction_full
test.test_gdb.test_misc test.test_gdb.test_pretty_print
test_android test_dbm_gnu test_epoll test_free_threading test_idle
test_kqueue test_launcher test_msvcrt test_perf_profiler
test_perfmaps test_startfile test_tcl test_tkinter test_ttk
test_ttk_textonly test_turtle test_winapi test_winconsoleio
test_winreg test_wmi
test_android test_apple test_dbm_gnu test_epoll
test_free_threading test_idle test_kqueue test_launcher
test_msvcrt test_perf_profiler test_perfmaps test_startfile
test_tcl test_tkinter test_ttk test_ttk_textonly test_turtle
test_winapi test_winconsoleio test_winreg test_wmi

6 tests skipped (resource denied):
test_smtpnet test_socketserver test_urllib2net test_urllibnet
test_winsound test_zipfile64

445 tests OK.
446 tests OK.

Total tests: run=44,074 (filtered) skipped=1,955
Total test files: run=472/478 (filtered) skipped=27 resource_denied=6
Total tests: run=44,228 (filtered) skipped=1,958
Total test files: run=474/480 (filtered) skipped=28 resource_denied=6
Result: SUCCESS
2 changes: 1 addition & 1 deletion doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
| runtime/perl | 5.40.1 | https://www.cpan.org/src/README.html
| runtime/python-311 | 3.11.11 | https://www.python.org/downloads/source/
| runtime/python-312 | 3.12.8 | https://www.python.org/downloads/source/
| runtime/python-313 | 3.13.1 | https://www.python.org/downloads/source/
| runtime/python-313 | 3.13.2 | https://www.python.org/downloads/source/
| security/sudo | 1.9.16p2 | https://www.sudo.ws/
| service/network/chrony | 4.5 | https://download.tuxfamily.org/chrony/
| service/network/ntpsec | 1.2.3 | https://github.com/ntpsec/ntpsec/tags https://blog.ntpsec.org/
Expand Down

0 comments on commit bced671

Please sign in to comment.