From gene@doughboy.nttmcl.com  Tue Sep 28 03:06:14 2004
Return-Path: <gene@doughboy.nttmcl.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E39FA16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Sep 2004 03:06:14 +0000 (GMT)
Received: from doughboy.nttmcl.com (doughboy.nttmcl.com [216.69.69.111])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C54FA43D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Sep 2004 03:06:14 +0000 (GMT)
	(envelope-from gene@doughboy.nttmcl.com)
Received: from doughboy.nttmcl.com (localhost [127.0.0.1])
	by doughboy.nttmcl.com (8.13.1/8.13.1) with ESMTP id i8S36EgN039592;
	Mon, 27 Sep 2004 20:06:14 -0700 (PDT)
	(envelope-from gene@doughboy.nttmcl.com)
Received: (from gene@localhost)
	by doughboy.nttmcl.com (8.13.1/8.13.1/Submit) id i8S36EGx039591;
	Mon, 27 Sep 2004 20:06:14 -0700 (PDT)
	(envelope-from gene)
Message-Id: <200409280306.i8S36EGx039591@doughboy.nttmcl.com>
Date: Mon, 27 Sep 2004 20:06:14 -0700 (PDT)
From: "Eugene M. Kim" <gene@nttmcl.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gene@nttmcl.com
Subject: The CVS version string is broken.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72139
>Category:       bin
>Synopsis:       The CVS version string is broken.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    peter
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 28 03:10:27 GMT 2004
>Closed-Date:    Sat Apr 09 02:17:58 GMT 2005
>Last-Modified:  Sat Apr 09 02:17:58 GMT 2005
>Originator:     Eugene M. Kim
>Release:        FreeBSD 5.3-BETA5 i386
>Organization:
NTT Multimedia Communications Laboratories, Inc.
>Environment:
System: FreeBSD doughboy.nttmcl.com 5.3-BETA5 FreeBSD 5.3-BETA5 #15: Mon Sep 20 15:33:34 PDT 2004 root@doughboy.nttmcl.com:/u/home/root/build/usr/obj/usr/src/sys/DOUGHBOY i386
>Description:
	Newer revisions of src/contrib/cvs/configure (FreeBSD rev 1.1.1.13 and
	up, line 1660) stores the VERSION number enclosed in quotes, and the
	sed(1) command in gnu/usr.bin/cvs/{lib,cvsbug}/Makefile that extracts
	this version number errneously extracts the quotes as well.
>How-To-Repeat:
	Do `cvs -v' and examine the output.
>Fix:
	Apply the following patch in gnu/usr.bin.
--- cvs.diff begins here ---
diff -ur cvs.old/cvsbug/Makefile cvs/cvsbug/Makefile
--- cvs.old/cvsbug/Makefile	Sun Sep  7 06:17:31 2003
+++ cvs/cvsbug/Makefile	Mon Sep 27 19:52:21 2004
@@ -15,7 +15,7 @@
 
 cvsbug: cvsbug.in
 	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\1/' -e q`; \
 	sed -e "s,@VERSION@,$${version}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff -ur cvs.old/lib/Makefile cvs/lib/Makefile
--- cvs.old/lib/Makefile	Mon Feb 16 21:38:44 2004
+++ cvs/lib/Makefile	Mon Sep 27 19:52:17 2004
@@ -29,7 +29,7 @@
 
 config.h: config.h.proto
 	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+	    -e '/^[ 	]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\1/' -e q`; \
 	sed -e "s,@VERSION@,$${version}-FreeBSD,g" \
 	    -e "s,@UMASK_DFLT@,${CVS_UMASK_DFLT},g" \
 	    -e "s,@TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \
--- cvs.diff ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: delphij 
State-Changed-When: Wed Sep 29 02:56:15 GMT 2004 
State-Changed-Why:  
MFC Reminder 


Responsible-Changed-From-To: freebsd-bugs->peter 
Responsible-Changed-By: delphij 
Responsible-Changed-When: Wed Sep 29 02:56:15 GMT 2004 
Responsible-Changed-Why:  
Peter has committed a fix to -HEAD, so bump state to patched 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72139 

From: Matteo Riondato <rionda@gufi.org>
To: Gnats PR Database <freebsd-gnats-submit@freebsd.org>
Cc: delphij@freebsd.org
Subject: Re: bin/72139: The CVS version string is broken
Date: Fri, 8 Apr 2005 22:38:54 +0200

 --1Wg5Vd7si6EhrIHA
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 This was fixed and MFCed to RELENG_5 and RELENG_4 back in 2004, so
 this PR can be closed.
 Thanks
 Best Regards
 
 --=20
 Rionda aka Matteo Riondato
 Disinformato per default
 G.U.F.I. Staff Member (http://www.gufi.org)
 FreeSBIE Developer (http://www.freesbie.org)
 
 --1Wg5Vd7si6EhrIHA
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iD8DBQFCVuve2Mp4pR7Fa+wRAoPRAJ4lhKiYHWPPIz4RgwuNqcR7Sz8T3gCgnre1
 RwiPH/X2tK0VgkX6N8AP6XA=
 =b0JB
 -----END PGP SIGNATURE-----
 
 --1Wg5Vd7si6EhrIHA--
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Sat Apr 9 02:16:47 GMT 2005 
State-Changed-Why:  
Patch already applied.  Close on submitters' request.  Thanks Peter. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72139 
>Unformatted:
