From 5e3a62dffe88f3504b349d0147b4792296b5e270 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 13 Sep 2023 05:59:22 +0100
Subject: [PATCH] Second attempt to fix libwebp.

Apologies to anyone who picked up the first version of the patch.
---
 general/graphlib/libwebp.xml       | 6 ++----
 introduction/welcome/changelog.xml | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/general/graphlib/libwebp.xml b/general/graphlib/libwebp.xml
index ea8f1af0ff..290afab8f0 100644
--- a/general/graphlib/libwebp.xml
+++ b/general/graphlib/libwebp.xml
@@ -71,7 +71,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/libwebp-&libwebp-version;-security_update-1.patch"/>
+          <ulink url="&patch-root;/libwebp-&libwebp-version;-security_update-2.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -97,13 +97,11 @@
   <sect2 role="installation">
     <title>Installation of libwebp</title>
 
-    <!-- CVE-2023-4863, critical, extracted from firefox-115.2.1 in the hope
-         it will be sufficient -->
     <para>
       Fix a security issue identified upstream:
     </para>
 
-<screen><userinput>patch -Np1 -i ../libwebp-&libwebp-version;-security_update-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../libwebp-&libwebp-version;-security_update-2.patch</userinput></screen>
 
     <para>
       Install <application>libwebp</application> by running the following
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 0899663de7..0da5e075c6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,12 @@
     <listitem>
       <para>September 13th, 2023</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated the libwebp patch to version2, this adds
+          a second chromium commit which the debian bug pointed to.
+          Fixes
+          <ulink url="&blfs-ticket-root;18544">#18544</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Patch libwebp-1.3.1 for a critical vulnerability.
           This is not the official fix, which is not yet public, but was