From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 6 16:30:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9602716A41F for ; Fri, 6 Jan 2006 16:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24D1943D7E for ; Fri, 6 Jan 2006 16:30:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k06GU2BK003976 for ; Fri, 6 Jan 2006 16:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k06GU2i4003975; Fri, 6 Jan 2006 16:30:02 GMT (envelope-from gnats) Resent-Date: Fri, 6 Jan 2006 16:30:02 GMT Resent-Message-Id: <200601061630.k06GU2i4003975@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, KOMATSU Shinichiro Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE92016A41F for ; Fri, 6 Jan 2006 16:25:45 +0000 (GMT) (envelope-from koma2@timedia.co.jp) Received: from timedia.co.jp (nurikabe.timedia.co.jp [218.225.123.151]) by mx1.FreeBSD.org (Postfix) with ESMTP id D41C943D55 for ; Fri, 6 Jan 2006 16:25:33 +0000 (GMT) (envelope-from koma2@timedia.co.jp) Received: by koma2-45.wins.timedia.co.jp (Postfix, from userid 1000) id A6852114D0; Sat, 7 Jan 2006 01:25:31 +0900 (JST) Message-Id: <20060106162531.A6852114D0@koma2-45.wins.timedia.co.jp> Date: Sat, 7 Jan 2006 01:25:31 +0900 (JST) From: KOMATSU Shinichiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91402: sysutils/portupgrade: Fix yet another infinite loop. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: KOMATSU Shinichiro List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 16:30:07 -0000 >Number: 91402 >Category: ports >Synopsis: sysutils/portupgrade: Fix yet another infinite loop. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 06 16:30:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: FreeBSD 5.4-RELEASE-p8 i386 >Description: Check and avoid infinite loop when MOVED has an entry such as: games/scummvm|emulators/scummvm|2004-04-06|new category emulators/scummvm|games/scummvm|2004-04-13|new category (games/scummvm -> emulators/scummvm -> games/scummvm -> ...) Reported by: Bohdan Horst >How-To-Repeat: >Fix: diff --exclude=*.log* --exclude=CVS -urN portupgrade.old/Makefile portupgrade/Makefile --- portupgrade.old/Makefile Sat Jan 7 01:20:31 2006 +++ portupgrade/Makefile Sat Jan 7 01:19:14 2006 @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.0.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ diff --exclude=*.log* --exclude=CVS -urN portupgrade.old/files/patch-lib-portsdb.rb portupgrade/files/patch-lib-portsdb.rb --- portupgrade.old/files/patch-lib-portsdb.rb Thu Jan 1 09:00:00 1970 +++ portupgrade/files/patch-lib-portsdb.rb Sat Jan 7 01:17:25 2006 @@ -0,0 +1,13 @@ +Index: lib/portsdb.rb +=================================================================== +--- lib/portsdb.rb (revision 74) ++++ lib/portsdb.rb (revision 75) +@@ -91,7 +91,7 @@ + while true + if moved = @moved[me] + t << moved if t.empty? or t.last.seq < moved.seq +- if me.nil? or me == moved.to ++ if me.nil? or t.map{|p| p.to}.include?(me) + break + else + me = moved.to >Release-Note: >Audit-Trail: >Unformatted: