Changes in / [0e223a6:2248715]

Files:

• appendices/dependencies.xml (modified) (5 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (3 diffs)
• chapter03/packages.xml (modified) (1 diff)
• chapter08/chapter08.xml (modified) (2 diffs)
• chapter08/pkgconf.xml (deleted)
• chapter08/pkgconfig.xml (added)
• packages.ent (modified) (3 diffs)

appendices/dependencies.xml

@@ -1608 +1608 @@
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
-          Gzip, Make, OpenSSL, Pkgconf, Sed, Xz, and Zlib</seg>
+          Gzip, Make, OpenSSL, Pkg-config, Sed, Xz, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
@@ -2485 +2485 @@
 
 <!-- Begin Pkg-config dependency info -->
-  <bridgehead renderas="sect2" id="pkgconf-dep">Pkgconf</bridgehead>
-
-      <segmentedlist id="pkgconf-depends">
+  <bridgehead renderas="sect2" id="pkgconfig-dep">Pkg-config</bridgehead>
+
+      <segmentedlist id="pkgconfig-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
@@ -2495 +2495 @@
       </segmentedlist>
 
-      <segmentedlist id="pkgconf-rundeps">
+      <segmentedlist id="pkgconfig-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -2502 +2502 @@
       </segmentedlist>
 
-      <segmentedlist id="pkgconf-testdeps">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="pkgconf-before">
+      <segmentedlist id="pkgconfig-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="pkgoonfig-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
@@ -2516 +2516 @@
       </segmentedlist>
 
-      <segmentedlist id="pkgconf-optdeps">
-        <segtitle>&external;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
+      <segmentedlist id="pkgconfig-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>
+            <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
+          </seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

@@ -40 +40 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
-
-    <listitem>
-      <para>2023-06-17</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to linux-6.3.8.  Fixes
-          <ulink url='&lfs-ticket-root;5272'>#5272</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to kbd-2.6.0.  Fixes
-          <ulink url='&lfs-ticket-root;5273'>#5273</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Changed from pkg-config to pkgconf 1.9.5.  Fixes
-          <ulink url='&lfs-ticket-root;5274'>#5274</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
     <listitem>
       <para>2023-06-09</para>

chapter01/whatsnew.xml

@@ -230 +230 @@
       <para>Perl-&perl-version;</para>
     </listitem>
+    <!--<listitem>
+      <para>Pkg-config-&pkgconfig-version;</para>
+    </listitem>-->
     <listitem>
       <para>Procps-ng-&procps-ng-version;</para>
@@ -306 +309 @@
 
     <listitem>
-      <para>Pkgconf-&flit-core-version;</para>
-    </listitem>
-
-    <listitem>
       <para>Flit-core-&flit-core-version;</para>
     </listitem>
@@ -331 +330 @@
 
     <listitem>
-      <para>Pkg-config-0.29.2</para>
-    </listitem>
-
-    <listitem>
       <para>systemd-252-security_fix-1.patch</para>
     </listitem>

chapter03/packages.xml

@@ -619 +619 @@
 
     <varlistentry>
-      <term>Pkgconf (&pkgconf-version;) - <token>&pkgconf-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&pkgconf-home;"/></para>
-        <para>Download: <ulink url="&pkgconf-url;"/></para>
-        <para>MD5 sum: <literal>&pkgconf-md5;</literal></para>
+      <term>Pkg-config (&pkgconfig-version;) - <token>&pkgconfig-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&pkgconfig-home;"/></para>
+        <para>Download: <ulink url="&pkgconfig-url;"/></para>
+        <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
       </listitem>
     </varlistentry>

chapter08/chapter08.xml

@@ -30 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
@@ -40 +41 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>

packages.ent

@@ -376 +376 @@
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY kbd-version "2.6.0">
-<!ENTITY kbd-size "1,560 KB">
+<!ENTITY kbd-version "2.5.1">
+<!ENTITY kbd-size "1,457 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "a8331144fc8e9421108c10311f28e078">
+<!ENTITY kbd-md5 "10f10c0a9d897807733f2e2419814abb">
 <!ENTITY kbd-home "https://kbd-project.org/">
 <!ENTITY kbd-fin-du "35 MB">
@@ -442 +442 @@
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "3">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-patch-version "6">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "133,708 KB">
+<!ENTITY linux-size "133,687 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "237a5269575160fed17c7f55d93cc46c">
+<!ENTITY linux-md5 "b30b7e0367fee0505eecbef74d852256">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
@@ -576 +576 @@
 <!ENTITY perl-fin-sbu "7.9 SBU">
 
-<!ENTITY pkgconf-version "1.9.5">
-<!ENTITY pkgconf-size "304 KB">
-<!ENTITY pkgconf-url "https://distfiles.dereferenced.org/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
-<!ENTITY pkgconf-md5 "0a8b69723bef4ebad83e9c8b43a75cc7">
-<!ENTITY pkgconf-home "http://pkgconf.org/">
-<!ENTITY pkgconf-fin-du "8.1 MB">
-<!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
+<!ENTITY pkgconfig-version "0.29.2">
+<!ENTITY pkgconfig-size "1,970 KB">
+<!ENTITY pkgconfig-url "https://pkg-config.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
+<!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
+<!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
+<!ENTITY pkgconfig-fin-du "29 MB">
+<!ENTITY pkgconfig-fin-sbu "0.1 SBU">
 
 <!ENTITY procps-ng-version "4.0.3">