rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f20'

Browse Source 
Conflicts:
	cups.spec
This commit is contained in:
Tim Waugh 2014-04-03 17:45:18 +01:00
commit d2a88b36ba
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-str4386.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.7.1/cups/request.c.str4386 cups-1.7.1/cups/request.c
--- cups-1.7.1/cups/request.c.str4386 2013-07-23 13:33:52.000000000 +0100
+++ cups-1.7.1/cups/request.c 2014-03-06 10:58:39.018807898 +0000
@@ -261,7 +261,7 @@ cupsDoIORequest(http_t *http, /* I -
* Get the server's response...
*/
- if (status != HTTP_STATUS_ERROR)
+ if (status <= HTTP_STATUS_CONTINUE || status == HTTP_STATUS_OK)
{
response = cupsGetResponse(http, resource);
status = httpGetStatus(http);

10
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.1 Version: 1.7.1
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -31,6 +31,7 @@ Source8: macros.cups
Patch1: cups-no-gzip-man.patch Patch1: cups-no-gzip-man.patch
Patch2: cups-system-auth.patch Patch2: cups-system-auth.patch
Patch3: cups-multilib.patch Patch3: cups-multilib.patch
Patch4: cups-str4386.patch
Patch5: cups-banners.patch Patch5: cups-banners.patch
Patch6: cups-serverbin-compat.patch Patch6: cups-serverbin-compat.patch
Patch7: cups-no-export-ssllibs.patch Patch7: cups-no-export-ssllibs.patch
@ -198,6 +199,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch2 -p1 -b .system-auth %patch2 -p1 -b .system-auth
# Prevent multilib conflict in cups-config script. # Prevent multilib conflict in cups-config script.
%patch3 -p1 -b .multilib %patch3 -p1 -b .multilib
# libcups: avoid race condition when sending IPP requests (STR #4386,
# bug #1072952).
%patch4 -p1 -b .str4386
# Ignore rpm save/new files in the banners directory. # Ignore rpm save/new files in the banners directory.
%patch5 -p1 -b .banners %patch5 -p1 -b .banners
# Use compatibility fallback path for ServerBin. # Use compatibility fallback path for ServerBin.
@ -676,6 +680,10 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Thu Apr 3 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.1-10
- libcups: avoid race condition when sending IPP requests (STR #4386,
bug #1072952).
* Wed Apr 02 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.1-9 * Wed Apr 02 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.1-9
- New client subpackage containing command line client tools (bug #1002342). - New client subpackage containing command line client tools (bug #1002342).
- Removed unneeded Group tags. - Removed unneeded Group tags.