diff -Nru cups-filters-2.0~rc1/backend/beh.c cups-filters-2.0.0/backend/beh.c
--- cups-filters-2.0~rc1/backend/beh.c	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/backend/beh.c	2023-09-22 16:14:04.000000000 +0000
@@ -26,13 +26,14 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 
 //
 // Local globals...
 //
 
-static int		job_canceled = 0; // Set to 1 on SIGTERM
+static volatile int	job_canceled = 0; // Set to 1 on SIGTERM
 
 
 //
@@ -237,21 +238,44 @@
 	     char *filename)            // I - File name of input data
 {
   const char	*cups_serverbin;	// Location of programs
+  char          *backend_argv[8];       // Arguments for called CUPS backend
   char		scheme[1024],           // Scheme from URI
                 *ptr,			// Pointer into scheme
-		cmdline[65536];		// Backend command line
-  int           retval;
+		backend_path[2048];	// Backend path
+  int           pid,
+                wait_pid,
+                wait_status,
+                retval = 0;
+  int           bytes;
+
 
   //
   // Build the backend command line...
   //
 
-  strncpy(scheme, uri, sizeof(scheme) - 1);
-  if (strlen(uri) > 1023)
-    scheme[1023] = '\0';
+  scheme[0] = '\0';
+  strncat(scheme, uri, sizeof(scheme) - 1);
   if ((ptr = strchr(scheme, ':')) != NULL)
     *ptr = '\0';
-
+  else
+  {
+    fprintf(stderr,
+	    "ERROR: beh: Invalid URI, no colon (':') to mark end of scheme part.\n");
+    exit (CUPS_BACKEND_FAILED);
+  }
+  if (strchr(scheme, '/'))
+  {
+    fprintf(stderr,
+	    "ERROR: beh: Invalid URI, scheme contains a slash ('/').\n");
+    exit (CUPS_BACKEND_FAILED);
+  }
+  if (!strcmp(scheme, ".") || !strcmp(scheme, ".."))
+  {
+    fprintf(stderr,
+	    "ERROR: beh: Invalid URI, scheme (\"%s\") is a directory.\n",
+	    scheme);
+    exit (CUPS_BACKEND_FAILED);
+  }
   if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
     cups_serverbin = CUPS_SERVERBIN;
 
@@ -261,16 +285,25 @@
 	    "ERROR: beh: Direct output into a file not supported.\n");
     exit (CUPS_BACKEND_FAILED);
   }
-  else
-    snprintf(cmdline, sizeof(cmdline),
-	     "%s/backend/%s '%s' '%s' '%s' '%s' '%s' %s",
-	     cups_serverbin, scheme, argv[1], argv[2], argv[3],
-	     // Apply number of copies only if beh was called with a
-	     // file name and not with the print data in stdin, as
-	     // backends should handle copies only if they are called
-	     // with a file name
-	     (argc == 6 ? "1" : argv[4]),
-	     argv[5], filename);
+
+  backend_argv[0] = uri;
+  backend_argv[1] = argv[1];
+  backend_argv[2] = argv[2];
+  backend_argv[3] = argv[3];
+  backend_argv[4] = (argc == 6 ? "1" : argv[4]);
+  backend_argv[5] = argv[5];
+  backend_argv[6] = filename;
+  backend_argv[7] = NULL;
+
+  bytes = snprintf(backend_path, sizeof(backend_path),
+		   "%s/backend/%s", cups_serverbin, scheme);
+  if (bytes < 0 || bytes >= sizeof(backend_path))
+  {
+    fprintf(stderr,
+	    "ERROR: beh: Invalid scheme (\"%s\"), could not determing backend path.\n",
+	    scheme);
+    exit (CUPS_BACKEND_FAILED);
+  }
 
   //
   // Overwrite the device URI and run the actual backend...
@@ -279,17 +312,41 @@
   setenv("DEVICE_URI", uri, 1);
 
   fprintf(stderr,
-	  "DEBUG: beh: Executing backend command line \"%s\"...\n",
-	  cmdline);
+	  "DEBUG: beh: Executing backend command line \"%s '%s' '%s' '%s' '%s' '%s'%s%s\"...\n",
+	  backend_path, backend_argv[1], backend_argv[2], backend_argv[3],
+	  backend_argv[4], backend_argv[5],
+	  (backend_argv[6] && backend_argv[6][0] ? " " : ""),
+	  (backend_argv[6] && backend_argv[6][0] ? backend_argv[6] : ""));
   fprintf(stderr,
 	  "DEBUG: beh: Using device URI: %s\n",
 	  uri);
 
-  retval = system(cmdline) >> 8;
+  if ((pid = fork()) == 0)
+  {
+    retval = execv(backend_path, backend_argv);
 
-  if (retval == -1)
-    fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n",
-	    strerror(errno));
+    if (retval == -1)
+      fprintf(stderr, "ERROR: Unable to execute backend: %s\n",
+	      strerror(errno));
+    exit (CUPS_BACKEND_FAILED);
+  }
+  else if (pid < 0)
+  {
+    fprintf(stderr, "ERROR: Unable to fork for backend\n");
+    return (CUPS_BACKEND_FAILED);
+  }
+
+  while ((wait_pid = wait(&wait_status)) < 0 && errno == EINTR);
+
+  if (wait_pid >= 0 && wait_status)
+  {
+    if (WIFEXITED(wait_status))
+      retval = WEXITSTATUS(wait_status);
+    else if (WTERMSIG(wait_status) != SIGTERM)
+      retval = WTERMSIG(wait_status);
+    else
+      retval = 0;
+  }
 
   return (retval);
 }
@@ -304,8 +361,10 @@
 {
   (void)sig;
 
-  fprintf(stderr,
-	  "DEBUG: beh: Job canceled.\n");
+  const char * const msg = "DEBUG: beh: Job canceled.\n";
+  // The if() is to eliminate the return value and silence the warning
+  // about an unused return value.
+  if (write(2, msg, strlen(msg)));
 
   if (job_canceled)
     _exit(CUPS_BACKEND_OK);
diff -Nru cups-filters-2.0~rc1/CHANGES.md cups-filters-2.0.0/CHANGES.md
--- cups-filters-2.0~rc1/CHANGES.md	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/CHANGES.md	2023-09-22 16:14:03.000000000 +0000
@@ -1,4 +1,54 @@
-# CHANGES - OpenPrinting CUPS Filters v2.0rc1 - 2023-04-12
+# CHANGES - OpenPrinting CUPS Filters v2.0.0 - 2023-09-22
+
+## CHANGES IN V2.0.0 (22th September 2023)
+
+- `universal`: Enable `application/vnd.cups-postscript` as input
+  There are filters which produce this MIME type (such as `hpps` of
+  HPLIP), and if someone uses such driver on a client and the server
+  has an IPP Everywhere/driverless printer, the job fails (Pull
+  request #534).
+
+
+## CHANGES IN V2.0rc2 (20th June 2023)
+
+- beh backend: Use `execv()` instead of `system()` - CVE-2023-24805
+  With `execv()` command line arguments are passed as separate strings
+  and not the full command line in a single string. This prevents
+  arbitrary command execution by escaping the quoting of the arguments
+  in a job with forged job title.
+
+- beh backend: Extra checks against odd/forged input - CVE-2023-24805
+
+  * Do not allow `/` in the scheme of the URI (= backend executable
+    name), to assure that only backends inside
+    `/usr/lib/cups/backend/` are used.
+
+  * Pre-define scheme buffer to empty string, to be defined for case
+    of URI being NULL.
+
+  * URI must have `:`, to split off scheme, otherwise error.
+
+  * Check return value of `snprintf()` to create call path for
+    backend, to error out on truncation of a too long scheme or on
+    complete failure due to a completely odd scheme.
+
+- beh backend: Further improvements - CVE-2023-24805
+
+  * Use `strncat()` instead of `strncpy()` for getting scheme from
+    URI, the latter does not require setting terminating zero byte in
+    case of truncation.
+
+  * Also exclude `.` or `..` as scheme, as directories are not valid
+    CUPS backends.
+
+  * Do not use `fprintf()` in `sigterm_handler()`, to not interfere
+    with a `fprintf()` which could be running in the main process when
+    `sigterm_handler()` is triggered.
+
+  * Use `static volatile int` for global variable job_canceled.
+
+- `parallel` backend: Added missing `#include` lines
+
 
 ## CHANGES IN V2.0rc1 (12th April 2023)
 
diff -Nru cups-filters-2.0~rc1/configure cups-filters-2.0.0/configure
--- cups-filters-2.0~rc1/configure	2023-04-11 23:49:21.000000000 +0000
+++ cups-filters-2.0.0/configure	2023-09-22 16:14:13.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for cups-filters 2.0rc1.
+# Generated by GNU Autoconf 2.71 for cups-filters 2.0.0.
 #
 # Report bugs to <https://github.com/OpenPrinting/cups-filters/issues>.
 #
@@ -622,8 +622,8 @@
 # Identity of this package.
 PACKAGE_NAME='cups-filters'
 PACKAGE_TARNAME='cups-filters'
-PACKAGE_VERSION='2.0rc1'
-PACKAGE_STRING='cups-filters 2.0rc1'
+PACKAGE_VERSION='2.0.0'
+PACKAGE_STRING='cups-filters 2.0.0'
 PACKAGE_BUGREPORT='https://github.com/OpenPrinting/cups-filters/issues'
 PACKAGE_URL='https://github.com/OpenPrinting/cups-filters/'
 
@@ -1451,7 +1451,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cups-filters 2.0rc1 to adapt to many kinds of systems.
+\`configure' configures cups-filters 2.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1522,7 +1522,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cups-filters 2.0rc1:";;
+     short | recursive ) echo "Configuration of cups-filters 2.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1687,7 +1687,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cups-filters configure 2.0rc1
+cups-filters configure 2.0.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2043,7 +2043,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cups-filters $as_me 2.0rc1, which was
+It was created by cups-filters $as_me 2.0.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2799,9 +2799,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-cups_filters_version="2.0rc1"
-cups_filters_version_major="`echo 2.0rc1 | awk -F. '{print $1}'`"
-cups_filters_version_major="`echo 2.0rc1 | awk -F. '{printf("%d\n",$2);}'`"
+cups_filters_version="2.0.0"
+cups_filters_version_major="`echo 2.0.0 | awk -F. '{print $1}'`"
+cups_filters_version_major="`echo 2.0.0 | awk -F. '{printf("%d\n",$2);}'`"
 
 # =============
 # Automake init
@@ -3492,7 +3492,7 @@
 
 # Define the identity of the package.
  PACKAGE='cups-filters'
- VERSION='2.0rc1'
+ VERSION='2.0.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -17858,7 +17858,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cups-filters $as_me 2.0rc1, which was
+This file was extended by cups-filters $as_me 2.0.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17927,7 +17927,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-cups-filters config.status 2.0rc1
+cups-filters config.status 2.0.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff -Nru cups-filters-2.0~rc1/configure.ac cups-filters-2.0.0/configure.ac
--- cups-filters-2.0~rc1/configure.ac	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/configure.ac	2023-09-22 16:14:03.000000000 +0000
@@ -5,7 +5,7 @@
 # ====================
 # Version informations
 # ====================
-AC_INIT([cups-filters], [2.0rc1], [https://github.com/OpenPrinting/cups-filters/issues], [cups-filters], [https://github.com/OpenPrinting/cups-filters/])
+AC_INIT([cups-filters], [2.0.0], [https://github.com/OpenPrinting/cups-filters/issues], [cups-filters], [https://github.com/OpenPrinting/cups-filters/])
 cups_filters_version="AC_PACKAGE_VERSION"
 cups_filters_version_major="`echo AC_PACKAGE_VERSION | awk -F. '{print $1}'`"
 cups_filters_version_major="`echo AC_PACKAGE_VERSION | awk -F. '{printf("%d\n",$2);}'`"
diff -Nru cups-filters-2.0~rc1/debian/changelog cups-filters-2.0.0/debian/changelog
--- cups-filters-2.0~rc1/debian/changelog	2023-05-15 14:35:05.000000000 +0000
+++ cups-filters-2.0.0/debian/changelog	2023-09-25 16:15:51.000000000 +0000
@@ -1,3 +1,14 @@
+cups-filters (2.0.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+    - Final release with further bug fixes
+    - Fix for CVE-2023-24805 included
+    - The "universal" filter also supports application/vnd.cups-postscript
+      as input format now, treating it as application/postscript.
+  * Removed patches, fixes are included in the upstream code.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Mon, 25 Sep 2023 18:15:51 +0200
+
 cups-filters (2.0~rc1-0ubuntu2) mantic; urgency=medium
 
   * SECURITY UPDATE: code execution in beh CUPS backend
diff -Nru cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-1.patch cups-filters-2.0.0/debian/patches/CVE-2023-24805-1.patch
--- cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-1.patch	2023-05-15 14:34:50.000000000 +0000
+++ cups-filters-2.0.0/debian/patches/CVE-2023-24805-1.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-From 714fa46f6a0dd446baa0e7b9a64a83d2cd4a0ec1 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Tue, 31 Jan 2023 00:55:36 -0300
-Subject: [PATCH 1/3] beh backend: Use execv() instead of system() -
- CVE-2023-24805
-
-With execv() command line arguments are passed as separate strings and
-not the full command line in a single string. This prevents arbitrary
-command execution by escaping the quoting of the arguments in a job
-with forged job title.
----
- backend/beh.c | 67 +++++++++++++++++++++++++++++++++++++--------------
- 1 file changed, 49 insertions(+), 18 deletions(-)
-
-diff --git a/backend/beh.c b/backend/beh.c
-index 7e588c2e3..a66f219cb 100644
---- a/backend/beh.c
-+++ b/backend/beh.c
-@@ -26,6 +26,7 @@
- #include <signal.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/wait.h>
- 
- 
- //
-@@ -237,10 +238,14 @@ call_backend(char *uri,                 // I - URI of final destination
- 	     char *filename)            // I - File name of input data
- {
-   const char	*cups_serverbin;	// Location of programs
-+  char          *backend_argv[8];       // Arguments for called CUPS backend
-   char		scheme[1024],           // Scheme from URI
-                 *ptr,			// Pointer into scheme
--		cmdline[65536];		// Backend command line
--  int           retval;
-+		backend_path[2048];	// Backend path
-+  int           pid,
-+                wait_pid,
-+                wait_status,
-+                retval = 0;
- 
-   //
-   // Build the backend command line...
-@@ -261,16 +266,18 @@ call_backend(char *uri,                 // I - URI of final destination
- 	    "ERROR: beh: Direct output into a file not supported.\n");
-     exit (CUPS_BACKEND_FAILED);
-   }
--  else
--    snprintf(cmdline, sizeof(cmdline),
--	     "%s/backend/%s '%s' '%s' '%s' '%s' '%s' %s",
--	     cups_serverbin, scheme, argv[1], argv[2], argv[3],
--	     // Apply number of copies only if beh was called with a
--	     // file name and not with the print data in stdin, as
--	     // backends should handle copies only if they are called
--	     // with a file name
--	     (argc == 6 ? "1" : argv[4]),
--	     argv[5], filename);
-+
-+  backend_argv[0] = uri;
-+  backend_argv[1] = argv[1];
-+  backend_argv[2] = argv[2];
-+  backend_argv[3] = argv[3];
-+  backend_argv[4] = (argc == 6 ? "1" : argv[4]);
-+  backend_argv[5] = argv[5];
-+  backend_argv[6] = filename;
-+  backend_argv[7] = NULL;
-+
-+  snprintf(backend_path, sizeof(backend_path),
-+	   "%s/backend/%s", cups_serverbin, scheme);
- 
-   //
-   // Overwrite the device URI and run the actual backend...
-@@ -279,17 +286,41 @@ call_backend(char *uri,                 // I - URI of final destination
-   setenv("DEVICE_URI", uri, 1);
- 
-   fprintf(stderr,
--	  "DEBUG: beh: Executing backend command line \"%s\"...\n",
--	  cmdline);
-+	  "DEBUG: beh: Executing backend command line \"%s '%s' '%s' '%s' '%s' '%s'%s%s\"...\n",
-+	  backend_path, backend_argv[1], backend_argv[2], backend_argv[3],
-+	  backend_argv[4], backend_argv[5],
-+	  (backend_argv[6] && backend_argv[6][0] ? " " : ""),
-+	  (backend_argv[6] && backend_argv[6][0] ? backend_argv[6] : ""));
-   fprintf(stderr,
- 	  "DEBUG: beh: Using device URI: %s\n",
- 	  uri);
- 
--  retval = system(cmdline) >> 8;
-+  if ((pid = fork()) == 0)
-+  {
-+    retval = execv(backend_path, backend_argv);
- 
--  if (retval == -1)
--    fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n",
--	    strerror(errno));
-+    if (retval == -1)
-+      fprintf(stderr, "ERROR: Unable to execute backend: %s\n",
-+	      strerror(errno));
-+    exit (CUPS_BACKEND_FAILED);
-+  }
-+  else if (pid < 0)
-+  {
-+    fprintf(stderr, "ERROR: Unable to fork for backend\n");
-+    return (CUPS_BACKEND_FAILED);
-+  }
-+
-+  while ((wait_pid = wait(&wait_status)) < 0 && errno == EINTR);
-+
-+  if (wait_pid >= 0 && wait_status)
-+  {
-+    if (WIFEXITED(wait_status))
-+      retval = WEXITSTATUS(wait_status);
-+    else if (WTERMSIG(wait_status) != SIGTERM)
-+      retval = WTERMSIG(wait_status);
-+    else
-+      retval = 0;
-+  }
- 
-   return (retval);
- }
--- 
-2.39.2
-
diff -Nru cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-2.patch cups-filters-2.0.0/debian/patches/CVE-2023-24805-2.patch
--- cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-2.patch	2023-05-15 14:34:55.000000000 +0000
+++ cups-filters-2.0.0/debian/patches/CVE-2023-24805-2.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-From c87c9a0f41cc2124d3c13c1836474191697660a9 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Thu, 11 May 2023 14:46:18 +0200
-Subject: [PATCH 2/3] beh backend: Extra checks against odd/forged input -
- CVE-2023-24805
-
-- Do not allow '/' in the scheme of the URI (= backend executable
-  name), to assure that only backends inside /usr/lib/cups/backend/
-  are used.
-
-- Pre-define scheme buffer to empty string, to be defined for case of
-  uri being NULL.
-
-- URI must have ':', to split off scheme, otherwise error.
-
-- Check return value of snprintf() to create call path for backend, to
-  error out on truncation of a too long scheme or on complete failure
-  due to a completely odd scheme.
----
- backend/beh.c | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/backend/beh.c b/backend/beh.c
-index a66f219cb..077fd8c58 100644
---- a/backend/beh.c
-+++ b/backend/beh.c
-@@ -246,16 +246,31 @@ call_backend(char *uri,                 // I - URI of final destination
-                 wait_pid,
-                 wait_status,
-                 retval = 0;
-+  int           bytes;
-+
- 
-   //
-   // Build the backend command line...
-   //
- 
-+  scheme[0] = '\0';
-   strncpy(scheme, uri, sizeof(scheme) - 1);
--  if (strlen(uri) > 1023)
--    scheme[1023] = '\0';
-+  if (strlen(uri) > sizeof(scheme) - 1)
-+    scheme[sizeof(scheme) - 1] = '\0';
-   if ((ptr = strchr(scheme, ':')) != NULL)
-     *ptr = '\0';
-+  else
-+  {
-+    fprintf(stderr,
-+	    "ERROR: beh: Invalid URI, no colon (':') to mark end of scheme part.\n");
-+    exit (CUPS_BACKEND_FAILED);
-+  }
-+  if (strchr(scheme, '/'))
-+  {
-+    fprintf(stderr,
-+	    "ERROR: beh: Invalid URI, scheme contains a slash ('/').\n");
-+    exit (CUPS_BACKEND_FAILED);
-+  }
- 
-   if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-     cups_serverbin = CUPS_SERVERBIN;
-@@ -276,8 +291,15 @@ call_backend(char *uri,                 // I - URI of final destination
-   backend_argv[6] = filename;
-   backend_argv[7] = NULL;
- 
--  snprintf(backend_path, sizeof(backend_path),
--	   "%s/backend/%s", cups_serverbin, scheme);
-+  bytes = snprintf(backend_path, sizeof(backend_path),
-+		   "%s/backend/%s", cups_serverbin, scheme);
-+  if (bytes < 0 || bytes >= sizeof(backend_path))
-+  {
-+    fprintf(stderr,
-+	    "ERROR: beh: Invalid scheme (\"%s\"), could not determing backend path.\n",
-+	    scheme);
-+    exit (CUPS_BACKEND_FAILED);
-+  }
- 
-   //
-   // Overwrite the device URI and run the actual backend...
--- 
-2.39.2
-
diff -Nru cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-3.patch cups-filters-2.0.0/debian/patches/CVE-2023-24805-3.patch
--- cups-filters-2.0~rc1/debian/patches/CVE-2023-24805-3.patch	2023-05-15 14:34:59.000000000 +0000
+++ cups-filters-2.0.0/debian/patches/CVE-2023-24805-3.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-From 09b917bf164a27a1188dac30a294bc20d56438e8 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Fri, 12 May 2023 01:24:51 +0200
-Subject: [PATCH 3/3] beh backend: Further improvements - CVE-2023-24805
-
-- Use strncat() instead of strncpy() for getting scheme from URI, the latter
-  does not require setting terminating zero byte in case of truncation.
-
-- Also exclude "." or ".." as scheme, as directories are not valid CUPS
-  backends.
-
-- Do not use fprintf() in sigterm_handler(), to not interfere with a
-  fprintf() which could be running in the main process when
-  sigterm_handler() is triggered.
-
-- Use "static volatile int" for global variable job_canceled.
----
- backend/beh.c | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/backend/beh.c b/backend/beh.c
-index 077fd8c58..121e64905 100644
---- a/backend/beh.c
-+++ b/backend/beh.c
-@@ -33,7 +33,7 @@
- // Local globals...
- //
- 
--static int		job_canceled = 0; // Set to 1 on SIGTERM
-+static volatile int	job_canceled = 0; // Set to 1 on SIGTERM
- 
- 
- //
-@@ -254,9 +254,7 @@ call_backend(char *uri,                 // I - URI of final destination
-   //
- 
-   scheme[0] = '\0';
--  strncpy(scheme, uri, sizeof(scheme) - 1);
--  if (strlen(uri) > sizeof(scheme) - 1)
--    scheme[sizeof(scheme) - 1] = '\0';
-+  strncat(scheme, uri, sizeof(scheme) - 1);
-   if ((ptr = strchr(scheme, ':')) != NULL)
-     *ptr = '\0';
-   else
-@@ -271,7 +269,13 @@ call_backend(char *uri,                 // I - URI of final destination
- 	    "ERROR: beh: Invalid URI, scheme contains a slash ('/').\n");
-     exit (CUPS_BACKEND_FAILED);
-   }
--
-+  if (!strcmp(scheme, ".") || !strcmp(scheme, ".."))
-+  {
-+    fprintf(stderr,
-+	    "ERROR: beh: Invalid URI, scheme (\"%s\") is a directory.\n",
-+	    scheme);
-+    exit (CUPS_BACKEND_FAILED);
-+  }
-   if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-     cups_serverbin = CUPS_SERVERBIN;
- 
-@@ -357,8 +361,10 @@ sigterm_handler(int sig)		// I - Signal number (unused)
- {
-   (void)sig;
- 
--  fprintf(stderr,
--	  "DEBUG: beh: Job canceled.\n");
-+  const char * const msg = "DEBUG: beh: Job canceled.\n";
-+  // The if() is to eliminate the return value and silence the warning
-+  // about an unused return value.
-+  if (write(2, msg, strlen(msg)));
- 
-   if (job_canceled)
-     _exit(CUPS_BACKEND_OK);
--- 
-2.39.2
-
diff -Nru cups-filters-2.0~rc1/debian/patches/series cups-filters-2.0.0/debian/patches/series
--- cups-filters-2.0~rc1/debian/patches/series	2023-05-15 14:34:59.000000000 +0000
+++ cups-filters-2.0.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-CVE-2023-24805-1.patch
-CVE-2023-24805-2.patch
-CVE-2023-24805-3.patch
diff -Nru cups-filters-2.0~rc1/INSTALL cups-filters-2.0.0/INSTALL
--- cups-filters-2.0~rc1/INSTALL	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/INSTALL	2023-09-22 16:14:03.000000000 +0000
@@ -1,5 +1,5 @@
-INSTALL - OpenPrinting CUPS Filters v2.0rc1 - 2023-04-12
---------------------------------------------------------
+INSTALL - OpenPrinting CUPS Filters v2.0.0 - 2023-09-22
+-------------------------------------------------------
 
 This file describes how to compile and install OpenPrinting CUPS
 Filters from source code. For more information on OpenPrinting CUPS
diff -Nru cups-filters-2.0~rc1/mime/cupsfilters-universal-postscript.convs cups-filters-2.0.0/mime/cupsfilters-universal-postscript.convs
--- cups-filters-2.0~rc1/mime/cupsfilters-universal-postscript.convs	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/mime/cupsfilters-universal-postscript.convs	2023-09-22 16:14:04.000000000 +0000
@@ -32,6 +32,7 @@
 #
 
 application/postscript                   application/vnd.universal-input   0  -
+application/vnd.cups-postscript          application/vnd.universal-input   0  -
 
 # CUPS file conversion rules for PostScript input when we are working
 # with the PDF printing workflow: General PostScript input should be
diff -Nru cups-filters-2.0~rc1/README.md cups-filters-2.0.0/README.md
--- cups-filters-2.0~rc1/README.md	2023-04-11 23:48:54.000000000 +0000
+++ cups-filters-2.0.0/README.md	2023-09-22 16:14:03.000000000 +0000
@@ -1,4 +1,4 @@
-# OpenPrinting CUPS Filters v2.0rc1 - 2023-04-12
+# OpenPrinting CUPS Filters v2.0.0 - 2023-09-22
 
 Looking for compile instructions?  Read the file "INSTALL"
 instead...