Merge pull request #3757 from citrus-it/pythonr50

python312 - update from 3.12.7 to 3.12.8 (r151050)
omniosorg · Dec 9, 2024 · dc09c1d · dc09c1d
2 parents 96e5c38 + a47c4d1
commit dc09c1d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/build/python312/build.sh b/build/python312/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=Python
-VER=3.12.6
+VER=3.12.8
 PKG=runtime/python-312
 MVER=${VER%.*}
 SUMMARY="$PROG $MVER"

diff --git a/build/python312/patches/disable_epoll.patch b/build/python312/patches/disable_epoll.patch
@@ -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
-@@ -4966,8 +4966,8 @@ PY_CHECK_FUNC([symlink], [@%:@include <u
+@@ -4969,8 +4969,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>])

diff --git a/build/python312/patches/gethostbyname.patch b/build/python312/patches/gethostbyname.patch
@@ -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
-@@ -5564,26 +5564,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],
+@@ -5569,26 +5569,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],
 
  AC_CHECK_FUNC([gethostbyname_r],
    [AC_DEFINE([HAVE_GETHOSTBYNAME_R])
@@ -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>
-@@ -5622,7 +5604,6 @@ AC_CHECK_FUNC([gethostbyname_r],
+@@ -5627,7 +5609,6 @@ AC_CHECK_FUNC([gethostbyname_r],
             AC_MSG_RESULT([no])
          ])
      ])

diff --git a/build/python312/patches/locale-encoding.patch b/build/python312/patches/locale-encoding.patch
@@ -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
-@@ -1792,6 +1792,15 @@ unicode_char(Py_UCS4 ch)
+@@ -1959,6 +1959,15 @@ unicode_char(Py_UCS4 ch)
      return unicode;
  }
 
@@ -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)
  {
-@@ -1828,6 +1837,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
+@@ -1995,6 +2004,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
          return unicode;
      }
  #endif

diff --git a/build/python312/patches/posix_spawn-close_fds-support.patch b/build/python312/patches/posix_spawn-close_fds-support.patch
@@ -104,7 +104,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
              default: {
                  PyErr_SetString(PyExc_TypeError,
                                  "Unknown file_actions identifier");
-@@ -16505,6 +16526,9 @@ all_ins(PyObject *m)
+@@ -16515,6 +16536,9 @@ all_ins(PyObject *m)
      if (PyModule_AddIntConstant(m, "POSIX_SPAWN_OPEN", POSIX_SPAWN_OPEN)) return -1;
      if (PyModule_AddIntConstant(m, "POSIX_SPAWN_CLOSE", POSIX_SPAWN_CLOSE)) return -1;
      if (PyModule_AddIntConstant(m, "POSIX_SPAWN_DUP2", POSIX_SPAWN_DUP2)) return -1;
@@ -117,7 +117,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
 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
-@@ -4930,6 +4930,7 @@ AC_CHECK_FUNCS([ \
+@@ -4933,6 +4933,7 @@ AC_CHECK_FUNCS([ \
    lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
    mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
    pipe2 plock poll posix_fadvise posix_fallocate posix_spawn posix_spawnp \
@@ -128,7 +128,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 diff -wpruN --no-dereference '--exclude=*.orig' a~/pyconfig.h.in a/pyconfig.h.in
 --- a~/pyconfig.h.in	1970-01-01 00:00:00
 +++ a/pyconfig.h.in	1970-01-01 00:00:00
-@@ -908,6 +908,10 @@
+@@ -904,6 +904,10 @@
  /* Define to 1 if you have the `posix_spawnp' function. */
  #undef HAVE_POSIX_SPAWNP