From 98a60c3e87c9e4dbaeb1a2233f6f7c5a949fb11a Mon Sep 17 00:00:00 2001
From: David King <dking@redhat.com>
Date: Tue, 13 May 2025 11:08:39 +0100
Subject: [PATCH] Update documentation for CVE-2022-4055 (RHEL-87487)

Resolves: RHEL-87487
---
 xdg-utils-1.1.3-CVE-2022-4055.patch | 65 ++++++++++++++++++++++++++++-
 xdg-utils.spec                      |  5 ++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/xdg-utils-1.1.3-CVE-2022-4055.patch b/xdg-utils-1.1.3-CVE-2022-4055.patch
index 6d0f3a6..a75b572 100644
--- a/xdg-utils-1.1.3-CVE-2022-4055.patch
+++ b/xdg-utils-1.1.3-CVE-2022-4055.patch
@@ -1,8 +1,8 @@
 From 1efb5f2fa49fb5e4e138d2b2531a6e7e180845c2 Mon Sep 17 00:00:00 2001
 From: Gabriel Corona <gabriel.corona@enst-bretagne.fr>
 Date: Thu, 25 Aug 2022 23:51:45 +0200
-Subject: [PATCH] Disable special support for Thunderbird in xdg-email (fixes
- CVE-2020-27748, CVE-2022-4055)
+Subject: [PATCH 1/2] Disable special support for Thunderbird in xdg-email
+ (fixes CVE-2020-27748, CVE-2022-4055)
 
 ---
  scripts/xdg-email.in | 113 -------------------------------------------
@@ -165,3 +165,64 @@ index 3614776..b700679 100644
 -- 
 2.49.0
 
+
+From 01a5c1b1a3372d0d6bc35e280800aad51fbbc383 Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Tue, 13 May 2025 11:01:35 +0100
+Subject: [PATCH 2/2] Remove attach option from documentation
+
+---
+ scripts/desc/xdg-email.xml | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/scripts/desc/xdg-email.xml b/scripts/desc/xdg-email.xml
+index 3abea2a..84cbe35 100644
+--- a/scripts/desc/xdg-email.xml
++++ b/scripts/desc/xdg-email.xml
+@@ -41,7 +41,6 @@
+       <arg><option>--bcc</option> <replaceable>address</replaceable></arg>
+       <arg><option>--subject</option> <replaceable>text</replaceable></arg>
+       <arg><option>--body</option> <replaceable>text</replaceable></arg>
+-      <arg><option>--attach</option> <replaceable>file</replaceable></arg>
+       <group choice="opt">
+         <arg choice="plain"><replaceable>mailto-uri</replaceable></arg>
+         <arg choice="plain"><replaceable>address(es)</replaceable></arg>
+@@ -136,20 +135,6 @@
+ 	</listitem>
+       </varlistentry>
+ 
+-      <varlistentry>
+-	<term><option>--attach</option> <replaceable>file</replaceable></term>
+-	<listitem>
+-	  <simpara>
+-	    Specify an attachment for the e-mail. <replaceable>file</replaceable>
+-	    must point to an existing file.
+-	  </simpara>
+-	  <simpara>
+-	    Some e-mail applications require the file to remain present
+-            after xdg-email returns.
+-	  </simpara>
+-	</listitem>
+-      </varlistentry>
+-      
+       <varlistentry>
+ 	<term><option>--help</option></term>
+ 	<listitem>
+@@ -271,14 +256,6 @@ xdg-email 'Jeremy White &lt;jwhite@example.com&gt;'
+     </para>
+     <para>
+ <programlisting>
+-xdg-email --attach /tmp/logo.png \
+-          --subject 'Logo contest' \
+-          --body 'Attached you find the logo for the contest.' \
+-          'jwhite@example.com'
+-</programlisting>
+-    </para>
+-    <para>
+-<programlisting>
+ xdg-email --subject 'Your password is about to expire' \
+           'jwhite@example.com' 'bastian@example.com' 'whipple@example.com'
+ </programlisting>
+-- 
+2.49.0
+
diff --git a/xdg-utils.spec b/xdg-utils.spec
index 0020875..ce43fc2 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.1.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?snap:1}
@@ -94,6 +94,9 @@ make install DESTDIR=%{buildroot}
 
 
 %changelog
+* Tue May 13 2025 David King <dking@redhat.com> - 1.1.3-13
+- Update documentation for CVE-2022-4055 (RHEL-87487)
+
 * Fri May 09 2025 David King <dking@redhat.com> - 1.1.3-12
 - Fix CVE-2022-4055 (RHEL-87487)