From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 31 14:00:07 2008 Return-Path: Delivered-To: freebsd-ports-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 CB79216A41B for ; Thu, 31 Jan 2008 14:00:07 +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 9F15413C468 for ; Thu, 31 Jan 2008 14:00:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0VE07ic079003 for ; Thu, 31 Jan 2008 14:00:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0VE076g079002; Thu, 31 Jan 2008 14:00:07 GMT (envelope-from gnats) Resent-Date: Thu, 31 Jan 2008 14:00:07 GMT Resent-Message-Id: <200801311400.m0VE076g079002@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Henri Hennebert Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F06516A469 for ; Thu, 31 Jan 2008 13:51:19 +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 32B7A13C467 for ; Thu, 31 Jan 2008 13:51:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0VDnSvo068392 for ; Thu, 31 Jan 2008 13:49:28 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m0VDnSAJ068391; Thu, 31 Jan 2008 13:49:28 GMT (envelope-from nobody) Message-Id: <200801311349.m0VDnSAJ068391@www.freebsd.org> Date: Thu, 31 Jan 2008 13:49:28 GMT From: Henri Hennebert To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/120185: devel/cvsweb - Wrong revision when a log entry contains LOG_FILESEPR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 14:00:07 -0000 >Number: 120185 >Category: ports >Synopsis: devel/cvsweb - Wrong revision when a log entry contains LOG_FILESEPR >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jan 31 14:00:07 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Henri Hennebert >Release: FreeBSD 7.0-RC1 >Organization: >Environment: FreeBSD morzine.restart.bel 7.0-RC1 FreeBSD 7.0-RC1 #0: Sun Jan 6 17:58:29 CET 2008 root@morzine.restart.bel:/usr/obj/usr/src/sys/MORZINE i386 >Description: Hello, When I display /src directory for RELENG_7, cvsweb.cgi display the wrong revision for UPDATING. It is due to a log entry containing a line matching `^={77}$'. I find that, at least on FreeBSD, rlog always display a file matching LOG_REVSEPR before the file separator (LOG_FILESEPR). Henri >How-To-Repeat: http://www.freebsd.org/cgi/cvsweb.cgi/src/?only_with_tag=RELENG_7 Wrong revision of UPDATING - 1.507 sould be 1.507.2.3 http://www.freebsd.org/cgi/cvsweb.cgi/src/?only_with_tag=RELENG_7_0 UPDATING is not in the list. >Fix: --- cvsweb.cgi.orig 2005-09-25 22:28:51.000000000 +0200 +++ cvsweb.cgi 2007-12-06 18:05:47.463195725 +0100 @@ -2570,7 +2570,7 @@ } if ($state eq "log") { - if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) { + if ($_ =~ LOG_REVSEPR) { # End of a log entry. my $revbranch = $rev; @@ -2615,7 +2615,7 @@ } } - if ($_ =~ LOG_FILESEPR) { + if ($_ =~ LOG_FILESEPR && $rev eq '') { $state = "start"; next; } Patch attached with submission follows: --- cvsweb.cgi.orig 2008-01-16 17:15:05.735574856 +0100 +++ cvsweb.cgi 2008-01-16 17:15:41.081962113 +0100 @@ -2570,7 +2570,7 @@ } if ($state eq "log") { - if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) { + if ($_ =~ LOG_REVSEPR) { # End of a log entry. my $revbranch = $rev; @@ -2615,7 +2615,7 @@ } } - if ($_ =~ LOG_FILESEPR) { + if ($_ =~ LOG_FILESEPR && $rev eq '') { $state = "start"; next; } >Release-Note: >Audit-Trail: >Unformatted: