Merge lp:~rhansen/ubuntu/vivid/cvsps/bug1413084 into lp:ubuntu/vivid/cvsps

[Richard Hansen]

Bug fix for #1413084

[Brian Murray (brian-murray)]

The correct format for bug numbers is LP: #1413084, notice the missing #. I've fixed this though and uploaded the change. Thanks for working on this.

review: Approve

Unmerged revisions

10. By Richard Hansen on 2015-02-11

Discard extra "M" response lines when reading server version

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-01 20:57:26 +0000
+++ debian/changelog	2015-02-11 19:36:57 +0000
@@ -1,3 +1,10 @@
+cvsps (2.1-6ubuntu1) vivid; urgency=medium
+
+  * Discard extra "M" response lines when reading the server's
+    version. (LP: 1413084)
+
+ -- Richard Hansen <[e-mail]>  Tue, 20 Jan 2015 23:29:12 -0500
+
 cvsps (2.1-6build1) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.
 
=== added file 'debian/patches/06-discard-extra-version-lines.patch'
--- debian/patches/06-discard-extra-version-lines.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06-discard-extra-version-lines.patch	2015-02-11 19:36:57 +0000
@@ -0,0 +1,27 @@
+Subject: Discard extra "M" lines in response to "version"
+From: Richard Hansen <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1413084
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775883
+
+Some CVS servers print more than one "M" line in response to a
+"version" command.  For example:
+
+Client: version
+Server: M Concurrent Versions System (CVS) 1.12.13 (client/server)
+Server: M with CVSACL Patch 1.2.5 (cvsacl.sourceforge.net)
+Server: ok
+
+This patch causes cvsps to consume all such lines rather than fail.
+
+--- a/cvs_direct.c
++++ b/cvs_direct.c
+@@ -916,7 +916,8 @@
+     else
+ 	debug(DEBUG_APPERROR, "cvs_direct: didn't read version: %s", lbuff);
+     
+-    read_line(ctx, lbuff);
++    while (strncmp(lbuff, "M ", 2) == 0)
++	read_line(ctx, lbuff);
+     if (strcmp(lbuff, "ok") != 0)
+ 	debug(DEBUG_APPERROR, "cvs_direct: protocol error reading version");
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-07 23:18:19 +0000
+++ debian/patches/series	2015-02-11 19:36:57 +0000
@@ -2,3 +2,4 @@
 02_dynamicbufferalloc.patch
 03_diffoptstypo.patch
 05-inet_addr_fix.patch
+06-discard-extra-version-lines.patch