- Fixed STR #1968 properly (bug #205619).

This commit is contained in:
Tim Waugh 2006-09-13 16:51:23 +00:00
parent 425e78505e
commit 9310f56d8a
2 changed files with 17 additions and 1 deletions

11
cups-wbuffer.patch Normal file
View File

@ -0,0 +1,11 @@
--- cups-1.2.3/cups/http.c.wbuffer 2006-09-13 16:41:57.000000000 +0100
+++ cups-1.2.3/cups/http.c 2006-09-13 16:42:23.000000000 +0100
@@ -1886,7 +1886,7 @@
if (length > 0)
{
- if (http->wused && (length + http->wused) > sizeof(http->wbuffer))
+ if (http->wused && (length + http->wused) >= sizeof(http->wbuffer))
{
DEBUG_printf((" flushing buffer (wused=%d, length=%d)\n",
http->wused, length));

View File

@ -6,7 +6,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.3 Version: 1.2.3
Release: 4 Release: 5
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -33,6 +33,7 @@ Patch8: cups-serverbin-compat.patch
Patch9: cups-locale.patch Patch9: cups-locale.patch
Patch10: cups-no-export-ssllibs.patch Patch10: cups-no-export-ssllibs.patch
Patch11: cups-paps.patch Patch11: cups-paps.patch
Patch12: cups-wbuffer.patch
Patch13: cups-direct-usb.patch Patch13: cups-direct-usb.patch
Patch14: cups-str1968.patch Patch14: cups-str1968.patch
Patch15: cups-maxlogsize.patch Patch15: cups-maxlogsize.patch
@ -131,6 +132,7 @@ lpd emulation.
%patch9 -p1 -b .locale %patch9 -p1 -b .locale
%patch10 -p1 -b .no-export-ssllibs %patch10 -p1 -b .no-export-ssllibs
%patch11 -p1 -b .paps %patch11 -p1 -b .paps
%patch12 -p1 -b .wbuffer
%patch13 -p1 -b .direct-usb %patch13 -p1 -b .direct-usb
%patch14 -p1 -b .str1968 %patch14 -p1 -b .str1968
%patch15 -p1 -b .maxlogsize %patch15 -p1 -b .maxlogsize
@ -414,6 +416,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Wed Sep 13 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.3-5
- Fixed STR #1968 properly (bug #205619).
* Tue Sep 12 2006 Tim Waugh <twaugh@redhat.com> * Tue Sep 12 2006 Tim Waugh <twaugh@redhat.com>
- No longer need language patch. - No longer need language patch.