[lfs] 01/01: Fix merge conflicts

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit 1dde883c6d7f777bdcb43e8cf4bfe996e5fc4c0b
Merge: 903abd72a 782268675
Author: Thomas Trepl <[email protected]>
AuthorDate: Wed Jan 1 08:51:23 2025 +0100

    Fix merge conflicts

 chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 19 ++++++++------
 chapter08/dbus.xml      | 56 ++++++++++++++---------------------------
 packages.ent            | 66 ++++++++++++++++++++++++-------------------------
 patches.ent             |  2 +-
 5 files changed, 113 insertions(+), 80 deletions(-)

diff --cc chapter01/changelog.xml
index b7743d366,c378309de..5749f5815
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@@ -40,16 -40,56 +40,66 @@@
      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>
 +        <listitem>
 +          <para>[thomas] - Fix systemd instructions. Thanks to
 +            Eric Clothier for preparing the patch.</para>
 +        </listitem>
 +      </itemizedlist>
 +    </listitem>
 +
      <listitem>
        <para>2024-12-15</para>
        <itemizedlist>
diff --cc packages.ent
index 0f81f4e20,b88852d20..49af3fb39
--- a/packages.ent
+++ b/packages.ent
@@@ -349,20 -349,10 +349,20 @@@
  <!ENTITY iproute2-fin-du "17 MB">
  <!ENTITY iproute2-fin-sbu "0.1 SBU">
  
 +<!ENTITY isl-version "0.27">
 +<!ENTITY isl-size "1,9 MB">
 +<!-- ENTITY isl-url "http://isl.gforge.inria.fr/isl-&isl-version;.tar.xz" -->
 +<!-- ENTITY isl-url "https://gcc.gnu.org/pub/gcc/infrastructure/isl-&isl-version;.tar.bz2" -->
 +<!ENTITY isl-url "https://libisl.sourceforge.io/isl-&isl-version;.tar.xz">
 +<!ENTITY isl-md5 "11ee9d335b227ea2e8579c4ba6e56138">
 +<!ENTITY isl-home "http://libisl.sourceforge.io/">
 +<!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">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page