From owner-freebsd-bugs@FreeBSD.ORG Tue Sep 28 03:10:28 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77ECC16A4E2 for ; Tue, 28 Sep 2004 03:10:28 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BA6943D1F for ; Tue, 28 Sep 2004 03:10:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i8S3ASFl043879 for ; Tue, 28 Sep 2004 03:10:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i8S3ASdh043878; Tue, 28 Sep 2004 03:10:28 GMT (envelope-from gnats) Resent-Date: Tue, 28 Sep 2004 03:10:28 GMT Resent-Message-Id: <200409280310.i8S3ASdh043878@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Eugene M. Kim" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E39FA16A4CE for ; 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 ; 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" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: gene@nttmcl.com Subject: bin/72139: The CVS version string is broken. X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2004 03:10:28 -0000 >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@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 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: >Unformatted: