rpms/cups/F-8 cups-undo-str2537.patch, 1.1, 1.2 cups.spec, 1.374, 1.375
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Tue Nov 27 10:15:36 UTC 2007
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25406
Modified Files:
cups-undo-str2537.patch cups.spec
Log Message:
* Tue Nov 27 2007 Tim Waugh <twaugh at redhat.com>
- Don't undo the util.c parts of STR #2537.
cups-undo-str2537.patch:
Index: cups-undo-str2537.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups-undo-str2537.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-undo-str2537.patch 12 Nov 2007 18:46:44 -0000 1.1
+++ cups-undo-str2537.patch 27 Nov 2007 10:15:33 -0000 1.2
@@ -1,234 +1,3 @@
-diff -up cups-1.3.4/cups/util.c.undo-str2537 cups-1.3.4/cups/util.c
---- cups-1.3.4/cups/util.c.undo-str2537 2007-10-10 23:00:43.000000000 +0100
-+++ cups-1.3.4/cups/util.c 2007-11-12 18:44:01.000000000 +0000
-@@ -91,6 +91,7 @@ cupsCancelJob(const char *name, /* I -
- uri[HTTP_MAX_URI]; /* Printer URI */
- ipp_t *request, /* IPP request */
- *response; /* IPP response */
-+ cups_lang_t *language; /* Language info */
- _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
-
-
-@@ -128,7 +129,21 @@ cupsCancelJob(const char *name, /* I -
- * [requesting-user-name]
- */
-
-- request = ippNewRequest(IPP_CANCEL_JOB);
-+ request = ippNew();
-+
-+ request->request.op.operation_id = IPP_CANCEL_JOB;
-+ request->request.op.request_id = 1;
-+
-+ language = cupsLangDefault();
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL,
-+ language != NULL ? language->language : "C");
-+
-+ cupsLangFree(language);
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
- NULL, uri);
-@@ -190,6 +205,7 @@ cupsGetClasses(char ***classes) /* O -
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- ipp_attribute_t *attr; /* Current attribute */
-+ cups_lang_t *language; /* Default language */
- char **temp; /* Temporary pointer */
- _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
-
-@@ -221,7 +237,20 @@ cupsGetClasses(char ***classes) /* O -
- * requested-attributes
- */
-
-- request = ippNewRequest(CUPS_GET_CLASSES);
-+ request = ippNew();
-+
-+ request->request.op.operation_id = CUPS_GET_CLASSES;
-+ request->request.op.request_id = 1;
-+
-+ language = cupsLangDefault();
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL, language->language);
-+
-+ cupsLangFree(language);
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", NULL, "printer-name");
-@@ -342,6 +371,7 @@ cupsGetDefault2(http_t *http) /* I - HT
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- ipp_attribute_t *attr; /* Current attribute */
-+ cups_lang_t *language; /* Default language */
- const char *var; /* Environment variable */
- _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
-
-@@ -373,7 +403,20 @@ cupsGetDefault2(http_t *http) /* I - HT
- * attributes-natural-language
- */
-
-- request = ippNewRequest(CUPS_GET_DEFAULT);
-+ request = ippNew();
-+
-+ request->request.op.operation_id = CUPS_GET_DEFAULT;
-+ request->request.op.request_id = 1;
-+
-+ language = cupsLangDefault();
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL, language->language);
-+
-+ cupsLangFree(language);
-
- /*
- * Do the request and get back a response...
-@@ -448,6 +491,7 @@ cupsGetJobs2(http_t *http, /* I - H
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- ipp_attribute_t *attr; /* Current attribute */
-+ cups_lang_t *language; /* Default language */
- cups_job_t *temp; /* Temporary pointer */
- int id, /* job-id */
- priority, /* job-priority */
-@@ -520,7 +564,20 @@ cupsGetJobs2(http_t *http, /* I - H
- * requested-attributes
- */
-
-- request = ippNewRequest(IPP_GET_JOBS);
-+ request = ippNew();
-+
-+ request->request.op.operation_id = IPP_GET_JOBS;
-+ request->request.op.request_id = 1;
-+
-+ language = cupsLangDefault();
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL, language->language);
-+
-+ cupsLangFree(language);
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
-@@ -900,6 +957,7 @@ cupsGetPrinters(char ***printers) /* O -
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- ipp_attribute_t *attr; /* Current attribute */
-+ cups_lang_t *language; /* Default language */
- char **temp; /* Temporary pointer */
- _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
-
-@@ -931,7 +989,20 @@ cupsGetPrinters(char ***printers) /* O -
- * requested-attributes
- */
-
-- request = ippNewRequest(CUPS_GET_PRINTERS);
-+ request = ippNew();
-+
-+ request->request.op.operation_id = CUPS_GET_PRINTERS;
-+ request->request.op.request_id = 1;
-+
-+ language = cupsLangDefault();
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL, language->language);
-+
-+ cupsLangFree(language);
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", NULL, "printer-name");
-@@ -1199,6 +1270,7 @@ cupsPrintFiles2(http_t *http, /*
- ipp_t *response; /* IPP response */
- ipp_attribute_t *attr; /* IPP job-id attribute */
- char uri[HTTP_MAX_URI]; /* Printer URI */
-+ cups_lang_t *language; /* Language to use */
- int jobid; /* New job ID */
- const char *base; /* Basename of current filename */
-
-@@ -1231,18 +1303,34 @@ cupsPrintFiles2(http_t *http, /*
- }
-
- /*
-+ * Setup the request data...
-+ */
-+
-+ language = cupsLangDefault();
-+
-+ /*
- * Build a standard CUPS URI for the printer and fill the standard IPP
- * attributes...
- */
-
-- if ((request = ippNewRequest(num_files == 1 ? IPP_PRINT_JOB :
-- IPP_CREATE_JOB)) == NULL)
-+ if ((request = ippNew()) == NULL)
- {
- _cupsSetError(IPP_INTERNAL_ERROR, NULL);
-
- return (0);
- }
-
-+ request->request.op.operation_id = num_files == 1 ? IPP_PRINT_JOB :
-+ IPP_CREATE_JOB;
-+ request->request.op.request_id = 1;
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL,
-+ language != NULL ? language->language : "C");
-+
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
- NULL, uri);
-
-@@ -1304,11 +1392,21 @@ cupsPrintFiles2(http_t *http, /*
- * attributes...
- */
-
-- if ((request = ippNewRequest(IPP_SEND_DOCUMENT)) == NULL)
-+ if ((request = ippNew()) == NULL)
- return (0);
-
-+ request->request.op.operation_id = IPP_SEND_DOCUMENT;
-+ request->request.op.request_id = 1;
-+
- snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", jobid);
-
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-+ "attributes-charset", NULL, cupsLangEncoding(language));
-+
-+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-+ "attributes-natural-language", NULL,
-+ language != NULL ? language->language : "C");
-+
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
- NULL, uri);
-
-@@ -1360,6 +1458,8 @@ cupsPrintFiles2(http_t *http, /*
- ippDelete(response);
- }
-
-+ cupsLangFree(language);
-+
- return (jobid);
- }
-
diff -up /dev/null cups-1.3.4/data/windows-874
--- /dev/null 2007-11-12 09:01:55.571160569 +0000
+++ cups-1.3.4/data/windows-874 2007-11-12 18:44:01.000000000 +0000
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- cups.spec 20 Nov 2007 13:43:42 -0000 1.374
+++ cups.spec 27 Nov 2007 10:15:33 -0000 1.375
@@ -453,6 +453,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Tue Nov 27 2007 Tim Waugh <twaugh at redhat.com>
+- Don't undo the util.c parts of STR #2537.
+
* Tue Nov 20 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-4
- Added fix for STR #2600 in which cupsd can crash from a NULL dereference
with LogLevel debug2 (bug #385631).
More information about the fedora-extras-commits
mailing list