bin/72139: The CVS version string is broken.

[Eugene M. Kim]

>Number:         72139
>Category:       bin
>Synopsis:       The CVS version string is broken.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 28 03:10:27 GMT 2004
>Closed-Date:
>Last-Modified:
>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 at 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, at 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, at VERSION@,$${version}-FreeBSD,g" \
 	    -e "s, at UMASK_DFLT@,${CVS_UMASK_DFLT},g" \
 	    -e "s, at TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \
--- cvs.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: