From d82520b5fc816cfbc6a6f9e6e9c358bcb28a296f Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Jul 12 2013 10:07:53 +0000 Subject: 1.6.3 --- diff --git a/.gitignore b/.gitignore index 579590a..9cd28f8 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ cups-1.4.4-source.tar.bz2 /cups-1.5.4-source.tar.bz2 /cups-1.6.1-source.tar.bz2 /cups-1.6.2-source.tar.bz2 +/cups-1.6.3-source.tar.bz2 diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch index d9cec2d..d97c58a 100644 --- a/cups-avahi-no-threaded.patch +++ b/cups-avahi-no-threaded.patch @@ -1,6 +1,6 @@ -diff -up cups-1.6.2/scheduler/avahi.c.avahi-no-threaded cups-1.6.2/scheduler/avahi.c ---- cups-1.6.2/scheduler/avahi.c.avahi-no-threaded 2013-07-01 17:27:51.825131332 +0100 -+++ cups-1.6.2/scheduler/avahi.c 2013-07-01 17:27:51.825131332 +0100 +diff -up cups-1.6.3/scheduler/avahi.c.avahi-no-threaded cups-1.6.3/scheduler/avahi.c +--- cups-1.6.3/scheduler/avahi.c.avahi-no-threaded 2013-07-12 11:42:14.650430828 +0200 ++++ cups-1.6.3/scheduler/avahi.c 2013-07-12 11:42:14.650430828 +0200 @@ -0,0 +1,441 @@ +/* + * "$Id$" @@ -443,9 +443,9 @@ diff -up cups-1.6.2/scheduler/avahi.c.avahi-no-threaded cups-1.6.2/scheduler/ava +/* + * End of "$Id$". + */ -diff -up cups-1.6.2/scheduler/avahi.h.avahi-no-threaded cups-1.6.2/scheduler/avahi.h ---- cups-1.6.2/scheduler/avahi.h.avahi-no-threaded 2013-07-01 17:27:51.825131332 +0100 -+++ cups-1.6.2/scheduler/avahi.h 2013-07-01 17:27:51.825131332 +0100 +diff -up cups-1.6.3/scheduler/avahi.h.avahi-no-threaded cups-1.6.3/scheduler/avahi.h +--- cups-1.6.3/scheduler/avahi.h.avahi-no-threaded 2013-07-12 11:42:14.651430814 +0200 ++++ cups-1.6.3/scheduler/avahi.h 2013-07-12 11:42:14.651430814 +0200 @@ -0,0 +1,69 @@ +/* + * "$Id$" @@ -516,9 +516,9 @@ diff -up cups-1.6.2/scheduler/avahi.h.avahi-no-threaded cups-1.6.2/scheduler/ava +/* + * End of "$Id$". + */ -diff -up cups-1.6.2/scheduler/cupsd.h.avahi-no-threaded cups-1.6.2/scheduler/cupsd.h ---- cups-1.6.2/scheduler/cupsd.h.avahi-no-threaded 2012-12-17 22:17:08.000000000 +0000 -+++ cups-1.6.2/scheduler/cupsd.h 2013-07-01 17:27:57.445154239 +0100 +diff -up cups-1.6.3/scheduler/cupsd.h.avahi-no-threaded cups-1.6.3/scheduler/cupsd.h +--- cups-1.6.3/scheduler/cupsd.h.avahi-no-threaded 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/scheduler/cupsd.h 2013-07-12 11:52:42.947705883 +0200 @@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int); #include "colorman.h" #include "conf.h" @@ -555,7 +555,7 @@ diff -up cups-1.6.2/scheduler/cupsd.h.avahi-no-threaded cups-1.6.2/scheduler/cup /* * Prototypes... -@@ -228,6 +243,18 @@ extern void cupsdStopSelect(void); +@@ -228,6 +243,17 @@ extern void cupsdStopSelect(void); extern void cupsdStartServer(void); extern void cupsdStopServer(void); @@ -570,13 +570,12 @@ diff -up cups-1.6.2/scheduler/cupsd.h.avahi-no-threaded cups-1.6.2/scheduler/cup + const struct timeval *tv); +extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); +#endif /* HAVE_AVAHI */ -+ /* - * End of "$Id: cupsd.h 10776 2012-12-17 22:17:08Z mike $". -diff -up cups-1.6.2/scheduler/dirsvc.c.avahi-no-threaded cups-1.6.2/scheduler/dirsvc.c ---- cups-1.6.2/scheduler/dirsvc.c.avahi-no-threaded 2012-10-03 15:17:41.000000000 +0100 -+++ cups-1.6.2/scheduler/dirsvc.c 2013-07-01 17:27:51.826131336 +0100 + * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $". +diff -up cups-1.6.3/scheduler/dirsvc.c.avahi-no-threaded cups-1.6.3/scheduler/dirsvc.c +--- cups-1.6.3/scheduler/dirsvc.c.avahi-no-threaded 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/scheduler/dirsvc.c 2013-07-12 11:42:14.652430800 +0200 @@ -212,7 +212,7 @@ cupsdStartBrowsing(void) } @@ -651,9 +650,9 @@ diff -up cups-1.6.2/scheduler/dirsvc.c.avahi-no-threaded cups-1.6.2/scheduler/di DNSSDMaster = NULL; # endif /* HAVE_DNSSD */ -diff -up cups-1.6.2/scheduler/dirsvc.h.avahi-no-threaded cups-1.6.2/scheduler/dirsvc.h ---- cups-1.6.2/scheduler/dirsvc.h.avahi-no-threaded 2012-04-17 00:26:18.000000000 +0100 -+++ cups-1.6.2/scheduler/dirsvc.h 2013-07-01 17:27:51.826131336 +0100 +diff -up cups-1.6.3/scheduler/dirsvc.h.avahi-no-threaded cups-1.6.3/scheduler/dirsvc.h +--- cups-1.6.3/scheduler/dirsvc.h.avahi-no-threaded 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/scheduler/dirsvc.h 2013-07-12 11:42:14.652430800 +0200 @@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU VAR DNSServiceRef DNSSDMaster VALUE(NULL); /* Master DNS-SD service reference */ @@ -663,9 +662,9 @@ diff -up cups-1.6.2/scheduler/dirsvc.h.avahi-no-threaded cups-1.6.2/scheduler/di /* Master polling interface for Avahi */ VAR AvahiClient *DNSSDClient VALUE(NULL); /* Client information */ -diff -up cups-1.6.2/scheduler/main.c.avahi-no-threaded cups-1.6.2/scheduler/main.c ---- cups-1.6.2/scheduler/main.c.avahi-no-threaded 2013-07-01 17:27:51.811131275 +0100 -+++ cups-1.6.2/scheduler/main.c 2013-07-01 17:27:51.826131336 +0100 +diff -up cups-1.6.3/scheduler/main.c.avahi-no-threaded cups-1.6.3/scheduler/main.c +--- cups-1.6.3/scheduler/main.c.avahi-no-threaded 2013-07-12 11:42:14.624431189 +0200 ++++ cups-1.6.3/scheduler/main.c 2013-07-12 11:42:14.653430786 +0200 @@ -159,6 +159,10 @@ main(int argc, /* I - Number of comm int launchd_idle_exit; /* Idle exit on select timeout? */ @@ -740,9 +739,9 @@ diff -up cups-1.6.2/scheduler/main.c.avahi-no-threaded cups-1.6.2/scheduler/main /* * Check whether we are accepting new connections... */ -diff -up cups-1.6.2/scheduler/Makefile.avahi-no-threaded cups-1.6.2/scheduler/Makefile ---- cups-1.6.2/scheduler/Makefile.avahi-no-threaded 2013-07-01 17:27:51.811131275 +0100 -+++ cups-1.6.2/scheduler/Makefile 2013-07-01 17:27:51.827131340 +0100 +diff -up cups-1.6.3/scheduler/Makefile.avahi-no-threaded cups-1.6.3/scheduler/Makefile +--- cups-1.6.3/scheduler/Makefile.avahi-no-threaded 2013-07-12 11:42:14.625431175 +0200 ++++ cups-1.6.3/scheduler/Makefile 2013-07-12 11:42:14.653430786 +0200 @@ -17,6 +17,7 @@ include ../Makedefs CUPSDOBJS = \ @@ -759,9 +758,9 @@ diff -up cups-1.6.2/scheduler/Makefile.avahi-no-threaded cups-1.6.2/scheduler/Ma tls.o LIBOBJS = \ filter.o \ -diff -up cups-1.6.2/scheduler/timeout.c.avahi-no-threaded cups-1.6.2/scheduler/timeout.c ---- cups-1.6.2/scheduler/timeout.c.avahi-no-threaded 2013-07-01 17:27:51.827131340 +0100 -+++ cups-1.6.2/scheduler/timeout.c 2013-07-01 17:27:51.827131340 +0100 +diff -up cups-1.6.3/scheduler/timeout.c.avahi-no-threaded cups-1.6.3/scheduler/timeout.c +--- cups-1.6.3/scheduler/timeout.c.avahi-no-threaded 2013-07-12 11:42:14.654430772 +0200 ++++ cups-1.6.3/scheduler/timeout.c 2013-07-12 11:42:14.654430772 +0200 @@ -0,0 +1,235 @@ +/* + * "$Id$" diff --git a/cups-lspp.patch b/cups-lspp.patch index d3bf086..8d6664f 100644 --- a/cups-lspp.patch +++ b/cups-lspp.patch @@ -1,7 +1,7 @@ -diff -up cups-1.6.2/config.h.in.lspp cups-1.6.2/config.h.in ---- cups-1.6.2/config.h.in.lspp 2013-03-18 19:00:30.704448157 +0100 -+++ cups-1.6.2/config.h.in 2013-03-18 19:00:30.724447879 +0100 -@@ -746,6 +746,13 @@ static __inline int _cups_abs(int i) { r +diff -up cups-1.6.3/config.h.in.lspp cups-1.6.3/config.h.in +--- cups-1.6.3/config.h.in.lspp 2013-07-12 11:54:00.974623350 +0200 ++++ cups-1.6.3/config.h.in 2013-07-12 11:54:01.013622809 +0200 +@@ -747,6 +747,13 @@ static __inline int _cups_abs(int i) { r # endif /* __GNUC__ || __STDC_VERSION__ */ #endif /* !HAVE_ABS && !abs */ @@ -15,9 +15,9 @@ diff -up cups-1.6.2/config.h.in.lspp cups-1.6.2/config.h.in #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up cups-1.6.2/config-scripts/cups-lspp.m4.lspp cups-1.6.2/config-scripts/cups-lspp.m4 ---- cups-1.6.2/config-scripts/cups-lspp.m4.lspp 2013-03-18 19:00:30.724447879 +0100 -+++ cups-1.6.2/config-scripts/cups-lspp.m4 2013-03-18 19:00:30.724447879 +0100 +diff -up cups-1.6.3/config-scripts/cups-lspp.m4.lspp cups-1.6.3/config-scripts/cups-lspp.m4 +--- cups-1.6.3/config-scripts/cups-lspp.m4.lspp 2013-07-12 11:54:01.013622809 +0200 ++++ cups-1.6.3/config-scripts/cups-lspp.m4 2013-07-12 11:54:01.013622809 +0200 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -55,9 +55,9 @@ diff -up cups-1.6.2/config-scripts/cups-lspp.m4.lspp cups-1.6.2/config-scripts/c + ;; + esac +fi -diff -up cups-1.6.2/configure.in.lspp cups-1.6.2/configure.in ---- cups-1.6.2/configure.in.lspp 2013-03-18 19:00:30.705448143 +0100 -+++ cups-1.6.2/configure.in 2013-03-18 19:00:30.724447879 +0100 +diff -up cups-1.6.3/configure.in.lspp cups-1.6.3/configure.in +--- cups-1.6.3/configure.in.lspp 2013-07-12 11:54:00.974623350 +0200 ++++ cups-1.6.3/configure.in 2013-07-12 11:54:01.013622809 +0200 @@ -37,6 +37,8 @@ sinclude(config-scripts/cups-systemd.m4) sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-scripting.m4) @@ -67,9 +67,9 @@ diff -up cups-1.6.2/configure.in.lspp cups-1.6.2/configure.in INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up cups-1.6.2/filter/common.c.lspp cups-1.6.2/filter/common.c ---- cups-1.6.2/filter/common.c.lspp 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.6.2/filter/common.c 2013-03-18 19:00:30.725447865 +0100 +diff -up cups-1.6.3/filter/common.c.lspp cups-1.6.3/filter/common.c +--- cups-1.6.3/filter/common.c.lspp 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/filter/common.c 2013-07-12 11:54:01.014622795 +0200 @@ -30,6 +30,12 @@ * Include necessary headers... */ @@ -238,9 +238,9 @@ diff -up cups-1.6.2/filter/common.c.lspp cups-1.6.2/filter/common.c /* -diff -up cups-1.6.2/filter/pstops.c.lspp cups-1.6.2/filter/pstops.c ---- cups-1.6.2/filter/pstops.c.lspp 2012-04-23 21:19:19.000000000 +0200 -+++ cups-1.6.2/filter/pstops.c 2013-03-18 19:00:30.726447852 +0100 +diff -up cups-1.6.3/filter/pstops.c.lspp cups-1.6.3/filter/pstops.c +--- cups-1.6.3/filter/pstops.c.lspp 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/filter/pstops.c 2013-07-12 11:54:01.015622781 +0200 @@ -3202,6 +3202,18 @@ write_label_prolog(pstops_doc_t *doc, /* { const char *classification; /* CLASSIFICATION environment variable */ @@ -396,9 +396,9 @@ diff -up cups-1.6.2/filter/pstops.c.lspp cups-1.6.2/filter/pstops.c /* -diff -up cups-1.6.2/Makedefs.in.lspp cups-1.6.2/Makedefs.in ---- cups-1.6.2/Makedefs.in.lspp 2013-03-18 19:00:30.706448129 +0100 -+++ cups-1.6.2/Makedefs.in 2013-03-18 19:00:30.726447852 +0100 +diff -up cups-1.6.3/Makedefs.in.lspp cups-1.6.3/Makedefs.in +--- cups-1.6.3/Makedefs.in.lspp 2013-07-12 11:54:00.976623322 +0200 ++++ cups-1.6.3/Makedefs.in 2013-07-12 11:54:01.015622781 +0200 @@ -146,7 +146,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) @@ -408,9 +408,9 @@ diff -up cups-1.6.2/Makedefs.in.lspp cups-1.6.2/Makedefs.in OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ -diff -up cups-1.6.2/scheduler/client.c.lspp cups-1.6.2/scheduler/client.c ---- cups-1.6.2/scheduler/client.c.lspp 2013-01-21 16:29:47.000000000 +0100 -+++ cups-1.6.2/scheduler/client.c 2013-03-18 19:00:30.727447838 +0100 +diff -up cups-1.6.3/scheduler/client.c.lspp cups-1.6.3/scheduler/client.c +--- cups-1.6.3/scheduler/client.c.lspp 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/scheduler/client.c 2013-07-12 11:54:01.017622754 +0200 @@ -41,6 +41,7 @@ * valid_host() - Is the Host: field valid? * write_file() - Send a file via HTTP. @@ -576,7 +576,7 @@ diff -up cups-1.6.2/scheduler/client.c.lspp cups-1.6.2/scheduler/client.c } if (con->http.state != HTTP_POST_SEND) -@@ -3572,6 +3698,49 @@ is_path_absolute(const char *path) /* I +@@ -3579,6 +3705,49 @@ is_path_absolute(const char *path) /* I return (1); } @@ -626,9 +626,9 @@ diff -up cups-1.6.2/scheduler/client.c.lspp cups-1.6.2/scheduler/client.c /* * 'pipe_command()' - Pipe the output of a command to the remote client. -diff -up cups-1.6.2/scheduler/client.h.lspp cups-1.6.2/scheduler/client.h ---- cups-1.6.2/scheduler/client.h.lspp 2013-03-18 19:00:30.706448129 +0100 -+++ cups-1.6.2/scheduler/client.h 2013-03-18 19:00:30.727447838 +0100 +diff -up cups-1.6.3/scheduler/client.h.lspp cups-1.6.3/scheduler/client.h +--- cups-1.6.3/scheduler/client.h.lspp 2013-07-12 11:54:00.976623322 +0200 ++++ cups-1.6.3/scheduler/client.h 2013-07-12 11:54:01.017622754 +0200 @@ -18,6 +18,13 @@ #endif /* HAVE_AUTHORIZATION_H */ @@ -664,9 +664,9 @@ diff -up cups-1.6.2/scheduler/client.h.lspp cups-1.6.2/scheduler/client.h #ifdef HAVE_SSL extern int cupsdEndTLS(cupsd_client_t *con); -diff -up cups-1.6.2/scheduler/conf.c.lspp cups-1.6.2/scheduler/conf.c ---- cups-1.6.2/scheduler/conf.c.lspp 2013-03-18 19:00:30.643449003 +0100 -+++ cups-1.6.2/scheduler/conf.c 2013-03-18 19:00:30.728447824 +0100 +diff -up cups-1.6.3/scheduler/conf.c.lspp cups-1.6.3/scheduler/conf.c +--- cups-1.6.3/scheduler/conf.c.lspp 2013-07-12 11:54:00.911624224 +0200 ++++ cups-1.6.3/scheduler/conf.c 2013-07-12 11:54:01.018622740 +0200 @@ -34,6 +34,7 @@ * read_location() - Read a definition. * read_policy() - Read a definition. @@ -771,9 +771,9 @@ diff -up cups-1.6.2/scheduler/conf.c.lspp cups-1.6.2/scheduler/conf.c /* * 'read_policy()' - Read a definition. -diff -up cups-1.6.2/scheduler/conf.h.lspp cups-1.6.2/scheduler/conf.h ---- cups-1.6.2/scheduler/conf.h.lspp 2013-03-18 19:00:30.643449003 +0100 -+++ cups-1.6.2/scheduler/conf.h 2013-03-18 19:00:30.729447810 +0100 +diff -up cups-1.6.3/scheduler/conf.h.lspp cups-1.6.3/scheduler/conf.h +--- cups-1.6.3/scheduler/conf.h.lspp 2013-07-12 11:54:00.911624224 +0200 ++++ cups-1.6.3/scheduler/conf.h 2013-07-12 11:54:01.019622726 +0200 @@ -249,6 +249,13 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NO /* SSL/TLS options */ #endif /* HAVE_SSL */ @@ -798,9 +798,9 @@ diff -up cups-1.6.2/scheduler/conf.h.lspp cups-1.6.2/scheduler/conf.h /* * Prototypes... -diff -up cups-1.6.2/scheduler/cupsd.h.lspp cups-1.6.2/scheduler/cupsd.h ---- cups-1.6.2/scheduler/cupsd.h.lspp 2012-12-17 23:17:08.000000000 +0100 -+++ cups-1.6.2/scheduler/cupsd.h 2013-03-18 19:00:30.729447810 +0100 +diff -up cups-1.6.3/scheduler/cupsd.h.lspp cups-1.6.3/scheduler/cupsd.h +--- cups-1.6.3/scheduler/cupsd.h.lspp 2013-07-12 11:54:01.005622920 +0200 ++++ cups-1.6.3/scheduler/cupsd.h 2013-07-12 11:54:01.019622726 +0200 @@ -13,6 +13,8 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -832,9 +832,9 @@ diff -up cups-1.6.2/scheduler/cupsd.h.lspp cups-1.6.2/scheduler/cupsd.h /* * Some OS's don't have hstrerror(), most notably Solaris... */ -diff -up cups-1.6.2/scheduler/ipp.c.lspp cups-1.6.2/scheduler/ipp.c ---- cups-1.6.2/scheduler/ipp.c.lspp 2013-03-18 19:00:30.668448656 +0100 -+++ cups-1.6.2/scheduler/ipp.c 2013-03-18 19:05:00.416706472 +0100 +diff -up cups-1.6.3/scheduler/ipp.c.lspp cups-1.6.3/scheduler/ipp.c +--- cups-1.6.3/scheduler/ipp.c.lspp 2013-07-12 11:54:00.940623822 +0200 ++++ cups-1.6.3/scheduler/ipp.c 2013-07-12 11:54:01.022622684 +0200 @@ -35,6 +35,7 @@ * cancel_all_jobs() - Cancel all or selected print jobs. * cancel_job() - Cancel a print job. @@ -1424,7 +1424,7 @@ diff -up cups-1.6.2/scheduler/ipp.c.lspp cups-1.6.2/scheduler/ipp.c if (count > 0) ippAddSeparator(con->response); -@@ -11303,6 +11764,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -11309,6 +11770,11 @@ validate_user(cupsd_job_t *job, /* I strlcpy(username, get_username(con), userlen); @@ -1436,9 +1436,9 @@ diff -up cups-1.6.2/scheduler/ipp.c.lspp cups-1.6.2/scheduler/ipp.c /* * Check the username against the owner... */ -diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c ---- cups-1.6.2/scheduler/job.c.lspp 2013-03-18 19:00:30.686448406 +0100 -+++ cups-1.6.2/scheduler/job.c 2013-03-18 19:00:30.735447727 +0100 +diff -up cups-1.6.3/scheduler/job.c.lspp cups-1.6.3/scheduler/job.c +--- cups-1.6.3/scheduler/job.c.lspp 2013-07-12 11:54:00.955623614 +0200 ++++ cups-1.6.3/scheduler/job.c 2013-07-12 11:59:53.147736756 +0200 @@ -68,6 +68,9 @@ * update_job_attrs() - Update the job-printer-* attributes. */ @@ -1479,9 +1479,9 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -1071,6 +1090,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I - } - } +@@ -1092,6 +1111,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I + if (final_content_type[0]) + envp[envc ++] = final_content_type; +#ifdef WITH_LSPP + if (is_lspp_config()) @@ -1547,7 +1547,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -@@ -1845,6 +1925,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J +@@ -1866,6 +1946,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J ippSetString(job->attrs, &job->reasons, 0, "none"); } @@ -1568,7 +1568,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/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); -@@ -2235,6 +2329,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2259,6 +2353,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -1583,7 +1583,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -2247,6 +2349,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2271,6 +2373,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J fchown(cupsFileNumber(fp), RunUser, Group); @@ -1660,7 +1660,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c job->attrs->state = IPP_IDLE; if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -3756,6 +3928,18 @@ get_options(cupsd_job_t *job, /* I - Jo +@@ -3780,6 +3952,18 @@ get_options(cupsd_job_t *job, /* I - Jo banner_page) continue; @@ -1679,7 +1679,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c /* * Otherwise add them to the list... */ -@@ -4480,6 +4664,19 @@ static void +@@ -4504,6 +4688,19 @@ static void start_job(cupsd_job_t *job, /* I - Job ID */ cupsd_printer_t *printer) /* I - Printer to print job */ { @@ -1699,7 +1699,7 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", job, job->id, printer, printer->name); -@@ -4622,6 +4819,108 @@ start_job(cupsd_job_t *job, /* I - +@@ -4646,6 +4843,108 @@ start_job(cupsd_job_t *job, /* I - fcntl(job->side_pipes[1], F_SETFD, fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); @@ -1808,9 +1808,9 @@ diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c /* * Now start the first file in the job... */ -diff -up cups-1.6.2/scheduler/job.h.lspp cups-1.6.2/scheduler/job.h ---- cups-1.6.2/scheduler/job.h.lspp 2012-05-23 03:36:50.000000000 +0200 -+++ cups-1.6.2/scheduler/job.h 2013-03-18 19:00:30.736447713 +0100 +diff -up cups-1.6.3/scheduler/job.h.lspp cups-1.6.3/scheduler/job.h +--- cups-1.6.3/scheduler/job.h.lspp 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/scheduler/job.h 2013-07-12 11:54:01.024622656 +0200 @@ -13,6 +13,13 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -1836,9 +1836,9 @@ diff -up cups-1.6.2/scheduler/job.h.lspp cups-1.6.2/scheduler/job.h }; typedef struct cupsd_joblog_s /**** Job log message ****/ -diff -up cups-1.6.2/scheduler/main.c.lspp cups-1.6.2/scheduler/main.c ---- cups-1.6.2/scheduler/main.c.lspp 2013-03-18 19:00:30.708448101 +0100 -+++ cups-1.6.2/scheduler/main.c 2013-03-18 19:05:36.422206888 +0100 +diff -up cups-1.6.3/scheduler/main.c.lspp cups-1.6.3/scheduler/main.c +--- cups-1.6.3/scheduler/main.c.lspp 2013-07-12 11:54:01.007622892 +0200 ++++ cups-1.6.3/scheduler/main.c 2013-07-12 11:54:01.025622643 +0200 @@ -38,6 +38,8 @@ * usage() - Show scheduler usage. */ @@ -1868,7 +1868,7 @@ diff -up cups-1.6.2/scheduler/main.c.lspp cups-1.6.2/scheduler/main.c #ifdef __sgi cups_file_t *fp; /* Fake lpsched lock file */ struct stat statbuf; /* Needed for checking lpsched FIFO */ -@@ -522,6 +530,25 @@ main(int argc, /* I - Number of comm +@@ -526,6 +534,25 @@ main(int argc, /* I - Number of comm #endif /* DEBUG */ } @@ -1894,7 +1894,7 @@ diff -up cups-1.6.2/scheduler/main.c.lspp cups-1.6.2/scheduler/main.c /* * Set the timezone info... */ -@@ -1216,6 +1243,11 @@ main(int argc, /* I - Number of comm +@@ -1238,6 +1265,11 @@ main(int argc, /* I - Number of comm cupsdStopSelect(); @@ -1906,9 +1906,9 @@ diff -up cups-1.6.2/scheduler/main.c.lspp cups-1.6.2/scheduler/main.c return (!stop_scheduler); } -diff -up cups-1.6.2/scheduler/printers.c.lspp cups-1.6.2/scheduler/printers.c ---- cups-1.6.2/scheduler/printers.c.lspp 2013-03-18 19:00:30.649448920 +0100 -+++ cups-1.6.2/scheduler/printers.c 2013-03-18 19:07:48.244377673 +0100 +diff -up cups-1.6.3/scheduler/printers.c.lspp cups-1.6.3/scheduler/printers.c +--- cups-1.6.3/scheduler/printers.c.lspp 2013-07-12 11:54:00.993623087 +0200 ++++ cups-1.6.3/scheduler/printers.c 2013-07-12 11:54:01.026622629 +0200 @@ -56,6 +56,8 @@ * write_xml_string() - Write a string with XML escaping. */ @@ -1929,7 +1929,7 @@ diff -up cups-1.6.2/scheduler/printers.c.lspp cups-1.6.2/scheduler/printers.c /* * Local functions... -@@ -2090,6 +2096,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2107,6 +2113,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) ipp_attribute_t *attr; /* Attribute data */ char *name, /* Current user/group name */ *filter; /* Current filter */ @@ -1943,7 +1943,7 @@ diff -up cups-1.6.2/scheduler/printers.c.lspp cups-1.6.2/scheduler/printers.c DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2212,6 +2225,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2229,6 +2242,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) attr->values[1].string.text = _cupsStrAlloc(Classification ? Classification : p->job_sheets[1]); } @@ -1989,7 +1989,7 @@ diff -up cups-1.6.2/scheduler/printers.c.lspp cups-1.6.2/scheduler/printers.c } p->raw = 0; -@@ -5298,7 +5350,6 @@ write_irix_state(cupsd_printer_t *p) /* +@@ -5315,7 +5367,6 @@ write_irix_state(cupsd_printer_t *p) /* } #endif /* __sgi */ diff --git a/cups-usblp-quirks.patch b/cups-usblp-quirks.patch index 59ecb0d..b626715 100644 --- a/cups-usblp-quirks.patch +++ b/cups-usblp-quirks.patch @@ -1,20 +1,7 @@ -diff -up cups-1.6.2/backend/usb-libusb.c.usblp-quirks cups-1.6.2/backend/usb-libusb.c ---- cups-1.6.2/backend/usb-libusb.c.usblp-quirks 2013-03-14 14:31:07.000000000 +0000 -+++ cups-1.6.2/backend/usb-libusb.c 2013-06-25 09:25:35.941884975 +0100 -@@ -142,8 +142,12 @@ static const struct quirk_printer_struct - { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ - { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ - { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ -+ { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, -+ Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ - { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, - by zut */ -+ { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D -+ Printer, https://bugs.launchpad.net/bugs/1160638 */ - { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 - Printer, http://www.cups.org/str.php?L4155 */ - { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 -@@ -154,10 +158,14 @@ static const struct quirk_printer_struct +diff -up cups-1.6.3/backend/usb-libusb.c.usblp-quirks cups-1.6.3/backend/usb-libusb.c +--- cups-1.6.3/backend/usb-libusb.c.usblp-quirks 2013-06-07 03:12:52.000000000 +0200 ++++ cups-1.6.3/backend/usb-libusb.c 2013-07-12 11:39:33.000000000 +0200 +@@ -158,6 +158,8 @@ static const struct quirk_printer_struct Printer, https://bugs.launchpad.net/bugs/1032456 */ { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009 */ @@ -23,46 +10,3 @@ diff -up cups-1.6.2/backend/usb-libusb.c.usblp-quirks cups-1.6.2/backend/usb-lib { 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 - Printer, http://www.cups.org/str.php?L4155 */ -+ { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 -+ Printer, https://bugs.launchpad.net/bugs/1160638 */ - { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd - HL-1430 Laser Printer, - https://bugs.launchpad.net/bugs/1038695 */ -@@ -165,24 +173,33 @@ static const struct quirk_printer_struct - USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd - HL-1440 Laser Printer, - https://bugs.launchpad.net/bugs/1000253 */ -+ { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | -+ USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd -+ HL-1450 Laser Printer, -+ https://bugs.launchpad.net/bugs/1000253 */ - { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. - Okipage 14ex Printer, - https://bugs.launchpad.net/bugs/872483 */ - { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, - https://bugs.launchpad.net/bugs/872483 */ -- { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, -+ { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | -+ USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, - http://bugs.debian.org/697970 */ -+ { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, -+ https://bugs.launchpad.net/bugs/872483 */ - { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt - Printer M129C */ - { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | - USBLP_QUIRK_NO_REATTACH | - USBLP_QUIRK_RESET }, -+ /* Prolific Technology, Inc. PL2305 Parallel Port -+ (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ - { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 - https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ - { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 - https://bugs.launchpad.net/bugs/1102470 */ -- /* Prolific Technology, Inc. PL2305 Parallel Port -- (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ -+ { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics -+ CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ - { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, - https://bugs.launchpad.net/bugs/1032456 */ - { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, diff --git a/cups-use-ipp1.1.patch b/cups-use-ipp1.1.patch index b0b7fc5..41855fc 100644 --- a/cups-use-ipp1.1.patch +++ b/cups-use-ipp1.1.patch @@ -1,12 +1,12 @@ -diff -up cups-1.6.2/cups/globals.c.use-ipp1.1 cups-1.6.2/cups/globals.c ---- cups-1.6.2/cups/globals.c.use-ipp1.1 2013-06-26 14:36:25.905364837 +0100 -+++ cups-1.6.2/cups/globals.c 2013-06-26 14:36:31.554385140 +0100 -@@ -215,7 +215,7 @@ cups_globals_alloc(void) - cg->any_root = 1; - cg->expired_certs = 1; - cg->expired_root = 1; -- cg->server_version = 20; -+ cg->server_version = 11; +diff -up cups-1.6.3/cups/usersys.c.use-ipp1.1 cups-1.6.3/cups/usersys.c +--- cups-1.6.3/cups/usersys.c.use-ipp1.1 2013-07-12 11:41:45.368837618 +0200 ++++ cups-1.6.3/cups/usersys.c 2013-07-12 11:41:45.391837299 +0200 +@@ -366,7 +366,7 @@ cupsSetServer(const char *server) /* I - + cg->server_version = 22; + } + else +- cg->server_version = 20; ++ cg->server_version = 11; - /* - * Then set directories as appropriate... + if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL && + !strchr(port, ']') && isdigit(port[1] & 255)) diff --git a/cups.spec b/cups.spec index 8987b5c..bc69b0f 100644 --- a/cups.spec +++ b/cups.spec @@ -10,8 +10,8 @@ Summary: CUPS printing system Name: cups Epoch: 1 -Version: 1.6.2 -Release: 18%{?dist} +Version: 1.6.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -232,8 +232,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch26 -p1 -b .lpd-manpage # Use IP address when resolving DNSSD URIs (bug #948288). %patch27 -p1 -b .avahi-address -# More USB quirks for the libusb-based backend (STR #4311). -# Fixed in 1.6.3 # Added usblp quirk for Canon PIXMA MP540 (bug #967873). %patch28 -p1 -b .usblp-quirks # Return from cupsEnumDests() once all records have been returned. @@ -378,11 +376,6 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3: /^\([^%].*\)/d ' > %{name}.lang -# don't ship Russian web templates because they're broken (#960571, STR #4310) -# will be fixed in 1.6.3 -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/www/ru -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/cups/templates/ru - %post %systemd_post %{name}.path %{name}.socket %{name}.service @@ -539,7 +532,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/%{name}/www/es %dir %{_datadir}/%{name}/www/fr %dir %{_datadir}/%{name}/www/ja -#%%dir %{_datadir}/%{name}/www/ru +%dir %{_datadir}/%{name}/www/ru %{_datadir}/%{name}/www/images %{_datadir}/%{name}/www/*.css %doc %{_datadir}/%{name}/www/index.html @@ -550,7 +543,7 @@ rm -f %{cups_serverbin}/backend/smb %doc %{_datadir}/%{name}/www/es/index.html %doc %{_datadir}/%{name}/www/fr/index.html %doc %{_datadir}/%{name}/www/ja/index.html -#%%doc %{_datadir}/%{name}/www/ru/index.html +%doc %{_datadir}/%{name}/www/ru/index.html %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_unitdir}/%{name}.path @@ -583,14 +576,14 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/cups/templates/es %dir %{_datadir}/cups/templates/fr %dir %{_datadir}/cups/templates/ja -#%%dir %{_datadir}/cups/templates/ru +%dir %{_datadir}/cups/templates/ru %{_datadir}/cups/templates/*.tmpl %{_datadir}/cups/templates/ca/*.tmpl %{_datadir}/cups/templates/cs/*.tmpl %{_datadir}/cups/templates/es/*.tmpl %{_datadir}/cups/templates/fr/*.tmpl %{_datadir}/cups/templates/ja/*.tmpl -#%%{_datadir}/cups/templates/ru/*.tmpl +%{_datadir}/cups/templates/ru/*.tmpl %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups @@ -643,6 +636,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Fri Jul 12 2013 Jiri Popelka - 1:1.6.3-1 +- 1.6.3 + * Thu Jul 11 2013 Tim Waugh 1:1.6.2-18 - Avoid sign-extending CRCs for gz decompression (bug #983486). diff --git a/sources b/sources index 3f710d0..e1e78c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c8b2b2336d42001abe4899766b62dc cups-1.6.2-source.tar.bz2 +946a2d8ad1aec6beced312fce18543da cups-1.6.3-source.tar.bz2