diff --git a/cups-str3436.patch b/cups-str3436.patch new file mode 100644 index 0000000..910d15a --- /dev/null +++ b/cups-str3436.patch @@ -0,0 +1,33 @@ +diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c +--- cups-1.4.2/cgi-bin/ipp-var.c.str3436 2009-11-09 23:01:17.000000000 +0000 ++++ cups-1.4.2/cgi-bin/ipp-var.c 2009-12-08 12:19:01.988500453 +0000 +@@ -333,7 +333,7 @@ cgiMoveJobs(http_t *http, /* I - Co + NULL, job_uri); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", NULL, "job-printer-uri"); +- ++ + if ((response = cupsDoRequest(http, request, "/")) != NULL) + { + if ((attr = ippFindAttribute(response, "job-printer-uri", +@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri, /* I - C + ishttps ? "https" : "http", + userpass, hostname, port, resource); + else +- snprintf(url, urlsize, "%s://%s:%d%s", ++ snprintf(url, urlsize, "%s://%s:%d%s", + ishttps ? "https" : "http", + hostname, port, resource); + } +@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t *http, /* I - Co + */ + + if (dest) ++ { + snprintf(val, sizeof(val), "/%s/%s", section, dest); ++ cgiSetVariable("PRINTER_NAME", dest); ++ cgiSetVariable("PRINTER_URI_SUPPORTED", val); ++ } + else + strlcpy(val, "/jobs/", sizeof(val)); + diff --git a/cups.spec b/cups.spec index ed39026..2e12816 100644 --- a/cups.spec +++ b/cups.spec @@ -66,6 +66,7 @@ Patch41: cups-negative-snmp-string-length.patch Patch42: cups-sidechannel-intrs.patch Patch43: cups-media-empty-warning.patch Patch44: cups-str3435.patch +Patch45: cups-str3436.patch Patch100: cups-lspp.patch @@ -239,6 +240,7 @@ module. %patch42 -p1 -b .sidechannel-intrs %patch43 -p1 -b .media-empty-warning %patch44 -p1 -b .str3435 +%patch45 -p1 -b .str3436 %if %lspp %patch100 -p1 -b .lspp @@ -530,6 +532,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Dec 8 2009 Tim Waugh - 1:1.4.2-14 +- The web interface did not show completed jobs (STR #3436). - Authenticated printing did not always work when printing directly to a remote server (STR #3435). - Use upstream patch to stop the network backends incorrectly clearing