From b9d57d5e0ff668e8ee8ceb33ed102e49c3079023 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Wed, 10 Sep 2025 12:04:18 +0800
Subject: [PATCH] 10.06.0

---
 backport-CVE-2025-7462.patch                  | 47 -------------------
 ....05.1.tar.xz => ghostscript-10.06.0.tar.xz |  4 +-
 ghostscript.spec                              |  8 ++--
 3 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 backport-CVE-2025-7462.patch
 rename ghostscript-10.05.1.tar.xz => ghostscript-10.06.0.tar.xz (32%)

diff --git a/backport-CVE-2025-7462.patch b/backport-CVE-2025-7462.patch
deleted file mode 100644
index 27d6f6c..0000000
--- a/backport-CVE-2025-7462.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 619a106ba4c4abed95110f84d5efcd7aee38c7cb Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Wed, 25 Jun 2025 13:23:41 +0100
-Subject: Bug 708606: Catch a null file pointer closing pdfwrite.
-
-In the event of an error opening a new output file.
----
- devices/vector/gdevpdf.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/devices/vector/gdevpdf.c b/devices/vector/gdevpdf.c
-index e75f33a6c..d7d5e8c6b 100644
---- a/devices/vector/gdevpdf.c
-+++ b/devices/vector/gdevpdf.c
-@@ -983,7 +983,10 @@ pdf_ferror(gx_device_pdf *pdev)
- {
-     int code = 0;
- 
--    gp_fflush(pdev->file);
-+    if (pdev->file != NULL) {
-+        gp_fflush(pdev->file);
-+        code = gp_ferror(pdev->file);
-+    }
-     gp_fflush(pdev->xref.file);
-     if (pdev->strm->file != NULL)
-         sflush(pdev->strm);
-@@ -992,12 +995,13 @@ pdf_ferror(gx_device_pdf *pdev)
-     if (pdev->streams.strm->file != NULL)
-         sflush(pdev->streams.strm);
-     if (pdev->ObjStm.strm != NULL && pdev->ObjStm.strm->file != NULL) {
-+        int code2;
-         sflush(pdev->ObjStm.strm);
--        code = gp_ferror(pdev->ObjStm.file);
-+        code2 = gp_ferror(pdev->ObjStm.file);
-+        if (code >= 0) code = code2;
-     }
--    return gp_ferror(pdev->file) || gp_ferror(pdev->xref.file) ||
--        gp_ferror(pdev->asides.file) || gp_ferror(pdev->streams.file) ||
--        code;
-+    return gp_ferror(pdev->xref.file) || gp_ferror(pdev->asides.file) ||
-+           gp_ferror(pdev->streams.file) || code;
- }
- 
- /* Compute the dominant text orientation of a page. */
--- 
-cgit v1.2.3
-
diff --git a/ghostscript-10.05.1.tar.xz b/ghostscript-10.06.0.tar.xz
similarity index 32%
rename from ghostscript-10.05.1.tar.xz
rename to ghostscript-10.06.0.tar.xz
index afd5aaa..5afda9e 100644
--- a/ghostscript-10.05.1.tar.xz
+++ b/ghostscript-10.06.0.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22f2bdca15c28830c9715cddc5c296ea66898bfdab0b604a4e0bcfeb03af6cad
-size 68043644
+oid sha256:64352648c2c081c8a9fb1a12dc1965e01ead7c57f58b72d1b54f6ef1cef3c561
+size 68955484
diff --git a/ghostscript.spec b/ghostscript.spec
index 30cd8b0..3be4068 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -8,15 +8,14 @@
 %global google_droid_fontpath %%(dirname $(fc-list : file | grep "DroidSansFallback"))
 
 Name:             ghostscript
-Version:          10.05.1
-Release:          2
+Version:          10.06.0
+Release:          1
 Summary:          An interpreter for PostScript and PDF files
 License:          AGPL-3.0-or-later
 URL:              https://ghostscript.com/
 Source0:          https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%{version_short}/ghostscript-%{version}.tar.xz
 
 Patch0:           ghostscript-9.23-100-run-dvipdf-securely.patch
-Patch6001:        backport-CVE-2025-7462.patch
 
 BuildRequires:    automake gcc
 BuildRequires:    adobe-mappings-cmap-devel adobe-mappings-pdf-devel
@@ -182,6 +181,9 @@ install -m 0755 -d %{buildroot}%{_datadir}/%{name}/conf.d/
 %{_bindir}/gsx
 
 %changelog
+* Wed Sep 10 2025 Funda Wang <fundawang@yeah.net> - 10.06.0-1
+- update to 10.06.0
+
 * Fri Jul 25 2025 Funda Wang <fundawang@yeah.net> - 10.05.1-2
 - fix CVE-2025-7462
 
-- 
Gitee