Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package updates #1570

Merged
merged 23 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/apr/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=apr
VER=1.7.4
VER=1.7.5
PKG=ooce/library/apr
SUMMARY="The Apache Portable Runtime library"
DESC="The Apache Portable Runtime is a library \
Expand Down
51 changes: 26 additions & 25 deletions build/apr/testsuite-32.log
Original file line number Diff line number Diff line change
Expand Up @@ -20,99 +20,99 @@ APR Lock Performance Test
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 1 threads OK
microseconds: 34762 usec
microseconds: 37672 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 1 threads OK
microseconds: 28677 usec
microseconds: 30852 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 1 threads OK
microseconds: 127011 usec
microseconds: 135413 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 1 threads OK
microseconds: 86524 usec
microseconds: 88560 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 2 threads OK
microseconds: 340591 usec
microseconds: 251673 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 2 threads OK
microseconds: 297511 usec
microseconds: 343640 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 2 threads OK
microseconds: 738169 usec
microseconds: 551905 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 2 threads OK
microseconds: 20808963 usec
microseconds: 22000495 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 3 threads OK
microseconds: 768902 usec
microseconds: 732865 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 3 threads OK
microseconds: 761092 usec
microseconds: 668556 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 3 threads OK
microseconds: 2646126 usec
microseconds: 1943856 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 3 threads OK
microseconds: 29905935 usec
microseconds: 33747296 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 4 threads OK
microseconds: 816077 usec
microseconds: 624899 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 4 threads OK
microseconds: 1127743 usec
microseconds: 1075974 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 4 threads OK
microseconds: 1939909 usec
microseconds: 1727532 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 4 threads OK
microseconds: 41898438 usec
microseconds: 44995811 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 5 threads OK
microseconds: 1607704 usec
microseconds: 1646400 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 5 threads OK
microseconds: 3321441 usec
microseconds: 3367823 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 5 threads OK
microseconds: 2616998 usec
microseconds: 2507277 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 5 threads OK
microseconds: 53976071 usec
microseconds: 55143040 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 6 threads OK
microseconds: 2178916 usec
microseconds: 2666483 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 6 threads OK
microseconds: 1118445 usec
microseconds: 1167607 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 6 threads OK
microseconds: 3405805 usec
microseconds: 3293779 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 6 threads OK
microseconds: 65036885 usec
microseconds: 65328944 usec
Trying proc mutexes with mechanism `default'...
mutex mechanism `default' is global in scope on this platform.
Trying global mutexes with mechanism `default'...
Expand Down Expand Up @@ -148,7 +148,8 @@ testdup : SUCCESS
testencode : SUCCESS
testenv : SUCCESS
testescape : SUCCESS
testfile : abcdefSUCCESS
testfile : abcdefRandom seed for test_atomic_append() is 1767240639
SUCCESS
testfilecopy : SUCCESS
testfileinfo : SUCCESS
testflock : SUCCESS
Expand Down
88 changes: 56 additions & 32 deletions build/apr/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,99 @@ APR Lock Performance Test
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 1 threads OK
microseconds: 18319 usec
microseconds: 23716 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 1 threads OK
microseconds: 18115 usec
microseconds: 23773 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 1 threads OK
microseconds: 84047 usec
microseconds: 91080 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 1 threads OK
microseconds: 48251 usec
microseconds: 54455 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 2 threads OK
microseconds: 153029 usec
microseconds: 128083 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 2 threads OK
microseconds: 252108 usec
microseconds: 321771 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 2 threads OK
microseconds: 739863 usec
microseconds: 588517 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 2 threads OK
microseconds: 22660602 usec
microseconds: 21796501 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 3 threads OK
microseconds: 329025 usec
microseconds: 324510 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 3 threads OK
microseconds: 389833 usec
microseconds: 421241 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 3 threads OK
microseconds: 1270905 usec
microseconds: 1091681 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 3 threads OK
microseconds: 33086968 usec
microseconds: 35814067 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 4 threads OK
microseconds: 700545 usec
microseconds: 958153 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 4 threads OK
microseconds: 793559 usec
microseconds: 722224 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 4 threads OK
microseconds: 1814759 usec
microseconds: 1913149 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 4 threads OK
microseconds: 43029566 usec
microseconds: 49835573 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 5 threads OK
microseconds: 902172 usec
microseconds: 962196 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 5 threads OK
microseconds: 660640 usec
microseconds: 654519 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 5 threads OK
microseconds: 2337663 usec
microseconds: 2530866 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 5 threads OK
microseconds: 55699046 usec
microseconds: 58232777 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (UNNESTED) OK
Starting 6 threads OK
microseconds: 2040095 usec
microseconds: 1992193 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (NESTED) OK
Starting 6 threads OK
microseconds: 1201804 usec
microseconds: 1236000 usec
apr_thread_mutex_t Tests
Initializing the apr_thread_mutex_t (TIMED) OK
Starting 6 threads OK
microseconds: 3418914 usec
microseconds: 3415026 usec
apr_thread_rwlock_t Tests
Initializing the apr_thread_rwlock_t OK
Starting 6 threads OK
microseconds: 66778145 usec
microseconds: 66348197 usec
Trying proc mutexes with mechanism `default'...
mutex mechanism `default' is global in scope on this platform.
Trying global mutexes with mechanism `default'...
Expand Down Expand Up @@ -132,7 +132,7 @@ testdup : SUCCESS
testencode : SUCCESS
testenv : SUCCESS
testescape : SUCCESS
testfile : abcdefRandom seed for test_atomic_append() is 3617717759
testfile : abcdefRandom seed for test_atomic_append() is 2255882941
SUCCESS
testfilecopy : SUCCESS
testfileinfo : SUCCESS
Expand Down Expand Up @@ -194,23 +194,39 @@ Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 211092 bytes
apr_socket_sendfile()->0, sent 133268 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 68928 bytes from offset 131072
File: 146752 bytes from offset 53248
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->11, sent 0 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 68928 bytes from offset 131072
File: 146752 bytes from offset 53248
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 158957 bytes
apr_socket_sendfile()->0, sent 131072 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 15680 bytes from offset 184320
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->11, sent 0 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 15680 bytes from offset 184320
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 105709 bytes
After apr_socket_sendfile(), the kernel file pointer is at offset 0.
client: apr_socket_sendfile() worked as expected!
Waiting for a client to connect...
Expand All @@ -228,15 +244,23 @@ Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 211092 bytes
apr_socket_sendfile()->0, sent 133268 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 146752 bytes from offset 53248
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 131072 bytes
Calling apr_socket_sendfile()...
Headers (0):
File: 68928 bytes from offset 131072
File: 15680 bytes from offset 184320
Trailers (3):
19 bytes
10 bytes
90000 bytes
apr_socket_sendfile()->0, sent 158957 bytes
apr_socket_sendfile()->0, sent 105709 bytes
After apr_socket_sendfile(), the kernel file pointer is at offset 0.
client: apr_socket_sendfile() worked as expected!
Waiting for a client to connect...
Expand Down
4 changes: 2 additions & 2 deletions build/bat/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=bat
VER=0.24.0
VER=0.25.0
PKG=ooce/util/bat
SUMMARY="A cat clone with wings"
DESC="A cat(1) clone with syntax highlighting and Git integration."
Expand Down
2 changes: 1 addition & 1 deletion build/bat/patches/do-not-strip-symbol-table.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.toml a/Cargo.toml
--- a~/Cargo.toml 1970-01-01 00:00:00
+++ a/Cargo.toml 1970-01-01 00:00:00
@@ -105,5 +105,5 @@ features = ["wrap_help", "cargo"]
@@ -119,5 +119,5 @@ features = ["wrap_help", "cargo"]

[profile.release]
lto = true
Expand Down
Loading
Loading