Merge pull request #3692 from citrus-it/pkgpython311r48

python and expat update (r151048)
omniosorg · Sep 10, 2024 · 97a5ddb · 97a5ddb
2 parents 50e7523 + 6d02a69
commit 97a5ddb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/build/expat/build.sh b/build/expat/build.sh
@@ -13,12 +13,12 @@
 # }}}
 #
 # Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=expat
-VER=2.5.0
+VER=2.6.3
 PKG=library/expat
 SUMMARY="XML parser library"
 DESC="Fast streaming XML parser written in C"

diff --git a/build/expat/patches/manpage.patch b/build/expat/patches/manpage.patch
diff --git a/build/expat/patches/no_link_libm.patch b/build/expat/patches/no_link_libm.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/m4/libtool.m4 a/m4/libtool.m4
+diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/libtool.m4 a/m4/libtool.m4
 --- a~/m4/libtool.m4	1970-01-01 00:00:00
 +++ a/m4/libtool.m4	1970-01-01 00:00:00
-@@ -3887,7 +3887,7 @@ case $host in
+@@ -3882,7 +3882,7 @@ case $host in
    AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
    ;;
  *)

diff --git a/build/expat/patches/series b/build/expat/patches/series
@@ -1,2 +1 @@
-manpage.patch
 no_link_libm.patch
diff --git a/build/python311/build.sh b/build/python311/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=Python
-VER=3.11.9
+VER=3.11.10
 PKG=runtime/python-311
 MVER=${VER%.*}
 SUMMARY="$PROG $MVER"

diff --git a/build/python311/patches/mod-posix-sched_priority.patch b/build/python311/patches/mod-posix-sched_priority.patch
@@ -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
-@@ -6901,7 +6901,11 @@ os_sched_get_priority_max_impl(PyObject
+@@ -6939,7 +6939,11 @@ os_sched_get_priority_max_impl(PyObject
      int max;
 
      max = sched_get_priority_max(policy);
@@ -19,7 +19,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
          return posix_error();
      return PyLong_FromLong(max);
  }
-@@ -6920,7 +6924,11 @@ os_sched_get_priority_min_impl(PyObject
+@@ -6958,7 +6962,11 @@ os_sched_get_priority_min_impl(PyObject
  /*[clinic end generated code: output=7595c1138cc47a6d input=21bc8fa0d70983bf]*/
  {
      int min = sched_get_priority_min(policy);

diff --git a/build/python311/patches/test-tarfile.patch b/build/python311/patches/test-tarfile.patch
@@ -9,7 +9,7 @@ Convert both timestamps to integer before comparing.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/Lib/test/test_tarfile.py a/Lib/test/test_tarfile.py
 --- a~/Lib/test/test_tarfile.py	1970-01-01 00:00:00
 +++ a/Lib/test/test_tarfile.py	1970-01-01 00:00:00
-@@ -3091,7 +3091,7 @@ class NoneInfoExtractTests(ReadTest):
+@@ -3133,7 +3133,7 @@ class NoneInfoExtractTests(ReadTest):
                          if not path.is_symlink():
                              raise
                      else: