From 36da32aeb5dbb783f3b01e3aefa4d28fd5360bf7 Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sat, 22 Jun 2024 21:57:41 +0200
Subject: [PATCH 1/5] xpdf: replaced rejected CVE with correct one

https://nvd.nist.gov/vuln/detail/CVE-2023-31557
---
 pkgs/applications/misc/xpdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 38b92eb77b9f..7116d61388e4 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
       "CVE-2023-26937"
       "CVE-2023-26938"
       "CVE-2023-27655"
-      "CVE-2023-31557"
+      "CVE-2023-2664"
     ];
   };
 }

From eac769ddaf1370c56be9b87f640e339d7b46fe0e Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sat, 22 Jun 2024 22:03:31 +0200
Subject: [PATCH 2/5] xpdf: removed rejected CVEs

---
 pkgs/applications/misc/xpdf/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 7116d61388e4..d1282deae27f 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -89,12 +89,6 @@ stdenv.mkDerivation rec {
       "CVE-2022-45587"
       "CVE-2023-26930"
       "CVE-2023-26931"
-      "CVE-2023-26934"
-      "CVE-2023-26935"
-      "CVE-2023-26936"
-      "CVE-2023-26937"
-      "CVE-2023-26938"
-      "CVE-2023-27655"
       "CVE-2023-2664"
     ];
   };

From 6723eac7618c97e2d6f96afd27558ead82a69d98 Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sat, 22 Jun 2024 22:14:40 +0200
Subject: [PATCH 3/5] xpdf: replaced rejected CVE with correct CVE

---
 pkgs/applications/misc/xpdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index d1282deae27f..e8e37c1a38b5 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
       "CVE-2019-9587: loop in PDF objects"
       "CVE-2019-9588: loop in PDF objects"
       "CVE-2019-16088: loop in PDF objects"
+      "CVE-2022-30524"
       "CVE-2022-38334"
       "CVE-2022-38928"
       "CVE-2022-41842"
@@ -88,7 +89,6 @@ stdenv.mkDerivation rec {
       "CVE-2022-45586"
       "CVE-2022-45587"
       "CVE-2023-26930"
-      "CVE-2023-26931"
       "CVE-2023-2664"
     ];
   };

From 94dc8189410e862744663c06329a5547af287f28 Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sat, 22 Jun 2024 22:26:08 +0200
Subject: [PATCH 4/5] xpdf: removed CVEs fixed in 4.05

https://www.xpdfreader.com/security-fixes.html
---
 pkgs/applications/misc/xpdf/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index e8e37c1a38b5..8467d290ccee 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -76,20 +76,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ sikmir ];
     knownVulnerabilities = [
-      "CVE-2019-9587: loop in PDF objects"
-      "CVE-2019-9588: loop in PDF objects"
-      "CVE-2019-16088: loop in PDF objects"
-      "CVE-2022-30524"
-      "CVE-2022-38334"
-      "CVE-2022-38928"
-      "CVE-2022-41842"
-      "CVE-2022-41843"
-      "CVE-2022-43071"
-      "CVE-2022-43295"
-      "CVE-2022-45586"
-      "CVE-2022-45587"
       "CVE-2023-26930"
-      "CVE-2023-2664"
     ];
   };
 }

From 8252d108b83ca08adf243390f39b88a1f795f549 Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sat, 22 Jun 2024 22:29:50 +0200
Subject: [PATCH 5/5] xpdf: added new CVEs

---
 pkgs/applications/misc/xpdf/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 8467d290ccee..2315810e03ff 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ sikmir ];
     knownVulnerabilities = [
       "CVE-2023-26930"
+      "CVE-2024-2971"
+      "CVE-2024-3247"
+      "CVE-2024-3248"
+      "CVE-2024-3900"
+      "CVE-2024-4141"
+      "CVE-2024-4568"
+      "CVE-2024-4976"
     ];
   };
 }