[Pkg-cvs-commits] r16 - in /trunk: changelog patches/90zlib-read-compressed.diff

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Mon May 22 19:07:23 2006
New Revision: 16

URL: http://svn.debian.org/wsvn/?sc=1&rev=16
Log:
Apply zlib bugfix from cvs development mailing list so that reading
CVS data over compressed links works again. Closes: #368494


Added:
    trunk/patches/90zlib-read-compressed.diff
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=16&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon May 22 19:07:23 2006
@@ -1,3 +1,11 @@
+cvs (1:1.12.13-2) unstable; urgency=low
+
+  [ Steve McIntyre ]
+  * Apply zlib bugfix from cvs development mailing list so that reading
+    CVS data over compressed links works again. Closes: #368494
+	
+ -- Steve McIntyre <93sam at debian.org>  Mon, 22 May 2006 19:53:42 +0100
+
 cvs (1:1.12.13-1) unstable; urgency=low
 
   [ Steve McIntyre ]

Added: trunk/patches/90zlib-read-compressed.diff
URL: http://svn.debian.org/wsvn/trunk/patches/90zlib-read-compressed.diff?rev=16&op=file
==============================================================================
--- trunk/patches/90zlib-read-compressed.diff (added)
+++ trunk/patches/90zlib-read-compressed.diff Mon May 22 19:07:23 2006
@@ -0,0 +1,11 @@
+--- cvs-1.12.13/src/zlib.c~	3 Jun 2005 18:26:09 -0000	1.31
++++ cvs-1.12.13/src/zlib.c	27 Oct 2005 17:59:49 -0000
+@@ -229,7 +229,7 @@ compress_buffer_input (void *closure, ch
+ 	   would fetch all the available bytes, and at least one byte.  */
+ 
+ 	status = (*cb->buf->input) (cb->buf->closure, bd->text,
+-				    need, BUFFER_DATA_SIZE, &nread);
++				    need ? 1 : 0, BUFFER_DATA_SIZE, &nread);
+ 
+ 	if (status == -2)
+ 	    /* Don't try to recover from memory allcoation errors.  */