omniosorg · hadfl · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024
@@ -18,12 +18,12 @@
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.18.30
+VER=9.18.31
 PKG=network/dns/bind
 SUMMARY="BIND DNS tools"
 DESC="Client utilities for DNS lookups"
 
-LIBUVVER=1.49.1
+LIBUVVER=1.49.2
 XFORM_ARGS+=" -DLIBUV=$LIBUVVER"
 
 # This package ships private shared libraries in $PREFIX/lib/dns that are only

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=curl
-VER=8.10.1
+VER=8.11.0
 PKG=web/curl
 SUMMARY="Command line tool for transferring data with URL syntax"
 DESC="Curl is a command line tool for transferring data with URL syntax, "

@@ -1,3 +1,3 @@
-TESTDONE: 1728 tests were considered during 543 seconds.
-TESTDONE: 1392 tests out of 1393 reported OK: 99%
+TESTDONE: 1739 tests were considered during 629 seconds.
+TESTDONE: 1430 tests out of 1431 reported OK: 99%
 TESTFAIL: These test cases failed: 1004
@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=expat
-VER=2.6.3
+VER=2.6.4
 PKG=library/expat
 SUMMARY="XML parser library"
 DESC="Fast streaming XML parser written in C"
@@ -40,7 +40,6 @@ PKGDIFF_HELPER="
 init
 download_source $PROG $PROG $VER
 patch_source
-run_inbuild ./buildconf.sh
 prep_build autoconf -oot
 build -multi
 run_testsuite check

@@ -1,7 +1,7 @@
 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
-@@ -3882,7 +3882,7 @@ case $host in
+@@ -3924,7 +3924,7 @@ case $host in
    AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
    ;;
  *)

@@ -21,7 +21,7 @@
 . ../../lib/build.sh
 
 PROG=fio
-VER=3.37
+VER=3.38
 PKG=system/test/fio
 SUMMARY="Flexible IO Tester"
 DESC="A tool that is able to simulate a given I/O workload"

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
 --- a~/Makefile	1970-01-01 00:00:00
 +++ a/Makefile	1970-01-01 00:00:00
-@@ -500,11 +500,11 @@ endif
+@@ -477,11 +477,11 @@ endif
  endif
 
  ifeq ($(CONFIG_TARGET_OS), SunOS)
@@ -15,7 +15,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
  bindir = $(prefix)/bin
  libdir = $(prefix)/lib/fio
 
-@@ -512,7 +512,7 @@ ifeq ($(CONFIG_TARGET_OS), Darwin)
+@@ -489,7 +489,7 @@ ifeq ($(CONFIG_TARGET_OS), Darwin)
  mandir = /usr/share/man
  sharedir = /usr/share/fio
  else

@@ -4,7 +4,7 @@ Prevent unecessary linking with old filter libraries.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
 --- a~/Makefile	1970-01-01 00:00:00
 +++ a/Makefile	1970-01-01 00:00:00
-@@ -260,7 +260,7 @@ endif
+@@ -237,7 +237,7 @@ endif
    LDFLAGS += -rdynamic
  endif
  ifeq ($(CONFIG_TARGET_OS), SunOS)
@@ -16,7 +16,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
 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
-@@ -921,7 +921,7 @@ int main(void)
+@@ -926,7 +926,7 @@ int main(void)
  EOF
  if compile_prog "" "-laio" "solarisaio" ; then
    solaris_aio=yes

@@ -19,7 +19,7 @@
 . ../../lib/build.sh
 
 PROG=git
-VER=2.46.2
+VER=2.47.0
 PKG=developer/versioning/git
 SUMMARY="$PROG - distributed version control system"
 DESC="Git is a free and open source distributed version control system "

@@ -3,7 +3,7 @@
 *** t0000-basic.sh ***
 # passed all 92 test(s)
 *** t0001-init.sh ***
-# passed all 78 test(s)
+# passed all 91 test(s)
 *** t0002-gitfile.sh ***
 # passed all 14 test(s)
 *** t0003-attributes.sh ***
@@ -20,8 +20,6 @@
 # passed all 397 test(s)
 *** t0010-racy-git.sh ***
 # passed all 10 test(s)
-*** t0011-hashmap.sh ***
-# passed all 14 test(s)
 *** t0012-help.sh ***
 # passed all 174 test(s)
 *** t0013-sha1dc.sh ***
@@ -55,8 +53,6 @@
 *** t0029-core-unsetenvvars.sh ***
 *** t0030-stripspace.sh ***
 # passed all 30 test(s)
-*** t0032-reftable-unittest.sh ***
-# passed all 1 test(s)
 *** t0033-safe-directory.sh ***
 # passed all 22 test(s)
 *** t0034-root-safe-directory.sh ***
@@ -83,8 +79,6 @@
 # passed all 2 test(s)
 *** t0063-string-list.sh ***
 # passed all 14 test(s)
-*** t0064-oid-array.sh ***
-# passed all 9 test(s)
 *** t0066-dir-iterator.sh ***
 # passed all 10 test(s)
 *** t0067-parse_pathspec_file.sh ***
@@ -111,8 +105,6 @@
 # passed all 6 test(s)
 *** t0101-at-syntax.sh ***
 # passed all 8 test(s)
-*** t0110-urlmatch-normalization.sh ***
-# passed all 11 test(s)
 *** t0200-gettext-basic.sh ***
 # lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
 # lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
@@ -145,6 +137,6 @@ not ok 6 - gettext: Fetching a UTF-8 msgid -> ISO-8859-1
 #	    grep "$(echo tvöfaldar | iconv -f UTF-8 -t ISO8859-1)" actual
 #	
 # failed 2 among 8 test(s)
-make[2]: *** [Makefile:75: t0204-gettext-reencode-sanity.sh] Error 1
-make[1]: *** [Makefile:62: test] Error 2
-make: *** [Makefile:3235: test] Error 2
+make[2]: *** [Makefile:77: t0204-gettext-reencode-sanity.sh] Error 1
+make[1]: *** [Makefile:63: test] Error 2
+make: *** [Makefile:3273: test] Error 2
@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=glib
-VER=2.82.1
+VER=2.82.2
 PKG=library/glib2
 SUMMARY="GNOME utility library"
 DESC="The GNOME general-purpose utility library"

@@ -226,7 +226,7 @@ glib:glib+core / types                                                 OK   1 su
 glib:glib+core / unicode                                               OK   38 subtests passed
 glib:glib+core / unicode-encoding                                      ERROR   killed by signal 6 SIGABRT
 glib:glib+core / unicode-normalize                                     OK   3 subtests passed
-glib:glib+core / unix                                                  ERROR   killed by signal 11 SIGSEGV
+glib:glib+core / unix                                                  OK   20 subtests passed
 glib:glib+core / uri                                                   OK   24 subtests passed
 glib:glib+core / utf8-misc                                             OK   7 subtests passed
 glib:glib+core / utf8-performance                                      OK   36 subtests passed
@@ -355,15 +355,14 @@ glib:glib+core / mapping                                               ERROR   k
 glib:glib+core / string                                                ERROR   killed by signal 6 SIGABRT
 glib:glib+core / unicode-encoding                                      ERROR   killed by signal 6 SIGABRT
 glib:glib+core / gutils-user-database                                  ERROR   killed by signal 5 SIGTRAP
-glib:glib+core / unix                                                  ERROR   killed by signal 11 SIGSEGV
 glib:gio / converter-stream                                            ERROR   killed by signal 11 SIGSEGV
 glib:gio / appmonitor                                                  ERROR   killed by signal 6 SIGABRT
 glib:gio / unix-mounts                                                 ERROR   killed by signal 6 SIGABRT
 glib:gio / gsettings                                                   ERROR   killed by signal 5 SIGTRAP
 
-Ok:                 333 
+Ok:                 334 
 Expected Fail:      0   
-Fail:               10  
+Fail:               9   
 Unexpected Pass:    0   
 Skipped:            6   
 Timeout:            0   

@@ -26,7 +26,7 @@
 . ../../lib/build.sh
 
 PROG=less
-VER=661
+VER=668
 PKG=text/less
 SUMMARY="less - paginator"
 DESC="A program similar to more, but which allows backward movement "

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=liboqs
-VER=0.10.1
+VER=0.11.0
 PKG=library/security/liboqs
 SUMMARY="$PROG"
 DESC="An open source C library for quantum-safe cryptographic algorithms"

@@ -1 +1,2 @@
 system-processor.patch
+testsuite.patch
@@ -0,0 +1,64 @@
+From a5528768a1e7a254707bad1b54d8e2f65c9490d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Iy=C3=A1n?= <[email protected]>
+Date: Fri, 27 Sep 2024 21:10:33 +0200
+Subject: [PATCH] Remove hardcoded build patch from test script (#1938)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a user has passed a custom build path to cmake, and then calls for
+example `ninja -C <custom_build_path> run_tests`, the script
+test_acvp_vectors.py fails due to having "build" harcoded in the calls.
+
+Instead, let's use `helpers.get_current_build_dir_name()` to get the build
+path and use that instead. This is already done in other scripts (e.g.,
+test_binary.py)
+
+Signed-off-by: Iyán Méndez Veiga <[email protected]>
+---
+ tests/test_acvp_vectors.py | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_acvp_vectors.py b/tests/test_acvp_vectors.py
+index 4eee4b810..ddd64003c 100644
+--- a/tests/test_acvp_vectors.py
++++ b/tests/test_acvp_vectors.py
+@@ -36,9 +36,10 @@ def test_acvp_vec_kem_keygen(kem_name):
+                     z = testCase["z"]
+                     pk = testCase["ek"]
+                     sk = testCase["dk"]
+-                    
++
++                    build_dir = helpers.get_current_build_dir_name()
+                     helpers.run_subprocess(
+-                        ['build/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk]
++                        [f'{build_dir}/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk]
+                     )
+
+         assert(variantFound == True)
+@@ -66,9 +67,10 @@ def test_acvp_vec_kem_encdec_aft(kem_name):
+                     #expected results
+                     k = testCase["k"]
+                     c = testCase["c"]
+-                                        
++
++                    build_dir = helpers.get_current_build_dir_name()
+                     helpers.run_subprocess(
+-                        ['build/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c]
++                        [f'{build_dir}/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c]
+                     )
+
+         assert(variantFound == True)
+@@ -94,9 +96,10 @@ def test_acvp_vec_kem_encdec_val(kem_name):
+                     c = testCase["c"]
+                     #expected results
+                     k = testCase["k"]
+-                                        
++
++                    build_dir = helpers.get_current_build_dir_name()
+                     helpers.run_subprocess(
+-                        ['build/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c]
++                        [f'{build_dir}/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c]
+                     )
+
+         assert(variantFound == True)