- added zlibfix patch: fix for broken zlib-client, which used to send truncated

  data when compressed file was longer than predefined buffer (BUFSIZ bytes)
- release 4, STBR

Changed files:
    cvs-nserver-zlibfix.patch -> 1.1
    cvs-nserver.spec -> 1.52

diff --git a/cvs-nserver-zlibfix.patch b/cvs-nserver-zlibfix.patch
new file mode 100644 (file)
index 0000000..ac6cd20
--- /dev/null
+++ b/cvs-nserver-zlibfix.patch
@@ -0,0 +1,23 @@
+--- cvs-nserver-1.11.1.52/src/zlib-client.c.orig       Tue Mar  5 01:27:05 2002
++++ cvs-nserver-1.11.1.52/src/zlib-client.c    Sat Mar 29 00:44:49 2003
+@@ -283,6 +283,7 @@
+ 
+     zcd->zsout.next_in = buf;
+     zcd->zsout.avail_in = len;
++  do {
+     zcd->zsout.next_out = zcd->buf_out;
+     zcd->zsout.avail_out = BUFSIZ;
+ 
+@@ -297,7 +298,11 @@
+ 
+     fprintf(stderr, "Actually writing %d bytes\n", BUFSIZ - zcd->zsout.avail_out);
+ #endif
+-    return ncli->next->write(ncli->next, zcd->buf_out, BUFSIZ - zcd->zsout.avail_out);
++    ret = ncli->next->write(ncli->next, zcd->buf_out, BUFSIZ - zcd->zsout.avail_out);
++    if (ret != NCLI_SUCCESS)
++        return ret;
++  } while(zcd->zsout.avail_out == 0);
++  return ret;
+ }
+ 
+ 

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index 1a2cf9c62e83a45ed77902d04e50b305c94c8ca9..1027921f9338c85aac482c657e95bca1723c210d 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -5,7 +5,7 @@ Summary(pl):    Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
 Version:       1.11.1.52
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch5:               %{name}-ssl-link.patch
 Patch6:                %{name}-fix_doc_CVSUSER.patch
 Patch7:                %{name}-segv.patch
 Patch8:                %{name}-initgroups-rootonly.patch
+Patch9:                %{name}-zlibfix.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.7
@@ -163,6 +164,7 @@ Serwer CVS - pliki nservera.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__aclocal}