From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 25 07:20:06 2005 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 BC34816A41F for ; Fri, 25 Nov 2005 07:20:05 +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 DD73143D62 for ; Fri, 25 Nov 2005 07:20:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAP7K2eK016969 for ; Fri, 25 Nov 2005 07:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAP7K2qP016968; Fri, 25 Nov 2005 07:20:02 GMT (envelope-from gnats) Resent-Date: Fri, 25 Nov 2005 07:20:02 GMT Resent-Message-Id: <200511250720.jAP7K2qP016968@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 1BB2816A41F; Fri, 25 Nov 2005 07:14:19 +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 8522C43D58; Fri, 25 Nov 2005 07:14:18 +0000 (GMT) (envelope-from koma2@timedia.co.jp) Received: by koma2-45.wins.timedia.co.jp (Postfix, from userid 1000) id DC77411816; Fri, 25 Nov 2005 16:14:15 +0900 (JST) Message-Id: <20051125071415.DC77411816@koma2-45.wins.timedia.co.jp> Date: Fri, 25 Nov 2005 16:14:15 +0900 (JST) From: KOMATSU Shinichiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: daichi@FreeBSD.org, kris@obsecurity.org Subject: ports/89520: sysutils/portupgrade: Change the name of the ports database file. 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, 25 Nov 2005 07:20:06 -0000 >Number: 89520 >Category: ports >Synopsis: sysutils/portupgrade: Change the name of the ports database file. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Nov 25 07:20:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 5.4-RELEASE-p5 i386 >Organization: >Environment: FreeBSD 5.4-RELEASE-p5 i386 >Description: 1. Change the name of the ports database file (INDEX.db) to $(basename ${INDEXFILE}).db, e.g. INDEX-6.db. [1] 2. Add SHA256. Requested by: kris [1] >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/portupgrade/Makefile,v retrieving revision 1.204 diff -u -r1.204 Makefile --- Makefile 19 Oct 2005 07:47:48 -0000 1.204 +++ Makefile 24 Nov 2005 13:49:24 -0000 @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 20041226 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/portupgrade/distinfo,v retrieving revision 1.154 diff -u -r1.154 distinfo --- distinfo 25 Dec 2004 21:17:06 -0000 1.154 +++ distinfo 25 Nov 2005 06:44:26 -0000 @@ -1,4 +1,6 @@ MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SHA256 (pkgtools-20041224.tar.bz2) = bf637cdcadc1bc843f300bf3d2628cf576c5d2252932f0f09188e8dd9d4803b7 SIZE (pkgtools-20041224.tar.bz2) = 104308 MD5 (pkgtools-20041224-20041226.diff.bz2) = aab3f2885424d5f25c8ab08d48da5f34 +SHA256 (pkgtools-20041224-20041226.diff.bz2) = 1900a764a50396d8f45b25576005533878bebcc37f5187099632ee591989ea63 SIZE (pkgtools-20041224-20041226.diff.bz2) = 1086 Index: files/patch-lib_portsdb.rb =================================================================== RCS file: /home/ncvs/ports/sysutils/portupgrade/files/patch-lib_portsdb.rb,v retrieving revision 1.1 diff -u -r1.1 patch-lib_portsdb.rb --- files/patch-lib_portsdb.rb 2 Aug 2005 09:06:38 -0000 1.1 +++ files/patch-lib_portsdb.rb 24 Nov 2005 13:47:56 -0000 @@ -1,5 +1,18 @@ ---- lib/portsdb.rb.orig Tue Aug 2 10:24:50 2005 -+++ lib/portsdb.rb Tue Aug 2 10:25:17 2005 +Index: lib/portsdb.rb +=================================================================== +--- lib/portsdb.rb (.../vendor/portupgrade/trunk/lib/portsdb.rb) (revision 2) ++++ lib/portsdb.rb (.../branches/ports/lib/portsdb.rb) (revision 41) +@@ -194,8 +194,8 @@ + def db_dir=(new_db_dir) + @db_dir = new_db_dir || ENV['PORTS_DBDIR'] || ports_dir + +- @db_file = File.join(@db_dir, 'INDEX.db') +- @db_filebase = @db_file.sub(/\.db$/, '') ++ @db_filebase = File.join(@db_dir, File.basename(index_file())) ++ @db_file = @db_filebase + '.db' + + close_db + @@ -846,7 +846,7 @@ def all_depends_list(origin, before_args = nil, after_args = nil) >Release-Note: >Audit-Trail: >Unformatted: