[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#358374: marked as done (cvsps: FreeBSD isn't evil - just misguided)

Your message dated Mon, 11 Jun 2007 18:02:04 +0000
with message-id <E1HxoDM-0000n4-7s@ries.debian.org>
and subject line Bug#358374: fixed in cvsps 2.1-3
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: cvsps
Version: 2.1-2
Severity: normal
Tags: patch

Hi,

cvsps fails against a FreeBSD CVS pserver. By fails I mean it fails back
to using the 'log' command rather the 'rlog' which would give me stable
patchsets.

cvsps requires the remote pserver to be 1.11.1 or later for rlog to
work and, indeed, the other side is a later version. Unfortunately
FreeBSD have, misguidedly, modified the version string such that cvsps
misdetects things.

Attached is a patch which fixes that.  Please apply.

Thanks,
Anand

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (650, 'testing'), (600, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)

Versions of packages cvsps depends on:
ii  cvs                          1:1.12.9-17 Concurrent Versions System
ii  libc6                        2.3.5-13    GNU C Library: Shared libraries an
ii  zlib1g                       1:1.2.3-9   compression library - runtime

cvsps recommends no packages.

-- no debconf information

diff -u cvsps-2.1/debian/changelog cvsps-2.1/debian/changelog
--- cvsps-2.1/debian/changelog
+++ cvsps-2.1/debian/changelog
@@ -1,4 +1,10 @@
+cvsps (2.1-2) unstable; urgency=low
+
+  * Handle CVS pserver whose version string has been corrupted (e.g. FreeBSD)
+
+ -- Anand Kumria <wildfire@progsoc.org>  Wed, 22 Mar 2006 23:46:35 +1100
+
 cvsps (2.1-1) unstable; urgency=low
 
   * New upstream version.
--- cvsps-2.1.orig/cap.c
+++ cvsps-2.1/cap.c
@@ -121,12 +121,20 @@
 	return 0;
     }
 
+    /* We might have encountered a FreeBSD system which
+     * has a mucked up version string of:
+     *  Concurrent Versions System (CVS) '1.11.17'-FreeBSD (client/server)
+     * so re-test just in case
+     */
     p += skip;
     if (sscanf(p, "%d.%d.%d", &major, &minor, &extra) != 3)
     {	
-	debug(DEBUG_APPMSG1, "WARNING: malformed CVS version: %s", str);
-	return 0;
+        if (sscanf(p, "'%d.%d.%d'", &major, &minor, &extra) != 3)
+	{
+		debug(DEBUG_APPMSG1, "WARNING: malformed CVS version: %s", str);
+		return 0;
+	}
     }
 
     return (major > req_major ||

--- End Message ---
--- Begin Message --- 
Source: cvsps
Source-Version: 2.1-3

We believe that the bug you reported is fixed in the latest version of
cvsps, which is due to be installed in the Debian FTP archive:

cvsps_2.1-3.diff.gz
  to pool/main/c/cvsps/cvsps_2.1-3.diff.gz
cvsps_2.1-3.dsc
  to pool/main/c/cvsps/cvsps_2.1-3.dsc
cvsps_2.1-3_i386.deb
  to pool/main/c/cvsps/cvsps_2.1-3_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 358374@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Clint Adams <schizo@debian.org> (supplier of updated cvsps package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Mon, 11 Jun 2007 13:41:49 -0400
Source: cvsps
Binary: cvsps
Architecture: source i386
Version: 2.1-3
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Clint Adams <schizo@debian.org>
Description: 
 cvsps      - Tool to generate CVS patch set information
Closes: 358374
Changes: 
 cvsps (2.1-3) unstable; urgency=low
 .
   * QA Upload.
   * Apply patch from Anand Kumria to cope with single quotes in
     FreeBSD CVS pserver version strings.  closes: #358374.
Files: 
 ff0c42ad505904d47f602abe484833cf 590 devel optional cvsps_2.1-3.dsc
 362a00e6d7bea00333b258cd743895ce 5017 devel optional cvsps_2.1-3.diff.gz
 860f10e1b877de7955c85fb5c361c377 47942 devel optional cvsps_2.1-3_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Debian!

iD8DBQFGbYv95m0u66uWM3ARAgvFAJ9F9UgQmaf+k0pq8lCzFqutVGW/zQCgw/gD
foMwgx31itvov4FKH1Al1Ks=
=Gx+o
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: