From 0b0e7383a5556de700d0b8dcde438f81af861859 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 12 Jan 2011 16:45:25 +0000 Subject: [PATCH] Properly separated serverbin-compat and lspp patches. --- cups-lspp.patch | 173 +++++++++++++++--------------------- cups-serverbin-compat.patch | 56 ++++++------ cups.spec | 5 +- 3 files changed, 106 insertions(+), 128 deletions(-) diff --git a/cups-lspp.patch b/cups-lspp.patch index 380b55d..6288f64 100644 --- a/cups-lspp.patch +++ b/cups-lspp.patch @@ -1,6 +1,6 @@ -diff -up cups-1.4.5/config.h.in.lspp cups-1.4.5/config.h.in ---- cups-1.4.5/config.h.in.lspp 2010-12-24 13:21:31.134859403 +0000 -+++ cups-1.4.5/config.h.in 2010-12-24 13:21:31.173858387 +0000 +diff -up cups-1.4.6/config.h.in.lspp cups-1.4.6/config.h.in +--- cups-1.4.6/config.h.in.lspp 2011-01-12 16:39:06.572141559 +0000 ++++ cups-1.4.6/config.h.in 2011-01-12 16:39:06.613139484 +0000 @@ -672,6 +672,12 @@ #undef HAVE_SYS_STATVFS_H #undef HAVE_SYS_VFS_H @@ -14,9 +14,9 @@ diff -up cups-1.4.5/config.h.in.lspp cups-1.4.5/config.h.in #endif /* !_CUPS_CONFIG_H_ */ -diff -up cups-1.4.5/config-scripts/cups-lspp.m4.lspp cups-1.4.5/config-scripts/cups-lspp.m4 ---- cups-1.4.5/config-scripts/cups-lspp.m4.lspp 2010-12-24 13:21:31.174858361 +0000 -+++ cups-1.4.5/config-scripts/cups-lspp.m4 2010-12-24 13:21:31.174858361 +0000 +diff -up cups-1.4.6/config-scripts/cups-lspp.m4.lspp cups-1.4.6/config-scripts/cups-lspp.m4 +--- cups-1.4.6/config-scripts/cups-lspp.m4.lspp 2011-01-12 16:39:06.613139484 +0000 ++++ cups-1.4.6/config-scripts/cups-lspp.m4 2011-01-12 16:39:06.613139484 +0000 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -54,9 +54,9 @@ diff -up cups-1.4.5/config-scripts/cups-lspp.m4.lspp cups-1.4.5/config-scripts/c + ;; + esac +fi -diff -up cups-1.4.5/configure.in.lspp cups-1.4.5/configure.in ---- cups-1.4.5/configure.in.lspp 2010-06-22 22:42:44.000000000 +0100 -+++ cups-1.4.5/configure.in 2010-12-24 13:21:31.174858362 +0000 +diff -up cups-1.4.6/configure.in.lspp cups-1.4.6/configure.in +--- cups-1.4.6/configure.in.lspp 2010-06-22 22:42:44.000000000 +0100 ++++ cups-1.4.6/configure.in 2011-01-12 16:39:06.614139432 +0000 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-scripting.m4) @@ -66,9 +66,9 @@ diff -up cups-1.4.5/configure.in.lspp cups-1.4.5/configure.in INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up cups-1.4.5/cups/cups.h.lspp cups-1.4.5/cups/cups.h ---- cups-1.4.5/cups/cups.h.lspp 2010-06-22 04:18:27.000000000 +0100 -+++ cups-1.4.5/cups/cups.h 2010-12-24 13:21:31.176858307 +0000 +diff -up cups-1.4.6/cups/cups.h.lspp cups-1.4.6/cups/cups.h +--- cups-1.4.6/cups/cups.h.lspp 2010-11-17 19:59:14.000000000 +0000 ++++ cups-1.4.6/cups/cups.h 2011-01-12 16:39:06.615139383 +0000 @@ -15,6 +15,9 @@ * This file is subject to the Apple OS-Developed Software exception. */ @@ -92,9 +92,9 @@ diff -up cups-1.4.5/cups/cups.h.lspp cups-1.4.5/cups/cups.h /* * Types and structures... */ -diff -up cups-1.4.5/data/Makefile.lspp cups-1.4.5/data/Makefile ---- cups-1.4.5/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000 -+++ cups-1.4.5/data/Makefile 2010-12-24 13:21:31.177858282 +0000 +diff -up cups-1.4.6/data/Makefile.lspp cups-1.4.6/data/Makefile +--- cups-1.4.6/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000 ++++ cups-1.4.6/data/Makefile 2011-01-12 16:39:06.616139335 +0000 @@ -25,7 +25,10 @@ BANNERS = \ secret \ standard \ @@ -107,9 +107,9 @@ diff -up cups-1.4.5/data/Makefile.lspp cups-1.4.5/data/Makefile CHARMAPS = \ euc-cn.txt \ -diff -up cups-1.4.5/data/mls.lspp cups-1.4.5/data/mls ---- cups-1.4.5/data/mls.lspp 2010-12-24 13:21:31.177858282 +0000 -+++ cups-1.4.5/data/mls 2010-12-24 13:21:31.178858258 +0000 +diff -up cups-1.4.6/data/mls.lspp cups-1.4.6/data/mls +--- cups-1.4.6/data/mls.lspp 2011-01-12 16:39:06.617139286 +0000 ++++ cups-1.4.6/data/mls 2011-01-12 16:39:06.617139286 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -372,9 +372,9 @@ diff -up cups-1.4.5/data/mls.lspp cups-1.4.5/data/mls +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF -diff -up cups-1.4.5/data/selinux.lspp cups-1.4.5/data/selinux ---- cups-1.4.5/data/selinux.lspp 2010-12-24 13:21:31.178858258 +0000 -+++ cups-1.4.5/data/selinux 2010-12-24 13:21:31.179858233 +0000 +diff -up cups-1.4.6/data/selinux.lspp cups-1.4.6/data/selinux +--- cups-1.4.6/data/selinux.lspp 2011-01-12 16:39:06.618139236 +0000 ++++ cups-1.4.6/data/selinux 2011-01-12 16:39:06.618139236 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -637,9 +637,9 @@ diff -up cups-1.4.5/data/selinux.lspp cups-1.4.5/data/selinux +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF -diff -up cups-1.4.5/data/te.lspp cups-1.4.5/data/te ---- cups-1.4.5/data/te.lspp 2010-12-24 13:21:31.179858233 +0000 -+++ cups-1.4.5/data/te 2010-12-24 13:21:31.180858207 +0000 +diff -up cups-1.4.6/data/te.lspp cups-1.4.6/data/te +--- cups-1.4.6/data/te.lspp 2011-01-12 16:39:06.620139134 +0000 ++++ cups-1.4.6/data/te 2011-01-12 16:39:06.620139134 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -902,9 +902,9 @@ diff -up cups-1.4.5/data/te.lspp cups-1.4.5/data/te +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% +%%EOF -diff -up cups-1.4.5/filter/common.c.lspp cups-1.4.5/filter/common.c ---- cups-1.4.5/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.4.5/filter/common.c 2010-12-24 13:21:31.181858180 +0000 +diff -up cups-1.4.6/filter/common.c.lspp cups-1.4.6/filter/common.c +--- cups-1.4.6/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 ++++ cups-1.4.6/filter/common.c 2011-01-12 16:39:06.624138928 +0000 @@ -30,6 +30,12 @@ * Include necessary headers... */ @@ -1073,10 +1073,10 @@ diff -up cups-1.4.5/filter/common.c.lspp cups-1.4.5/filter/common.c /* -diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c ---- cups-1.4.5/filter/pstops.c.lspp 2010-12-24 13:21:30.960863932 +0000 -+++ cups-1.4.5/filter/pstops.c 2010-12-24 13:21:31.186858049 +0000 -@@ -3335,6 +3335,18 @@ write_label_prolog(pstops_doc_t *doc, /* +diff -up cups-1.4.6/filter/pstops.c.lspp cups-1.4.6/filter/pstops.c +--- cups-1.4.6/filter/pstops.c.lspp 2011-01-12 16:39:06.420149233 +0000 ++++ cups-1.4.6/filter/pstops.c 2011-01-12 16:39:06.626138829 +0000 +@@ -3326,6 +3326,18 @@ write_label_prolog(pstops_doc_t *doc, /* { const char *classification; /* CLASSIFICATION environment variable */ const char *ptr; /* Temporary string pointer */ @@ -1095,7 +1095,7 @@ diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c /* -@@ -3357,6 +3369,124 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3348,6 +3360,124 @@ write_label_prolog(pstops_doc_t *doc, /* return; } @@ -1220,7 +1220,7 @@ diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c /* * Set the classification + page label string... */ -@@ -3435,7 +3565,10 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3426,7 +3556,10 @@ write_label_prolog(pstops_doc_t *doc, /* doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); doc_puts(doc, "pop\n"); doc_puts(doc, "}bind put\n"); @@ -1231,9 +1231,9 @@ diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c /* -diff -up cups-1.4.5/Makedefs.in.lspp cups-1.4.5/Makedefs.in ---- cups-1.4.5/Makedefs.in.lspp 2010-12-24 13:21:31.073860989 +0000 -+++ cups-1.4.5/Makedefs.in 2010-12-24 13:21:31.187858023 +0000 +diff -up cups-1.4.6/Makedefs.in.lspp cups-1.4.6/Makedefs.in +--- cups-1.4.6/Makedefs.in.lspp 2011-01-12 16:39:06.527143831 +0000 ++++ cups-1.4.6/Makedefs.in 2011-01-12 16:39:06.631138575 +0000 @@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS) @@ -1252,9 +1252,9 @@ diff -up cups-1.4.5/Makedefs.in.lspp cups-1.4.5/Makedefs.in .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz .c.o: -diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c ---- cups-1.4.5/scheduler/client.c.lspp 2010-10-17 05:13:56.000000000 +0100 -+++ cups-1.4.5/scheduler/client.c 2010-12-24 13:21:31.194857839 +0000 +diff -up cups-1.4.6/scheduler/client.c.lspp cups-1.4.6/scheduler/client.c +--- cups-1.4.6/scheduler/client.c.lspp 2010-10-17 05:13:56.000000000 +0100 ++++ cups-1.4.6/scheduler/client.c 2011-01-12 16:39:06.636138325 +0000 @@ -44,6 +44,7 @@ * valid_host() - Is the Host: field valid? * write_file() - Send a file via HTTP. @@ -1475,9 +1475,9 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.4.5/scheduler/client.h.lspp cups-1.4.5/scheduler/client.h ---- cups-1.4.5/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100 -+++ cups-1.4.5/scheduler/client.h 2010-12-24 13:21:31.195857813 +0000 +diff -up cups-1.4.6/scheduler/client.h.lspp cups-1.4.6/scheduler/client.h +--- cups-1.4.6/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100 ++++ cups-1.4.6/scheduler/client.h 2011-01-12 16:39:06.638138222 +0000 @@ -18,6 +18,13 @@ #endif /* HAVE_AUTHORIZATION_H */ @@ -1513,9 +1513,9 @@ diff -up cups-1.4.5/scheduler/client.h.lspp cups-1.4.5/scheduler/client.h /* -diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c ---- cups-1.4.5/scheduler/conf.c.lspp 2010-12-24 13:21:30.897865572 +0000 -+++ cups-1.4.5/scheduler/conf.c 2010-12-24 13:21:31.200857684 +0000 +diff -up cups-1.4.6/scheduler/conf.c.lspp cups-1.4.6/scheduler/conf.c +--- cups-1.4.6/scheduler/conf.c.lspp 2011-01-12 16:39:06.362152165 +0000 ++++ cups-1.4.6/scheduler/conf.c 2011-01-12 16:39:06.643137971 +0000 @@ -29,6 +29,7 @@ * read_configuration() - Read a configuration file. * read_location() - Read a definition. @@ -1625,9 +1625,9 @@ diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c /* * 'read_policy()' - Read a definition. -diff -up cups-1.4.5/scheduler/conf.h.lspp cups-1.4.5/scheduler/conf.h ---- cups-1.4.5/scheduler/conf.h.lspp 2010-12-24 13:21:30.897865572 +0000 -+++ cups-1.4.5/scheduler/conf.h 2010-12-24 13:21:31.202857632 +0000 +diff -up cups-1.4.6/scheduler/conf.h.lspp cups-1.4.6/scheduler/conf.h +--- cups-1.4.6/scheduler/conf.h.lspp 2011-01-12 16:39:06.365152014 +0000 ++++ cups-1.4.6/scheduler/conf.h 2011-01-12 16:39:06.645137869 +0000 @@ -250,6 +250,12 @@ VAR char *ServerKey VALUE(NULL); VAR int SSLOptions VALUE(CUPSD_SSL_NONE); /* SSL/TLS options */ @@ -1651,9 +1651,9 @@ diff -up cups-1.4.5/scheduler/conf.h.lspp cups-1.4.5/scheduler/conf.h /* * Prototypes... -diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c ---- cups-1.4.5/scheduler/ipp.c.lspp 2010-12-24 13:21:31.114859924 +0000 -+++ cups-1.4.5/scheduler/ipp.c 2010-12-24 13:21:31.217857242 +0000 +diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c +--- cups-1.4.6/scheduler/ipp.c.lspp 2011-01-12 16:39:06.561142113 +0000 ++++ cups-1.4.6/scheduler/ipp.c 2011-01-12 16:39:06.655137365 +0000 @@ -41,6 +41,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -2251,9 +2251,9 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c /* * Check the username against the owner... */ -diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c ---- cups-1.4.5/scheduler/job.c.lspp 2010-12-24 13:21:31.028862162 +0000 -+++ cups-1.4.5/scheduler/job.c 2010-12-24 13:21:31.224857060 +0000 +diff -up cups-1.4.6/scheduler/job.c.lspp cups-1.4.6/scheduler/job.c +--- cups-1.4.6/scheduler/job.c.lspp 2011-01-12 16:39:06.481146153 +0000 ++++ cups-1.4.6/scheduler/job.c 2011-01-12 16:39:06.664136910 +0000 @@ -66,6 +66,9 @@ * update_job_attrs() - Update the job-printer-* attributes. */ @@ -2279,7 +2279,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c /* * Design Notes for Job Management -@@ -505,6 +516,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I +@@ -508,6 +519,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I /* PRINTER env variable */ rip_max_cache[255]; /* RIP_MAX_CACHE env variable */ @@ -2294,7 +2294,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -929,6 +948,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I +@@ -932,6 +951,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I } } @@ -2362,32 +2362,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -@@ -1165,13 +1245,13 @@ cupsdContinueJob(cupsd_job_t *job) /* I - if (access(command, F_OK)) - { - snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -- method); -+ scheme); - if (!access(command, F_OK)) - { - /* Not in the correct directory, but we found it in the compat - * directory. Issue a warning. */ - cupsdLogMessage(CUPSD_LOG_INFO, -- "Backend '%s' not in %s/backend!", method, -+ "Backend '%s' not in %s/backend!", scheme, - ServerBin); - } - else -@@ -1179,7 +1259,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - /* Not in the compat directory either; make any error - messages use the correct directory name then. */ - snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -- method); -+ scheme); - } - } - #endif /* __x86_64__ */ -@@ -1626,6 +1706,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J +@@ -1629,6 +1709,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J goto error; } @@ -2408,7 +2383,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER); job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -2013,6 +2107,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2016,6 +2110,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -2423,7 +2398,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -2031,6 +2133,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2034,6 +2136,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J fchmod(cupsFileNumber(fp), 0600); fchown(cupsFileNumber(fp), RunUser, Group); @@ -2500,7 +2475,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c job->attrs->state = IPP_IDLE; if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -3332,6 +3504,18 @@ get_options(cupsd_job_t *job, /* I - Jo +@@ -3341,6 +3513,18 @@ get_options(cupsd_job_t *job, /* I - Jo banner_page) continue; @@ -2519,7 +2494,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c /* * Otherwise add them to the list... */ -@@ -4020,6 +4204,19 @@ static void +@@ -4029,6 +4213,19 @@ static void start_job(cupsd_job_t *job, /* I - Job ID */ cupsd_printer_t *printer) /* I - Printer to print job */ { @@ -2539,7 +2514,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", job, job->id, printer, printer->name); -@@ -4142,6 +4339,108 @@ start_job(cupsd_job_t *job, /* I - +@@ -4151,6 +4348,108 @@ start_job(cupsd_job_t *job, /* I - fcntl(job->side_pipes[1], F_SETFD, fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); @@ -2648,9 +2623,9 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c /* * Now start the first file in the job... */ -diff -up cups-1.4.5/scheduler/job.h.lspp cups-1.4.5/scheduler/job.h ---- cups-1.4.5/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100 -+++ cups-1.4.5/scheduler/job.h 2010-12-24 13:21:31.225857034 +0000 +diff -up cups-1.4.6/scheduler/job.h.lspp cups-1.4.6/scheduler/job.h +--- cups-1.4.6/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100 ++++ cups-1.4.6/scheduler/job.h 2011-01-12 16:39:06.667136759 +0000 @@ -13,6 +13,13 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -2676,9 +2651,9 @@ diff -up cups-1.4.5/scheduler/job.h.lspp cups-1.4.5/scheduler/job.h }; typedef struct cupsd_joblog_s /**** Job log message ****/ -diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c ---- cups-1.4.5/scheduler/main.c.lspp 2010-12-24 13:21:31.158858778 +0000 -+++ cups-1.4.5/scheduler/main.c 2010-12-24 13:22:10.827825881 +0000 +diff -up cups-1.4.6/scheduler/main.c.lspp cups-1.4.6/scheduler/main.c +--- cups-1.4.6/scheduler/main.c.lspp 2011-01-12 16:39:06.589140699 +0000 ++++ cups-1.4.6/scheduler/main.c 2011-01-12 16:39:06.669136658 +0000 @@ -37,6 +37,8 @@ * usage() - Show scheduler usage. */ @@ -2698,7 +2673,7 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c /* * Local functions... -@@ -145,6 +150,9 @@ main(int argc, /* I - Number of comm +@@ -149,6 +154,9 @@ main(int argc, /* I - Number of comm #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; /* Actions for POSIX signals */ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ @@ -2708,7 +2683,7 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c #ifdef __sgi cups_file_t *fp; /* Fake lpsched lock file */ struct stat statbuf; /* Needed for checking lpsched FIFO */ -@@ -474,6 +482,25 @@ main(int argc, /* I - Number of comm +@@ -478,6 +486,25 @@ main(int argc, /* I - Number of comm #endif /* DEBUG */ } @@ -2734,7 +2709,7 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c /* * Set the timezone info... */ -@@ -1241,6 +1268,11 @@ main(int argc, /* I - Number of comm +@@ -1258,6 +1285,11 @@ main(int argc, /* I - Number of comm cupsdStopSelect(); @@ -2746,9 +2721,9 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c return (!stop_scheduler); } -diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c ---- cups-1.4.5/scheduler/printers.c.lspp 2010-12-24 13:21:31.168858518 +0000 -+++ cups-1.4.5/scheduler/printers.c 2010-12-24 13:21:31.236856747 +0000 +diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/scheduler/printers.c +--- cups-1.4.6/scheduler/printers.c.lspp 2011-01-12 16:39:06.602140044 +0000 ++++ cups-1.4.6/scheduler/printers.c 2011-01-12 16:39:06.678136203 +0000 @@ -59,6 +59,8 @@ * write_xml_string() - Write a string with XML escaping. */ diff --git a/cups-serverbin-compat.patch b/cups-serverbin-compat.patch index 44a7894..bf1bc99 100644 --- a/cups-serverbin-compat.patch +++ b/cups-serverbin-compat.patch @@ -1,6 +1,6 @@ -diff -up cups-1.4.4/scheduler/conf.c.serverbin-compat cups-1.4.4/scheduler/conf.c ---- cups-1.4.4/scheduler/conf.c.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/conf.c 2010-09-15 13:20:41.339960335 +0100 +diff -up cups-1.4.6/scheduler/conf.c.serverbin-compat cups-1.4.6/scheduler/conf.c +--- cups-1.4.6/scheduler/conf.c.serverbin-compat 2010-08-31 05:18:38.000000000 +0100 ++++ cups-1.4.6/scheduler/conf.c 2011-01-12 16:28:47.233270999 +0000 @@ -488,6 +488,9 @@ cupsdReadConfiguration(void) cupsdClearString(&ServerName); cupsdClearString(&ServerAdmin); @@ -11,7 +11,7 @@ diff -up cups-1.4.4/scheduler/conf.c.serverbin-compat cups-1.4.4/scheduler/conf. cupsdSetString(&RequestRoot, CUPS_REQUESTS); cupsdSetString(&CacheDir, CUPS_CACHEDIR); cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -1318,7 +1321,12 @@ cupsdReadConfiguration(void) +@@ -1331,7 +1334,12 @@ cupsdReadConfiguration(void) * Read the MIME type and conversion database... */ @@ -24,9 +24,9 @@ diff -up cups-1.4.4/scheduler/conf.c.serverbin-compat cups-1.4.4/scheduler/conf. snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); MimeDatabase = mimeLoadTypes(NULL, mimedir); -diff -up cups-1.4.4/scheduler/conf.h.serverbin-compat cups-1.4.4/scheduler/conf.h ---- cups-1.4.4/scheduler/conf.h.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/conf.h 2010-09-15 13:20:41.340959464 +0100 +diff -up cups-1.4.6/scheduler/conf.h.serverbin-compat cups-1.4.6/scheduler/conf.h +--- cups-1.4.6/scheduler/conf.h.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 ++++ cups-1.4.6/scheduler/conf.h 2011-01-12 16:28:47.233270999 +0000 @@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) /* Root directory for scheduler */ *ServerBin VALUE(NULL), @@ -38,9 +38,9 @@ diff -up cups-1.4.4/scheduler/conf.h.serverbin-compat cups-1.4.4/scheduler/conf. *StateDir VALUE(NULL), /* Root directory for state data */ *RequestRoot VALUE(NULL), -diff -up cups-1.4.4/scheduler/env.c.serverbin-compat cups-1.4.4/scheduler/env.c ---- cups-1.4.4/scheduler/env.c.serverbin-compat 2009-06-15 18:13:52.000000000 +0100 -+++ cups-1.4.4/scheduler/env.c 2010-09-15 13:20:41.341959587 +0100 +diff -up cups-1.4.6/scheduler/env.c.serverbin-compat cups-1.4.6/scheduler/env.c +--- cups-1.4.6/scheduler/env.c.serverbin-compat 2009-06-15 18:13:52.000000000 +0100 ++++ cups-1.4.6/scheduler/env.c 2011-01-12 16:28:47.234270949 +0000 @@ -87,8 +87,13 @@ cupsdInitEnv(void) cupsdSetEnv("LD_LIBRARY_PATH", NULL); cupsdSetEnv("LD_PRELOAD", NULL); @@ -55,10 +55,10 @@ diff -up cups-1.4.4/scheduler/env.c.serverbin-compat cups-1.4.4/scheduler/env.c cupsdSetEnv("SERVER_ADMIN", ServerAdmin); cupsdSetEnv("SHLIB_PATH", NULL); cupsdSetEnv("SOFTWARE", CUPS_MINIMAL); -diff -up cups-1.4.4/scheduler/ipp.c.serverbin-compat cups-1.4.4/scheduler/ipp.c ---- cups-1.4.4/scheduler/ipp.c.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/ipp.c 2010-09-15 13:20:41.359835378 +0100 -@@ -2615,9 +2615,18 @@ add_printer(cupsd_client_t *con, /* I - +diff -up cups-1.4.6/scheduler/ipp.c.serverbin-compat cups-1.4.6/scheduler/ipp.c +--- cups-1.4.6/scheduler/ipp.c.serverbin-compat 2010-10-06 21:07:44.000000000 +0100 ++++ cups-1.4.6/scheduler/ipp.c 2011-01-12 16:28:47.246270349 +0000 +@@ -2602,9 +2602,18 @@ add_printer(cupsd_client_t *con, /* I - * Could not find device in list! */ @@ -77,10 +77,10 @@ diff -up cups-1.4.4/scheduler/ipp.c.serverbin-compat cups-1.4.4/scheduler/ipp.c } } -diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c ---- cups-1.4.4/scheduler/job.c.serverbin-compat 2010-03-30 23:07:33.000000000 +0100 -+++ cups-1.4.4/scheduler/job.c 2010-09-15 13:20:41.366836134 +0100 -@@ -972,8 +972,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I +diff -up cups-1.4.6/scheduler/job.c.serverbin-compat cups-1.4.6/scheduler/job.c +--- cups-1.4.6/scheduler/job.c.serverbin-compat 2010-11-30 22:35:02.000000000 +0000 ++++ cups-1.4.6/scheduler/job.c 2011-01-12 16:31:43.515443755 +0000 +@@ -975,8 +975,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) { if (filter->filter[0] != '/') @@ -115,7 +115,7 @@ diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c else strlcpy(command, filter->filter, sizeof(command)); -@@ -1119,6 +1143,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I +@@ -1122,6 +1146,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I cupsdClosePipe(job->print_pipes); cupsdClosePipe(job->back_pipes); cupsdClosePipe(job->side_pipes); @@ -123,13 +123,13 @@ diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c + if (access(command, F_OK)) + { + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -+ method); ++ scheme); + if (!access(command, F_OK)) + { + /* Not in the correct directory, but we found it in the compat + * directory. Issue a warning. */ + cupsdLogMessage(CUPSD_LOG_INFO, -+ "Backend '%s' not in %s/backend!", method, ++ "Backend '%s' not in %s/backend!", scheme, + ServerBin); + } + else @@ -137,17 +137,17 @@ diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c + /* Not in the compat directory either; make any error + messages use the correct directory name then. */ + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -+ method); ++ scheme); + } + } +#endif /* __x86_64__ */ close(job->status_pipes[1]); job->status_pipes[1] = -1; -diff -up cups-1.4.4/scheduler/printers.c.serverbin-compat cups-1.4.4/scheduler/printers.c ---- cups-1.4.4/scheduler/printers.c.serverbin-compat 2010-04-23 21:53:38.000000000 +0100 -+++ cups-1.4.4/scheduler/printers.c 2010-09-15 13:21:39.627960657 +0100 -@@ -1059,9 +1059,19 @@ cupsdLoadAllPrinters(void) +diff -up cups-1.4.6/scheduler/printers.c.serverbin-compat cups-1.4.6/scheduler/printers.c +--- cups-1.4.6/scheduler/printers.c.serverbin-compat 2010-09-22 19:35:07.000000000 +0100 ++++ cups-1.4.6/scheduler/printers.c 2011-01-12 16:28:47.261269599 +0000 +@@ -1114,9 +1114,19 @@ cupsdLoadAllPrinters(void) * Backend does not exist, stop printer... */ @@ -167,7 +167,7 @@ diff -up cups-1.4.4/scheduler/printers.c.serverbin-compat cups-1.4.4/scheduler/p } } -@@ -3603,6 +3613,14 @@ add_printer_filter( +@@ -3658,6 +3668,14 @@ add_printer_filter( if (stat(filename, &fileinfo)) { @@ -182,7 +182,7 @@ diff -up cups-1.4.4/scheduler/printers.c.serverbin-compat cups-1.4.4/scheduler/p memset(&fileinfo, 0, sizeof(fileinfo)); snprintf(p->state_message, sizeof(p->state_message), -@@ -3611,6 +3629,9 @@ add_printer_filter( +@@ -3666,6 +3684,9 @@ add_printer_filter( cupsdSetPrinterReasons(p, "+cups-missing-filter-warning"); cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); diff --git a/cups.spec b/cups.spec index 72bf0f7..4926127 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -606,6 +606,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Wed Jan 12 2011 Tim Waugh 1:1.4.6-4 +- Properly separated serverbin-compat and lspp patches. + * Tue Jan 11 2011 Tim Waugh 1:1.4.6-3 - Build requires automake for avahi support.