Skip to content

Commit

Permalink
Merge pull request #3754 from citrus-it/pkgupd
Browse files Browse the repository at this point in the history
Core package updates
  • Loading branch information
oetiker authored Dec 6, 2024
2 parents 2f66731 + d8300fd commit df65e7f
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 28 deletions.
2 changes: 1 addition & 1 deletion build/mercurial/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=mercurial
VER=6.8.2
VER=6.9
PKG=developer/versioning/mercurial
SUMMARY="Mercurial source control management"
DESC="Free, distributed source control management tool"
Expand Down
2 changes: 1 addition & 1 deletion build/pv/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
. ../../lib/build.sh

PROG=pv
VER=1.9.0
VER=1.9.7
PKG=shell/pipe-viewer
SUMMARY="Pipe Viewer"
DESC="pv - a terminal-based tool for monitoring the progress of data through a pipeline."
Expand Down
2 changes: 1 addition & 1 deletion build/python312/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=Python
VER=3.12.7
VER=3.12.8
PKG=runtime/python-312
MVER=${VER%.*}
SUMMARY="$PROG $MVER"
Expand Down
2 changes: 1 addition & 1 deletion build/python312/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
@@ -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>])
Expand Down
4 changes: 2 additions & 2 deletions build/python312/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
@@ -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])
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>
@@ -5622,7 +5604,6 @@ AC_CHECK_FUNC([gethostbyname_r],
@@ -5627,7 +5609,6 @@ AC_CHECK_FUNC([gethostbyname_r],
AC_MSG_RESULT([no])
])
])
Expand Down
4 changes: 2 additions & 2 deletions build/python312/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
@@ -1792,6 +1792,15 @@ unicode_char(Py_UCS4 ch)
@@ -1959,6 +1959,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)
{
@@ -1828,6 +1837,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
@@ -1995,6 +2004,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
return unicode;
}
#endif
Expand Down
6 changes: 3 additions & 3 deletions build/python312/patches/posix_spawn-close_fds-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 \
Expand All @@ -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

Expand Down
53 changes: 49 additions & 4 deletions build/python312/testsuite.log
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== Tests result: SUCCESS ==
== Tests result: FAILURE ==

26 tests skipped:
test.test_asyncio.test_windows_events
Expand All @@ -14,8 +14,53 @@
test_ossaudiodev test_smtpnet test_socketserver test_urllib2net
test_urllibnet test_winsound test_xmlrpc_net test_zipfile64

2 tests failed:
test_multiprocessing_main_handling test_poplib

454 tests OK.

0:11:32 load avg: 0.11 Re-running 2 failed tests in verbose mode in subprocesses
0:11:32 load avg: 0.11 Run 2 tests in parallel using 2 worker processes
0:11:34 load avg: 0.12 [1/2] test_multiprocessing_main_handling passed
Re-running test_multiprocessing_main_handling in verbose mode (matching: test_zipfile_compiled)
test_zipfile_compiled (test.test_multiprocessing_main_handling.ForkCmdLineTest.test_zipfile_compiled) ... ok
test_zipfile_compiled (test.test_multiprocessing_main_handling.ForkServerCmdLineTest.test_zipfile_compiled) ... ok
test_zipfile_compiled (test.test_multiprocessing_main_handling.SpawnCmdLineTest.test_zipfile_compiled) ... ok

----------------------------------------------------------------------
Ran 3 tests in 1.132s

OK
0:11:50 load avg: 0.15 [2/2] test_poplib passed
Re-running test_poplib in verbose mode (matching: testTimeoutNone)
testTimeoutNone (test.test_poplib.TestTimeouts.testTimeoutNone) ... ok

----------------------------------------------------------------------
Ran 1 test in 16.921s

OK

== Tests result: FAILURE then SUCCESS ==

26 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_dbm_gnu test_epoll test_idle test_kqueue test_launcher
test_msilib test_perf_profiler test_perfmaps test_startfile
test_tcl test_tix test_tkinter test_ttk test_ttk_textonly
test_turtle test_winapi test_winconsoleio test_winreg test_wmi

8 tests skipped (resource denied):
test_ossaudiodev test_smtpnet test_socketserver test_urllib2net
test_urllibnet test_winsound test_xmlrpc_net test_zipfile64

2 re-run tests:
test_multiprocessing_main_handling test_poplib

456 tests OK.

Total tests: run=41,968 (filtered) skipped=1,424
Total test files: run=482/490 (filtered) skipped=26 resource_denied=8
Result: SUCCESS
Total tests: run=42,149 (filtered) failures=1 skipped=1,547
Total test files: run=484/490 (filtered) skipped=26 resource_denied=8 rerun=2
Result: FAILURE then SUCCESS
2 changes: 1 addition & 1 deletion build/rsyslog/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=rsyslog
VER=8.2410.0
VER=8.2412.0
PKG=system/rsyslog
SUMMARY="rsyslog - the rocket-fast system for log processing."
DESC="A high-performance, modular syslog implementation."
Expand Down
4 changes: 2 additions & 2 deletions build/rsyslog/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PASS: dnscache-TTL-0.sh
PASS: invalid_nested_include.sh
SKIP: omfwd-lb-1target-retry-full_buf.sh
SKIP: omfwd-lb-1target-retry-1_byte_buf.sh
SKIP: omfwd-lb-1target-retry-1_byte_buf-TargetFail
SKIP: omfwd-lb-1target-retry-1_byte_buf-TargetFail.sh
PASS: omfwd-lb-susp.sh
PASS: omfwd-lb-2target-basic.sh
PASS: omfwd-lb-2target-retry.sh
Expand Down Expand Up @@ -420,7 +420,7 @@ PASS: imtcp-tls-ossl-error-key.sh
PASS: imtcp-tls-ossl-error-key2.sh
PASS: uxsock_simple.sh
============================================================================
Testsuite summary for rsyslog 8.2410.0
Testsuite summary for rsyslog 8.2412.0
============================================================================
# TOTAL: 422
# PASS: 379
Expand Down
2 changes: 1 addition & 1 deletion build/tcsh/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=tcsh
VER=6.24.13
VER=6.24.14
PKG=shell/tcsh
SUMMARY="Tenex C-shell (tcsh)"
DESC="A Unix shell based on and compatible with the C shell (csh)"
Expand Down
2 changes: 1 addition & 1 deletion build/tcsh/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Expect 53 skipped tests (of untested features) in a full make check

## ------------------------------ ##
## Tcsh 6.24.13 test suite: tcsh. ##
## Tcsh 6.24.14 test suite: tcsh. ##
## ------------------------------ ##

Special aliases
Expand Down
16 changes: 8 additions & 8 deletions doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
| developer/parser/bison | 3.8.2 | https://ftp.gnu.org/gnu/bison/
| developer/pkg-config | 0.29.2 | https://pkg-config.freedesktop.org/releases
| developer/versioning/git | 2.47.1 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/
| developer/versioning/mercurial | 6.8.2 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew
| developer/versioning/mercurial | 6.9 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew
| developer/versioning/sccs | 5.09 | https://sourceforge.net/projects/sccs/files/
| driver/tuntap | 1.3.3 | https://github.com/kaizawa/tuntap/tags
| editor/vim | 9.1 | https://www.vim.org/download.php https://github.com/vim/vim
Expand Down Expand Up @@ -66,8 +66,8 @@
| library/unixodbc | 2.3.12 | http://www.unixodbc.org/download.html
| library/xxhash | 0.8.2 | https://github.com/Cyan4973/xxHash/releases | Currently used solely by rsync
| library/zlib | 1.3.1 | https://www.zlib.net/
| meta/data/microcode/amd | 20240710 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode
| meta/data/microcode/intel | 20240910 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases
| meta/data/microcode/amd | 20241121 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode
| meta/data/microcode/intel | 20241112 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases
| network/dns/bind | 9.18.31 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/
| network/openssh | 9.9p1 | https://www.mirrorservice.org/pub/OpenBSD/OpenSSH/portable/
| network/rsync | 3.3.0 | https://rsync.samba.org/
Expand All @@ -80,17 +80,17 @@
| runtime/java/openjdk21 | 21.0.5+11 | https://github.com/openjdk/jdk21u/tags
| runtime/java/openjdk8 | 1.8.432-06 | https://github.com/openjdk/jdk8u/tags
| runtime/perl | 5.40.0 | https://www.cpan.org/src/README.html
| runtime/python-311 | 3.11.10 | https://www.python.org/downloads/source/
| runtime/python-312 | 3.12.7 | https://www.python.org/downloads/source/
| runtime/python-311 | 3.11.11 | https://www.python.org/downloads/source/
| runtime/python-312 | 3.12.8 | 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/
| service/network/smtp/dma | 0.13 | https://github.com/corecode/dma/tags
| shell/bash | 5.2.37 | https://ftp.gnu.org/gnu/bash/
| shell/bash5-patchlvl | 037 | https://ftp.gnu.org/gnu/bash/bash-5.2-patches
| shell/bash5-completions | 2.14.0 | https://github.com/scop/bash-completion/releases
| shell/pipe-viewer | 1.9.0 | http://www.ivarch.com/programs/pv.shtml
| shell/tcsh | 6.24.13 | https://github.com/tcsh-org/tcsh/tags
| shell/pipe-viewer | 1.9.7 | http://www.ivarch.com/programs/pv.shtml
| shell/tcsh | 6.24.14 | https://github.com/tcsh-org/tcsh/tags
| shell/zsh | 5.9 | https://sourceforge.net/projects/zsh/files/zsh
| system/cpuid | 1.8.2 | https://github.com/tycho/cpuid/tags
| system/data/urxvt-terminfo | 9.31 | http://dist.schmorp.de/rxvt-unicode/
Expand All @@ -103,7 +103,7 @@
| system/network/lldp | 0.4alpha | https://sourceforge.net/projects/openlldp/files/
| system/pciutils | 3.13.0 | https://www.kernel.org/pub/software/utils/pciutils/
| system/pkgtree | 1.1 | https://github.com/quattor/pkgtree/tags
| system/rsyslog | 8.2410.0 | https://www.rsyslog.com/downloads/download-v8-stable/
| system/rsyslog | 8.2412.0 | https://www.rsyslog.com/downloads/download-v8-stable/
| system/test/epolltest | 20240808 | https://github.com/omniosorg/epoll-test-suite
| system/test/fio | 3.38 | https://github.com/axboe/fio/tags
| system/watch | 3.3.16 | https://gitlab.com/api/v4/projects/procps-ng%2Fprocps/releases https://gitlab.com/procps-ng/procps/-/releases
Expand Down

0 comments on commit df65e7f

Please sign in to comment.