Index: branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c
===================================================================
--- branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c	(revision 546069)
+++ branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c	(revision 546070)
@@ -1,30 +1,39 @@
 --- foomaticrip.c.orig	2012-07-02 14:50:46 UTC
 +++ foomaticrip.c
-@@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo
+@@ -109,7 +109,7 @@ jobparams_t * get_current_job()
+ }
+ 
+ 
+-dstr_t *postpipe;  /* command into which the output of this filter should be piped */
++dstr_t *postpipe = NULL;  /* command into which the output of this filter should be piped */
+ FILE *postpipe_fh = NULL;
+ 
+ FILE * open_postpipe()
+@@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/f
                                  "/opt/cups/filter:"
                                  "/usr/lib/cups/filter";
  
 -char modern_shell[64] = "/bin/bash";
 +char modern_shell[64] = "/bin/sh";
  
  void config_set_option(const char *key, const char *value)
  {
-@@ -1061,7 +1061,7 @@ int print_file(const char *filename, int
+@@ -1061,7 +1061,7 @@ int print_file(const char *filename, int convert)
  		   Ghostscript is not available. */
  		if (spooler == SPOOLER_CUPS)
  		  snprintf(pdf2ps_cmd, PATH_MAX,
 -			   "pdftops '%s' '%s' '%s' '%s' '%s' '%s'",
 +			   "/usr/local/libexec/cups/filter/pdftops '%s' '%s' '%s' '%s' '%s' '%s'",
  			   job->id, job->user, job->title, "1", job->optstr->data,
  			   filename);
  		else
 @@ -1197,7 +1197,8 @@ int main(int argc, char** argv)
          debug = 1;
  
      if (debug) {
 -	int fd = mkstemp (LOG_FILE "-XXXXXX.log");
 +	sprintf(tmp, "%s-XXXXXX.log", LOG_FILE);
 +	int fd = mkstemps (tmp, 4);
  	if (fd != -1)
  	    logh = fdopen(fd, "w");
  	else
Index: branches/2020Q3/print/foomatic-filters/files/patch-options.c
===================================================================
--- branches/2020Q3/print/foomatic-filters/files/patch-options.c	(nonexistent)
+++ branches/2020Q3/print/foomatic-filters/files/patch-options.c	(revision 546070)
@@ -0,0 +1,21 @@
+--- options.c.orig	2012-07-02 14:50:46 UTC
++++ options.c
+@@ -38,15 +38,15 @@ typedef struct icc_mapping_entry_s {
+ } icc_mapping_entry_t;
+ 
+ /* Values from foomatic keywords in the ppd file */
+-char printer_model [256];
++extern char printer_model [256];
+ char printer_id [256];
+ char driver [128];
+ char cmd [4096];
+ char cmd_pdf [4096];
+-dstr_t *postpipe = NULL;  /* command into which the output of this
++extern dstr_t *postpipe;  /* command into which the output of this
+                              filter should be piped */
+ int ps_accounting = 1;
+-char cupsfilter [256];
++extern char cupsfilter [256];
+ int jobentitymaxlen = 0;
+ int userentitymaxlen = 0;
+ int hostentitymaxlen = 0;

Property changes on: branches/2020Q3/print/foomatic-filters/files/patch-options.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 546069)
+++ branches/2020Q3	(revision 546070)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r546067