Merge pull request #3869 from citrus-it/pkgupd

Core package updates
omniosorg · Mar 3, 2025 · ecb3075 · ecb3075
2 parents b551d46 + 825d6c4
commit ecb3075
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 505 deletions.
diff --git a/build/dbus/build.sh b/build/dbus/build.sh
@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=dbus
-VER=1.16.0
+VER=1.16.2
 PKG=dbus ##IGNORE##
 SUMMARY="filled in below"
 DESC="$SUMMARY"

diff --git a/build/dbus/patches/inline.patch b/build/dbus/patches/inline.patch
@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-address.h a/dbus/dbus-address.h
 --- a~/dbus/dbus-address.h	1970-01-01 00:00:00
 +++ a/dbus/dbus-address.h	1970-01-01 00:00:00
-@@ -71,12 +71,9 @@ char* dbus_address_unescape_value (const
+@@ -73,12 +73,9 @@ char* dbus_address_unescape_value (const
   * pointer_to_entries must not be #NULL, but *pointer_to_entries
   * may be #NULL.
   */
@@ -20,7 +20,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-address.h a/dbus/db
 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-connection.h a/dbus/dbus-connection.h
 --- a~/dbus/dbus-connection.h	1970-01-01 00:00:00
 +++ a/dbus/dbus-connection.h	1970-01-01 00:00:00
-@@ -461,12 +461,9 @@ dbus_bool_t dbus_connection_get_socket
+@@ -466,12 +466,9 @@ dbus_bool_t dbus_connection_get_socket
   * pointer_to_connection must not be #NULL, but *pointer_to_connection
   * may be #NULL.
   */
@@ -39,7 +39,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-connection.h a/dbus
 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-message.h a/dbus/dbus-message.h
 --- a~/dbus/dbus-message.h	1970-01-01 00:00:00
 +++ a/dbus/dbus-message.h	1970-01-01 00:00:00
-@@ -369,12 +369,8 @@ dbus_bool_t dbus_message_get_allow_inter
+@@ -387,12 +387,8 @@ dbus_bool_t dbus_message_get_allow_inter
   * pointer_to_message must not be #NULL, but *pointer_to_message
   * may be #NULL.
   */
@@ -57,7 +57,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-message.h a/dbus/db
 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-pending-call.h a/dbus/dbus-pending-call.h
 --- a~/dbus/dbus-pending-call.h	1970-01-01 00:00:00
 +++ a/dbus/dbus-pending-call.h	1970-01-01 00:00:00
-@@ -84,12 +84,9 @@ void*       dbus_pending_call_get_data
+@@ -86,12 +86,9 @@ void*       dbus_pending_call_get_data
   * pointer_to_pending_call must not be #NULL, but *pointer_to_pending_call
   * may be #NULL.
   */
@@ -76,7 +76,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-pending-call.h a/db
 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-server.h a/dbus/dbus-server.h
 --- a~/dbus/dbus-server.h	1970-01-01 00:00:00
 +++ a/dbus/dbus-server.h	1970-01-01 00:00:00
-@@ -112,11 +112,8 @@ void*       dbus_server_get_data
+@@ -114,11 +114,8 @@ void*       dbus_server_get_data
   * pointer_to_server must not be #NULL, but *pointer_to_server
   * may be #NULL.
   */

diff --git a/build/dbus/patches/installdir.patch b/build/dbus/patches/installdir.patch
@@ -1,7 +1,6 @@
-diff --git a/bus/meson.build b/bus/meson.build
-index 176894d..6f2b15f 100644
---- a/bus/meson.build
-+++ b/bus/meson.build
+diff -wpruN --no-dereference '--exclude=*.orig' a~/bus/meson.build a/bus/meson.build
+--- a~/bus/meson.build	1970-01-01 00:00:00
++++ a/bus/meson.build	1970-01-01 00:00:00
 @@ -139,6 +139,7 @@ dbus_daemon = executable('dbus-daemon',
      include_directories: root_include,
      link_with: libdbus_daemon_internal,

diff --git a/build/dbus/testsuite.log b/build/dbus/testsuite.log
@@ -18,8 +18,8 @@
 18/28 dbus:dbus / userdb                            OK                  1 subtests passed
 19/28 dbus:dbus / variant                           OK                  2 subtests passed
 20/28 dbus:dbus / sysdeps                           OK                  3 subtests passed
-21/28 dbus:dbus / hash                              OK                  1 subtests passed
-22/28 dbus:runs-dbus-daemon+slow / header-fields    OK                  5 subtests passed
+21/28 dbus:runs-dbus-daemon+slow / header-fields    OK                  5 subtests passed
+22/28 dbus:dbus / hash                              OK                  1 subtests passed
 23/28 dbus:dbus / relay                             OK                  6 subtests passed
 24/28 dbus:dbus / test-dbus-daemon-fork.sh          OK               
 25/28 dbus:runs-dbus-daemon / sd-activation         OK                  8 subtests passed

diff --git a/build/gettext/build.sh b/build/gettext/build.sh
@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=gettext
-VER=0.23.1
+VER=0.24
 PKG=text/gnu-gettext
 SUMMARY="gettext - GNU gettext utility"
 DESC="GNU gettext - GNU gettext utility"
@@ -49,6 +49,7 @@ PKGDIFF_HELPER='
 init
 download_source $PROG $PROG $VER
 patch_source
+run_autoreconf -fi
 prep_build
 build
 run_testsuite check

diff --git a/build/gettext/patches/configure.patch b/build/gettext/patches/configure.patch
@@ -0,0 +1,12 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/gettext-tools/gnulib-m4/getaddrinfo.m4 a/gettext-tools/gnulib-m4/getaddrinfo.m4
+--- a~/gettext-tools/gnulib-m4/getaddrinfo.m4	1970-01-01 00:00:00
++++ a/gettext-tools/gnulib-m4/getaddrinfo.m4	1970-01-01 00:00:00
+@@ -108,7 +108,7 @@ int getaddrinfo (const char *, const cha
+ #include <string.h>
+             ]], [[
+               struct addrinfo hints;
+-              struct addrinfo ai;
++              struct addrinfo *ai;
+               memset (&hints, 0, sizeof (hints));
+               hints.ai_flags = AI_NUMERICSERV;
+               return getaddrinfo ("www.gnu.org", "http", &hints, &ai) != EAI_NONAME;
diff --git a/build/gettext/patches/series b/build/gettext/patches/series
@@ -0,0 +1 @@
+configure.patch