From 3d363e527f44d04c06495ebcdd45bf8b087df441 Mon Sep 17 00:00:00 2001
From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Tue, 7 Oct 2025 20:05:58 +0200
Subject: libcupsfilters: upgrade 2.0.0 -> 2.1.1

This contains a fix for CVE-2024-47076

Changelog: https://github.com/OpenPrinting/libcupsfilters/blob/2.1.1/CHANGES.md

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...except-false-instead-of-throw-from-c-17-onward.patch | 14 +++++++-------
 meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb   | 17 -----------------
 meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb   | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb
 create mode 100644 meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb

diff --git a/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch
index 72bbf10a14..0e0eb731a5 100644
--- a/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch
+++ b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch
@@ -9,7 +9,7 @@ throw(whatever) with noexcept(false).
 
 [1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html
 
-Upstream-Status: Submitted [https://github.com/OpenPrinting/cups-filters/pull/505]
+Upstream-Status: Backport [https://github.com/OpenPrinting/cups-filters/commit/2076627d33477212f21352ad39e9d305adb63af3]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  filter/pdftoraster.cxx | 4 ++++
@@ -17,11 +17,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
 index e8af184fb..e91e22459 100755
-@@ -2198,7 +2198,11 @@
+@@ -2199,11 +2199,11 @@
  // For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW
  // should be used as a guard, otherwise use traditional definition
  #ifndef _GLIBCXX_THROW
--#define _GLIBCXX_THROW throw
+-#  if __cplusplus >= 201103L
+-#    define _GLIBCXX_THROW(_EXC)
+-#  else
+-#    define _GLIBCXX_THROW(_EXC) throw(_EXC)
+-#  endif
 +#if __cplusplus < 201703L
 +#define _GLIBCXX_THROW throw
 +#else
@@ -30,7 +34,3 @@ index e8af184fb..e91e22459 100755
  #endif
  
  void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc)
-
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb
deleted file mode 100644
index 7f7174d940..0000000000
--- a/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "OpenPrinting libcupsfilters"
-HOMEPAGE = "https://github.com/OpenPrinting"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684"
-
-DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff"
-
-SRC_URI = " \
-	https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
-	file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \
-"
-SRC_URI[sha256sum] = "542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601"
-
-inherit autotools gettext pkgconfig github-releases
-
-FILES:${PN} += "${datadir}"
-RDEPENDS:${PN} += "ghostscript"
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb
new file mode 100644
index 0000000000..51d8c4f18b
--- /dev/null
+++ b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "OpenPrinting libcupsfilters"
+HOMEPAGE = "https://github.com/OpenPrinting"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684"
+
+DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff"
+
+SRC_URI = " \
+	https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+	file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \
+"
+SRC_URI[sha256sum] = "6c303e36cfde05a6c88fb940c62b6a18e7cdbfb91f077733ebc98f104925ce36"
+
+inherit autotools gettext pkgconfig github-releases
+
+FILES:${PN} += "${datadir}"
+RDEPENDS:${PN} += "ghostscript"
-- 
cgit v1.2.3-54-g00ecf