Automatic merge of trunk into multilib

2025-01-31 11:21:59 +00:00 · 2024-01-25 12:41:51 +01:00 · 2024-01-25 12:41:51 +01:00 · bb1dfaf649
commit bb1dfaf649
parent 64a4f1330f 47bc996103
12 changed files with 187 additions and 85 deletions
--- a/13
+++ b/13
@ -164,9 +164,11 @@ profile-html:
                stylesheets/lfs-xsl/profile.xsl      \
                $(RENDERTMP)/lfs-full.xml

+DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \
+                packages.ent patches.ent general.ent
+
 wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
-$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                      packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
 	$(Q)xsltproc --xinclude --nonet            \
@ -174,9 +176,7 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
                stylesheets/wget-list.xsl     \
                chapter03/chapter03.xml

-$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
-                             chapter03/chapter03.xml \
-                             packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	$(Q)xsltproc --nonet --xinclude                   \
                --stringparam profile.revision $(REV) \
                --output $(RENDERTMP)/wget-list.xml   \
@ -188,8 +188,7 @@ $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
                $(RENDERTMP)/wget-list.xml

 md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                    packages.ent patches.ent
+$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
 	$(Q)mkdir -p $(BASEDIR)

--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@ -40,6 +40,72 @@
    appropriate for the entry or if needed the entire day's listitem.
    -->

+    <listitem>
+      <para>2024-01-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Apply upstream fix for pkgconf-2.1.0 regression.
+          Fixes <ulink url='&lfs-ticket-root;5414'>#5414</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.7.5.  Fixes
+          <ulink url='&lfs-ticket-root;5408'>#5408</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to attr-2.5.2.  Fixes
+          <ulink url='&lfs-ticket-root;5412'>#5412</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to ncurses-6.4-20230520 (security fix).
+          Fixes <ulink url='&lfs-ticket-root;5416'>#5416</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to markupsafe-2.1.4.  Fixes
+          <ulink url='&lfs-ticket-root;5418'>#5418</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.7.1.  Fixes
+          <ulink url='&lfs-ticket-root;5406'>#5406</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iproute2-6.7.0.  Fixes
+          <ulink url='&lfs-ticket-root;5410'>#5410</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-9.1.0041.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iana-etc-20240117.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to shadow-4.14.3.  Fixes
+          <ulink url='&lfs-ticket-root;5413'>#5413</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Fix CVE-2024-0684 for coreutils-9.4.  Fixes
+          <ulink url="&lfs-ticket-root;5417">#5417</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2024-01-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Edit a ncurses header to always use the
+          wide-character ABI compatible with libncursesw.so because we
+          are faking the 8-bit libncurses.so with it.  Fixes
+          <ulink url="&lfs-ticket-root;5415">#5415</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
      <para>2024-01-09</para>
      <itemizedlist>
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@ -29,9 +29,9 @@
    <!--<listitem>
      <para>Acl-&acl-version;</para>
    </listitem>-->
-    <!--<listitem>
+    <listitem>
      <para>Attr-&attr-version;</para>
-    </listitem>-->
+    </listitem>
    <listitem>
      <para>Autoconf-&autoconf-version;</para>
    </listitem>
@ -134,9 +134,9 @@
    <listitem>
      <para>IPRoute2-&iproute2-version;</para>
    </listitem>
-    <!--<listitem revision="systemd">
+    <listitem>
      <para>Jinja2-&jinja2-version;</para>
-    </listitem>-->
+    </listitem>
    <listitem>
      <para>Kbd-&kbd-version;</para>
    </listitem>
@ -179,9 +179,9 @@
    <!--<listitem>
      <para>Man-pages-&man-pages-version;</para>
    </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem>
      <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
+    </listitem>
    <listitem>
      <para>Meson-&meson-version;</para>
    </listitem>
@ -191,9 +191,9 @@
    <listitem>
      <para>MPFR-&mpfr-version;</para>
    </listitem>
-    <!--<listitem>
+    <listitem>
      <para>Ncurses-&ncurses-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
      <para>Ninja-&ninja-version;</para>
    </listitem>-->
@ -298,6 +298,10 @@
      <para>&glibc-upstream-fixes-patch;</para>
    </listitem>

+    <listitem>
+      <para>&pkgconf-upstream-fix-patch;</para>
+    </listitem>
+
    <listitem>
      <para>&readline-fixes-patch;</para>
    </listitem>
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@ -117,15 +117,14 @@
      </listitem>
    </varlistentry>
 -->
-<!--
+
    <varlistentry>
-      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
      <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
      </listitem>
    </varlistentry>
-->

    <varlistentry>
      <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@ -156,7 +156,9 @@ popd</userinput></screen>
    <para>Install the package:</para>

 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
+ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i $LFS/usr/include/curses.h</userinput></screen>
 <!--
    <para>Remove an unneeded static library not handled by
    <command>configure</command>:</para>
@ -176,12 +178,28 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
      </varlistentry>

      <varlistentry>
-        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
+        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
        <listitem>
          <para>The <filename>libncurses.so</filename> library is needed by
-          a few packages we will build soon. We create this small linker
-          script, as this is what is done in <xref
-          linkend="chapter-building-system"/>.</para>
+          a few packages we will build soon. We create this symlink to use
+          <filename>libncursesw.so</filename> as a replacement.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>sed -e 's/^#if.*XOPEN.*$/#if 1/' ...</command></term>
+        <listitem>
+          <para>The header file <filename>curses.h</filename> contains
+          the definition of various Ncurses data structures.  With different
+          preprocessor macro definitions two different sets of the data
+          structure definition may be used: the 8-bit definition is
+          compatible with <filename>libncurses.so</filename> and the
+          wide-character definition is compatible with
+          <filename>libncursesw.so</filename>.  Since we are using
+          <filename>libncursesw.so</filename> as a replacement of
+          <filename>libncurses.so</filename>, edit the header file so it
+          will always use the wide-character data structure definition
+          compatible with <filename>libncursesw.so</filename>.</para>
        </listitem>
      </varlistentry>

--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@ -53,13 +53,13 @@
      those bugs are reproducible without this patch.</para>
    </note>

-    <!-- https://bugs.gnu.org/62403 -->
-<!--
-    <para>Fix a bug in checksum utilities causing failed checks not
-    reported correctly:</para>
+    <!-- https://seclists.org/oss-sec/2024/q1/30 -->
+    <para>Fix a security vulnerability in the <command>split</command>
+    utility:</para>
+
+<screen><userinput remap="pre">sed -e '/n_out += n_hold/,+4 s|.*bufsize.*|//&amp;|' \
+    -i src/split.c</userinput></screen>

-<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
-->
    <para>Now prepare Coreutils for compilation:</para>

 <screen><userinput remap="configure">autoreconf -fiv
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@ -556,7 +556,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
      <varlistentry id="libcc1">
        <term><filename class="libraryfile">libcc1</filename></term>
        <listitem>
-          <para>The C preprocessing library</para>
+          <para>A library that allows GDB to make use of GCC</para>
          <indexterm zone="ch-system-gcc libcc1">
            <primary sortas="b-libcc1">libcc1</primary>
          </indexterm>
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@ -99,9 +99,9 @@
        <term><parameter>--enable-widec</parameter></term>
        <listitem>
          <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
          to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
          These wide-character libraries are usable in both multibyte and
          traditional 8-bit locales, while normal libraries work properly
          only in 8-bit locales. Wide-character and normal libraries are
@ -127,34 +127,39 @@
         make will spawn new shell processes during "make install".  -->

    <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
    in-place.  It may crash the shell process which is using code and data
    from the library file.  Install the package with
    <literal>DESTDIR</literal>, and replace the library file correctly using
-    <command>install</command> command:</para>
+    <command>install</command> command (the header
+    <filename>curses.h</filename> is also edited to ensure the
+    wide-character ABI to be used as what we've done in
+    <xref linkend='ch-tools-ncurses'/>):</para>

 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i dest/usr/include/curses.h
 cp -av dest/* /</userinput></screen>

    <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
+    non-wide-character Ncurses libraries. Trick such applications into
+    linking with wide-character libraries by means of symlinks
+    (note that the <filename class='extension'>.so</filename> links are
+    only safe with <filename>curses.h</filename> edited to always use the
+    wide-character ABI):</para>

 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
+    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>

    <para>Finally, make sure that old applications that look for
    <filename class="libraryfile">-lcurses</filename> at build time are still
    buildable:</para>

-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>

    <para>If desired, install the Ncurses documentation:</para>

@ -298,13 +303,17 @@ rm -rf DESTDIR</userinput></screen>
           tset
        </seg>
        <seg>
-           libcursesw.so (symlink and linker script to libncursesw.so),
+           libcurses.so (symlink),
+           libform.so (symlink),
           libformw.so,
+           libmenu.so (symlink),
           libmenuw.so,
+           libncurses.so (symlink),
           libncursesw.so,
           libncurses++w.so,
-           libpanelw.so, and their non-wide-character counterparts without "w"
-              in the library names.</seg>
+           libpanel.so (symlink),
+           and libpanelw.so,
+        </seg>
        <seg>
           /usr/share/tabset,
           /usr/share/terminfo, and
--- a/chapter08/pkgconf.xml
+++ b/chapter08/pkgconf.xml
@ -45,9 +45,9 @@
    <title>Installation of Pkgconf</title>

    <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>

-    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>

    <para>Prepare Pkgconf for compilation:</para>

--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@ -1 +1 @@
-6.6.3
+6.7.1
--- a/packages.ent
+++ b/packages.ent
@ -21,10 +21,10 @@
 <!ENTITY acl-fin-du "6.1 MB">
 <!ENTITY acl-fin-sbu "less than 0.1 SBU">

-<!ENTITY attr-version "2.5.1">
-<!ENTITY attr-size "456 KB">
+<!ENTITY attr-version "2.5.2">
+<!ENTITY attr-size "484 KB">
 <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
-<!ENTITY attr-md5 "ac1c5a7a084f0f83b8cace34211f64d8">
+<!ENTITY attr-md5 "227043ec2f6ca03c0948df5517f9c927">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-fin-du "4.1 MB">
 <!ENTITY attr-fin-sbu "less than 0.1 SBU">
@ -57,10 +57,10 @@
 <!ENTITY bash-fin-du "52 MB">
 <!ENTITY bash-fin-sbu "1.1 SBU">

-<!ENTITY bc-version "6.7.4">
-<!ENTITY bc-size "456 KB">
+<!ENTITY bc-version "6.7.5">
+<!ENTITY bc-size "460 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "7826138b08c72f4618d6e48860101196">
+<!ENTITY bc-md5 "e249b1f86f886d6fb71c15f72b65dd3d">
 <!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">
@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">

-<!ENTITY iana-etc-version "20231205">
-<!ENTITY iana-etc-size "592 KB">
+<!ENTITY iana-etc-version "20240117">
+<!ENTITY iana-etc-size "596 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 "7904f5aefaccd74e24af738da0e8bdaf">
+<!ENTITY iana-etc-md5 "215feb4b55043a6c18e84a5ed58b705f">
 <!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">
@ -341,10 +341,10 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">

-<!ENTITY iproute2-version "6.6.0">
-<!ENTITY iproute2-size "897 KB">
+<!ENTITY iproute2-version "6.7.0">
+<!ENTITY iproute2-size "900 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "6716fc3188dbea226997fa2478a190d7">
+<!ENTITY iproute2-md5 "35d8277d1469596b7edc07a51470a033">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
 <!ENTITY iproute2-fin-sbu "0.1 SBU">
@ -358,10 +358,10 @@
 <!ENTITY isl-fin-du "20 MB">
 <!ENTITY isl-fin-sbu "0.1 SBU">

-<!ENTITY jinja2-version "3.1.2">
-<!ENTITY jinja2-size "262 KB">
+<!ENTITY jinja2-version "3.1.3">
+<!ENTITY jinja2-size "264 KB">
 <!ENTITY jinja2-url "&pypi-src;/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
-<!ENTITY jinja2-md5 "d31148abd89c1df1cdb077a55db27d02">
+<!ENTITY jinja2-md5 "caf5418c851eac59e70a78d9730d4cea">
 <!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
 <!ENTITY jinja2-fin-du "3.4 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
@ -439,13 +439,13 @@
 <!ENTITY libxcrypt-fin-sbu "0.1 SBU">

 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-minor-version "7">
+<!ENTITY linux-patch-version "1">
 <!--<!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,800 KB">
+<!ENTITY linux-size "138,096 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a3deb764c4f8a77ff49735d6b3057409">
+<!ENTITY linux-md5 "d8a7394e0e349dd373e9722e141c8b61">
 <!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
@ -495,10 +495,10 @@
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">

-<!ENTITY markupsafe-version "2.1.3">
-<!ENTITY markupsafe-size "19 KB">
+<!ENTITY markupsafe-version "2.1.4">
+<!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "ca33f119bd0551ce15837f58bb180214">
+<!ENTITY markupsafe-md5 "8138329a11cf4bd0f9db780b2af26c66">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "548 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
@ -527,10 +527,13 @@
 <!ENTITY mpfr-fin-du "43 MB">
 <!ENTITY mpfr-fin-sbu "0.2 SBU">

-<!ENTITY ncurses-version "6.4">
-<!ENTITY ncurses-size "3,528 KB">
-<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "5a62487b5d4ac6b132fe2bf9f8fad29b">
+<!ENTITY ncurses-release "6.4">
+<!ENTITY ncurses-version "&ncurses-release;-20230520">
+<!ENTITY ncurses-size "2,156 KB">
+<!-- switch back to invisible-mirror.net for 6.5 -->
+<!--ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz"-->
+<!ENTITY ncurses-url "&anduin-sources;/ncurses-&ncurses-version;.tar.xz">
+<!ENTITY ncurses-md5 "c5367e829b6d9f3f97b280bb3e6bfbc3">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-tmp-du "51 MB">
 <!ENTITY ncurses-tmp-sbu "0.3 SBU">
@ -645,10 +648,10 @@
 <!ENTITY setuptools-fin-du "30 MB">
 <!ENTITY setuptools-fin-sbu "0.1 SBU">

-<!ENTITY shadow-version "4.14.2">
-<!ENTITY shadow-size "1,758 KB">
+<!ENTITY shadow-version "4.14.3">
+<!ENTITY shadow-size "1,760 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "effc1aa17590305647413125b966f1dd">
+<!ENTITY shadow-md5 "b9a7f56d0c63297c0d11d742be2f8ffd">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "46 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">
@ -744,13 +747,13 @@
 <!ENTITY util-linux-fin-du "310 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">

-<!ENTITY vim-version "9.0.2189">
+<!ENTITY vim-version "9.1.0041">
 <!-- <!ENTITY vim-majmin "90"> -->
-<!ENTITY vim-docdir "vim/vim90">
-<!ENTITY vim-size "17,196 KB">
+<!ENTITY vim-docdir "vim/vim91">
+<!ENTITY vim-size "17,224 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 "0a750075a7da900b96691bf6fcc919c6">
+<!ENTITY vim-md5 "79dfe62be5d347b1325cbd5ce2a1f9b3">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "229 MB">
 <!ENTITY vim-fin-sbu "2.3 SBU">
--- a/patches.ent
+++ b/patches.ent
@ -22,6 +22,10 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">

+<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
+<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
+<!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
+
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
 <!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
 <!ENTITY readline-fixes-patch-size "5.7 KB">
 @ -1 +1 @@
 .6.3
 .7.1