From 5a83b91b3ea2160a4aac2018c78a2fd3343d8d74 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 21 Sep 2023 16:02:30 -0500
Subject: [PATCH] Update to cups-2.4.7 (Security Update)

---
 introduction/welcome/changelog.xml |  4 ++
 packages.ent                       |  2 +-
 pst/printing/cups.xml              | 93 +++++-------------------------
 3 files changed, 18 insertions(+), 81 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d9f50e7c01..9d3376a1b4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
     <listitem>
       <para>September 21st, 2023</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cups-2.4.7 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;18623">#18623</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to stunnel-5.71. Fixes
           <ulink url="&blfs-ticket-root;18612">#18612</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index a6bb22abad..c3680707cd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -1113,7 +1113,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 
 <!-- Part XIII -->
 <!-- Chapter 46 -->
-<!ENTITY cups-version                 "2.4.6">
+<!ENTITY cups-version                 "2.4.7">
 <!ENTITY cups-filters-version         "1.28.16">
 <!ENTITY gs-version                   "10.02.0">
 <!ENTITY gs-dl-version                "10.02.0">
diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml
index bb9771208f..2fc630c14b 100644
--- a/pst/printing/cups.xml
+++ b/pst/printing/cups.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "b8ca6027eaeeed6171178cc526879ff5">
+  <!ENTITY cups-md5sum        "e0a5ddbf53dfad41da26fc1ef60b2256">
   <!ENTITY cups-size          "7.8 MB">
-  <!ENTITY cups-buildsize     "76 MB (Add 60 MB for tests)">
-  <!ENTITY cups-time          "0.5 SBU (Add 1.6 SBU for tests)">
+  <!ENTITY cups-buildsize     "77 MB (Add 49 MB for tests)">
+  <!ENTITY cups-time          "0.4 SBU (Add 1.0 SBU for tests)">
 ]>
 
 <sect1 id="cups" xreflabel="Cups-&cups-version;">
@@ -191,17 +191,6 @@
       choice.
     </para>
 
-<!-- Fixed in 2.4.1
-    <para revision="systemd">
-      Fix a bug that causes the <filename>cups.service</filename> systemd unit
-      to be placed into a non-existent target:
-    </para>
-
-<screen revision="systemd"><userinput remap="pre">sed -e "s/printers.target/printer.target/" \
-    -i configure \
-       config-scripts/cups-defaults.m4</userinput></screen>
--->
-
     <para>
       Build <application>Cups</application> by running the following commands:
     </para>
@@ -414,21 +403,21 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>
-           <!--accept,--> cancel, cupsaccept, <!--cupsaddsmb,--> cups-config,
-          cupsctl, cupsd, cupsdisable, cupsenable, cupsfilter, cupsreject,
-          <!--cupstestdsc,--> cupstestppd, ippeveprinter, ippfind, ipptool, lp,
-          lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq, lpr, lprm, lpstat, ppdc,
-          ppdhtml, ppdi, ppdmerge, and ppdpo <!--and reject-->
+          cancel, cupsaccept, cups-config, cupsctl, cupsd, cupsdisable,
+          cupsenable, cupsfilter, cupsreject, cupstestppd, ippeveprinter,
+          ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq,
+          lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge, and ppdpo
         </seg>
         <seg>
-          <!--libcupscgi.so,--> libcupsimage.so <!--libcupsmime.so,-->
-          <!--libcupsppdc.so,--> and libcups.so
+          libcupsimage.so
+          and libcups.so
         </seg>
         <seg>
           /etc/cups,
           /usr/{include,lib,share}/cups,
-          /usr/share/doc/cups-&cups-version;, and
-          /var/{cache,log,run,spool}/cups
+          /usr/share/doc/cups-&cups-version;,
+          /run/cups, and
+          /var/{cache,log,spool}/cups
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -438,21 +427,6 @@ EOF</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <!--
-      <varlistentry id="accept">
-        <term><command>accept</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to accept print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups accept">
-            <primary sortas="b-accept">accept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-     -->
-
      <varlistentry id="cancel-cups">
         <term><command>cancel</command></term>
         <listitem>
@@ -477,21 +451,6 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
-<!--
-      <varlistentry id="cupsaddsmb">
-        <term><command>cupsaddsmb</command></term>
-        <listitem>
-          <para>
-            exports printers to the <application>Samba</application>
-            software for use with Windows clients.
-          </para>
-          <indexterm zone="cups cupsaddsmb">
-            <primary sortas="b-cupsaddsmb">cupsaddsmb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
       <varlistentry id="cups-config-prog">
         <term><command>cups-config</command></term>
         <listitem>
@@ -578,19 +537,6 @@ EOF</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="cupstestdsc">
-        <term><command>cupstestdsc</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PostScript files.
-          </para>
-          <indexterm zone="cups cupstestdsc">
-            <primary sortas="b-cupstestdsc">cupstestdsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
 
       <varlistentry id="cupstestppd">
         <term><command>cupstestppd</command></term>
@@ -829,20 +775,7 @@ EOF</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="reject">
-        <term><command>reject</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to reject print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups reject">
-            <primary sortas="b-reject">reject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="libcups">
         <term><filename class="libraryfile">libcups.so</filename></term>
         <listitem>