From owner-freebsd-bugs@FreeBSD.ORG Sat Jan 23 15:00:09 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2C02106568F for ; Sat, 23 Jan 2010 15:00:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 788BD8FC1B for ; Sat, 23 Jan 2010 15:00:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0NF095I062465 for ; Sat, 23 Jan 2010 15:00:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0NF09aY062464; Sat, 23 Jan 2010 15:00:09 GMT (envelope-from gnats) Resent-Date: Sat, 23 Jan 2010 15:00:09 GMT Resent-Message-Id: <201001231500.o0NF09aY062464@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, jhell Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D8CE10656A3 for ; Sat, 23 Jan 2010 14:55:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 882978FC12 for ; Sat, 23 Jan 2010 14:55:02 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0NEt2eJ067166 for ; Sat, 23 Jan 2010 14:55:02 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o0NEt26w067164; Sat, 23 Jan 2010 14:55:02 GMT (envelope-from nobody) Message-Id: <201001231455.o0NEt26w067164@www.freebsd.org> Date: Sat, 23 Jan 2010 14:55:02 GMT From: jhell To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: conf/143127: Patch against newvers.sh, minor cleanup/fixes X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2010 15:00:09 -0000 >Number: 143127 >Category: conf >Synopsis: Patch against newvers.sh, minor cleanup/fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 23 15:00:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: jhell >Release: 7.2-STABLE Latest >Organization: >Environment: Before Patch: FreeBSD 7.2-STABLE #0 r202861M: Fri Jan 22 21:38:37 EST 2010 i386 With the patch: FreeBSD 7.2-STABLE #0 r202861M Fri Jan 22 21:38:37 EST 2010 i386 Non relevant sections of uname removed. >Description: Remove unneeded ":" delimiter. Nothing else has a delimiter in the version string so why have one at all ?. This effects extra needed parsing efforts when svnversion turns into "rREV:REV". Convert four spaces to one space+tab. I believe this used to be a space+tab but was turned into spaces due to copy & paste. >How-To-Repeat: Revert/Update sections of code or other files to a previous revision than what the tree is at. This will give you rREV:REV in any built kernels uname. >Fix: Patch attached. Patch attached with submission follows: Author: jhell@dataix.net Date: Thu Jan 21 22:42:37 UTC 2010 Log: Remove unneeded ":" delimiter. Nothing else has a delimiter in the version string so why have one at all ?. This effects extra needed parsing efforts when svnversion turns into "rREV:REV". Convert four spaces to one space+tab. I believe this used to be a space+tab but was turned into spaces due to copy & paste. Modified: stable/7/sys/conf/newvers.sh Modified: stable/7/sys/conf/newvers.sh =================================================================== --- /usr/src/sys/conf/newvers.sh (revision 202769) +++ /usr/src/sys/conf/newvers.sh (working copy) @@ -135,8 +135,8 @@ cat << EOF > vers.c $COPYRIGHT -#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}" -#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n ${u}@${h}:${d}\\n" +#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git} ${t}" +#define VERSTR "${VERSION} #${v}${svn}${git} ${t}\\n ${u}@${h}:${d}\\n" #define RELSTR "${RELEASE}" char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR; >Release-Note: >Audit-Trail: >Unformatted: