gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Thomas Trepl 2025-01-01 08:51:23 +01:00
commit 1dde883c6d
5 changed files with 113 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
chapter01/changelog.xml
View File

@ -40,6 +40,56 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2025-01-01</para>
<itemizedlist>
<listitem>
<para>[renodr] - Update to libxcrypt-4.4.37. Fixes
<ulink url="&lfs-ticket-root;5618">#5618</ulink>.</para>
</listitem>
<listitem revision="systemd">
<para>[renodr] - Update to dbus-1.16.0. Fixes
<ulink url="&lfs-ticket-root;5609">#5609</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20241220. Addresses
<ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to texinfo-7.2. Fixes
<ulink url='&lfs-ticket-root;5616'>#5616</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to sysvinit-3.12. Fixes
<ulink url='&lfs-ticket-root;5615'>#5615</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to shadow-4.17.0. Fixes
<ulink url='&lfs-ticket-root;5616'>#5617</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to procps-ng-4.0.5. Fixes
<ulink url='&lfs-ticket-root;5611'>#5611</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to meson-1.6.1. Fixes
<ulink url='&lfs-ticket-root;5510'>#5610</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-6.12.7. Fixes
<ulink url='&lfs-ticket-root;5613'>#5613</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to kbd-2.7.1. Fixes
<ulink url='&lfs-ticket-root;5608'>#5608</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to jinja2-3.1.5 (Security Update). Fixes
<ulink url='&lfs-ticket-root;5614'>#5614</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2024-12-23</para>
<itemizedlist>

19
chapter01/whatsnew.xml
View File

@ -62,9 +62,9 @@
<!--<listitem>
<para>DejaGNU-&dejagnu-version;</para>
</listitem>-->
<!--<listitem revision="systemd">
<listitem revision="systemd">
<para>D-Bus-&dbus-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Diffutils-&diffutils-version;</para>
</listitem>-->
@ -134,9 +134,9 @@
<listitem>
<para>IPRoute2-&iproute2-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Jinja2-&jinja2-version;</para>
</listitem>-->
</listitem>
<listitem>
<para>Kbd-&kbd-version;</para>
</listitem>
@ -164,6 +164,9 @@
<listitem>
<para>Libtool-&libtool-version;</para>
</listitem>
<listitem>
<para>Libxcrypt-&libxcrypt-version;</para>
</listitem>
<listitem>
<para>Linux-&linux-version;</para>
</listitem>
@ -212,9 +215,9 @@
<!--<listitem>
<para>Pkgconf-&pkgconf-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Procps-ng-&procps-ng-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Psmisc-&psmisc-version;</para>
</listitem>-->
@ -230,9 +233,9 @@
<listitem>
<para>Setuptools-&setuptools-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Shadow-&shadow-version;</para>
</listitem>-->
</listitem>
<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>

56
chapter08/dbus.xml
View File

@ -48,41 +48,21 @@
<para>Prepare D-Bus for compilation:</para>
<screen><userinput remap="configure">./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</userinput></screen>
<screen><userinput remap="configure">mkdir build
cd build
meson setup --prefix=/usr --buildtype=release --wrap-mode=nofallback ..</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<title>The meaning of the meson options:</title>
<varlistentry>
<term>
<parameter>--runstatedir=/run</parameter> and
<parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>
<parameter>--wrap-mode=nofallback</parameter>
</term>
<listitem>
<para>These cause the PID file and the system bus socket
to be in <filename class="directory">/run</filename>, instead of
the deprecated <filename class="directory">/var/run</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<parameter>--enable-user-session</parameter>
</term>
<listitem>
<para>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.</para>
<para>This switch prevents meson from attempting to download a copy
of the Glib package for the tests.</para>
</listitem>
</varlistentry>
@ -90,11 +70,11 @@
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<screen><userinput remap="make">ninja</userinput></screen>
<para>To test the results, issue:</para>
<screen><userinput remap="test">make check</userinput></screen>
<screen><userinput remap="test">ninja test</userinput></screen>
<para>Many tests are disabled because they require additional
packages that are not included in LFS. Instructions for running the
@ -103,7 +83,7 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
<screen><userinput remap="install">ninja install</userinput></screen>
<para>Create a symlink so that D-Bus and systemd can use the same
<filename>machine-id</filename> file:</para>
@ -149,7 +129,7 @@
<varlistentry id="dbus-daemon">
<term><command>dbus-daemon</command></term>
<listitem>
<para>Is the D-Bus message bus daemon</para>
<para>is the D-Bus message bus daemon</para>
<indexterm zone="ch-system-dbus dbus-daemon">
<primary sortas="b-dbus-daemon">dbus-daemon</primary>
</indexterm>
@ -159,7 +139,7 @@
<varlistentry id="dbus-launch">
<term><command>dbus-launch</command></term>
<listitem>
<para>Starts <command>dbus-daemon</command> from a shell
<para>starts <command>dbus-daemon</command> from a shell
script</para>
<indexterm zone="ch-system-dbus dbus-launch">
<primary sortas="b-dbus-launch">dbus-launch</primary>
@ -170,7 +150,7 @@
<varlistentry id="dbus-monitor">
<term><command>dbus-monitor</command></term>
<listitem>
<para>Monitors messages passing through a D-Bus message bus</para>
<para>monitors messages passing through a D-Bus message bus</para>
<indexterm zone="ch-system-dbus dbus-monitor">
<primary sortas="b-dbus-monitor">dbus-monitor</primary>
</indexterm>
@ -180,7 +160,7 @@
<varlistentry id="dbus-run-session">
<term><command>dbus-run-session</command></term>
<listitem>
<para>Starts a session bus instance of <command>dbus-daemon</command>
<para>starts a session bus instance of <command>dbus-daemon</command>
from a shell script and starts a specified program in that
session</para>
<indexterm zone="ch-system-dbus dbus-run-session">
@ -192,7 +172,7 @@
<varlistentry id="dbus-send">
<term><command>dbus-send</command></term>
<listitem>
<para>Sends a message to a D-Bus message bus</para>
<para>sends a message to a D-Bus message bus</para>
<indexterm zone="ch-system-dbus dbus-send">
<primary sortas="b-dbus-send">dbus-send</primary>
</indexterm>
@ -202,7 +182,7 @@
<varlistentry id="dbus-test-tool">
<term><command>dbus-test-tool</command></term>
<listitem>
<para>Is a tool to help packages test
<para>is a tool to help packages test
<application>D-Bus</application></para>
<indexterm zone="ch-system-dbus dbus-test-tool">
<primary sortas="b-dbus-test-tool">dbus-test-tool</primary>
@ -214,7 +194,7 @@
<varlistentry id="dbus-update-activation-environment">
<term><command>dbus-update-activation-environment</command></term>
<listitem>
<para>Updates environment variables that will be set for
<para>updates environment variables that will be set for
<application>D-Bus</application> session services</para>
<indexterm zone="ch-system-dbus dbus-update-activation-environment">
<primary sortas="b-dbus-update-activation-environment">dbus-update-activation-environment</primary>

66
packages.ent
View File

@ -114,12 +114,12 @@
<!ENTITY coreutils-fin-du "173 MB">
<!ENTITY coreutils-fin-sbu "1.1 SBU">
<!ENTITY dbus-version "1.14.10">
<!ENTITY dbus-size "1,344 KB">
<!ENTITY dbus-version "1.16.0">
<!ENTITY dbus-size "1,092 KB">
<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
<!ENTITY dbus-md5 "46070a3487817ff690981f8cd2ba9376">
<!ENTITY dbus-md5 "66bfcf1f42d4ebc634ca558d14335e92">
<!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
<!ENTITY dbus-fin-du "19 MB">
<!ENTITY dbus-fin-du "17 MB">
<!ENTITY dbus-fin-sbu "0.1 SBU">
<!ENTITY dejagnu-version "1.6.3">
@ -317,10 +317,10 @@
<!ENTITY gzip-fin-du "21 MB">
<!ENTITY gzip-fin-sbu "0.3 SBU">
<!ENTITY iana-etc-version "20241206">
<!ENTITY iana-etc-version "20241220">
<!ENTITY iana-etc-size "591 KB">
<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "8ed4c07cada287f55207577976d6a37f">
<!ENTITY iana-etc-md5 "81e5f37dcc239d9e7268113ba4f1970d">
<!ENTITY iana-etc-home "https://www.iana.org/protocols">
<!ENTITY iana-etc-fin-du "4.8 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@ -359,18 +359,18 @@
<!ENTITY isl-fin-du "20 MB">
<!ENTITY isl-fin-sbu "0.1 SBU">
<!ENTITY jinja2-version "3.1.4">
<!ENTITY jinja2-size "235 KB">
<!ENTITY jinja2-version "3.1.5">
<!ENTITY jinja2-size "239 KB">
<!ENTITY jinja2-url "&pypi-src;/J/Jinja2/jinja2-&jinja2-version;.tar.gz">
<!ENTITY jinja2-md5 "02ca9a6364c92e83d14b037bef4732bc">
<!ENTITY jinja2-md5 "083d64f070f6f1b5f75971ae60240785">
<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.1.x/">
<!ENTITY jinja2-fin-du "2.5 MB">
<!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
<!ENTITY kbd-version "2.7">
<!ENTITY kbd-size "1,437 KB">
<!ENTITY kbd-version "2.7.1">
<!ENTITY kbd-size "1,438 KB">
<!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
<!ENTITY kbd-md5 "bf40be5bea1b62e691410f5c6e0bbd6b">
<!ENTITY kbd-md5 "f15673d9f748e58f82fa50cff0d0fd20">
<!ENTITY kbd-home "https://kbd-project.org/">
<!ENTITY kbd-fin-du "34 MB">
<!ENTITY kbd-fin-sbu "0.1 SBU">
@ -431,22 +431,22 @@
<!ENTITY libtool-fin-du "45 MB">
<!ENTITY libtool-fin-sbu "0.8 SBU">
<!ENTITY libxcrypt-version "4.4.36">
<!ENTITY libxcrypt-size "610 KB">
<!ENTITY libxcrypt-version "4.4.37">
<!ENTITY libxcrypt-size "612 KB">
<!ENTITY libxcrypt-url "&github;/besser82/libxcrypt/releases/download/v&libxcrypt-version;/libxcrypt-&libxcrypt-version;.tar.xz">
<!ENTITY libxcrypt-md5 "b84cd4104e08c975063ec6c4d0372446">
<!ENTITY libxcrypt-md5 "13b528d04c74dab3c1c5471430161a8f">
<!ENTITY libxcrypt-home "&github;/besser82/libxcrypt/">
<!ENTITY libxcrypt-fin-du "12 MB">
<!ENTITY libxcrypt-fin-sbu "0.1 SBU">
<!ENTITY linux-major-version "6">
<!ENTITY linux-minor-version "12">
<!ENTITY linux-patch-version "5">
<!ENTITY linux-patch-version "7">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "144,535 KB">
<!ENTITY linux-size "144,501 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "33a827ff7dea6908e7615d0766f1018e">
<!ENTITY linux-md5 "267a2cec0d794454a9f92a726280b56d">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 :
minimum is allnoconfig
@ -513,10 +513,10 @@
<!ENTITY markupsafe-fin-du "508 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
<!ENTITY meson-version "1.6.0">
<!ENTITY meson-size "2,225 KB">
<!ENTITY meson-version "1.6.1">
<!ENTITY meson-size "2,223 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "0031ea392f8ef97eeadfe1906c5cc5b4">
<!ENTITY meson-md5 "397e29700c71f69d70fd2b5898620177">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "43 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
@ -595,10 +595,10 @@
<!ENTITY pkgconf-fin-du "4.7 MB">
<!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
<!ENTITY procps-ng-version "4.0.4">
<!ENTITY procps-ng-size "1,369 KB">
<!ENTITY procps-ng-version "4.0.5">
<!ENTITY procps-ng-size "1,483 KB">
<!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
<!ENTITY procps-ng-md5 "2f747fc7df8ccf402d03e375c565cf96">
<!ENTITY procps-ng-md5 "90803e64f51f192f3325d25c3335d057">
<!ENTITY procps-ng-home "https://gitlab.com/procps-ng/procps/">
<!ENTITY procps-ng-fin-du "26 MB">
<!ENTITY procps-ng-fin-sbu "0.1 SBU">
@ -655,10 +655,10 @@
<!ENTITY setuptools-fin-du "35 MB">
<!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
<!ENTITY shadow-version "4.16.0">
<!ENTITY shadow-size "2,154 KB">
<!ENTITY shadow-version "4.17.0">
<!ENTITY shadow-size "2,164 KB">
<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
<!ENTITY shadow-md5 "eb70bad3316d08f0d3bb3d4bbeccb3b4">
<!ENTITY shadow-md5 "63920a6fb28305401a4ebbde09e88376">
<!ENTITY shadow-home "&github;/shadow-maint/shadow/">
<!ENTITY shadow-fin-du "112 MB">
<!ENTITY shadow-fin-sbu "0.1 SBU">
@ -689,10 +689,10 @@
<!ENTITY systemd-fin-du "267 MB">
<!ENTITY systemd-fin-sbu "0.8 SBU">
<!ENTITY sysvinit-version "3.11">
<!ENTITY sysvinit-size "235 KB">
<!ENTITY sysvinit-version "3.12">
<!ENTITY sysvinit-size "236 KB">
<!ENTITY sysvinit-url "&github;/slicer69/sysvinit/releases/download/&sysvinit-version;/sysvinit-&sysvinit-version;.tar.xz">
<!ENTITY sysvinit-md5 "cb4e4bdabd902b774c4d66a85e1f6209">
<!ENTITY sysvinit-md5 "4ade3bb661b94dcc9c0198ff8c02df6a">
<!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
<!ENTITY sysvinit-fin-du "2.8 MB">
<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
@ -719,10 +719,10 @@
<!ENTITY tcl-tmp-du "91 MB">
<!ENTITY tcl-tmp-sbu "3.2 SBU">
<!ENTITY texinfo-version "7.1.1">
<!ENTITY texinfo-size "5,443 KB">
<!ENTITY texinfo-version "7.2">
<!ENTITY texinfo-size "6,259 KB">
<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
<!ENTITY texinfo-md5 "e5fc595794a7980f98ce446a5f8aa273">
<!ENTITY texinfo-md5 "11939a7624572814912a18e76c8d8972">
<!ENTITY texinfo-home "&gnu-software;texinfo/">
<!ENTITY texinfo-tmp-du "130 MB">
<!ENTITY texinfo-tmp-sbu "0.2 SBU">

2
patches.ent
View File

@ -40,7 +40,7 @@
<!ENTITY readline-fixes-patch-size "13 KB">
-->
<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
<!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
<!ENTITY sysvinit-consolidated-patch-md5 "3af8fd8e13cad481eeeaa48be4247445">
<!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
<!--
<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-upstream_fixes-1.patch">