From c1a3c0292add70d8bfa7057cbcfa0443d683b364 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Tue, 31 Dec 2024 13:53:30 -0600 Subject: [PATCH] Package updates: Update to dbus-1.16.0 (systemd only) Update to libxcrypt-4.4.37 --- chapter01/changelog.xml | 8 ++++++ chapter01/whatsnew.xml | 7 +++-- chapter08/dbus.xml | 57 ++++++++++++++--------------------------- packages.ent | 14 +++++----- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3258be6d9..b5fb95d7e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,14 @@ 2025-01-01 + + [renodr] - Update to libxcrypt-4.4.37. Fixes + #5618. + + + [renodr] - Update to dbus-1.16.0. Fixes + #5609. + [bdubbs] - Update to iana-etc-20241220. Addresses #5006. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 9fc118bb5..90afb8d16 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -62,9 +62,9 @@ - + @@ -164,6 +164,9 @@ Libtool-&libtool-version; + + Libxcrypt-&libxcrypt-version; + Linux-&linux-version; diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml index 36d5c55ca..02bc434cb 100644 --- a/chapter08/dbus.xml +++ b/chapter08/dbus.xml @@ -48,41 +48,22 @@ Prepare D-Bus for compilation: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --runstatedir=/run \ - --enable-user-session \ - --disable-static \ - --disable-doxygen-docs \ - --disable-xml-docs \ - --docdir=/usr/share/doc/dbus-&dbus-version; \ - --with-system-socket=/run/dbus/system_bus_socket +mkdir build +cd build + +meson setup --prefix=/usr --buildtype=release --wrap-mode=nofallback .. +ninja - The meaning of the configure options: + The meaning of the meson options: - --runstatedir=/run and - --with-system-socket=/run/dbus/system_bus_socket + --wrap-mode=nofallback - These cause the PID file and the system bus socket - to be in /run, instead of - the deprecated /var/run. - - - - - - --enable-user-session - - - This ensures the D-Bus per-user service and socket unit - files are installed for Systemd. They are not useful (but - harmless) in a base LFS installation, however they can be used - once systemd is rebuilt with PAM support in BLFS. + This switch prevents meson from attempting to download a copy + of the Glib package for the tests. @@ -90,11 +71,11 @@ Compile the package: -make +ninja To test the results, issue: -make check +ninja test Many tests are disabled because they require additional packages that are not included in LFS. Instructions for running the @@ -103,7 +84,7 @@ Install the package: -make install +ninja install Create a symlink so that D-Bus and systemd can use the same machine-id file: @@ -149,7 +130,7 @@ dbus-daemon - Is the D-Bus message bus daemon + is the D-Bus message bus daemon dbus-daemon @@ -159,7 +140,7 @@ dbus-launch - Starts dbus-daemon from a shell + starts dbus-daemon from a shell script dbus-launch @@ -170,7 +151,7 @@ dbus-monitor - Monitors messages passing through a D-Bus message bus + monitors messages passing through a D-Bus message bus dbus-monitor @@ -180,7 +161,7 @@ dbus-run-session - Starts a session bus instance of dbus-daemon + starts a session bus instance of dbus-daemon from a shell script and starts a specified program in that session @@ -192,7 +173,7 @@ dbus-send - Sends a message to a D-Bus message bus + sends a message to a D-Bus message bus dbus-send @@ -202,7 +183,7 @@ dbus-test-tool - Is a tool to help packages test + is a tool to help packages test D-Bus dbus-test-tool @@ -214,7 +195,7 @@ dbus-update-activation-environment - Updates environment variables that will be set for + updates environment variables that will be set for D-Bus session services dbus-update-activation-environment diff --git a/packages.ent b/packages.ent index 5f76f4633..b88852d20 100644 --- a/packages.ent +++ b/packages.ent @@ -114,12 +114,12 @@ - - + + - + - + @@ -421,10 +421,10 @@ - - + + - +