Skip to content

Commit 0a8bc38

Browse files
oetikeroetiker
authored
Merge pull request #1570 from hadfl/pkgupd
package updates
2 parents 4544ecb + 3738efe commit 0a8bc38

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+861
-332
lines changed

‎build/apr/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=apr
20-
VER=1.7.4
20+
VER=1.7.5
2121
PKG=ooce/library/apr
2222
SUMMARY="The Apache Portable Runtime library"
2323
DESC="The Apache Portable Runtime is a library \

‎build/apr/testsuite-32.log

+26-25
Original file line numberDiff line numberDiff line change
@@ -20,99 +20,99 @@ APR Lock Performance Test
2020
apr_thread_mutex_t Tests
2121
Initializing the apr_thread_mutex_t (UNNESTED) OK
2222
Starting 1 threads OK
23-
microseconds: 34762 usec
23+
microseconds: 37672 usec
2424
apr_thread_mutex_t Tests
2525
Initializing the apr_thread_mutex_t (NESTED) OK
2626
Starting 1 threads OK
27-
microseconds: 28677 usec
27+
microseconds: 30852 usec
2828
apr_thread_mutex_t Tests
2929
Initializing the apr_thread_mutex_t (TIMED) OK
3030
Starting 1 threads OK
31-
microseconds: 127011 usec
31+
microseconds: 135413 usec
3232
apr_thread_rwlock_t Tests
3333
Initializing the apr_thread_rwlock_t OK
3434
Starting 1 threads OK
35-
microseconds: 86524 usec
35+
microseconds: 88560 usec
3636
apr_thread_mutex_t Tests
3737
Initializing the apr_thread_mutex_t (UNNESTED) OK
3838
Starting 2 threads OK
39-
microseconds: 340591 usec
39+
microseconds: 251673 usec
4040
apr_thread_mutex_t Tests
4141
Initializing the apr_thread_mutex_t (NESTED) OK
4242
Starting 2 threads OK
43-
microseconds: 297511 usec
43+
microseconds: 343640 usec
4444
apr_thread_mutex_t Tests
4545
Initializing the apr_thread_mutex_t (TIMED) OK
4646
Starting 2 threads OK
47-
microseconds: 738169 usec
47+
microseconds: 551905 usec
4848
apr_thread_rwlock_t Tests
4949
Initializing the apr_thread_rwlock_t OK
5050
Starting 2 threads OK
51-
microseconds: 20808963 usec
51+
microseconds: 22000495 usec
5252
apr_thread_mutex_t Tests
5353
Initializing the apr_thread_mutex_t (UNNESTED) OK
5454
Starting 3 threads OK
55-
microseconds: 768902 usec
55+
microseconds: 732865 usec
5656
apr_thread_mutex_t Tests
5757
Initializing the apr_thread_mutex_t (NESTED) OK
5858
Starting 3 threads OK
59-
microseconds: 761092 usec
59+
microseconds: 668556 usec
6060
apr_thread_mutex_t Tests
6161
Initializing the apr_thread_mutex_t (TIMED) OK
6262
Starting 3 threads OK
63-
microseconds: 2646126 usec
63+
microseconds: 1943856 usec
6464
apr_thread_rwlock_t Tests
6565
Initializing the apr_thread_rwlock_t OK
6666
Starting 3 threads OK
67-
microseconds: 29905935 usec
67+
microseconds: 33747296 usec
6868
apr_thread_mutex_t Tests
6969
Initializing the apr_thread_mutex_t (UNNESTED) OK
7070
Starting 4 threads OK
71-
microseconds: 816077 usec
71+
microseconds: 624899 usec
7272
apr_thread_mutex_t Tests
7373
Initializing the apr_thread_mutex_t (NESTED) OK
7474
Starting 4 threads OK
75-
microseconds: 1127743 usec
75+
microseconds: 1075974 usec
7676
apr_thread_mutex_t Tests
7777
Initializing the apr_thread_mutex_t (TIMED) OK
7878
Starting 4 threads OK
79-
microseconds: 1939909 usec
79+
microseconds: 1727532 usec
8080
apr_thread_rwlock_t Tests
8181
Initializing the apr_thread_rwlock_t OK
8282
Starting 4 threads OK
83-
microseconds: 41898438 usec
83+
microseconds: 44995811 usec
8484
apr_thread_mutex_t Tests
8585
Initializing the apr_thread_mutex_t (UNNESTED) OK
8686
Starting 5 threads OK
87-
microseconds: 1607704 usec
87+
microseconds: 1646400 usec
8888
apr_thread_mutex_t Tests
8989
Initializing the apr_thread_mutex_t (NESTED) OK
9090
Starting 5 threads OK
91-
microseconds: 3321441 usec
91+
microseconds: 3367823 usec
9292
apr_thread_mutex_t Tests
9393
Initializing the apr_thread_mutex_t (TIMED) OK
9494
Starting 5 threads OK
95-
microseconds: 2616998 usec
95+
microseconds: 2507277 usec
9696
apr_thread_rwlock_t Tests
9797
Initializing the apr_thread_rwlock_t OK
9898
Starting 5 threads OK
99-
microseconds: 53976071 usec
99+
microseconds: 55143040 usec
100100
apr_thread_mutex_t Tests
101101
Initializing the apr_thread_mutex_t (UNNESTED) OK
102102
Starting 6 threads OK
103-
microseconds: 2178916 usec
103+
microseconds: 2666483 usec
104104
apr_thread_mutex_t Tests
105105
Initializing the apr_thread_mutex_t (NESTED) OK
106106
Starting 6 threads OK
107-
microseconds: 1118445 usec
107+
microseconds: 1167607 usec
108108
apr_thread_mutex_t Tests
109109
Initializing the apr_thread_mutex_t (TIMED) OK
110110
Starting 6 threads OK
111-
microseconds: 3405805 usec
111+
microseconds: 3293779 usec
112112
apr_thread_rwlock_t Tests
113113
Initializing the apr_thread_rwlock_t OK
114114
Starting 6 threads OK
115-
microseconds: 65036885 usec
115+
microseconds: 65328944 usec
116116
Trying proc mutexes with mechanism `default'...
117117
mutex mechanism `default' is global in scope on this platform.
118118
Trying global mutexes with mechanism `default'...
@@ -148,7 +148,8 @@ testdup : SUCCESS
148148
testencode : SUCCESS
149149
testenv : SUCCESS
150150
testescape : SUCCESS
151-
testfile : abcdefSUCCESS
151+
testfile : abcdefRandom seed for test_atomic_append() is 1767240639
152+
SUCCESS
152153
testfilecopy : SUCCESS
153154
testfileinfo : SUCCESS
154155
testflock : SUCCESS

‎build/apr/testsuite.log

+56-32
Original file line numberDiff line numberDiff line change
@@ -4,99 +4,99 @@ APR Lock Performance Test
44
apr_thread_mutex_t Tests
55
Initializing the apr_thread_mutex_t (UNNESTED) OK
66
Starting 1 threads OK
7-
microseconds: 18319 usec
7+
microseconds: 23716 usec
88
apr_thread_mutex_t Tests
99
Initializing the apr_thread_mutex_t (NESTED) OK
1010
Starting 1 threads OK
11-
microseconds: 18115 usec
11+
microseconds: 23773 usec
1212
apr_thread_mutex_t Tests
1313
Initializing the apr_thread_mutex_t (TIMED) OK
1414
Starting 1 threads OK
15-
microseconds: 84047 usec
15+
microseconds: 91080 usec
1616
apr_thread_rwlock_t Tests
1717
Initializing the apr_thread_rwlock_t OK
1818
Starting 1 threads OK
19-
microseconds: 48251 usec
19+
microseconds: 54455 usec
2020
apr_thread_mutex_t Tests
2121
Initializing the apr_thread_mutex_t (UNNESTED) OK
2222
Starting 2 threads OK
23-
microseconds: 153029 usec
23+
microseconds: 128083 usec
2424
apr_thread_mutex_t Tests
2525
Initializing the apr_thread_mutex_t (NESTED) OK
2626
Starting 2 threads OK
27-
microseconds: 252108 usec
27+
microseconds: 321771 usec
2828
apr_thread_mutex_t Tests
2929
Initializing the apr_thread_mutex_t (TIMED) OK
3030
Starting 2 threads OK
31-
microseconds: 739863 usec
31+
microseconds: 588517 usec
3232
apr_thread_rwlock_t Tests
3333
Initializing the apr_thread_rwlock_t OK
3434
Starting 2 threads OK
35-
microseconds: 22660602 usec
35+
microseconds: 21796501 usec
3636
apr_thread_mutex_t Tests
3737
Initializing the apr_thread_mutex_t (UNNESTED) OK
3838
Starting 3 threads OK
39-
microseconds: 329025 usec
39+
microseconds: 324510 usec
4040
apr_thread_mutex_t Tests
4141
Initializing the apr_thread_mutex_t (NESTED) OK
4242
Starting 3 threads OK
43-
microseconds: 389833 usec
43+
microseconds: 421241 usec
4444
apr_thread_mutex_t Tests
4545
Initializing the apr_thread_mutex_t (TIMED) OK
4646
Starting 3 threads OK
47-
microseconds: 1270905 usec
47+
microseconds: 1091681 usec
4848
apr_thread_rwlock_t Tests
4949
Initializing the apr_thread_rwlock_t OK
5050
Starting 3 threads OK
51-
microseconds: 33086968 usec
51+
microseconds: 35814067 usec
5252
apr_thread_mutex_t Tests
5353
Initializing the apr_thread_mutex_t (UNNESTED) OK
5454
Starting 4 threads OK
55-
microseconds: 700545 usec
55+
microseconds: 958153 usec
5656
apr_thread_mutex_t Tests
5757
Initializing the apr_thread_mutex_t (NESTED) OK
5858
Starting 4 threads OK
59-
microseconds: 793559 usec
59+
microseconds: 722224 usec
6060
apr_thread_mutex_t Tests
6161
Initializing the apr_thread_mutex_t (TIMED) OK
6262
Starting 4 threads OK
63-
microseconds: 1814759 usec
63+
microseconds: 1913149 usec
6464
apr_thread_rwlock_t Tests
6565
Initializing the apr_thread_rwlock_t OK
6666
Starting 4 threads OK
67-
microseconds: 43029566 usec
67+
microseconds: 49835573 usec
6868
apr_thread_mutex_t Tests
6969
Initializing the apr_thread_mutex_t (UNNESTED) OK
7070
Starting 5 threads OK
71-
microseconds: 902172 usec
71+
microseconds: 962196 usec
7272
apr_thread_mutex_t Tests
7373
Initializing the apr_thread_mutex_t (NESTED) OK
7474
Starting 5 threads OK
75-
microseconds: 660640 usec
75+
microseconds: 654519 usec
7676
apr_thread_mutex_t Tests
7777
Initializing the apr_thread_mutex_t (TIMED) OK
7878
Starting 5 threads OK
79-
microseconds: 2337663 usec
79+
microseconds: 2530866 usec
8080
apr_thread_rwlock_t Tests
8181
Initializing the apr_thread_rwlock_t OK
8282
Starting 5 threads OK
83-
microseconds: 55699046 usec
83+
microseconds: 58232777 usec
8484
apr_thread_mutex_t Tests
8585
Initializing the apr_thread_mutex_t (UNNESTED) OK
8686
Starting 6 threads OK
87-
microseconds: 2040095 usec
87+
microseconds: 1992193 usec
8888
apr_thread_mutex_t Tests
8989
Initializing the apr_thread_mutex_t (NESTED) OK
9090
Starting 6 threads OK
91-
microseconds: 1201804 usec
91+
microseconds: 1236000 usec
9292
apr_thread_mutex_t Tests
9393
Initializing the apr_thread_mutex_t (TIMED) OK
9494
Starting 6 threads OK
95-
microseconds: 3418914 usec
95+
microseconds: 3415026 usec
9696
apr_thread_rwlock_t Tests
9797
Initializing the apr_thread_rwlock_t OK
9898
Starting 6 threads OK
99-
microseconds: 66778145 usec
99+
microseconds: 66348197 usec
100100
Trying proc mutexes with mechanism `default'...
101101
mutex mechanism `default' is global in scope on this platform.
102102
Trying global mutexes with mechanism `default'...
@@ -132,7 +132,7 @@ testdup : SUCCESS
132132
testencode : SUCCESS
133133
testenv : SUCCESS
134134
testescape : SUCCESS
135-
testfile : abcdefRandom seed for test_atomic_append() is 3617717759
135+
testfile : abcdefRandom seed for test_atomic_append() is 2255882941
136136
SUCCESS
137137
testfilecopy : SUCCESS
138138
testfileinfo : SUCCESS
@@ -194,23 +194,39 @@ Trailers (3):
194194
19 bytes
195195
10 bytes
196196
90000 bytes
197-
apr_socket_sendfile()->0, sent 211092 bytes
197+
apr_socket_sendfile()->0, sent 133268 bytes
198198
Calling apr_socket_sendfile()...
199199
Headers (0):
200-
File: 68928 bytes from offset 131072
200+
File: 146752 bytes from offset 53248
201201
Trailers (3):
202202
19 bytes
203203
10 bytes
204204
90000 bytes
205205
apr_socket_sendfile()->11, sent 0 bytes
206206
Calling apr_socket_sendfile()...
207207
Headers (0):
208-
File: 68928 bytes from offset 131072
208+
File: 146752 bytes from offset 53248
209209
Trailers (3):
210210
19 bytes
211211
10 bytes
212212
90000 bytes
213-
apr_socket_sendfile()->0, sent 158957 bytes
213+
apr_socket_sendfile()->0, sent 131072 bytes
214+
Calling apr_socket_sendfile()...
215+
Headers (0):
216+
File: 15680 bytes from offset 184320
217+
Trailers (3):
218+
19 bytes
219+
10 bytes
220+
90000 bytes
221+
apr_socket_sendfile()->11, sent 0 bytes
222+
Calling apr_socket_sendfile()...
223+
Headers (0):
224+
File: 15680 bytes from offset 184320
225+
Trailers (3):
226+
19 bytes
227+
10 bytes
228+
90000 bytes
229+
apr_socket_sendfile()->0, sent 105709 bytes
214230
After apr_socket_sendfile(), the kernel file pointer is at offset 0.
215231
client: apr_socket_sendfile() worked as expected!
216232
Waiting for a client to connect...
@@ -228,15 +244,23 @@ Trailers (3):
228244
19 bytes
229245
10 bytes
230246
90000 bytes
231-
apr_socket_sendfile()->0, sent 211092 bytes
247+
apr_socket_sendfile()->0, sent 133268 bytes
248+
Calling apr_socket_sendfile()...
249+
Headers (0):
250+
File: 146752 bytes from offset 53248
251+
Trailers (3):
252+
19 bytes
253+
10 bytes
254+
90000 bytes
255+
apr_socket_sendfile()->0, sent 131072 bytes
232256
Calling apr_socket_sendfile()...
233257
Headers (0):
234-
File: 68928 bytes from offset 131072
258+
File: 15680 bytes from offset 184320
235259
Trailers (3):
236260
19 bytes
237261
10 bytes
238262
90000 bytes
239-
apr_socket_sendfile()->0, sent 158957 bytes
263+
apr_socket_sendfile()->0, sent 105709 bytes
240264
After apr_socket_sendfile(), the kernel file pointer is at offset 0.
241265
client: apr_socket_sendfile() worked as expected!
242266
Waiting for a client to connect...

‎build/bat/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=bat
20-
VER=0.24.0
20+
VER=0.25.0
2121
PKG=ooce/util/bat
2222
SUMMARY="A cat clone with wings"
2323
DESC="A cat(1) clone with syntax highlighting and Git integration."

‎build/bat/patches/do-not-strip-symbol-table.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.toml a/Cargo.toml
22
--- a~/Cargo.toml 1970-01-01 00:00:00
33
+++ a/Cargo.toml 1970-01-01 00:00:00
4-
@@ -105,5 +105,5 @@ features = ["wrap_help", "cargo"]
4+
@@ -119,5 +119,5 @@ features = ["wrap_help", "cargo"]
55

66
[profile.release]
77
lto = true

0 commit comments

Comments
 (0)