main/dbus: update to 1.16.0

chimera-linux · Jan 14, 2025 · 3fb68e2 · 3fb68e2
1 parent 5fa406c
commit 3fb68e2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 49 deletions.
diff --git a/main/dbus/patches/0001-add-flag-for-dinit-activated-launch.patch b/main/dbus/patches/0001-add-flag-for-dinit-activated-launch.patch
@@ -1,4 +1,4 @@
-From 8c8503624ed6ce76f24d56409ee185e939ad52b0 Mon Sep 17 00:00:00 2001
+From b60d7689eb6ac54554f3505aa3c7407b1f253d38 Mon Sep 17 00:00:00 2001
 From: q66 <[email protected]>
 Date: Sun, 24 Nov 2024 20:08:28 +0100
 Subject: [PATCH 1/2] add flag for dinit-activated launch
@@ -10,7 +10,7 @@ Subject: [PATCH 1/2] add flag for dinit-activated launch
  3 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/bus/bus.c b/bus/bus.c
-index 11de90d..f7fc1b5 100644
+index eaa8f2a..06bf7e3 100644
 --- a/bus/bus.c
 +++ b/bus/bus.c
 @@ -77,6 +77,7 @@ struct BusContext
@@ -33,7 +33,7 @@ index 11de90d..f7fc1b5 100644
    /* Check for an existing pid file. Of course this is a race;
     * we'd have to use fcntl() locks on the pid file to
     * avoid that. But we want to check for the pid file
-@@ -1353,6 +1359,12 @@ bus_context_get_systemd_activation (BusContext *context)
+@@ -1341,6 +1347,12 @@ bus_context_get_systemd_activation (BusContext *context)
    return context->systemd_activation;
  }
 
@@ -47,10 +47,10 @@ index 11de90d..f7fc1b5 100644
  bus_context_get_registry (BusContext  *context)
  {
 diff --git a/bus/bus.h b/bus/bus.h
-index bc8b42c..75b020b 100644
+index b970be6..127683d 100644
 --- a/bus/bus.h
 +++ b/bus/bus.h
-@@ -81,7 +81,8 @@ typedef enum
+@@ -83,7 +83,8 @@ typedef enum
    BUS_CONTEXT_FLAG_SYSTEMD_ACTIVATION = (1 << 4),
    BUS_CONTEXT_FLAG_SYSLOG_ALWAYS = (1 << 5),
    BUS_CONTEXT_FLAG_SYSLOG_NEVER = (1 << 6),
@@ -60,7 +60,7 @@ index bc8b42c..75b020b 100644
  } BusContextFlags;
 
  BusContext*       bus_context_new                                (const DBusString *config_file,
-@@ -102,6 +103,7 @@ const char*       bus_context_get_type                           (BusContext
+@@ -104,6 +105,7 @@ const char*       bus_context_get_type                           (BusContext
  const char*       bus_context_get_address                        (BusContext       *context);
  const char*       bus_context_get_servicehelper                  (BusContext       *context);
  dbus_bool_t       bus_context_get_systemd_activation             (BusContext       *context);
@@ -69,18 +69,18 @@ index bc8b42c..75b020b 100644
  BusConnections*   bus_context_get_connections                    (BusContext       *context);
  BusActivation*    bus_context_get_activation                     (BusContext       *context);
 diff --git a/bus/main.c b/bus/main.c
-index 5f756d5..a85aff5 100644
+index cf1abc6..65fefa1 100644
 --- a/bus/main.c
 +++ b/bus/main.c
-@@ -173,6 +173,7 @@ usage (void)
+@@ -175,6 +175,7 @@ usage (void)
  #ifdef DBUS_UNIX
        " [--fork]"
        " [--systemd-activation]"
 +      " [--dinit]"
  #endif
        "\n");
    exit (1);
-@@ -506,6 +507,10 @@ main (int argc, char **argv)
+@@ -505,6 +506,10 @@ main (int argc, char **argv)
          {
            flags |= BUS_CONTEXT_FLAG_SYSTEMD_ACTIVATION;
          }
@@ -92,5 +92,5 @@ index 5f756d5..a85aff5 100644
        else if (strcmp (arg, "--nopidfile") == 0)
          {
 -- 
-2.47.0
+2.48.0
 
diff --git a/main/dbus/patches/0002-add-dinit-environment-updating.patch b/main/dbus/patches/0002-add-dinit-environment-updating.patch
@@ -1,4 +1,4 @@
-From 77e1c81af72f4faa99b45534526bb7a3ae66ed36 Mon Sep 17 00:00:00 2001
+From 9d719eb914d13ba5c07dd04ee46296e024bc9a83 Mon Sep 17 00:00:00 2001
 From: q66 <[email protected]>
 Date: Sun, 24 Nov 2024 20:14:30 +0100
 Subject: [PATCH 2/2] add dinit environment updating
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] add dinit environment updating
  1 file changed, 25 insertions(+), 10 deletions(-)
 
 diff --git a/bus/driver.c b/bus/driver.c
-index 8ea2955..7d8c2ce 100644
+index fa4213c..fa9acc2 100644
 --- a/bus/driver.c
 +++ b/bus/driver.c
-@@ -1189,18 +1189,25 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
+@@ -1169,18 +1169,25 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
 
    _dbus_assert (_dbus_list_get_length (&keys) == _dbus_list_get_length (&values));
 
@@ -43,7 +43,7 @@ index 8ea2955..7d8c2ce 100644
            goto out;
          }
 
-@@ -1211,7 +1218,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
+@@ -1191,7 +1198,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
                                               &systemd_iter))
          {
            BUS_SET_OOM (error);
@@ -52,7 +52,7 @@ index 8ea2955..7d8c2ce 100644
            goto out;
          }
      }
-@@ -1244,7 +1251,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
+@@ -1224,7 +1231,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
                !_dbus_string_append_printf (&envline, "%s=%s", key, value))
              {
                BUS_SET_OOM (error);
@@ -61,7 +61,7 @@ index 8ea2955..7d8c2ce 100644
                _dbus_string_free (&envline);
                break;
              }
-@@ -1255,7 +1262,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
+@@ -1235,7 +1242,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
                                                 DBUS_TYPE_STRING, &s))
              {
                BUS_SET_OOM (error);
@@ -70,7 +70,7 @@ index 8ea2955..7d8c2ce 100644
                _dbus_string_free (&envline);
                break;
              }
-@@ -1283,7 +1290,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
+@@ -1263,7 +1270,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
        if (!dbus_message_iter_close_container (&iter, &systemd_iter))
          {
            BUS_SET_OOM (error);
@@ -79,7 +79,7 @@ index 8ea2955..7d8c2ce 100644
            goto out;
          }
 
-@@ -3195,6 +3202,14 @@ features_getter (BusContext      *context,
+@@ -3135,6 +3142,14 @@ features_getter (BusContext      *context,
          goto abandon;
      }
 
@@ -95,5 +95,5 @@ index 8ea2955..7d8c2ce 100644
 
  abandon:
 -- 
-2.47.0
+2.48.0
 
diff --git a/main/dbus/patches/fix-32bit-int.patch b/main/dbus/patches/fix-32bit-int.patch
diff --git a/main/dbus/template.py b/main/dbus/template.py
@@ -1,24 +1,23 @@
 pkgname = "dbus"
-pkgver = "1.14.10"
-pkgrel = 15
-build_style = "gnu_configure"
+pkgver = "1.16.0"
+pkgrel = 0
+build_style = "meson"
 configure_args = [
     "--libexecdir=/usr/lib",  # XXX drop libexec
-    "--disable-selinux",
-    "--disable-asserts",
-    "--disable-systemd",
-    "--disable-user-session",
-    "--disable-doxygen-docs",
-    "--enable-inotify",
-    "--enable-xml-docs",
-    "--enable-epoll",
-    "--enable-traditional-activation",
-    "--with-dbus-user=dbus",
-    "--with-system-socket=/run/dbus/system_bus_socket",
-    "--with-system-pid-file=/run/dbus/pid",
+    "-Dasserts=false",
+    "-Ddbus_user=dbus",
+    "-Ddoxygen_docs=disabled",
+    "-Depoll=enabled",
+    "-Dinotify=enabled",
+    "-Dselinux=disabled",
+    "-Dsystem_pid_file=/run/dbus/pid",
+    "-Dsystem_socket=/run/dbus/system_bus_socket",
+    "-Dsystemd=disabled",
+    "-Duser_session=false",
+    "-Dtraditional_activation=true",
+    "-Dxml_docs=enabled",
 ]
-configure_gen = []
-hostmakedepends = ["gperf", "pkgconf", "xmlto"]
+hostmakedepends = ["gperf", "meson", "pkgconf", "xmlto"]
 makedepends = ["libexpat-devel", "libx11-devel", "libcap-devel"]
 triggers = ["/usr/share/dbus-1/system.d"]
 scripts = {"pre-install": True, "pre-upgrade": True}
@@ -27,7 +26,7 @@
 license = "GPL-2.0-or-later"
 url = "https://dbus.freedesktop.org"
 source = f"https://dbus.freedesktop.org/releases/dbus/dbus-{pkgver}.tar.xz"
-sha256 = "ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f"
+sha256 = "9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849"
 file_modes = {"usr/lib/dbus-daemon-launch-helper": ("root", "dbus", 0o4750)}
 hardening = ["vis", "!cfi"]
 options = ["linkundefver"]