rpms/cups/devel cups-wbuffer.patch,NONE,1.1 cups.spec,1.262,1.263

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7688

Modified Files:
	cups.spec 
Added Files:
	cups-wbuffer.patch 
Log Message:
* Wed Sep 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-5
- Fixed STR #1968 properly (bug #205619).


cups-wbuffer.patch:
 http.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-wbuffer.patch ---
--- 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));


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- cups.spec	12 Sep 2006 13:52:42 -0000	1.262
+++ cups.spec	13 Sep 2006 16:51:23 -0000	1.263
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.3
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -33,6 +33,7 @@
 Patch9: cups-locale.patch
 Patch10: cups-no-export-ssllibs.patch
 Patch11: cups-paps.patch
+Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-str1968.patch
 Patch15: cups-maxlogsize.patch
@@ -131,6 +132,7 @@
 %patch9 -p1 -b .locale
 %patch10 -p1 -b .no-export-ssllibs
 %patch11 -p1 -b .paps
+%patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .str1968
 %patch15 -p1 -b .maxlogsize
@@ -414,6 +416,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-5
+- Fixed STR #1968 properly (bug #205619).
+
 * Tue Sep 12 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need language patch.