From e663022e55440121bdd08719211899ca08da570e Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Jun 28 2011 09:48:01 +0000 Subject: 1.4.7. --- diff --git a/.gitignore b/.gitignore index 7da940e..60f8131 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ cups-1.4.3-source.tar.bz2 cups-1.4.4-source.tar.bz2 /cups-1.4.5-source.tar.bz2 /cups-1.4.6-source.tar.bz2 +/cups-1.4.7-source.tar.bz2 diff --git a/cups-autotype-crash.patch b/cups-autotype-crash.patch deleted file mode 100644 index ed6cb15..0000000 --- a/cups-autotype-crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up cups-1.4.4/scheduler/ipp.c.autotype-crash cups-1.4.4/scheduler/ipp.c ---- cups-1.4.4/scheduler/ipp.c.autotype-crash 2010-10-15 15:25:15.093421917 +0100 -+++ cups-1.4.4/scheduler/ipp.c 2010-10-15 15:25:49.645296947 +0100 -@@ -10481,8 +10481,9 @@ send_document(cupsd_client_t *con, /* I - if (!filetype) - filetype = mimeType(MimeDatabase, super, type); - -- cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.", -- filetype->super, filetype->type); -+ if (filetype) -+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.", -+ filetype->super, filetype->type); - } - else - filetype = mimeType(MimeDatabase, super, type); diff --git a/cups-hostnamelookups.patch b/cups-hostnamelookups.patch deleted file mode 100644 index 75b6abf..0000000 --- a/cups-hostnamelookups.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cups-1.4.4/scheduler/network.c.hostnamelookups cups-1.4.4/scheduler/network.c ---- cups-1.4.4/scheduler/network.c.hostnamelookups 2010-04-09 23:42:09.000000000 +0100 -+++ cups-1.4.4/scheduler/network.c 2010-06-18 11:13:02.331979867 +0100 -@@ -154,11 +154,7 @@ cupsdNetIFUpdate(void) - * Try looking up the hostname for the address as needed... - */ - --#ifdef __APPLE__ - if (HostNameLookups) --#else -- if (HostNameLookups || RemotePort) --#endif /* __APPLE__ */ - httpAddrLookup((http_addr_t *)(addr->ifa_addr), hostname, - sizeof(hostname)); - else -@@ -166,7 +162,7 @@ cupsdNetIFUpdate(void) - /* - * Map the default server address and localhost to the server name - * and localhost, respectively; for all other addresses, use the -- * dotted notation... -+ * numeric address... - */ - - if (httpAddrLocalhost((http_addr_t *)(addr->ifa_addr))) diff --git a/cups-job-state-changed.patch b/cups-job-state-changed.patch deleted file mode 100644 index 16b5677..0000000 --- a/cups-job-state-changed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4.6/notifier/dbus.c.job-state-changed cups-1.4.6/notifier/dbus.c ---- cups-1.4.6/notifier/dbus.c.job-state-changed 2011-02-25 12:42:11.084127808 +0000 -+++ cups-1.4.6/notifier/dbus.c 2011-02-25 12:42:31.312811947 +0000 -@@ -332,7 +332,7 @@ main(int argc, /* I - Number of comm - const char *word2 = event + 4; /* Second word */ - - params = PARAMS_JOB; -- if (!strcmp(word2, "state")) -+ if (!strcmp(word2, "state-changed")) - signame = "JobState"; - else if (!strcmp(word2, "created")) - signame = "JobCreated"; diff --git a/cups-lspp.patch b/cups-lspp.patch index 7f67913..56a171e 100644 --- a/cups-lspp.patch +++ b/cups-lspp.patch @@ -1,7 +1,7 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/config.h.in 2010-12-13 14:51:01.000000000 +0100 -@@ -672,6 +672,12 @@ +diff -up cups-1.4.7/config.h.in.lspp cups-1.4.7/config.h.in +--- cups-1.4.7/config.h.in.lspp 2011-06-28 11:18:57.127406939 +0200 ++++ cups-1.4.7/config.h.in 2011-06-28 11:18:57.170406371 +0200 +@@ -673,6 +673,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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/config-scripts/cups-lspp.m4 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/config-scripts/cups-lspp.m4.lspp cups-1.4.7/config-scripts/cups-lspp.m4 +--- cups-1.4.7/config-scripts/cups-lspp.m4.lspp 2011-06-28 11:18:57.170406371 +0200 ++++ cups-1.4.7/config-scripts/cups-lspp.m4 2011-06-28 11:18:57.170406371 +0200 @@ -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 23:42:44.000000000 +0200 -+++ cups-1.4.5/configure.in 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/configure.in.lspp cups-1.4.7/configure.in +--- cups-1.4.7/configure.in.lspp 2010-06-22 23:42:44.000000000 +0200 ++++ cups-1.4.7/configure.in 2011-06-28 11:18:57.171406358 +0200 @@ -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 05:18:27.000000000 +0200 -+++ cups-1.4.5/cups/cups.h 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/cups/cups.h.lspp cups-1.4.7/cups/cups.h +--- cups-1.4.7/cups/cups.h.lspp 2011-01-06 23:48:42.000000000 +0100 ++++ cups-1.4.7/cups/cups.h 2011-06-28 11:18:57.172406345 +0200 @@ -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 20:30:57.000000000 +0100 -+++ cups-1.4.5/data/Makefile 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/data/Makefile.lspp cups-1.4.7/data/Makefile +--- cups-1.4.7/data/Makefile.lspp 2008-11-12 20:30:57.000000000 +0100 ++++ cups-1.4.7/data/Makefile 2011-06-28 11:18:57.172406345 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/data/mls 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/data/mls.lspp cups-1.4.7/data/mls +--- cups-1.4.7/data/mls.lspp 2011-06-28 11:18:57.173406332 +0200 ++++ cups-1.4.7/data/mls 2011-06-28 11:18:57.173406332 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/data/selinux 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/data/selinux.lspp cups-1.4.7/data/selinux +--- cups-1.4.7/data/selinux.lspp 2011-06-28 11:18:57.173406332 +0200 ++++ cups-1.4.7/data/selinux 2011-06-28 11:18:57.173406332 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/data/te 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/data/te.lspp cups-1.4.7/data/te +--- cups-1.4.7/data/te.lspp 2011-06-28 11:18:57.174406319 +0200 ++++ cups-1.4.7/data/te 2011-06-28 11:18:57.174406319 +0200 @@ -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 23:46:42.000000000 +0200 -+++ cups-1.4.5/filter/common.c 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/filter/common.c.lspp cups-1.4.7/filter/common.c +--- cups-1.4.7/filter/common.c.lspp 2007-07-11 23:46:42.000000000 +0200 ++++ cups-1.4.7/filter/common.c 2011-06-28 11:18:57.175406306 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/filter/pstops.c 2010-12-13 14:51:01.000000000 +0100 -@@ -3335,6 +3335,18 @@ write_label_prolog(pstops_doc_t *doc, /* +diff -up cups-1.4.7/filter/pstops.c.lspp cups-1.4.7/filter/pstops.c +--- cups-1.4.7/filter/pstops.c.lspp 2011-06-28 11:18:57.078407587 +0200 ++++ cups-1.4.7/filter/pstops.c 2011-06-28 11:18:57.177406280 +0200 +@@ -3330,6 +3330,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, /* +@@ -3352,6 +3364,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, /* +@@ -3430,7 +3560,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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/Makedefs.in 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/Makedefs.in.lspp cups-1.4.7/Makedefs.in +--- cups-1.4.7/Makedefs.in.lspp 2011-06-28 11:18:57.154406582 +0200 ++++ cups-1.4.7/Makedefs.in 2011-06-28 11:18:57.178406267 +0200 @@ -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 06:13:56.000000000 +0200 -+++ cups-1.4.5/scheduler/client.c 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/client.c.lspp cups-1.4.7/scheduler/client.c +--- cups-1.4.7/scheduler/client.c.lspp 2011-01-22 01:07:22.000000000 +0100 ++++ cups-1.4.7/scheduler/client.c 2011-06-28 11:19:51.661681320 +0200 @@ -44,6 +44,7 @@ * valid_host() - Is the Host: field valid? * write_file() - Send a file via HTTP. @@ -1270,8 +1270,8 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c +#define _GNU_SOURCE #ifdef HAVE_CDSASSL # include - # include -@@ -90,6 +92,12 @@ extern const char *cssmErrorString(int e + # ifdef HAVE_SECITEM_H +@@ -92,6 +94,12 @@ extern const char *cssmErrorString(int e # include #endif /* HAVE_TCPD_H */ @@ -1284,7 +1284,7 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c /* * Local functions... -@@ -391,6 +399,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) +@@ -393,6 +401,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) } #endif /* HAVE_TCPD_H */ @@ -1342,7 +1342,7 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c #ifdef AF_INET6 if (con->http.hostaddr->addr.sa_family == AF_INET6) cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)", -@@ -781,6 +840,13 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -783,6 +842,13 @@ cupsdReadClient(cupsd_client_t *con) /* mime_type_t *type; /* MIME type of file */ cupsd_printer_t *p; /* Printer */ static unsigned request_id = 0; /* Request ID for temp files */ @@ -1356,7 +1356,7 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c status = HTTP_CONTINUE; -@@ -2135,6 +2201,67 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -2137,6 +2203,67 @@ cupsdReadClient(cupsd_client_t *con) /* fchmod(con->file, 0640); fchown(con->file, RunUser, Group); fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); @@ -1424,7 +1424,7 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c } if (con->http.state != HTTP_POST_SEND) -@@ -4641,6 +4768,50 @@ make_certificate(cupsd_client_t *con) /* +@@ -4647,6 +4774,50 @@ make_certificate(cupsd_client_t *con) /* #endif /* HAVE_SSL */ @@ -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-27 00:01:23.000000000 +0200 -+++ cups-1.4.5/scheduler/client.h 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/client.h.lspp cups-1.4.7/scheduler/client.h +--- cups-1.4.7/scheduler/client.h.lspp 2009-05-27 00:01:23.000000000 +0200 ++++ cups-1.4.7/scheduler/client.h 2011-06-28 11:18:57.182406212 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/conf.c 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/conf.c.lspp cups-1.4.7/scheduler/conf.c +--- cups-1.4.7/scheduler/conf.c.lspp 2011-06-28 11:18:57.050407956 +0200 ++++ cups-1.4.7/scheduler/conf.c 2011-06-28 11:18:57.184406186 +0200 @@ -29,6 +29,7 @@ * read_configuration() - Read a configuration file. * read_location() - Read a definition. @@ -1555,7 +1555,7 @@ diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c /* -@@ -713,6 +724,25 @@ cupsdReadConfiguration(void) +@@ -719,6 +730,25 @@ cupsdReadConfiguration(void) RunUser = getuid(); @@ -1581,7 +1581,7 @@ diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", RemotePort ? "enabled" : "disabled"); -@@ -1081,11 +1111,23 @@ cupsdReadConfiguration(void) +@@ -1087,11 +1117,23 @@ cupsdReadConfiguration(void) * Update classification setting as needed... */ @@ -1606,7 +1606,7 @@ diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c /* * Check the MaxClients setting, and then allocate memory for it... -@@ -3657,6 +3699,18 @@ read_location(cups_file_t *fp, /* I - C +@@ -3663,6 +3705,18 @@ read_location(cups_file_t *fp, /* I - C return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); } @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/conf.h 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/conf.h.lspp cups-1.4.7/scheduler/conf.h +--- cups-1.4.7/scheduler/conf.h.lspp 2011-06-28 11:18:57.050407956 +0200 ++++ cups-1.4.7/scheduler/conf.h 2011-06-28 11:18:57.197406011 +0200 @@ -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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/ipp.c 2010-12-13 15:01:43.000000000 +0100 +diff -up cups-1.4.7/scheduler/ipp.c.lspp cups-1.4.7/scheduler/ipp.c +--- cups-1.4.7/scheduler/ipp.c.lspp 2011-06-28 11:18:57.091407416 +0200 ++++ cups-1.4.7/scheduler/ipp.c 2011-06-28 11:18:57.201405959 +0200 @@ -41,6 +41,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -1972,7 +1972,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c /* * See if we need to add the starting sheet... -@@ -4289,6 +4521,107 @@ check_rss_recipient( +@@ -4302,6 +4534,107 @@ check_rss_recipient( } @@ -2080,7 +2080,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -4843,6 +5176,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4856,6 +5189,15 @@ copy_banner(cupsd_client_t *con, /* I - char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -2096,7 +2096,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -4878,6 +5220,82 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4891,6 +5233,82 @@ copy_banner(cupsd_client_t *con, /* I - fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); @@ -2179,7 +2179,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c /* * Try the localized banner file under the subdirectory... -@@ -4972,6 +5390,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4985,6 +5403,24 @@ copy_banner(cupsd_client_t *con, /* I - else s = attrname; @@ -2204,7 +2204,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -6945,6 +7381,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -6963,6 +7399,22 @@ get_job_attrs(cupsd_client_t *con, /* I return; } @@ -2227,7 +2227,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c /* * Copy attributes... */ -@@ -7175,6 +7627,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -7193,6 +7645,11 @@ get_jobs(cupsd_client_t *con, /* I - C if (username[0] && strcasecmp(username, job->username)) continue; @@ -2239,7 +2239,7 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c if (count > 0) ippAddSeparator(con->response); -@@ -11594,6 +12051,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -11612,6 +12069,11 @@ validate_user(cupsd_job_t *job, /* I strlcpy(username, get_username(con), userlen); @@ -2251,10 +2251,10 @@ 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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/job.c 2010-12-13 15:02:11.000000000 +0100 -@@ -66,6 +66,9 @@ +diff -up cups-1.4.7/scheduler/job.c.lspp cups-1.4.7/scheduler/job.c +--- cups-1.4.7/scheduler/job.c.lspp 2011-06-28 11:18:57.114407111 +0200 ++++ cups-1.4.7/scheduler/job.c 2011-06-28 11:18:57.205405907 +0200 +@@ -64,6 +64,9 @@ * update_job_attrs() - Update the job-printer-* attributes. */ @@ -2264,7 +2264,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c /* * Include necessary headers... */ -@@ -75,6 +78,14 @@ +@@ -73,6 +76,14 @@ #include #include @@ -2387,7 +2387,7 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c } } #endif /* __x86_64__ */ -@@ -1626,6 +1706,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J +@@ -1634,6 +1714,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J goto error; } @@ -2408,7 +2408,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 +@@ -2021,6 +2115,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -2423,7 +2423,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 +@@ -2039,6 +2141,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J fchmod(cupsFileNumber(fp), 0600); fchown(cupsFileNumber(fp), RunUser, Group); @@ -2500,7 +2500,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 +@@ -3353,6 +3525,18 @@ get_options(cupsd_job_t *job, /* I - Jo banner_page) continue; @@ -2519,7 +2519,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 +@@ -3989,6 +4173,19 @@ static void start_job(cupsd_job_t *job, /* I - Job ID */ cupsd_printer_t *printer) /* I - Printer to print job */ { @@ -2539,7 +2539,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 - +@@ -4111,6 +4308,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 +2648,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-12 00:46:01.000000000 +0200 -+++ cups-1.4.5/scheduler/job.h 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/job.h.lspp cups-1.4.7/scheduler/job.h +--- cups-1.4.7/scheduler/job.h.lspp 2009-05-12 00:46:01.000000000 +0200 ++++ cups-1.4.7/scheduler/job.h 2011-06-28 11:18:57.206405894 +0200 @@ -13,6 +13,13 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -2676,9 +2676,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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/main.c 2010-12-13 14:51:01.000000000 +0100 +diff -up cups-1.4.7/scheduler/main.c.lspp cups-1.4.7/scheduler/main.c +--- cups-1.4.7/scheduler/main.c.lspp 2011-06-28 11:18:57.074407640 +0200 ++++ cups-1.4.7/scheduler/main.c 2011-06-28 11:18:57.207405881 +0200 @@ -37,6 +37,8 @@ * usage() - Show scheduler usage. */ @@ -2746,10 +2746,10 @@ 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-13 14:51:01.000000000 +0100 -+++ cups-1.4.5/scheduler/printers.c 2010-12-13 14:51:01.000000000 +0100 -@@ -59,6 +59,8 @@ +diff -up cups-1.4.7/scheduler/printers.c.lspp cups-1.4.7/scheduler/printers.c +--- cups-1.4.7/scheduler/printers.c.lspp 2011-06-28 11:18:57.061407812 +0200 ++++ cups-1.4.7/scheduler/printers.c 2011-06-28 11:18:57.209405855 +0200 +@@ -61,6 +61,8 @@ * write_xml_string() - Write a string with XML escaping. */ @@ -2758,7 +2758,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c /* * Include necessary headers... */ -@@ -103,6 +105,10 @@ static void write_irix_state(cupsd_print +@@ -105,6 +107,10 @@ static void write_irix_state(cupsd_print #endif /* __sgi */ static void write_xml_string(cups_file_t *fp, const char *s); @@ -2769,7 +2769,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c /* * 'cupsdAddPrinter()' - Add a printer to the system. -@@ -2266,6 +2272,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2270,6 +2276,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) "username", "password" }; @@ -2783,7 +2783,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2396,6 +2409,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2400,6 +2413,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) attr->values[1].string.text = _cupsStrAlloc(Classification ? Classification : p->job_sheets[1]); } @@ -2829,7 +2829,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c } p->raw = 0; -@@ -5535,7 +5587,6 @@ write_irix_state(cupsd_printer_t *p) /* +@@ -5585,7 +5637,6 @@ write_irix_state(cupsd_printer_t *p) /* } #endif /* __sgi */ diff --git a/cups-serverbin-compat.patch b/cups-serverbin-compat.patch index 44a7894..5e95509 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.7/scheduler/conf.c.serverbin-compat cups-1.4.7/scheduler/conf.c +--- cups-1.4.7/scheduler/conf.c.serverbin-compat 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.4.7/scheduler/conf.c 2011-06-28 10:43:24.677053741 +0200 @@ -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) +@@ -1337,7 +1340,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.7/scheduler/conf.h.serverbin-compat cups-1.4.7/scheduler/conf.h +--- cups-1.4.7/scheduler/conf.h.serverbin-compat 2010-04-23 20:56:34.000000000 +0200 ++++ cups-1.4.7/scheduler/conf.h 2011-06-28 10:43:24.678053725 +0200 @@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) /* Root directory for scheduler */ *ServerBin VALUE(NULL), @@ -38,27 +38,27 @@ 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 -@@ -87,8 +87,13 @@ cupsdInitEnv(void) - cupsdSetEnv("LD_LIBRARY_PATH", NULL); - cupsdSetEnv("LD_PRELOAD", NULL); - cupsdSetEnv("NLSPATH", NULL); +diff -up cups-1.4.7/scheduler/env.c.serverbin-compat cups-1.4.7/scheduler/env.c +--- cups-1.4.7/scheduler/env.c.serverbin-compat 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.4.7/scheduler/env.c 2011-06-28 10:49:25.638319580 +0200 +@@ -218,8 +218,13 @@ cupsdUpdateEnv(void) + set_if_undefined("LD_PRELOAD", NULL); + set_if_undefined("NLSPATH", NULL); + if (find_env("PATH") < 0) +#ifdef __x86_64__ -+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR -+ ":/bin:/usr/bin", ServerBin, ServerBin_compat); ++ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ++ ":/bin:/usr/bin", ServerBin, ServerBin_compat); +#else /* ! defined(__x86_64__) */ - cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR - ":/bin:/usr/bin", ServerBin); + cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR + ":/bin:/usr/bin", ServerBin); +#endif - 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 - + set_if_undefined("SERVER_ADMIN", ServerAdmin); + set_if_undefined("SHLIB_PATH", NULL); + set_if_undefined("SOFTWARE", CUPS_MINIMAL); +diff -up cups-1.4.7/scheduler/ipp.c.serverbin-compat cups-1.4.7/scheduler/ipp.c +--- cups-1.4.7/scheduler/ipp.c.serverbin-compat 2011-02-15 00:47:29.000000000 +0100 ++++ cups-1.4.7/scheduler/ipp.c 2011-06-28 10:43:24.682053664 +0200 +@@ -2602,9 +2602,18 @@ add_printer(cupsd_client_t *con, /* I - * Could not find device in list! */ @@ -77,9 +77,9 @@ 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 +diff -up cups-1.4.7/scheduler/job.c.serverbin-compat cups-1.4.7/scheduler/job.c +--- cups-1.4.7/scheduler/job.c.serverbin-compat 2011-04-23 00:38:01.000000000 +0200 ++++ cups-1.4.7/scheduler/job.c 2011-06-28 10:43:24.686053600 +0200 @@ -972,8 +972,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) { @@ -144,10 +144,10 @@ diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c 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.7/scheduler/printers.c.serverbin-compat cups-1.4.7/scheduler/printers.c +--- cups-1.4.7/scheduler/printers.c.serverbin-compat 2011-03-04 20:28:38.000000000 +0100 ++++ cups-1.4.7/scheduler/printers.c 2011-06-28 10:43:24.688053568 +0200 +@@ -1118,9 +1118,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( +@@ -3657,6 +3667,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( +@@ -3665,6 +3683,9 @@ add_printer_filter( cupsdSetPrinterReasons(p, "+cups-missing-filter-warning"); cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); diff --git a/cups-snmp-quirks.patch b/cups-snmp-quirks.patch index 0308676..d7c82a4 100644 --- a/cups-snmp-quirks.patch +++ b/cups-snmp-quirks.patch @@ -1,7 +1,7 @@ -diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp-supplies.c ---- cups-1.4.3/backend/snmp-supplies.c.snmp-quirks 2009-11-20 01:27:57.000000000 +0000 -+++ cups-1.4.3/backend/snmp-supplies.c 2010-06-09 16:27:05.515019804 +0100 -@@ -38,6 +38,13 @@ +diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-supplies.c +--- cups-1.4.7/backend/snmp-supplies.c.snmp-quirks 2011-03-10 04:50:59.000000000 +0100 ++++ cups-1.4.7/backend/snmp-supplies.c 2011-06-28 11:11:57.944155996 +0200 +@@ -49,6 +49,13 @@ /* @@ -15,7 +15,7 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- * Local structures... */ -@@ -57,6 +64,12 @@ typedef struct /**** Printer state ta +@@ -68,6 +75,12 @@ typedef struct /**** Printer state ta const char *keyword; /* IPP printer-state-reasons keyword */ } backend_state_t; @@ -28,16 +28,16 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- /* * Local globals... -@@ -68,6 +81,7 @@ static int current_state = -1; +@@ -79,6 +92,7 @@ static int current_state = -1; static int charset = -1; /* Character set for supply names */ static int num_supplies = 0; /* Number of supplies found */ +static int quirks = 0; /* Printer quirks */ static backend_supplies_t supplies[CUPS_MAX_SUPPLIES]; /* Supply information */ - -@@ -153,6 +167,15 @@ static const backend_state_t const print - { CUPS_TC_outputFull, "output-area-full-warning" } + static int supply_state = -1; +@@ -180,6 +194,15 @@ static const backend_state_t const suppl + { CUPS_TONER_EMPTY, "toner-empty-warning" } }; +static const quirk_name_t const quirk_names[] = @@ -52,17 +52,17 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- /* * Local functions... -@@ -208,6 +231,9 @@ backendSNMPSupplies( - if (i) - *ptr++ = ','; +@@ -233,6 +256,9 @@ backendSNMPSupplies( + for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr)) + { + if (quirks & QUIRK_CAPACITY) -+ supplies[i].max_capacity = 100; ++ supplies[i].max_capacity = 100; + - if (supplies[i].max_capacity > 0) - sprintf(ptr, "%d", 100 * supplies[i].level / supplies[i].max_capacity); - else -@@ -305,6 +331,7 @@ backend_init_supplies( + percent = 100 * supplies[i].level / supplies[i].max_capacity; + + if (percent <= 10) +@@ -406,6 +432,7 @@ backend_init_supplies( http_addr_t *addr) /* I - Printer address */ { int i, /* Looping var */ @@ -70,7 +70,7 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- type; /* Current marker type */ cups_file_t *cachefile; /* Cache file */ const char *cachedir; /* CUPS_CACHEDIR value */ -@@ -366,6 +393,7 @@ backend_init_supplies( +@@ -467,6 +494,7 @@ backend_init_supplies( current_state = -1; num_supplies = -1; charset = -1; @@ -78,7 +78,7 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- memset(supplies, 0, sizeof(supplies)); -@@ -381,6 +409,34 @@ backend_init_supplies( +@@ -482,6 +510,34 @@ backend_init_supplies( return; } diff --git a/cups-str3754.patch b/cups-str3754.patch deleted file mode 100644 index 148575a..0000000 --- a/cups-str3754.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.4.5/scheduler/printers.c.printer-timeout cups-1.4.5/scheduler/printers.c ---- cups-1.4.5/scheduler/printers.c.printer-timeout 2010-12-16 14:42:07.048865052 +0000 -+++ cups-1.4.5/scheduler/printers.c 2010-12-16 14:43:05.325684376 +0000 -@@ -785,6 +785,7 @@ cupsdDeletePrinter( - */ - - cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, update); -+ p->state = IPP_PRINTER_STOPPED; - - if (p->job) - cupsdSetJobState(p->job, IPP_JOB_PENDING, CUPSD_JOB_FORCE, diff --git a/cups.spec b/cups.spec index 6c2ee6e..7892344 100644 --- a/cups.spec +++ b/cups.spec @@ -7,8 +7,8 @@ Summary: Common Unix Printing System Name: cups -Version: 1.4.6 -Release: 7%{?dist} +Version: 1.4.7 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -58,16 +58,12 @@ Patch24: cups-avahi.patch Patch25: cups-str3382.patch Patch26: cups-force-gnutls.patch Patch27: cups-serialize-gnutls.patch -Patch29: cups-0755.patch -Patch31: cups-hostnamelookups.patch -Patch33: cups-snmp-quirks.patch -Patch34: cups-hp-deviceid-oid.patch -Patch35: cups-dnssd-deviceid.patch -Patch36: cups-ricoh-deviceid-oid.patch -Patch37: cups-texttops-rotate-page.patch -Patch38: cups-autotype-crash.patch -Patch39: cups-str3754.patch -Patch40: cups-job-state-changed.patch +Patch28: cups-0755.patch +Patch29: cups-snmp-quirks.patch +Patch30: cups-hp-deviceid-oid.patch +Patch31: cups-dnssd-deviceid.patch +Patch32: cups-ricoh-deviceid-oid.patch +Patch33: cups-texttops-rotate-page.patch Patch100: cups-lspp.patch @@ -253,28 +249,19 @@ module. # locking (bug #607159). %patch27 -p1 -b .serialize-gnutls # Use mode 0755 for binaries and libraries where appropriate. -%patch29 -p1 -b .0755 -# Use numeric addresses for interfaces unless HostNameLookups are -# turned on (bug #583054). -%patch31 -p1 -b .hostnamelookups +%patch28 -p1 -b .0755 # Handle SNMP supply level quirks (bug #581825). -%patch33 -p1 -b .snmp-quirks +%patch29 -p1 -b .snmp-quirks # Add an SNMP query for HP's device ID OID (STR #3552). -%patch34 -p1 -b .hp-deviceid-oid +%patch30 -p1 -b .hp-deviceid-oid # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;". -%patch35 -p1 -b .dnssd-deviceid +%patch31 -p1 -b .dnssd-deviceid # Add an SNMP query for Ricoh's device ID OID (STR #3552). -%patch36 -p1 -b .ricoh-deviceid-oid +%patch32 -p1 -b .ricoh-deviceid-oid # Adjust texttops output to be in natural orientation (STR #3563). # This fixes page-label orientation when texttops is used in the # filter chain (bug #572338). -%patch37 -p1 -b .texttops-rotate-page -# Don't crash when MIME database could not be loaded (bug #610088). -%patch38 -p1 -b .autotype-crash -# Don't crash when job queued for printer that times out (bug #660604). -%patch39 -p1 -b .str3754 -# Fixed dbus notifier support for job-state-changed. -%patch40 -p1 -b .job-state-changed +%patch33 -p1 -b .texttops-rotate-page %if %lspp # LSPP support. @@ -572,6 +559,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Tue Jun 28 2011 Jiri Popelka 1:1.4.7-1 +- 1.4.7. + * Thu Mar 10 2011 Tim Waugh 1:1.4.6-7 - LSPP: only warn when unable to get printer context. diff --git a/sources b/sources index e542076..6da4bc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de8fb5a29c36554925c0c6a6e2c0dae1 cups-1.4.6-source.tar.bz2 +1590033ab4c739b859aeb672fe849089 cups-1.4.7-source.tar.bz2