Skip to content

Commit

Permalink
Merge pull request #3493 from citrus-it/pkgupd
Browse files Browse the repository at this point in the history
Core package updates
  • Loading branch information
hadfl authored Feb 20, 2024
2 parents 1a251d4 + 7491eeb commit 22886e0
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 37 deletions.
6 changes: 3 additions & 3 deletions build/bind/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
# }}}
#
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=bind
VER=9.18.21
VER=9.18.24
PKG=network/dns/bind
SUMMARY="BIND DNS tools"
DESC="Client utilities for DNS lookups"

LIBUVVER=1.47.0
LIBUVVER=1.48.0
XFORM_ARGS+=" -DLIBUV=$LIBUVVER"

# This package ships private shared libraries in $PREFIX/lib/dns that are only
Expand Down
4 changes: 2 additions & 2 deletions build/git/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#
# Copyright (c) 2014 by Delphix. All rights reserved.
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=git
VER=2.43.0
VER=2.43.2
PKG=developer/versioning/git
SUMMARY="$PROG - distributed version control system"
DESC="Git is a free and open source distributed version control system "
Expand Down
2 changes: 1 addition & 1 deletion build/git/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
*** t0069-oidtree.sh ***
# passed all 2 test(s)
*** t0070-fundamental.sh ***
# passed all 8 test(s)
# passed all 12 test(s)
*** t0071-sort.sh ***
# passed all 1 test(s)
*** t0081-find-pack.sh ***
Expand Down
4 changes: 2 additions & 2 deletions build/libffi/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=libffi
VER=3.4.4
VER=3.4.5
PKG=library/libffi
SUMMARY="A Portable Foreign Function Interface Library"
DESC="$PROG - $SUMMARY"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/configure a/configure
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -17396,7 +17396,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
Expand Down
6 changes: 3 additions & 3 deletions build/libffi/patches/aarch64-eh_frame.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff -wpruN '--exclude=*.orig' a~/src/aarch64/sysv.S a/src/aarch64/sysv.S
diff -wpruN --no-dereference '--exclude=*.orig' a~/src/aarch64/sysv.S a/src/aarch64/sysv.S
--- a~/src/aarch64/sysv.S 1970-01-01 00:00:00
+++ a/src/aarch64/sysv.S 1970-01-01 00:00:00
@@ -531,6 +531,8 @@ CNAME(ffi_go_closure_SYSV):
@@ -675,6 +675,8 @@ CNAME(ffi_go_closure_SYSV):
#endif /* FFI_CLOSURES */
#endif /* __arm64__ */

+.section .eh_frame,EH_FRAME_FLAGS,%progbits
+
#if defined __ELF__ && defined __linux__
.section .note.GNU-stack,"",%progbits
#endif

6 changes: 3 additions & 3 deletions build/libffi/patches/unwind-instead-of-exceptions.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN '--exclude=*.orig' a~/configure a/configure
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -18628,7 +18628,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -18570,7 +18570,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi

if test "x$GCC" = "xyes"; then
Expand All @@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/configure a/configure
fi

cat > local.exp <<EOF
@@ -19839,7 +19839,7 @@ else $as_nop
@@ -19455,7 +19455,7 @@ else $as_nop

libffi_cv_ro_eh_frame=yes
echo 'extern void foo (void); void bar (void) { foo (); foo (); }' > conftest.c
Expand Down
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.6.2
VER=6.6.3
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/nss/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=nss
VER=3.97
VER=3.98
PKG=system/library/mozilla-nss
SUMMARY="Network Security Services"
DESC="Network Security Services (NSS) is a set of libraries designed to "
Expand Down
4 changes: 2 additions & 2 deletions build/pcre2/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 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
#
. ../../lib/build.sh

PROG=pcre2
VER=10.42
VER=10.43
PKG=library/pcre2
SUMMARY="Perl-Compatible Regular Expressions, version 2"
DESC="The PCRE library is a set of functions that implement regular expression"
Expand Down
6 changes: 3 additions & 3 deletions build/pcre2/patches/no_pcre2demo.patch
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/pcre2.3 a/doc/pcre2.3
diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/pcre2api.3 a/doc/pcre2api.3
--- a~/doc/pcre2api.3 1970-01-01 00:00:00
+++ a/doc/pcre2api.3 1970-01-01 00:00:00
@@ -395,18 +395,7 @@ against a non-dll PCRE2 library, you mus
@@ -406,18 +406,7 @@ against a non-dll PCRE2 library, you mus
\fBpcre2.h\fP.
.P
The functions \fBpcre2_compile()\fP and \fBpcre2_match()\fP are used for
Expand All @@ -66,7 +66,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/pcre2api.3 a/doc/pcre2api
.P
The compiling and matching functions recognize various options that are passed
as bits in an options argument. There are also some more complicated parameters
@@ -2663,12 +2652,8 @@ Finding all the matches in a subject is
@@ -2781,12 +2770,8 @@ Finding all the matches in a subject is
empty string. It is possible to emulate Perl's /g behaviour by first trying the
match again at the same offset, with the PCRE2_NOTEMPTY_ATSTART and
PCRE2_ANCHORED options, and then if that fails, advancing the starting offset
Expand All @@ -81,7 +81,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/doc/pcre2api.3 a/doc/pcre2api
newline convention recognizes CRLF as a newline, and if so, and the current
character is CR followed by LF, advance the starting offset by two characters
instead of one.
@@ -4010,9 +3995,8 @@ fail, this error is given.
@@ -4148,9 +4133,8 @@ fail, this error is given.
.SH "SEE ALSO"
.rs
.sp
Expand Down
2 changes: 1 addition & 1 deletion build/pcre2/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PASS: pcre2posix_test
PASS: RunTest
PASS: RunGrepTest
============================================================================
Testsuite summary for PCRE2 10.42
Testsuite summary for PCRE2 10.43
============================================================================
# TOTAL: 3
# PASS: 3
Expand Down
4 changes: 2 additions & 2 deletions build/tmux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# }}}
#
# Copyright 2016 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=tmux
VER=3.3
VER=3.4
PKG=terminal/tmux
SUMMARY="Terminal multiplexer"
DESC="$SUMMARY"
Expand Down
2 changes: 1 addition & 1 deletion build/tmux/patches-libevent/no-arc4random-addrandom.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/evutil_rand.c a/evutil_rand.c
diff -wpruN --no-dereference '--exclude=*.orig' a~/evutil_rand.c a/evutil_rand.c
--- a~/evutil_rand.c 1970-01-01 00:00:00
+++ a/evutil_rand.c 1970-01-01 00:00:00
@@ -194,8 +194,15 @@ evutil_secure_rng_get_bytes(void *buf, s
Expand Down
2 changes: 1 addition & 1 deletion build/tmux/patches/errno-for-errno.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/server-client.c a/server-client.c
diff -wpruN --no-dereference '--exclude=*.orig' a~/server-client.c a/server-client.c
--- a~/server-client.c 1970-01-01 00:00:00
+++ a/server-client.c 1970-01-01 00:00:00
@@ -26,6 +26,7 @@
Expand Down
2 changes: 1 addition & 1 deletion build/tmux/patches/evports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ See: https://github.com/tmux/tmux/issues/2702
We would rather use event ports than poll, and given that we cannot replicate
the original bug, we re-enable them.

diff -wpruN '--exclude=*.orig' a~/osdep-sunos.c a/osdep-sunos.c
diff -wpruN --no-dereference '--exclude=*.orig' a~/osdep-sunos.c a/osdep-sunos.c
--- a~/osdep-sunos.c 1970-01-01 00:00:00
+++ a/osdep-sunos.c 1970-01-01 00:00:00
@@ -96,17 +96,5 @@ osdep_get_cwd(int fd)
Expand Down
2 changes: 1 addition & 1 deletion build/tmux/patches/job-libevheader.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/job.c a/job.c
diff -wpruN --no-dereference '--exclude=*.orig' a~/job.c a/job.c
--- a~/job.c 1970-01-01 00:00:00
+++ a/job.c 1970-01-01 00:00:00
@@ -28,6 +28,7 @@
Expand Down
16 changes: 8 additions & 8 deletions doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
| developer/nasm | 2.16.01 | http://www.nasm.us/pub/nasm/releasebuilds
| 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.43.0 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/
| developer/versioning/mercurial | 6.6.2 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew
| developer/versioning/git | 2.43.2 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/
| developer/versioning/mercurial | 6.6.3 | 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.0 | http://ftp.vim.org/pub/vim/unix
Expand All @@ -45,18 +45,18 @@
| library/libedit | 20230828-3.1 | https://thrysoee.dk/editline/
| library/libevent | 2.1.12 | https://github.com/libevent/libevent/tags | Currently used solely by tmux
| library/libidn | 1.42 | http://git.savannah.gnu.org/cgit/libidn.git/refs/tags https://ftp.gnu.org/gnu/libidn/
| library/libffi | 3.4.4 | https://sourceware.org/libffi/
| library/libffi | 3.4.5 | https://sourceware.org/libffi/
| library/libpsl | 0.21.5 | https://github.com/rockdaboot/libpsl/releases
| library/libuv | 1.47.0 | https://github.com/libuv/libuv/releases | Currently used solely by bind
| library/libuv | 1.48.0 | https://github.com/libuv/libuv/releases | Currently used solely by bind
| library/libxml2 | 2.12.5 | https://github.com/GNOME/libxml2/tags http://xmlsoft.org/news.html
| library/libxslt | 1.1.30 | http://xmlsoft.org/libxslt/news.html
| library/lzlib | 1.14 | https://download.savannah.gnu.org/releases/lzip/lzlib/
| library/nettle | 3.9.1 | https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | Used solely by chrony
| library/ncurses | 6.4 | https://ftp.gnu.org/gnu/ncurses/
| library/nghttp2 | 1.59.0 | https://github.com/nghttp2/nghttp2/releases
| library/nss | 3.97 | https://ftp.mozilla.org/pub/security/nss/releases/ https://firefox-source-docs.mozilla.org/security/nss/releases/
| library/nss | 3.98 | https://ftp.mozilla.org/pub/security/nss/releases/ https://firefox-source-docs.mozilla.org/security/nss/releases/
| library/nspr | 4.35 | http://archive.mozilla.org/pub/nspr/releases/ | https://ftp.mozilla.org/pub/security/nss/releases/
| library/pcre2 | 10.42 | https://github.com/PhilipHazel/pcre2/releases
| library/pcre2 | 10.43 | https://github.com/PhilipHazel/pcre2/releases
| library/perl-5/xml-parser | 2.47 | https://metacpan.org/pod/XML::Parser
| library/readline | 8.2 | https://ftp.gnu.org/gnu/readline/
| library/readline6-patchlvl | 008 | https://ftp.gnu.org/gnu/readline/readline-6.3-patches/
Expand All @@ -68,7 +68,7 @@
| library/zlib | 1.3.1 | https://www.zlib.net/
| meta/data/microcode/amd | 20231205 | https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode
| meta/data/microcode/intel | 20231114 | https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases
| network/dns/bind | 9.18.21 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/
| network/dns/bind | 9.18.24 | https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/
| network/openssh | 9.6p1 | https://www.mirrorservice.org/pub/OpenBSD/OpenSSH/portable/
| network/rsync | 3.2.7 | https://rsync.samba.org/
| network/service/isc-dhcp | 4.4.3-P1 | https://ftp.isc.org/isc/dhcp/ https://www.isc.org/downloads/
Expand Down Expand Up @@ -109,7 +109,7 @@
| system/test/fio | 3.36 | 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
| terminal/screen | 4.9.1 | https://ftp.gnu.org/gnu/screen/
| terminal/tmux | 3.3 | https://github.com/tmux/tmux/releases http://tmux.github.io/
| terminal/tmux | 3.4 | https://github.com/tmux/tmux/releases http://tmux.github.io/
| text/gawk | 5.3.0 | https://ftp.gnu.org/gnu/gawk/
| text/gnu-diffutils | 3.10 | http://git.savannah.gnu.org/cgit/diffutils.git/refs/tags
| text/gnu-gettext | 0.22.4 | https://ftp.gnu.org/pub/gnu/gettext/
Expand Down

0 comments on commit 22886e0

Please sign in to comment.