diff options
| -rw-r--r-- | appendices/dependencies.xml | 1 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 96 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 24 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/binutils-pass1.xml | 19 | ||||
| -rw-r--r-- | chapter06/binutils-pass2.xml | 3 | ||||
| -rw-r--r-- | chapter07/util-linux.xml | 8 | ||||
| -rw-r--r-- | chapter08/autoconf.xml | 17 | ||||
| -rw-r--r-- | chapter08/binutils.xml | 14 | ||||
| -rw-r--r-- | chapter08/grub.xml | 7 | ||||
| -rw-r--r-- | chapter08/libtool.xml | 6 | ||||
| -rw-r--r-- | chapter08/systemd.xml | 42 | ||||
| -rw-r--r-- | chapter08/tar.xml | 7 | ||||
| -rw-r--r-- | chapter08/udev.xml | 12 | ||||
| -rw-r--r-- | chapter08/util-linux.xml | 10 | ||||
| -rw-r--r-- | chapter09/symlinks.xml | 13 | ||||
| -rwxr-xr-x | gen-changelog.py | 16 | ||||
| -rw-r--r-- | packages.ent | 96 | ||||
| -rw-r--r-- | patches.ent | 4 |
19 files changed, 264 insertions, 139 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 30f2b05a6..3cbfe7b8b 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2935,6 +2935,7 @@ <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>, <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>, <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>, + <ulink url="&pypi-home;pefile">pefile</ulink>, <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>, <ulink url='&pypi-home;/pyelftools'>pyelftools</ulink>, <ulink url="&blfs-book;postlfs/qemu.html">qemu</ulink>, diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 11df22160..de94d85d9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,102 @@ --> <listitem> + <para>2023-12-31</para> + <itemizedlist> + <listitem> + <para>[xry111] - Add --enable-default-hash-style=gnu configuring + binutils. Fixes + <ulink url='&lfs-ticket-root;5401'>#5401</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Fix CVE-2023-7008 for systemd-255. Fixes + <ulink url='&lfs-ticket-root;5405'>#5405</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to iana-etc-20231205. Addresses + <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to tzdata-2023d. Fixes + <ulink url='&lfs-ticket-root;5399'>#5399</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to linux-6.6.8. Fixes + <ulink url='&lfs-ticket-root;5397'>#5397</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to meson-1.3.1. Fixes + <ulink url='&lfs-ticket-root;5402'>#5402</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to grub-2.12. Fixes + <ulink url='&lfs-ticket-root;5396'>#5396</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to inetutils-2.5. Fixes + <ulink url='&lfs-ticket-root;5404'>#5404</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to setuptools-69.0.3. Fixes + <ulink url='&lfs-ticket-root;5400'>#5400</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to xml-parser-2.47. Fixes + <ulink url='&lfs-ticket-root;5403'>#5403</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to vim-9.0.2189. Addresses + <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para> + </listitem> + <listitem> + <para>[xry111] - Update to autoconf-2.72. Fixes + <ulink url='&lfs-ticket-root;5398'>#5398</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2023-12-16</para> + <itemizedlist> + <listitem> + <para>[xry111] - Update to <phrase revision='sysv'>udev + from </phrase>systemd-255. Fixes + <ulink url='&lfs-ticket-root;5390'>#5390</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2023-12-14</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to util-linux v2.39.3. Fixes + <ulink url='&lfs-ticket-root;5388'>#5388</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to python3-3.12.1. Fixes + <ulink url='&lfs-ticket-root;5392'>#5392</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to linux-6.6.7. Fixes + <ulink url='&lfs-ticket-root;5387'>#5387</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to kbd-2.6.4. Fixes + <ulink url='&lfs-ticket-root;5393'>#5393</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to bc-6.7.4. Fixes + <ulink url='&lfs-ticket-root;5389'>#5389</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Reformat util-linux configure parameters. Fixes + <ulink url='&lfs-ticket-root;5395'>#5395</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2023-12-04</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index bd97a81f0..e8002fcf6 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -32,9 +32,9 @@ <!--<listitem> <para>Attr-&attr-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Autoconf-&autoconf-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Automake-&automake-version;</para> </listitem>--> @@ -116,18 +116,18 @@ <!--<listitem> <para>Groff-&groff-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>GRUB-&grub-version;</para> - </listitem>--> + </listitem> <listitem> <para>Gzip-&gzip-version;</para> </listitem> <listitem> <para>Iana-Etc-&iana-etc-version;</para> </listitem> - <!--<listitem> + <listitem> <para>Inetutils-&inetutils-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Intltool-&intltool-version;</para> </listitem>--> @@ -248,9 +248,9 @@ <listitem> <para>Texinfo-&texinfo-version;</para> </listitem> - <!--<listitem> + <listitem> <para>Tzdata-&tzdata-version;</para> - </listitem>--> + </listitem> <!--<listitem revision="sysv"> <para>Udev from Systemd-&systemd-version;</para> </listitem>--> @@ -263,9 +263,9 @@ <listitem> <para>Wheel-&wheel-version;</para> </listitem> - <!--<listitem> + <listitem> <para>XML::Parser-&xml-parser-version;</para> - </listitem>--> + </listitem> <listitem> <para>Xz-&xz-version;</para> </listitem> @@ -313,6 +313,10 @@ </listitem> <listitem> + <para>grub-2.06-upstream_fixes-1.patch</para> + </listitem> + + <listitem> <para>readline-8.2-upstream_fix-1.patch</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 00628bda7..2073638fc 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -94,14 +94,6 @@ </varlistentry> <varlistentry> - <term>GRUB Upstream Fixes Patch - <token>&grub-upstream-fixes-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&grub-upstream-fixes-patch;"/></para> - <para>MD5 sum: <literal>&grub-upstream-fixes-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 65e8dd2ae..c3bf1f117 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -75,7 +75,8 @@ cd build</userinput></screen> --target=$LFS_TGT \ --disable-nls \ --enable-gprofng=no \ - --disable-werror</userinput></screen> + --disable-werror \ + --enable-default-hash-style=gnu</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -132,6 +133,22 @@ cd build</userinput></screen> </listitem> </varlistentry> + <varlistentry> + <term><parameter>--enable-default-hash-style=gnu</parameter></term> + <listitem> + <para>By default, the linker would generate both the GNU-style + hash table and the classic ELF hash table for shared libraries and + dynamically linked executables. The hash tables are only intended + for a dynamic linker to perform symbol lookup. On LFS the dynamic + linker (provided by the Glibc package) will always use the + GNU-style hash table which is faster to query. So the classic + ELF hash table is completely useless. This makes the the linker + only generate the GNU-style hash table by default, so we can avoid + wasting time to generate the classic ELF hash table when we build + the packages, or wasting disk space to store it.</para> + </listitem> + </varlistentry> + </variablelist> <para>Continue with compiling the package:</para> diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 983aaee2f..15582f937 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -72,7 +72,8 @@ cd build</userinput></screen> --enable-shared \ --enable-gprofng=no \ --disable-werror \ - --enable-64-bit-bfd</userinput></screen> + --enable-64-bit-bfd \ + --enable-default-hash-style=gnu</userinput></screen> <variablelist> <title>The meaning of the new configure options:</title> diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml index 2f88e7d5f..b5aca7e7b 100644 --- a/chapter07/util-linux.xml +++ b/chapter07/util-linux.xml @@ -51,10 +51,8 @@ <para>Prepare Util-linux for compilation:</para> -<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ - --libdir=/usr/lib \ +<screen><userinput remap="configure">./configure --libdir=/usr/lib \ --runstatedir=/run \ - --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ --disable-nologin \ @@ -63,7 +61,9 @@ --disable-runuser \ --disable-pylibmount \ --disable-static \ - --without-python</userinput></screen> + --without-python \ + ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml index 38375665f..120f31632 100644 --- a/chapter08/autoconf.xml +++ b/chapter08/autoconf.xml @@ -41,12 +41,6 @@ <sect2 role="installation"> <title>Installation of Autoconf</title> - <para>First, fix several problems with the tests caused by bash-5.2 and later:</para> - - <screen><userinput remap="pre">sed -e 's/SECONDS|/&SHLVL|/' \ - -e '/BASH_ARGV=/a\ /^SHLVL=/ d' \ - -i.orig tests/local.at</userinput></screen> - <para>Prepare Autoconf for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> @@ -61,17 +55,6 @@ To run the tests anyway, issue:</para> --> <screen><userinput remap="test">make check</userinput></screen> -<!-- - <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition, - several tests are skipped that use Automake. For full test coverage, - Autoconf can be re-tested after Automake has been installed. In addition, - two tests fail due to changes in libtool-2.4.3 and later.</para> ---> - <note><para>The test time for autoconf can be reduced significantly on a - system with multiple cores. To do this, append - <command>TESTSUITEFLAGS=-j<N></command> to the line above. For - instance, using -j4 can reduce the test time by over 60 - percent.</para></note> <para>Install the package:</para> diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 63ae7e2eb..c4a25492c 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -57,9 +57,11 @@ cd build</userinput></screen> --enable-shared \ --disable-werror \ --enable-64-bit-bfd \ - --with-system-zlib</userinput></screen> + --with-system-zlib \ + --enable-default-hash-style=gnu</userinput></screen> + <variablelist> - <title>The meaning of the configure parameters:</title> + <title>The meaning of the new configure parameters:</title> <varlistentry> <term><parameter>--enable-gold</parameter></term> @@ -85,14 +87,6 @@ cd build</userinput></screen> </varlistentry> <varlistentry> - <term><parameter>--enable-64-bit-bfd</parameter></term> - <listitem> - <para>Enables 64-bit support (on hosts with narrower word sizes). - May not be needed on 64-bit systems, but does no harm.</para> - </listitem> - </varlistentry> - - <varlistentry> <term><parameter>--with-system-zlib</parameter></term> <listitem> <para>Use the installed zlib library instead of building the diff --git a/chapter08/grub.xml b/chapter08/grub.xml index ddde75490..8d0661b69 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -73,13 +73,10 @@ </warning> <para> - Fix an issue causing <command>grub-install</command> to fail when the - <filename class='directory'>/boot</filename> partition (or the root - partition if <filename class='directory'>/boot</filename> is not a - separate partition) is created by e2fsprogs-1.47.0 or later: + Add a file missing from the release tarball: </para> -<screen><userinput remap='pre'>patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch</userinput></screen> +<screen><userinput remap='pre'>echo <literal>depends bli part_gpt</literal> > grub-core/extra_deps.lst</userinput></screen> <!--https://git.savannah.gnu.org/cgit/grub.git/commit/?id=69edb312 --> <para>Apply an upstream change so GRUB will be capable to load diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index d21d0b751..d73bd6efb 100644 --- a/chapter08/libtool.xml +++ b/chapter08/libtool.xml @@ -54,12 +54,6 @@ <screen><userinput remap="test">make -k check</userinput></screen> - <note><para>The test time for Libtool can be reduced significantly on a - system with multiple cores. To do this, append - <command>TESTSUITEFLAGS=-j<N></command> to the line above. For - instance, using -j4 can reduce the test time by over 60 - percent.</para></note> - <para>Five tests are known to fail in the LFS build environment due to a circular dependency, but these tests pass if rechecked after automake has been installed. Additionally, with grep-3.8, two tests will diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 761467acd..de5a668d1 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -48,6 +48,13 @@ <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \ -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen> + <!-- https://github.com/systemd/systemd/pull/30549 --> + <para>Now fix a security vulnerability in the DNSSEC verification of + <command>systemd-resolved</command>:</para> + +<screen><userinput remap='pre'>sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \ + -i src/resolve/resolved-dns-transaction.c</userinput></screen> + <para>Prepare systemd for compilation:</para> <screen><userinput remap="configure">mkdir -p build @@ -62,13 +69,15 @@ meson setup \ -Dldconfig=false \ -Dsysusers=false \ -Drpmmacrosdir=no \ - -Dhomed=false \ + -Dhomed=disabled \ -Duserdb=false \ -Dman=false \ -Dmode=release \ -Dpamconfdir=no \ -Ddev-kvm-mode=0660 \ -Dnobody-group=nogroup \ + -Dsysupdate=disabled \ + -Dukify=disabled \ -Ddocdir=/usr/share/doc/systemd-&systemd-version; \ ..</userinput></screen> @@ -139,7 +148,8 @@ meson setup \ </varlistentry> <varlistentry> - <term><parameter>-D{userdb,homed}=false</parameter></term> + <term><parameter>-Dhomed=disabled</parameter> and + <parameter>-Duserdb=false</parameter></term> <listitem> <para>Remove two daemons with dependencies that do not fit within the scope of LFS.</para> @@ -187,6 +197,28 @@ meson setup \ <systemitem class='groupname'>nogroup</systemitem>.</para> </listitem> </varlistentry> + + <varlistentry> + <term><parameter>-Dsysupdate=disabled</parameter></term> + <listitem> + <para>Do not install the <command>systemd-sysupdate</command> + tool. It's designed for automatically upgrading binary distros, + so it's useless for a basic Linux system built from source. + And it will report errors on boot if it's enabled but not properly + configured.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>-Dukify=disabled</parameter></term> + <listitem> + <para>Do not install the <command>systemd-ukify</command> script. + At runtime this script requires the + <application>pefile</application> Python module that neither LFS + nor BLFS provides.</para> + </listitem> + </varlistentry> + </variablelist> <para>Compile the package:</para> @@ -214,12 +246,6 @@ meson setup \ <screen><userinput remap="adjust">systemctl preset-all</userinput></screen> - <para>Disable two services for upgrading binary distros. They are useless for - a basic Linux system built from source, and each one will report an error if - it's enabled but not configured:</para> - -<screen><userinput remap="adjust">systemctl disable systemd-sysupdate{,-reboot}</userinput></screen> - <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out. If it causes any trouble, we can add this back and also copy it into BLFS --> <!-- diff --git a/chapter08/tar.xml b/chapter08/tar.xml index ea5f44ebb..802f04d2e 100644 --- a/chapter08/tar.xml +++ b/chapter08/tar.xml @@ -72,13 +72,6 @@ <screen><userinput remap="test">make check</userinput></screen> - <!-- On one system the -j4 improvement is 167s - 46s = 121s (72.46%) --> - <note><para>The test time for Tar can be reduced significantly on a - system with multiple cores. To do this, append - <command>TESTSUITEFLAGS=-j<N></command> to the line above. For - instance, using -j4 can reduce the test time by over 70 - percent.</para></note> - <para>One test, capabilities: binary store/restore, is known to fail if it is run because LFS lacks selinux, but will be skipped if the host kernel does not support extended attributes or security labels on the filesystem diff --git a/chapter08/udev.xml b/chapter08/udev.xml index dd686f489..967b3dd84 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -125,11 +125,18 @@ meson setup \ </varlistentry> </variablelist> + <para>Get the list of the shipped udev helpers and save it into an + environment variable:</para> + + <screen><userinput remap="make">udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \ + awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen> + <para>Only build the components needed for udev:</para> <screen><userinput remap="make">ninja udevadm systemd-hwdb \ $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \ - $(realpath libudev.so --relative-to .)</userinput></screen> + $(realpath libudev.so --relative-to .) \ + $udev_helpers udevadm</userinput></screen> <para>Install the package:</para> @@ -147,8 +154,7 @@ install -vm644 rules.d/* ../rules.d/README /usr/lib/udev/rules.d/ install -vm644 $(find ../rules.d/*.rules \ -not -name '*power-switch*') /usr/lib/udev/rules.d/ install -vm644 hwdb.d/* ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/ -install -vm755 $(find src/udev \ - -type f -not -name '*.*') /usr/lib/udev +install -vm755 $udev_helpers /usr/lib/udev install -vm644 ../network/99-default.link /usr/lib/udev/network</userinput></screen> <para>Install some custom rules and support files useful in an LFS diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index 00f804842..8d4514094 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -48,8 +48,7 @@ <para>Prepare Util-linux for compilation:</para> -<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ - --bindir=/usr/bin \ +<screen revision="sysv"><userinput remap="configure">./configure --bindir=/usr/bin \ --libdir=/usr/lib \ --runstatedir=/run \ --sbindir=/usr/sbin \ @@ -63,11 +62,11 @@ --disable-static \ --without-python \ --without-systemd \ - --without-systemdsystemunitdir \ + --without-systemdsystemunitdir \ + ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen> -<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ - --bindir=/usr/bin \ +<screen revision="systemd"><userinput remap="configure">./configure --bindir=/usr/bin \ --libdir=/usr/lib \ --runstatedir=/run \ --sbindir=/usr/sbin \ @@ -80,6 +79,7 @@ --disable-pylibmount \ --disable-static \ --without-python \ + ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen> <para>The --disable and --without options prevent warnings about diff --git a/chapter09/symlinks.xml b/chapter09/symlinks.xml index 86528ba69..b2479f053 100644 --- a/chapter09/symlinks.xml +++ b/chapter09/symlinks.xml @@ -112,6 +112,19 @@ proceeding, and be sure to use that <literal>NAME</literal> value when creating your network configuration files.</para> + <para>Even if the custom udev rule file is created, udev may still + assign one or more alternative names for a NIC based on physical + characteristics. If a custom udev rule would rename some NIC using + a name already assigned as an alternative name of another NIC, this + udev rule will fail. If this issue happens, you may create the + <filename>/etc/udev/network/99-default.link</filename> configuration + file with an empty alternative assignment policy, overriding the + default configuration file + <filename>/usr/lib/udev/network/99-default.link</filename>:</para> + +<screen role="nodump"><userinput>sed -e '/^AlternativeNamesPolicy/s/=.*$/=/' \ + -i /usr/lib/udev/network/99-default.link \ + > /etc/udev/network/99-default.link</userinput></screen> </sect3> </sect2> diff --git a/gen-changelog.py b/gen-changelog.py index e7ee1d7e7..3bf6bc064 100755 --- a/gen-changelog.py +++ b/gen-changelog.py @@ -76,6 +76,8 @@ for i in tsv: security.add(pkg) ticket[pkg] = tic +hold_ticket = {'vim': '4500', 'iana-etc': '5006'} + print("Plain Text:") for (s, act) in [(upd, "Update to "), (add, "Add ")]: for i in s: @@ -83,6 +85,8 @@ for (s, act) in [(upd, "Update to "), (add, "Add ")]: out = act + pkgver if pkgver in ticket: out += ' (#' + ticket[pkgver] + ')' + elif i in hold_ticket: + out += ' (#' + hold_ticket[i] + ')' print("-", out) for i in rem: print("-", "Remove", i) @@ -99,10 +103,18 @@ for (s, act) in [(upd, "Update to "), (add, "Add ")]: if pkgver in security: out += " (security fix)" out += "." + + pkg_ticket = None if pkgver in ticket: out += " Fixes\n " - out += "<ulink url='&lfs-ticket-root;" + ticket[pkgver] + "'>#" - out += ticket[pkgver] + "</ulink>." + pkg_ticket = ticket[pkgver] + elif i in hold_ticket: + out += " Addresses\n " + pkg_ticket = hold_ticket[i] + + if pkg_ticket: + out += "<ulink url='&lfs-ticket-root;" + pkg_ticket + "'>#" + out += pkg_ticket + "</ulink>." out += "</para>" print(out) print(' </listitem>') diff --git a/packages.ent b/packages.ent index 50b140bf2..2caa1f663 100644 --- a/packages.ent +++ b/packages.ent @@ -29,10 +29,10 @@ <!ENTITY attr-fin-du "4.1 MB"> <!ENTITY attr-fin-sbu "less than 0.1 SBU"> -<!ENTITY autoconf-version "2.71"> -<!ENTITY autoconf-size "1,263 KB"> +<!ENTITY autoconf-version "2.72"> +<!ENTITY autoconf-size "1,360 KB"> <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz"> -<!ENTITY autoconf-md5 "12cfa1687ffa2606337efe1a64416106"> +<!ENTITY autoconf-md5 "1be79f7106ab6767f18391c5e22be701"> <!ENTITY autoconf-home "&gnu-software;autoconf/"> <!ENTITY autoconf-fin-du "24 MB"> <!ENTITY autoconf-fin-sbu-tests "6.0"> @@ -57,10 +57,10 @@ <!ENTITY bash-fin-du "52 MB"> <!ENTITY bash-fin-sbu "1.1 SBU"> -<!ENTITY bc-version "6.7.3"> +<!ENTITY bc-version "6.7.4"> <!ENTITY bc-size "456 KB"> <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz"> -<!ENTITY bc-md5 "a2e39a5be32330bc2166b0e501668178"> +<!ENTITY bc-md5 "7826138b08c72f4618d6e48860101196"> <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc"> <!ENTITY bc-fin-du "7.7 MB"> <!ENTITY bc-fin-sbu "less than 0.1 SBU"> @@ -299,10 +299,10 @@ <!ENTITY groff-fin-du "107 MB"> <!ENTITY groff-fin-sbu "0.2 SBU"> -<!ENTITY grub-version "2.06"> -<!ENTITY grub-size "6,428 KB"> +<!ENTITY grub-version "2.12"> +<!ENTITY grub-size "6,524 KB"> <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz"> -<!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363"> +<!ENTITY grub-md5 "60c564b1bdc39d8e43b3aab4bc0fb140"> <!ENTITY grub-home "&gnu-software;grub/"> <!ENTITY grub-fin-du "161 MB"> <!ENTITY grub-fin-sbu "0.3 SBU"> @@ -317,18 +317,18 @@ <!ENTITY gzip-fin-du "21 MB"> <!ENTITY gzip-fin-sbu "0.3 SBU"> -<!ENTITY iana-etc-version "20231117"> -<!ENTITY iana-etc-size "588 KB"> +<!ENTITY iana-etc-version "20231205"> +<!ENTITY iana-etc-size "592 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 "f26b37a03a211ddd4e9c7189191e2772"> +<!ENTITY iana-etc-md5 "7904f5aefaccd74e24af738da0e8bdaf"> <!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"> -<!ENTITY inetutils-version "2.4"> -<!ENTITY inetutils-size "1,522 KB"> +<!ENTITY inetutils-version "2.5"> +<!ENTITY inetutils-size "1,632 KB"> <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz"> -<!ENTITY inetutils-md5 "319d65bb5a6f1847c4810651f3b4ba74"> +<!ENTITY inetutils-md5 "9e5a6dfd2d794dc056a770e8ad4a9263"> <!ENTITY inetutils-home "&gnu-software;inetutils/"> <!ENTITY inetutils-fin-du "31 MB"> <!ENTITY inetutils-fin-sbu "0.2 SBU"> @@ -357,10 +357,10 @@ <!ENTITY jinja2-fin-du "3.4 MB"> <!ENTITY jinja2-fin-sbu "less than 0.1 SBU"> -<!ENTITY kbd-version "2.6.3"> -<!ENTITY kbd-size "1,468 KB"> +<!ENTITY kbd-version "2.6.4"> +<!ENTITY kbd-size "1,470 KB"> <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz"> -<!ENTITY kbd-md5 "4764775cac0415f1d35a0cd311249941"> +<!ENTITY kbd-md5 "e2fd7adccf6b1e98eb1ae8d5a1ce5762"> <!ENTITY kbd-home "https://kbd-project.org/"> <!ENTITY kbd-fin-du "35 MB"> <!ENTITY kbd-fin-sbu "0.1 SBU"> @@ -431,12 +431,12 @@ <!ENTITY linux-major-version "6"> <!ENTITY linux-minor-version "6"> -<!ENTITY linux-patch-version "3"> +<!ENTITY linux-patch-version "8"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -<!ENTITY linux-size "136,763 KB"> +<!ENTITY linux-size "136,800 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "3a760f5ac7d37b62dda9a4ca89f5fd96"> +<!ENTITY linux-md5 "a3deb764c4f8a77ff49735d6b3057409"> <!ENTITY linux-home "https://www.kernel.org/"> <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is allnoconfig + some configs we recommend for the users, rounded down to @@ -494,10 +494,10 @@ <!ENTITY markupsafe-fin-du "548 KB"> <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU"> -<!ENTITY meson-version "1.3.0"> -<!ENTITY meson-size "2,171 KB"> +<!ENTITY meson-version "1.3.1"> +<!ENTITY meson-size "2,172 KB"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> -<!ENTITY meson-md5 "35dc15e4f94ca5fd30dbe2d88a672254"> +<!ENTITY meson-md5 "dd404b8c0f8b79f80181b4a58bb81768"> <!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-fin-du "42 MB"> <!ENTITY meson-fin-sbu "less than 0.1 SBU"> @@ -595,19 +595,19 @@ <!-- If python minor version changes, updates in python and meson pages will be needed: python3.6 and python3.6m --> -<!ENTITY python-version "3.12.0"> +<!ENTITY python-version "3.12.1"> <!ENTITY python-minor "3.12"> -<!ENTITY python-size "20,093 KB"> +<!ENTITY python-size "20,102 KB"> <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> -<!ENTITY python-md5 "f6f4616584b23254d165f4db90c247d6"> +<!ENTITY python-md5 "50f827c800483776c8ef86e6a53831fa"> <!ENTITY python-home "https://www.python.org/"> <!ENTITY python-tmp-du "533 MB"> <!ENTITY python-tmp-sbu "0.4 SBU"> <!ENTITY python-fin-du "370 MB"> <!ENTITY python-fin-sbu "1.9 SBU"> <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2"> -<!ENTITY python-docs-md5 "ae9d19bb613ae8ef2457496bd2893915"> -<!ENTITY python-docs-size "8,009 KB"> +<!ENTITY python-docs-md5 "d5c21b804c219b06256495eae30fd153"> +<!ENTITY python-docs-size "7,998 KB"> <!ENTITY readline-version "8.2"> <!ENTITY readline-soversion "8.2"><!-- used for stripping --> @@ -628,10 +628,10 @@ <!ENTITY sed-fin-du "30 MB"> <!ENTITY sed-fin-sbu "0.3 SBU"> -<!ENTITY setuptools-version "69.0.2"> +<!ENTITY setuptools-version "69.0.3"> <!ENTITY setuptools-size "2,168 KB"> <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz"> -<!ENTITY setuptools-md5 "32bcc14eb830a13fbf33e053286f1081"> +<!ENTITY setuptools-md5 "b82de45aaa6b9bb911226660212ebb83"> <!ENTITY setuptools-home "&pypi-home;/setuptools/"> <!ENTITY setuptools-fin-du "30 MB"> <!ENTITY setuptools-fin-sbu "0.1 SBU"> @@ -652,20 +652,20 @@ <!ENTITY sysklogd-fin-du "680 KB"> <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU"> -<!ENTITY systemd-version "254"> +<!ENTITY systemd-version "255"> <!--<!ENTITY systemd-stable "6b4878d">--> <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel change that is incompatible, we will switch to the backport branch until the next stable release. --> -<!ENTITY systemd-size "13,985 KB"> +<!ENTITY systemd-size "14,516 KB"> <!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz"> <!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">--> -<!ENTITY systemd-md5 "0d266e5361dc72097b6c18cfde1c0001"> +<!ENTITY systemd-md5 "521cda27409a9edf0370c128fae3e690"> <!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/"> -<!ENTITY systemd-man-version "254"> -<!ENTITY systemd-man-size "626 KB"> +<!ENTITY systemd-man-version "255"> +<!ENTITY systemd-man-size "652 KB"> <!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">--> <!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz"> -<!ENTITY systemd-man-md5 "fc32faeac581e1890ca27fcea3858410"> +<!ENTITY systemd-man-md5 "1ebe54d7a80f9abf8f2d14ddfeb2432d"> <!ENTITY systemd-fin-du "238 MB"> <!ENTITY systemd-fin-sbu "0.7 SBU"> @@ -709,10 +709,10 @@ <!ENTITY texinfo-fin-du "128 MB"> <!ENTITY texinfo-fin-sbu "0.3 SBU"> -<!ENTITY tzdata-version "2023c"> -<!ENTITY tzdata-size "436 KB"> +<!ENTITY tzdata-version "2023d"> +<!ENTITY tzdata-size "440 KB"> <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz"> -<!ENTITY tzdata-md5 "5aa672bf129b44dd915f8232de38e49a"> +<!ENTITY tzdata-md5 "08b9d559939670725ec298fdbb029649"> <!ENTITY tzdata-home "https://www.iana.org/time-zones"> <!ENTITY udev-fin-du "138 MB"> @@ -725,23 +725,23 @@ <!ENTITY udev-lfs-home " "> <!ENTITY util-linux-minor "2.39"> -<!ENTITY util-linux-version "2.39.2"> <!-- 2.33.x --> -<!ENTITY util-linux-size "8,167 KB"> +<!ENTITY util-linux-version "2.39.3"> <!-- 2.33.x --> +<!ENTITY util-linux-size "8,327 KB"> <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz"> -<!ENTITY util-linux-md5 "2feb3e7c306f336a3d22a182dfffc942"> +<!ENTITY util-linux-md5 "f3591e6970c017bb4bcd24ae762a98f5"> <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/"> <!ENTITY util-linux-tmp-du "169 MB"> <!ENTITY util-linux-tmp-sbu "0.2 SBU"> <!ENTITY util-linux-fin-du "310 MB"> <!ENTITY util-linux-fin-sbu "0.5 SBU"> -<!ENTITY vim-version "9.0.2136"> +<!ENTITY vim-version "9.0.2189"> <!-- <!ENTITY vim-majmin "90"> --> <!ENTITY vim-docdir "vim/vim90"> -<!ENTITY vim-size "16,989 KB"> +<!ENTITY vim-size "17,196 KB"> <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz"> <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">--> -<!ENTITY vim-md5 "8dcf113cb690bcdd13d75a4e7c2e3a62"> +<!ENTITY vim-md5 "0a750075a7da900b96691bf6fcc919c6"> <!ENTITY vim-home "https://www.vim.org"> <!ENTITY vim-fin-du "229 MB"> <!ENTITY vim-fin-sbu "2.3 SBU"> @@ -754,10 +754,10 @@ <!ENTITY wheel-fin-du "1.5 MB"> <!ENTITY wheel-fin-sbu "less than 0.1 SBU"> -<!ENTITY xml-parser-version "2.46"> -<!ENTITY xml-parser-size "249 KB"> +<!ENTITY xml-parser-version "2.47"> +<!ENTITY xml-parser-size "276 KB"> <!ENTITY xml-parser-url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz"> -<!ENTITY xml-parser-md5 "80bb18a8e6240fcf7ec2f7b57601c170"> +<!ENTITY xml-parser-md5 "89a8e82cfd2ad948b349c0a69c494463"> <!ENTITY xml-parser-home "&github;/chorny/XML-Parser"> <!ENTITY xml-parser-fin-du "2.3 MB"> <!ENTITY xml-parser-fin-sbu "less than 0.1 SBU"> diff --git a/patches.ent b/patches.ent index 13f291e0f..6c03b9728 100644 --- a/patches.ent +++ b/patches.ent @@ -18,10 +18,6 @@ <!ENTITY glibc-upstream-fixes-patch-md5 "545977e0b5c341ba945cf4b5de92f1e2"> <!ENTITY glibc-upstream-fixes-patch-size "28 KB"> -<!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch"> -<!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174"> -<!ENTITY grub-upstream-fixes-patch-size "8 KB"> - <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch"> <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895"> <!ENTITY kbd-backspace-patch-size "12 KB"> |