[packages/cups-filters] - remove obslete patches

baggins baggins at pld-linux.org
Sun Nov 10 22:32:00 CET 2024


commit 2b65831d4d09d048cbf1d0f493d483b49097447d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 10 22:28:23 2024 +0100

    - remove obslete patches

 cups-filters-1.28.17-CVE-2023-24805.patch | 225 -----------------------------
 cups-filters-1.28.17-c++17.patch          |  28 ----
 cups-filters-php.patch                    |  66 ---------
 cups-filters-php7.patch                   | 230 ------------------------------
 cups-filters-php73.patch                  |  46 ------
 5 files changed, 595 deletions(-)
---
diff --git a/cups-filters-1.28.17-CVE-2023-24805.patch b/cups-filters-1.28.17-CVE-2023-24805.patch
deleted file mode 100644
index 58b5625..0000000
--- a/cups-filters-1.28.17-CVE-2023-24805.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-Modified version from:
-
-  https://packages.debian.org/de/sid/cups-filters
-
-  From: Thorsten Alteholz <debian at alteholz.de>
-  Date: Fri, 19 May 2023 10:49:35 +0200
-  Subject: fix CVE-2023-24805
-
-Original patch:
-
-https://github.com/OpenPrinting/cups-filters/commit/8f274035756c04efeb77eb654e9d4c4447287d65
-
-From 8f274035756c04efeb77eb654e9d4c4447287d65 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter at gmail.com>
-Date: Wed, 17 May 2023 11:12:37 +0200
-Subject: [PATCH] Merge pull request from GHSA-gpxc-v2m8-fr3x
-
-* 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.
-
----
- backend/beh.c | 107 +++++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 84 insertions(+), 23 deletions(-)
-
-diff --git a/backend/beh.c b/backend/beh.c
-index 225fd27..8d51235 100644
---- a/backend/beh.c
-+++ b/backend/beh.c
-@@ -22,12 +22,13 @@
- #include "backend-private.h"
- #include <cups/array.h>
- #include <ctype.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 */
- 
- /*
-  * Local functions...
-@@ -213,21 +214,40 @@ call_backend(char *uri,                 /* I - URI of final destination */
- 	     char **argv,		/* I - Command-line arguments */
- 	     char *filename) {          /* I - File name of input data */
-   const char	*cups_serverbin;	/* Location of programs */
-+  char          *backend_argv[8];	/* Arguments for 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 = 0, 		/* Process ID of backend */
-+                wait_pid,		/* Process ID from wait() */
-+                wait_status, 		/* Status from child */
-+                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;
- 
-@@ -235,16 +255,29 @@ call_backend(char *uri,                 /* I - URI of final destination */
-     fprintf(stderr,
- 	    "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];
-+  /* 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 */
-+  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);
-+    return (CUPS_BACKEND_FAILED);
-+  }
- 
-  /*
-   * Overwrite the device URI and run the actual backend...
-@@ -253,18 +286,44 @@ 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\"...\n",
-+	  backend_path, backend_argv[1], backend_argv[2], backend_argv[3],
-+	  backend_argv[4], backend_argv[5], backend_argv[6]);
-   fprintf(stderr,
- 	  "DEBUG: beh: Using device URI: %s\n",
- 	  uri);
- 
--  retval = system(cmdline) >> 8;
-+  if ((pid = fork()) == 0) {
-+   /*
-+    * Child comes here...
-+    */
-+
-+    /* Run the backend */
-+    execv(backend_path, backend_argv);
- 
--  if (retval == -1)
-     fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n",
- 	    strerror(errno));
- 
-+    exit(1);
-+  } else if (pid < 0) {
-+   /*
-+    * Unable to fork!
-+    */
-+
-+    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);
- }
- 
-@@ -277,8 +336,10 @@ static void
- 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);
diff --git a/cups-filters-1.28.17-c++17.patch b/cups-filters-1.28.17-c++17.patch
deleted file mode 100644
index ce70ce5..0000000
--- a/cups-filters-1.28.17-c++17.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Mon, 6 Feb 2023 18:13:52 -0800
-Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards
-
-C++17 removed dynamic exception specifications [1]
-they had been deprecated since C++11, replace
-throw(whatever) with noexcept(false).
-
-[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
---- a/filter/pdftoraster.cxx
-+++ b/filter/pdftoraster.cxx
-@@ -2148,7 +2148,11 @@ int main(int argc, char *argv[]) {
- /* For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW
-  *  should be used as a guard, otherwise use traditional definition */
- #ifndef _GLIBCXX_THROW
-+#if __cplusplus < 201703L
- #define _GLIBCXX_THROW throw
-+#else
-+#define _GLIBCXX_THROW(x) noexcept(false)
-+#endif
- #endif
- 
- void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc)
-
diff --git a/cups-filters-php.patch b/cups-filters-php.patch
deleted file mode 100644
index 122d4e5..0000000
--- a/cups-filters-php.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- cups-filters-1.0.41/configure.ac.orig	2013-12-01 10:26:49.834817503 +0100
-+++ cups-filters-1.0.41/configure.ac	2013-12-01 10:37:48.081456545 +0100
-@@ -568,6 +568,8 @@
- 	])
- 	PHPDIR="`$PHPCONFIG --extension-dir`"
- 	AC_SUBST(PHPDIR)
-+	PHP_CFLAGS="`$PHPCONFIG --includes`"
-+	AC_SUBST(PHP_CFLAGS)
- ])
- 
- # =========
---- cups-filters-1.0.41/Makefile.am.orig	2013-12-01 10:26:49.831484169 +0100
-+++ cups-filters-1.0.41/Makefile.am	2013-12-01 10:37:08.568124870 +0100
-@@ -696,8 +696,8 @@
- 	scripting/php/phpcups.c \
- 	scripting/php/phpcups.h
- libphpcups_la_LIBADD = $(CUPS_LIBS)
--libphpcups_la_CFLAGS = $(CUPS_CFLAGS)
--libphpcups_la_LDFLAGS = -no-undefined
-+libphpcups_la_CFLAGS = $(CUPS_CFLAGS) $(PHP_CFLAGS)
-+libphpcups_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- EXTRA_DIST += \
- 	scripting/perl \
---- cups-filters-1.0.41/scripting/php/phpcups.c.orig	2012-06-22 18:10:47.000000000 +0200
-+++ cups-filters-1.0.41/scripting/php/phpcups.c	2013-12-01 10:50:16.171425151 +0100
-@@ -29,12 +29,16 @@
-  * Include necessary headers...
-  */
- 
--#include <cups/string-private.h>
-+#include <cups/cups.h>
- #include "php.h"
- #include "php_ini.h"
- #include "ext/standard/info.h"
- #include "phpcups.h"
- 
-+#ifndef CUPS_SVERSION
-+#  define CPPSTR(x) #x
-+#  define CUPS_SVERSION CPPSTR(CUPS_VERSION_MAJOR) "." CPPSTR(CUPS_VERSION_MINOR) "." CPPSTR(CUPS_VERSION_PATCH)
-+#endif
- 
- /*
-  * PHP function list...
---- cups-filters-1.0.41/scripting/php/phpcups.h.orig	2012-06-22 18:10:47.000000000 +0200
-+++ cups-filters-1.0.41/scripting/php/phpcups.h	2013-12-01 10:42:51.171443826 +0100
-@@ -22,7 +22,6 @@
- 
- #  include <cups/cups.h>
- #  include <cups/language.h>
--#  include <cups/debug-private.h>
- #  include <fcntl.h>
- #  include <sys/stat.h>
- #  if defined(WIN32) || defined(__EMX__)
-diff -urN cups-filters-1.0.53.orig/scripting/php/phpcups.c cups-filters-1.0.53/scripting/php/phpcups.c
---- cups-filters-1.0.53.orig/scripting/php/phpcups.c	2014-05-01 18:48:49.622212848 +0200
-+++ cups-filters-1.0.53/scripting/php/phpcups.c	2014-05-01 18:49:21.228878551 +0200
-@@ -44,7 +44,7 @@
-  * PHP function list...
-  */
- 
--function_entry phpcups_functions[] =
-+zend_function_entry phpcups_functions[] =
- {
-   PHP_FE(cups_cancel_job, NULL)
-   PHP_FE(cups_get_dests, NULL)
diff --git a/cups-filters-php7.patch b/cups-filters-php7.patch
deleted file mode 100644
index 9b30e45..0000000
--- a/cups-filters-php7.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- cups-filters-1.8.2/scripting/php/phpcups.c.orig	2016-03-21 21:04:50.568131047 +0100
-+++ cups-filters-1.8.2/scripting/php/phpcups.c	2016-03-28 21:51:56.884340677 +0200
-@@ -37,6 +37,16 @@
- #  define CUPS_SVERSION CPPSTR(CUPS_VERSION_MAJOR) "." CPPSTR(CUPS_VERSION_MINOR) "." CPPSTR(CUPS_VERSION_PATCH)
- #endif
- 
-+#if PHP_MAJOR_VERSION >= 7
-+#  define php_add_property_string(arg, key, str, n) add_property_string(arg, key, str)
-+#  define php_add_assoc_string(arg, key, str, n) add_assoc_string(arg, key, str)
-+#  define PHP_RETURN_STRING(s, n) RETURN_STRING(s)
-+#else
-+#  define php_add_property_string(arg, key, str, n) add_property_string(arg, key, str, n)
-+#  define php_add_assoc_string(arg, key, str, n) add_assoc_string(arg, key, str, n)
-+#  define PHP_RETURN_STRING(s, n) RETURN_STRING(s, n)
-+#endif
-+
- /*
-  * PHP function list...
-  */
-@@ -87,44 +97,70 @@
- {
-   int		num_options;		/* Number of options */
-   HashTable	*ht;			/* Option array hash table */
--  Bucket	*current;		/* Current element in array */
-   zval		*value;			/* Current value in array */
-   char		temp[255];		/* String value for numbers */
-+#if PHP_MAJOR_VERSION >= 7
-+  zend_string   *zkey;
-+#else
-+  Bucket	*current;		/* Current element in array */
-+#endif
-+  const char    *key;
- 
- 
-   ht          = Z_ARRVAL_P(optionsobj);
-   num_options = 0;
- 
-+#if PHP_MAJOR_VERSION >= 7
-+  ZEND_HASH_FOREACH_STR_KEY_VAL(ht, zkey, value)
-+    key = (const char*)&ZSTR_VAL(zkey);
-+#else
-   for (current = ht->pListHead; current; current = current->pListNext)
-   {
-     value = (zval *)current->pDataPtr;
-+    key = current->arKey;
-+#endif
- 
-     switch (Z_TYPE_P(value))
-     {
-       case IS_LONG :
-           sprintf(temp, "%ld", Z_LVAL_P(value));
--          num_options = cupsAddOption(current->arKey, temp, num_options,
-+          num_options = cupsAddOption(key, temp, num_options,
- 	                              options);
-           break;
- 
-       case IS_DOUBLE :
-           sprintf(temp, "%g", Z_DVAL_P(value));
--          num_options = cupsAddOption(current->arKey, temp, num_options,
-+          num_options = cupsAddOption(key, temp, num_options,
- 	                              options);
-           break;
- 
-+#if PHP_MAJOR_VERSION >= 7
-+      case IS_FALSE :
-+          num_options = cupsAddOption(key, "false",
-+				      num_options, options);
-+          break;
-+      case IS_TRUE :
-+          num_options = cupsAddOption(key, "true",
-+				      num_options, options);
-+          break;
-+#else
-       case IS_BOOL :
--          num_options = cupsAddOption(current->arKey,
-+          num_options = cupsAddOption(key,
- 	                              Z_BVAL_P(value) ? "true" : "false",
- 				      num_options, options);
-           break;
-+#endif
- 
-       case IS_STRING :
--          num_options = cupsAddOption(current->arKey, Z_STRVAL_P(value),
-+          num_options = cupsAddOption(key, Z_STRVAL_P(value),
- 				      num_options, options);
-           break;
-     }
-+#if PHP_MAJOR_VERSION >= 7
-+  ZEND_HASH_FOREACH_END();
-+#else
-   }
-+#endif
- 
-   return (num_options);
- }
-@@ -244,6 +280,9 @@
-   cups_dest_t	*dests,			/* Destinations */
- 		*dest;			/* Current destination */
-   cups_option_t	*option;		/* Current option */
-+#if PHP_MAJOR_VERSION >= 7
-+  zval		destobjs, optionsobjs;	/* storage for the below */
-+#endif
-   zval		*destobj,		/* Destination object */
- 		*optionsobj;		/* Options object */
- 
-@@ -262,7 +301,11 @@
-   {
-     for (i = 0, dest = dests; i < num_dests; i ++, dest ++)
-     {
-+#if PHP_MAJOR_VERSION >= 7
-+      destobj = &destobjs;
-+#else
-       MAKE_STD_ZVAL(destobj);
-+#endif
- 
-       if (object_init(destobj) == SUCCESS)
-       {
-@@ -271,8 +314,8 @@
- 	* members...
- 	*/
- 
--        add_property_string(destobj, "name", dest->name, 1);
--        add_property_string(destobj, "instance",
-+        php_add_property_string(destobj, "name", dest->name, 1);
-+        php_add_property_string(destobj, "instance",
- 	                    dest->instance ? dest->instance : "", 1);
-         add_property_long(destobj, "is_default", dest->is_default);
- 
-@@ -280,14 +323,18 @@
-         * Create an associative array for the options...
- 	*/
- 
-+#if PHP_MAJOR_VERSION >= 7
-+	optionsobj = &optionsobjs;
-+#else
-         MAKE_STD_ZVAL(optionsobj);
-+#endif
- 
- 	if (array_init(optionsobj) == SUCCESS)
- 	{
- 	  for (j = 0, option = dest->options;
- 	       j < dest->num_options;
- 	       j ++, option ++)
--	    add_assoc_string(optionsobj, option->name, option->value, 1);
-+	    php_add_assoc_string(optionsobj, option->name, option->value, 1);
- 
- 	  add_property_zval(destobj, "options", optionsobj);
- 	}
-@@ -316,7 +363,9 @@
-   cups_job_t	*jobs,			/* Jobs */
- 		*job;			/* Current job */
-   zval		*jobobj;		/* Job object */
--
-+#if PHP_MAJOR_VERSION >= 7
-+  zval		jobobjs;		/* Job object storage */
-+#endif
- 
- 
- 
-@@ -338,7 +387,11 @@
-   {
-     for (i = 0, job = jobs; i < num_jobs; i ++, job ++)
-     {
-+#if PHP_MAJOR_VERSION >= 7
-+      jobobj = &jobobjs;
-+#else
-       MAKE_STD_ZVAL(jobobj);
-+#endif
- 
-       if (object_init(jobobj) == SUCCESS)
-       {
-@@ -348,10 +401,10 @@
- 	*/
- 
-         add_property_long(jobobj, "id", job->id);
--        add_property_string(jobobj, "dest", job->dest, 1);
--        add_property_string(jobobj, "title", job->title, 1);
--        add_property_string(jobobj, "user", job->user, 1);
--        add_property_string(jobobj, "format", job->format, 1);
-+        php_add_property_string(jobobj, "dest", job->dest, 1);
-+        php_add_property_string(jobobj, "title", job->title, 1);
-+        php_add_property_string(jobobj, "user", job->user, 1);
-+        php_add_property_string(jobobj, "format", job->format, 1);
-         add_property_long(jobobj, "state", job->state);
-         add_property_long(jobobj, "size", job->size);
-         add_property_long(jobobj, "priority", job->priority);
-@@ -394,7 +447,7 @@
-     WRONG_PARAM_COUNT;
-   }
- 
--  RETURN_STRING((char *)cupsLastErrorString(), 1);
-+  PHP_RETURN_STRING((char *)cupsLastErrorString(), 1);
- }
- 
- 
-@@ -451,7 +504,11 @@
-   int		num_options;		/* Number of options */
-   cups_option_t	*options;		/* Options */
-   HashTable	*ht2;			/* Option array hash table */
-+#if PHP_MAJOR_VERSION >= 7
-+  zval          *value;
-+#else
-   Bucket	*current;		/* Current element in array */
-+#endif
-   int		id;			/* Job ID */
- 
- 
-@@ -465,6 +522,14 @@
-   ht2       = Z_ARRVAL_P(filesobj);
-   num_files = 0;
- 
-+#if PHP_MAJOR_VERSION >= 7
-+  ZEND_HASH_FOREACH_VAL(ht2, value)
-+    files[num_files ++] = Z_STRVAL_P(value);
-+
-+    if (num_files >= (int)(sizeof(files) / sizeof(files[0])))
-+      break;
-+  ZEND_HASH_FOREACH_END();
-+#else
-   for (current = ht2->pListHead; current; current = current->pListNext)
-   {
-     files[num_files ++] = Z_STRVAL_P(((zval *)current->pDataPtr));
-@@ -472,6 +537,7 @@
-     if (num_files >= (int)(sizeof(files) / sizeof(files[0])))
-       break;
-   }
-+#endif
- 
-   num_options = cups_convert_options(optionsobj, &options);
- 
diff --git a/cups-filters-php73.patch b/cups-filters-php73.patch
deleted file mode 100644
index 570a754..0000000
--- a/cups-filters-php73.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-since php-7.3.0 array_init() and array_init_size() are converted into macros
-calling zend_new_array(). They are not functions anymore and don't return
-any values.
-
-this change was introduced in following commit:
-https://github.com/php/php-src/commit/44e0b79ac64b344fc1335c126e548f00d8308602
-
---- cups-filters-1.21.4/scripting/php/phpcups.c	2018-11-24 19:42:09.905418408 +0100
-+++ cups-filters-1.21.4.orig/scripting/php/phpcups.c	2018-11-24 19:40:21.903078482 +0100
-@@ -297,7 +297,11 @@
-     RETURN_NULL();
-   }
- 
-+#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3
-+  array_init(return_value);
-+#else
-   if (array_init(return_value) == SUCCESS)
-+#endif
-   {
-     for (i = 0, dest = dests; i < num_dests; i ++, dest ++)
-     {
-@@ -329,7 +333,11 @@
-         MAKE_STD_ZVAL(optionsobj);
- #endif
- 
-+#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3
-+	array_init(optionsobj);
-+#else
- 	if (array_init(optionsobj) == SUCCESS)
-+#endif
- 	{
- 	  for (j = 0, option = dest->options;
- 	       j < dest->num_options;
-@@ -383,7 +391,12 @@
-     RETURN_NULL();
-   }
- 
-+
-+#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3
-+  array_init(return_value);
-+#else
-   if (array_init(return_value) == SUCCESS)
-+#endif
-   {
-     for (i = 0, job = jobs; i < num_jobs; i ++, job ++)
-     {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cups-filters.git/commitdiff/2b65831d4d09d048cbf1d0f493d483b49097447d



More information about the pld-cvs-commit mailing list