diff --git a/.gitignore b/.gitignore index ff93a17..e755438 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ cups-1.4.4-source.tar.bz2 /cups-1.7.0-source.tar.bz2 /cups-1.7.1-source.tar.bz2 /cups-1.7.2-source.tar.bz2 +/cups-1.7.3-source.tar.bz2 diff --git a/cups-1.7.2-source.tar.bz2.sig b/cups-1.7.2-source.tar.bz2.sig deleted file mode 100644 index b3a5de8..0000000 Binary files a/cups-1.7.2-source.tar.bz2.sig and /dev/null differ diff --git a/cups-1.7.3-source.tar.bz2.sig b/cups-1.7.3-source.tar.bz2.sig new file mode 100644 index 0000000..1a888e0 Binary files /dev/null and b/cups-1.7.3-source.tar.bz2.sig differ diff --git a/cups-str4386.patch b/cups-str4386.patch deleted file mode 100644 index e2da700..0000000 --- a/cups-str4386.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up cups-1.7.2/cups/request.c.str4386 cups-1.7.2/cups/request.c ---- cups-1.7.2/cups/request.c.str4386 2014-03-26 21:06:04.000000000 +0000 -+++ cups-1.7.2/cups/request.c 2014-04-16 14:02:20.039876149 +0100 -@@ -749,9 +749,8 @@ cupsSendRequest(http_t *http, /* I - - got_status = 0; - - while ((state = ippWrite(http, request)) != IPP_STATE_DATA) -- if (state == IPP_STATE_ERROR) -- break; -- else if (httpCheck(http)) -+ { -+ if (httpCheck(http)) - { - got_status = 1; - -@@ -759,15 +758,24 @@ cupsSendRequest(http_t *http, /* I - - if (status >= HTTP_STATUS_MULTIPLE_CHOICES) - break; - } -+ else if (state == IPP_STATE_ERROR) -+ break; -+ } - - if (state == IPP_STATE_ERROR) - { -- DEBUG_puts("1cupsSendRequest: Unable to send IPP request."); -+ /* We weren't able to send the IPP request. But did we already -+ * get an HTTP error status? */ -+ if (!(got_status && status >= HTTP_STATUS_MULTIPLE_CHOICES)) -+ { -+ /* No, something else went wrong. */ -+ DEBUG_puts("1cupsSendRequest: Unable to send IPP request."); - -- http->status = HTTP_STATUS_ERROR; -- http->state = HTTP_STATE_WAITING; -+ http->status = HTTP_STATUS_ERROR; -+ http->state = HTTP_STATE_WAITING; - -- return (HTTP_STATUS_ERROR); -+ return (HTTP_STATUS_ERROR); -+ } - } - - /* diff --git a/cups.spec b/cups.spec index 5bfe98b..40de148 100644 --- a/cups.spec +++ b/cups.spec @@ -10,8 +10,8 @@ Summary: CUPS printing system Name: cups Epoch: 1 -Version: 1.7.2 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} License: GPLv2 Url: http://www.cups.org/ Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 @@ -30,7 +30,6 @@ Source8: macros.cups Patch1: cups-no-gzip-man.patch Patch2: cups-system-auth.patch Patch3: cups-multilib.patch -Patch4: cups-str4386.patch Patch5: cups-banners.patch Patch6: cups-serverbin-compat.patch Patch7: cups-no-export-ssllibs.patch @@ -193,9 +192,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch2 -p1 -b .system-auth # Prevent multilib conflict in cups-config script. %patch3 -p1 -b .multilib -# Apply patch to fix cupsSendRequest() race condition (bug #1072952, -# STR #4386). -%patch4 -p1 -b .str4386 # Ignore rpm save/new files in the banners directory. %patch5 -p1 -b .banners # Use compatibility fallback path for ServerBin. @@ -546,6 +542,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/%{name}/www/fr %dir %{_datadir}/%{name}/www/it %dir %{_datadir}/%{name}/www/ja +%dir %{_datadir}/%{name}/www/pt_BR %dir %{_datadir}/%{name}/www/ru %{_datadir}/%{name}/www/images %{_datadir}/%{name}/www/*.css @@ -559,6 +556,7 @@ rm -f %{cups_serverbin}/backend/smb %doc %{_datadir}/%{name}/www/fr/index.html %doc %{_datadir}/%{name}/www/it/index.html %doc %{_datadir}/%{name}/www/ja/index.html +%doc %{_datadir}/%{name}/www/pt_BR/index.html %doc %{_datadir}/%{name}/www/ru/index.html %dir %{_datadir}/%{name}/usb %{_datadir}/%{name}/usb/org.cups.usb-quirks @@ -600,6 +598,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/cups/templates/fr %dir %{_datadir}/cups/templates/it %dir %{_datadir}/cups/templates/ja +%dir %{_datadir}/cups/templates/pt_BR %dir %{_datadir}/cups/templates/ru %{_datadir}/cups/templates/*.tmpl %{_datadir}/cups/templates/ca/*.tmpl @@ -609,6 +608,7 @@ rm -f %{cups_serverbin}/backend/smb %{_datadir}/cups/templates/fr/*.tmpl %{_datadir}/cups/templates/it/*.tmpl %{_datadir}/cups/templates/ja/*.tmpl +%{_datadir}/cups/templates/pt_BR/*.tmpl %{_datadir}/cups/templates/ru/*.tmpl %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups @@ -671,6 +671,10 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Wed May 28 2014 Jiri Popelka - 1:1.7.3-1 +- 1.7.3 +- str4386.patch merged upstream in STR #4403 + * Fri May 9 2014 Tim Waugh - 1:1.7.2-3 - Another attempt at avoiding race condition when sending IPP requests (STR #4386, bug #1072952). diff --git a/sources b/sources index 1f8167c..bcab508 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f06a997d4b71b81b23324e27174f93e7 cups-1.7.2-source.tar.bz2 +d498c3020acda0904ab0c13b6389a1ec cups-1.7.3-source.tar.bz2