Merge pull request #3353 from citrus-it/pkgupd

Core package updates

build/curl/build.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=curl
-VER=8.2.1
+VER=8.3.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, "
@@ -32,6 +32,7 @@ CONFIGURE_OPTS="
     --with-ca-bundle=/etc/ssl/cacert.pem
     --with-ca-path=/etc/ssl/certs
     --with-openssl
+    --disable-manual
 "
 
 # Build backwards so that the 32-bit version is available for the test-suite.

build/curl/testsuite.log

@@ -1,3 +1,3 @@
-TESTDONE: 1611 tests were considered during 440 seconds.
-TESTDONE: 1300 tests out of 1301 reported OK: 99%
+TESTDONE: 1635 tests were considered during 463 seconds.
+TESTDONE: 1316 tests out of 1317 reported OK: 99%
 TESTFAIL: These test cases failed: 1004 

build/dbus/build.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=dbus
-VER=1.14.8
+VER=1.14.10
 PKG=dbus ##IGNORE##
 SUMMARY="filled in below"
 DESC="$SUMMARY"

build/dbus/testsuite.log

@@ -216,6 +216,7 @@ SKIP: test-uid-permissions 1 /uid-permissions/uae/other # SKIP cannot use altern
 SKIP: test-uid-permissions 2 /uid-permissions/monitor/root # SKIP cannot use alternative uid when not uid 0
 SKIP: test-uid-permissions 3 /uid-permissions/monitor/messagebus # SKIP cannot use alternative uid when not uid 0
 SKIP: test-uid-permissions 4 /uid-permissions/monitor/other # SKIP cannot use alternative uid when not uid 0
+PASS: test-userdb 1 /userdb/groups_from_uid
 PASS: test-variant 1 /variant/simple
 PASS: test-variant 2 /variant/oom
 PASS: test-containers 1 /containers/get-supported-arguments
@@ -244,10 +245,10 @@ PASS: test-sd-activation 6 /sd-activation/deny-receive/com.example.ReceiveDenied
 PASS: test-sd-activation 7 /sd-activation/transient-services/later
 PASS: test-sd-activation 8 /sd-activation/transient-services/in-advance
 ============================================================================
-Testsuite summary for dbus 1.14.8
+Testsuite summary for dbus 1.14.10
 ============================================================================
-# TOTAL: 239
-# PASS:  202
+# TOTAL: 240
+# PASS:  203
 # SKIP:  37
 # XFAIL: 0
 # FAIL:  0
@@ -256,7 +257,7 @@ Testsuite summary for dbus 1.14.8
 ============================================================================
 Making check in name-test
 ============================================================================
-Testsuite summary for dbus 1.14.8
+Testsuite summary for dbus 1.14.10
 ============================================================================
 # TOTAL: 0
 # PASS:  0

build/glib/build.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=glib
-VER=2.76.5
+VER=2.78.0
 PKG=library/glib2
 SUMMARY="GNOME utility library"
 DESC="The GNOME general-purpose utility library"

build/glib/patches/libsocket.patch

@@ -1,7 +1,20 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/meson.build a/gio/tests/meson.build
 --- a~/gio/tests/meson.build	1970-01-01 00:00:00
 +++ a/gio/tests/meson.build	1970-01-01 00:00:00
-@@ -118,6 +118,8 @@ gio_tests = {
+@@ -100,7 +100,11 @@ gio_tests = {
+   'memory-output-stream' : {},
+   'memory-settings-backend' : {},
+   'mount-operation' : {},
+-  'network-address' : {'extra_sources': ['mock-resolver.c']},
++  'network-address' : {
++    'extra_sources': ['mock-resolver.c'],
++    'c_args' : network_args,
++    'dependencies' : network_libs,
++  },
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'null-settings-backend' : {},
+@@ -119,6 +123,8 @@ gio_tests = {
    'socket' : {
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
      'can_fail' : host_system == 'darwin',
@@ -10,7 +23,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/meson.build a/gio/t
    },
    'socket-listener' : {},
    'socket-service' : {},
-@@ -132,7 +134,10 @@ gio_tests = {
+@@ -133,7 +139,10 @@ gio_tests = {
    'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
    'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
    'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
@@ -22,7 +35,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/meson.build a/gio/t
    'gdbus-address-get-session' : {
      'extra_programs': host_system != 'windows' ? ['dbus-launch'] : [],
      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-@@ -228,7 +233,10 @@ endif
+@@ -233,7 +242,10 @@ endif
  if host_machine.system() != 'windows'
    gio_tests += {
      'file' : {},
@@ -34,7 +47,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/meson.build a/gio/t
      'gdbus-sasl' : {},
      'live-g-file' : {},
      'portal-support-flatpak-none' : {
-@@ -272,7 +280,10 @@ if host_machine.system() != 'windows'
+@@ -277,7 +289,10 @@ if host_machine.system() != 'windows'
      },
      'resolver-parsing' : {'dependencies' : [network_libs]},
      'socket-address' : {},
@@ -46,7 +59,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/meson.build a/gio/t
      'unix-mounts' : {},
      'unix-streams' : {},
      'g-file-info-filesystem-readonly' : {},
-@@ -519,8 +530,8 @@ if host_machine.system() != 'windows'
+@@ -530,8 +545,8 @@ if host_machine.system() != 'windows'
 
    # This test is currently unreliable
    executable('gdbus-overflow', 'gdbus-overflow.c',

build/glib/patches/mntent.patch

@@ -5,7 +5,7 @@ OmniOS and mnt_opts on Linux; adjust.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/gunixmounts.c a/gio/gunixmounts.c
 --- a~/gio/gunixmounts.c	1970-01-01 00:00:00
 +++ a/gio/gunixmounts.c	1970-01-01 00:00:00
-@@ -632,7 +632,7 @@ _g_get_unix_mounts (void)
+@@ -641,7 +641,7 @@ _g_get_unix_mounts (void)
                                               mntent->mnt_dir,
                                               NULL,
                                               mntent->mnt_type,
@@ -14,7 +14,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/gunixmounts.c a/gio/gunix
                                               is_read_only);
 
        g_hash_table_insert (mounts_hash,
-@@ -747,7 +747,7 @@ _g_get_unix_mounts (void)
+@@ -756,7 +756,7 @@ _g_get_unix_mounts (void)
                                               mntent.mnt_mountp,
                                               NULL,
                                               mntent.mnt_fstype,
@@ -23,7 +23,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/gunixmounts.c a/gio/gunix
                                               is_read_only);
 
        return_list = g_list_prepend (return_list, mount_entry);
-@@ -1170,7 +1170,7 @@ _g_get_unix_mount_points (void)
+@@ -1179,7 +1179,7 @@ _g_get_unix_mount_points (void)
        mount_point = create_unix_mount_point (device_path,
                                               mntent->mnt_dir,
                                               mntent->mnt_type,

build/glib/patches/no_inotify.patch

@@ -1,15 +1,15 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/meson.build a/meson.build
 --- a~/meson.build	1970-01-01 00:00:00
 +++ a/meson.build	1970-01-01 00:00:00
-@@ -367,7 +367,6 @@ headers = [
+@@ -376,7 +376,6 @@ headers = [
    'sys/auxv.h',
    'sys/event.h',
    'sys/filio.h',
 -  'sys/inotify.h',
    'sys/mkdev.h',
    'sys/mntctl.h',
    'sys/mnttab.h',
-@@ -628,7 +627,6 @@ functions = [
+@@ -639,7 +638,6 @@ functions = [
    'getvfsstat',
    'gmtime_r',
    'hasmntopt',

build/glib/patches/ptrace.patch

@@ -0,0 +1,13 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/gio/tests/gsubprocess-testprog.c a/gio/tests/gsubprocess-testprog.c
+--- a~/gio/tests/gsubprocess-testprog.c	1970-01-01 00:00:00
++++ a/gio/tests/gsubprocess-testprog.c	1970-01-01 00:00:00
+@@ -5,7 +5,9 @@
+ #include <errno.h>
+ #ifdef G_OS_UNIX
+ #include <unistd.h>
++#ifndef __illumos__
+ #include <sys/ptrace.h>
++#endif
+ #else
+ #include <io.h>
+ #endif

build/glib/patches/series

@@ -6,3 +6,4 @@ devnull_poll.patch
 strftime.patch
 printf.patch
 test-credentials-clear-error.patch
+ptrace.patch