From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 22 21:00:48 2005 Return-Path: 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 02D3716A4CF for ; Fri, 22 Apr 2005 21:00:48 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0194143D5C for ; Fri, 22 Apr 2005 21:00:47 +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 j3ML0kdi073087 for ; Fri, 22 Apr 2005 21:00:46 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3ML0kkO073077; Fri, 22 Apr 2005 21:00:46 GMT (envelope-from gnats) Resent-Date: Fri, 22 Apr 2005 21:00:46 GMT Resent-Message-Id: <200504222100.j3ML0kkO073077@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, "Michael C.Shultz" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6B7316A4CE for ; Fri, 22 Apr 2005 20:53:13 +0000 (GMT) Received: from vms046pub.verizon.net (vms046pub.verizon.net [206.46.252.46]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14FA843D49 for ; Fri, 22 Apr 2005 20:53:13 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: from ringworm.mechee.com ([4.28.64.41])0.04 <0IFD00GKR8OMS7R1@vms046.mailsrvcs.net> for FreeBSD-gnats-submit@freebsd.org; Fri, 22 Apr 2005 15:53:12 -0500 (CDT) Received: by ringworm.mechee.com (Postfix, from userid 1001) id B6FD8130C09; Fri, 22 Apr 2005 13:53:15 -0700 (PDT) Message-Id: <20050422205315.B6FD8130C09@ringworm.mechee.com> Date: Fri, 22 Apr 2005 13:53:15 -0700 (PDT) From: ringworm01@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80264: [MAINTAINER] sysutils/portmanager update to 0.2.9_4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Michael C.Shultz" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 21:00:48 -0000 >Number: 80264 >Category: ports >Synopsis: [MAINTAINER] sysutils/portmanager update to 0.2.9_4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 22 21:00:46 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Michael C. Shultz >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD ringworm.mechee.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Apr 13 14:34:05 PDT 2005 root@ringworm.mechee.com:/usr/obj/usr/src/sys/RINGWORM i386 >Description: sysutils/portmanager update to 0.2.9_4 note to committer: please add files/patch-0.2.9_4 1) Fixes two reported bugs, see NEWS or Changelog for details >How-To-Repeat: N/A >Fix: --- portmanager-0.2.9_4.diff begins here --- diff -ruN portmanager/Makefile portmanager-NEW/Makefile --- portmanager/Makefile Mon Mar 14 11:40:12 2005 +++ portmanager-NEW/Makefile Fri Apr 22 13:11:15 2005 @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.2.9 -PORTREVISION= 3 +PORTREVISION= 4 #----------------------------------------- #for local use, remove before submitting PR CATEGORIES= sysutils diff -ruN portmanager/files/patch-0.2.9_4 portmanager-NEW/files/patch-0.2.9_4 --- portmanager/files/patch-0.2.9_4 Wed Dec 31 16:00:00 1969 +++ portmanager-NEW/files/patch-0.2.9_4 Fri Apr 22 13:11:02 2005 @@ -0,0 +1,725 @@ +diff -ruN ../../0.2.9_3/portmanager/ChangeLog ./ChangeLog +--- ../../0.2.9_3/portmanager/ChangeLog Wed Apr 6 19:50:14 2005 ++++ ./ChangeLog Fri Apr 22 12:32:22 2005 +@@ -1,6 +1,32 @@ + change log + +-NOTE to self: Monitor from 0.2.1 to 0.2.2 item 3. ++from 0.2.9_3 to 0.2.9_4 (April 2005) ++ ++1) Improved warning message if a +CONTENTS file is missing in PMGRrVerifyContentsFile.c ++ ++2) PMGRrAddDependencies.c changed way stringSize is calculated for portDependency variable ++to eliminate a potential buffer over run. While I have never duplicated a buffer overrun ++the portmanager.core file received from "TJ Varghese" from a FreeBSD ++4.11 system proves it is possible. ++ ++ ++from 0.2.9_2 to 0.2.9_3 (March 2005) ++ ++1) Added check for really old ports in PMGRrAddDependencies that ++aborts portmanager and provides suggestion on how to update manually. ++This is to fix a seg fault when @comment DEPORIGIN: is missing in ++a port's +CONTENTS file ++ ++2) Incorporated Alistair Sutton's ++code that adds interactive update option "portmanager -ui". ++ ++3) Slowly switching license from GNU to BSD. ++ ++from 0.2.9 to 0.2.9_2 (March 2005) ++ ++from 0.2.9 to 0.2.9_1 (March 2005) ++ ++ 1) Added warnings if portmanager is not run as root + + from 0.2.8 to 0.2.9 (February 2005) + +@@ -23,7 +49,7 @@ + + 2) Added conflict handling when upgrading ports + +- 3) If running in xter, now indicates %done in title bar. ++ 3) If running in xterm, now indicates %done in title bar. + + from 0.2.6 to 0.2.7 (February 2005) + +@@ -33,7 +59,7 @@ + + from 0.2.5 to 0.2.6 (February 2005) + +- Added -sl and -slid options to help users safely remove uneeded ++ Added -sl and -slid options to help users safely remove unneeded + ports ports from their system. + + from 0.2.4 to 0.2.5 (February 2005) +@@ -51,7 +77,7 @@ + + from 0.2.2 to 0.2.3 (January 2005) + +- Major rewrite of libMG routines. Now most datbase related code is ++ Major rewrite of libMG routines. Now most database related code is + object oriented, this will simplify adding user requested features + in future releases. + +@@ -63,7 +89,7 @@ + for an index to the others. Be warned, many still need to be written, + I'll try to add a few with each new version of portmanager. + +- One final thing, found a major openfile leak while running pmstatus ++ One final thing, found a major open file leak while running pmstatus + which is run once with portmanager -s or several times with + portmanager -u. In this version (0.2.3) pmstatus and pmupgrade were + merged into portmanager and the open files grew to: +@@ -73,7 +99,7 @@ + After tracking down the problem and fixing it individual ports seem + to build faster. It is likely that previous versions of portmanager + caused a few ports to fail to build because it was hogging too many +- open file handles, if so I appologize and promise to tighly monitor ++ open file handles, if so I apologize and promise to tightly monitor + memory leaks and open files in future versions. BTW, this version under + extensive monitoring with top and fstat -p shows no leakage at all in my + initial tests. +@@ -97,10 +123,10 @@ + + 5) pmupgrade.c fixed hard coded paths + +- 6) pmupgrade.c Major cleanup of code, seperated upgrade routine into ++ 6) pmupgrade.c Major cleanup of code, separated upgrade routine into + upgrade, checkForOldDepencies, and doUpgrade routines. + +- 7) fixed portmanager seg faulting when it selfupdates. (thanks to ++ 7) fixed portmanager seg faulting when it self updates. (thanks to + "Noah" for reporting + + from 0.2.0 to 0.2.1 (December 2004) +@@ -110,7 +136,7 @@ + + 2) Replaced html docs with a portmanager.1 man page. + +- 3) Eleminated several useless header files ++ 3) Eliminated several useless header files + + 4) Added better error checking or /var/db/{portname}/+CONTENTS + files +@@ -120,13 +146,13 @@ + from 0.1.9 to 0.2.0 + + added patches (with some mods) provided by Gudin Francis to +- pmupgrade.c (add error checking durring make) and ++ pmupgrade.c (add error checking during make) and + PMGRrMakeDescribe (modify's how make describe is called by + placing options before target) + + reworked config file, now renamed to pm-020.conf + +- added -pkgadd switch though this may not be a permament change ++ added -pkgadd switch though this may not be a permanent change + yet. + + from 0.1.8 to 0.1.9 +@@ -155,9 +181,9 @@ + + from 0.1.4 to 0.1.5 + +- if pmStatus receives a segfault it will reset the cache +- automatically. pmUpgrade and portmanager -s will automatically +- retry pmStatus one time after a cache reset. ++ if pmstatus receives a seg fault it will reset the cache ++ automatically. pmupgrade and portmanager -s will automatically ++ retry pmstatus one time after a cache reset. + + from 0.1.3 to 0.1.4 + +@@ -202,10 +228,10 @@ + + April 20, 2004 + +- 1 Added portmanager the executable which serves to run pmUpgrade +- and pmStatus. ++ 1 Added portmanager the executable which serves to run pmupgrade ++ and pmstatus. + +- 2 Renamed port from portManager to portmanager because the cap ++ 2 Renamed port from portmanager to portmanager because the cap + in the middle may be annoying to remember for users running it + from the command line. + +diff -ruN ../../0.2.9_3/portmanager/NEWS ./NEWS +--- ../../0.2.9_3/portmanager/NEWS Wed Apr 6 19:50:14 2005 ++++ ./NEWS Fri Apr 22 12:31:39 2005 +@@ -1,5 +1,14 @@ + change log + ++from 0.2.9_3 to 0.2.9_4 (April 2005) ++ ++1) Improved warning message if a +CONTENTS file is missing in PMGRrVerifyContentsFile.c ++ ++2) PMGRrAddDependencies.c changed way stringSize is calculated for portDependency variable ++to eliminate a potential buffer over run. While I have never duplicated a buffer overrun ++the portmanager.core file received from "TJ Varghese" from a FreeBSD ++4.11 system proves it is possible. ++ + + from 0.2.9_2 to 0.2.9_3 (March 2005) + +@@ -40,7 +49,7 @@ + + 2) Added conflict handling when upgrading ports + +- 3) If running in xter, now indicates %done in title bar. ++ 3) If running in xterm, now indicates %done in title bar. + + from 0.2.6 to 0.2.7 (February 2005) + +@@ -50,7 +59,7 @@ + + from 0.2.5 to 0.2.6 (February 2005) + +- Added -sl and -slid options to help users safely remove uneeded ++ Added -sl and -slid options to help users safely remove unneeded + ports ports from their system. + + from 0.2.4 to 0.2.5 (February 2005) +@@ -68,7 +77,7 @@ + + from 0.2.2 to 0.2.3 (January 2005) + +- Major rewrite of libMG routines. Now most datbase related code is ++ Major rewrite of libMG routines. Now most database related code is + object oriented, this will simplify adding user requested features + in future releases. + +@@ -80,7 +89,7 @@ + for an index to the others. Be warned, many still need to be written, + I'll try to add a few with each new version of portmanager. + +- One final thing, found a major openfile leak while running pmstatus ++ One final thing, found a major open file leak while running pmstatus + which is run once with portmanager -s or several times with + portmanager -u. In this version (0.2.3) pmstatus and pmupgrade were + merged into portmanager and the open files grew to: +@@ -90,7 +99,7 @@ + After tracking down the problem and fixing it individual ports seem + to build faster. It is likely that previous versions of portmanager + caused a few ports to fail to build because it was hogging too many +- open file handles, if so I appologize and promise to tighly monitor ++ open file handles, if so I apologize and promise to tightly monitor + memory leaks and open files in future versions. BTW, this version under + extensive monitoring with top and fstat -p shows no leakage at all in my + initial tests. +@@ -114,10 +123,10 @@ + + 5) pmupgrade.c fixed hard coded paths + +- 6) pmupgrade.c Major cleanup of code, seperated upgrade routine into ++ 6) pmupgrade.c Major cleanup of code, separated upgrade routine into + upgrade, checkForOldDepencies, and doUpgrade routines. + +- 7) fixed portmanager seg faulting when it selfupdates. (thanks to ++ 7) fixed portmanager seg faulting when it self updates. (thanks to + "Noah" for reporting + + from 0.2.0 to 0.2.1 (December 2004) +@@ -127,7 +136,7 @@ + + 2) Replaced html docs with a portmanager.1 man page. + +- 3) Eleminated several useless header files ++ 3) Eliminated several useless header files + + 4) Added better error checking or /var/db/{portname}/+CONTENTS + files +@@ -137,13 +146,13 @@ + from 0.1.9 to 0.2.0 + + added patches (with some mods) provided by Gudin Francis to +- pmupgrade.c (add error checking durring make) and ++ pmupgrade.c (add error checking during make) and + PMGRrMakeDescribe (modify's how make describe is called by + placing options before target) + + reworked config file, now renamed to pm-020.conf + +- added -pkgadd switch though this may not be a permament change ++ added -pkgadd switch though this may not be a permanent change + yet. + + from 0.1.8 to 0.1.9 +@@ -172,9 +181,9 @@ + + from 0.1.4 to 0.1.5 + +- if pmStatus receives a segfault it will reset the cache +- automatically. pmUpgrade and portmanager -s will automatically +- retry pmStatus one time after a cache reset. ++ if pmstatus receives a seg fault it will reset the cache ++ automatically. pmupgrade and portmanager -s will automatically ++ retry pmstatus one time after a cache reset. + + from 0.1.3 to 0.1.4 + +@@ -219,10 +228,10 @@ + + April 20, 2004 + +- 1 Added portmanager the executable which serves to run pmUpgrade +- and pmStatus. ++ 1 Added portmanager the executable which serves to run pmupgrade ++ and pmstatus. + +- 2 Renamed port from portManager to portmanager because the cap ++ 2 Renamed port from portmanager to portmanager because the cap + in the middle may be annoying to remember for users running it + from the command line. + +diff -ruN ../../0.2.9_3/portmanager/libPMGR/src/PMGRrAddDependencies.c ./libPMGR/src/PMGRrAddDependencies.c +--- ../../0.2.9_3/portmanager/libPMGR/src/PMGRrAddDependencies.c Wed Apr 6 19:50:14 2005 ++++ ./libPMGR/src/PMGRrAddDependencies.c Fri Apr 22 12:30:40 2005 +@@ -102,11 +102,20 @@ + while( ( portDependency = strnstr( buffPtr, "@pkgdep ", bufferSize - (buffPtr - buffer) ) ) ) + { + portDependency += strlen( "@pkgdep " ); ++ ++/* + stringSize = strstr( portDependency, "\n" ) - portDependency; + if(stringSize < 1) + { + break; + } ++*/ ++ stringSize = 0; ++ while( portDependency[stringSize] != LINEFEED && stringSize < 256 ) ++ { ++ stringSize++; ++ } ++ + portDependency[stringSize] = 0; + + buffPtr = portDependency + stringSize + 1; +@@ -173,4 +182,5 @@ + } + return(0); + } ++ + +diff -ruN ../../0.2.9_3/portmanager/libPMGR/src/PMGRrVerifyContentsFile.c ./libPMGR/src/PMGRrVerifyContentsFile.c +--- ../../0.2.9_3/portmanager/libPMGR/src/PMGRrVerifyContentsFile.c Wed Apr 6 19:50:14 2005 ++++ ./libPMGR/src/PMGRrVerifyContentsFile.c Fri Apr 22 12:09:41 2005 +@@ -34,6 +34,7 @@ + int stringSize = 0; + signed int fopenIdx = 0; + signed int mallocIdx = 0; ++ pid_t pid; + + stringSize = strlen(PKGDBDIR) + + strlen("/") +@@ -72,7 +73,15 @@ + { + fprintf( stderr, "%s %s error: could not open %s\n", id, VERSION, contentsFileName ); + perror( "system message" ); +- assert(0); ++ pid = fork(); ++ if( !pid ) ++ { ++ execl( "/usr/sbin/pkg_info", "pkg_info", portName, 0 ); ++ } ++ wait( pid ); ++ fprintf( stderr, "%s %s error: portmanager cannot continue, recommend you manually reinstall %s\n", id, VERSION, portName ); ++ free( contentsFileName ); ++ exit( 1 ); + } + + bufferSize = MGrFileSize( contentsFileName ); +diff -ruN ../../0.2.9_3/portmanager/patch-0.2.9_4 ./patch-0.2.9_4 +--- ../../0.2.9_3/portmanager/patch-0.2.9_4 Wed Dec 31 16:00:00 1969 ++++ ./patch-0.2.9_4 Fri Apr 22 12:32:26 2005 +@@ -0,0 +1,333 @@ ++diff -ruN ../../0.2.9_3/portmanager/ChangeLog ./ChangeLog ++--- ../../0.2.9_3/portmanager/ChangeLog Wed Apr 6 19:50:14 2005 +++++ ./ChangeLog Fri Apr 22 12:32:22 2005 ++@@ -1,6 +1,32 @@ ++ change log ++ ++-NOTE to self: Monitor from 0.2.1 to 0.2.2 item 3. +++from 0.2.9_3 to 0.2.9_4 (April 2005) +++ +++1) Improved warning message if a +CONTENTS file is missing in PMGRrVerifyContentsFile.c +++ +++2) PMGRrAddDependencies.c changed way stringSize is calculated for portDependency variable +++to eliminate a potential buffer over run. While I have never duplicated a buffer overrun +++the portmanager.core file received from "TJ Varghese" from a FreeBSD +++4.11 system proves it is possible. +++ +++ +++from 0.2.9_2 to 0.2.9_3 (March 2005) +++ +++1) Added check for really old ports in PMGRrAddDependencies that +++aborts portmanager and provides suggestion on how to update manually. +++This is to fix a seg fault when @comment DEPORIGIN: is missing in +++a port's +CONTENTS file +++ +++2) Incorporated Alistair Sutton's +++code that adds interactive update option "portmanager -ui". +++ +++3) Slowly switching license from GNU to BSD. +++ +++from 0.2.9 to 0.2.9_2 (March 2005) +++ +++from 0.2.9 to 0.2.9_1 (March 2005) +++ +++ 1) Added warnings if portmanager is not run as root ++ ++ from 0.2.8 to 0.2.9 (February 2005) ++ ++@@ -23,7 +49,7 @@ ++ ++ 2) Added conflict handling when upgrading ports ++ ++- 3) If running in xter, now indicates %done in title bar. +++ 3) If running in xterm, now indicates %done in title bar. ++ ++ from 0.2.6 to 0.2.7 (February 2005) ++ ++@@ -33,7 +59,7 @@ ++ ++ from 0.2.5 to 0.2.6 (February 2005) ++ ++- Added -sl and -slid options to help users safely remove uneeded +++ Added -sl and -slid options to help users safely remove unneeded ++ ports ports from their system. ++ ++ from 0.2.4 to 0.2.5 (February 2005) ++@@ -51,7 +77,7 @@ ++ ++ from 0.2.2 to 0.2.3 (January 2005) ++ ++- Major rewrite of libMG routines. Now most datbase related code is +++ Major rewrite of libMG routines. Now most database related code is ++ object oriented, this will simplify adding user requested features ++ in future releases. ++ ++@@ -63,7 +89,7 @@ ++ for an index to the others. Be warned, many still need to be written, ++ I'll try to add a few with each new version of portmanager. ++ ++- One final thing, found a major openfile leak while running pmstatus +++ One final thing, found a major open file leak while running pmstatus ++ which is run once with portmanager -s or several times with ++ portmanager -u. In this version (0.2.3) pmstatus and pmupgrade were ++ merged into portmanager and the open files grew to: ++@@ -73,7 +99,7 @@ ++ After tracking down the problem and fixing it individual ports seem ++ to build faster. It is likely that previous versions of portmanager ++ caused a few ports to fail to build because it was hogging too many ++- open file handles, if so I appologize and promise to tighly monitor +++ open file handles, if so I apologize and promise to tightly monitor ++ memory leaks and open files in future versions. BTW, this version under ++ extensive monitoring with top and fstat -p shows no leakage at all in my ++ initial tests. ++@@ -97,10 +123,10 @@ ++ ++ 5) pmupgrade.c fixed hard coded paths ++ ++- 6) pmupgrade.c Major cleanup of code, seperated upgrade routine into +++ 6) pmupgrade.c Major cleanup of code, separated upgrade routine into ++ upgrade, checkForOldDepencies, and doUpgrade routines. ++ ++- 7) fixed portmanager seg faulting when it selfupdates. (thanks to +++ 7) fixed portmanager seg faulting when it self updates. (thanks to ++ "Noah" for reporting ++ ++ from 0.2.0 to 0.2.1 (December 2004) ++@@ -110,7 +136,7 @@ ++ ++ 2) Replaced html docs with a portmanager.1 man page. ++ ++- 3) Eleminated several useless header files +++ 3) Eliminated several useless header files ++ ++ 4) Added better error checking or /var/db/{portname}/+CONTENTS ++ files ++@@ -120,13 +146,13 @@ ++ from 0.1.9 to 0.2.0 ++ ++ added patches (with some mods) provided by Gudin Francis to ++- pmupgrade.c (add error checking durring make) and +++ pmupgrade.c (add error checking during make) and ++ PMGRrMakeDescribe (modify's how make describe is called by ++ placing options before target) ++ ++ reworked config file, now renamed to pm-020.conf ++ ++- added -pkgadd switch though this may not be a permament change +++ added -pkgadd switch though this may not be a permanent change ++ yet. ++ ++ from 0.1.8 to 0.1.9 ++@@ -155,9 +181,9 @@ ++ ++ from 0.1.4 to 0.1.5 ++ ++- if pmStatus receives a segfault it will reset the cache ++- automatically. pmUpgrade and portmanager -s will automatically ++- retry pmStatus one time after a cache reset. +++ if pmstatus receives a seg fault it will reset the cache +++ automatically. pmupgrade and portmanager -s will automatically +++ retry pmstatus one time after a cache reset. ++ ++ from 0.1.3 to 0.1.4 ++ ++@@ -202,10 +228,10 @@ ++ ++ April 20, 2004 ++ ++- 1 Added portmanager the executable which serves to run pmUpgrade ++- and pmStatus. +++ 1 Added portmanager the executable which serves to run pmupgrade +++ and pmstatus. ++ ++- 2 Renamed port from portManager to portmanager because the cap +++ 2 Renamed port from portmanager to portmanager because the cap ++ in the middle may be annoying to remember for users running it ++ from the command line. ++ ++diff -ruN ../../0.2.9_3/portmanager/NEWS ./NEWS ++--- ../../0.2.9_3/portmanager/NEWS Wed Apr 6 19:50:14 2005 +++++ ./NEWS Fri Apr 22 12:31:39 2005 ++@@ -1,5 +1,14 @@ ++ change log ++ +++from 0.2.9_3 to 0.2.9_4 (April 2005) +++ +++1) Improved warning message if a +CONTENTS file is missing in PMGRrVerifyContentsFile.c +++ +++2) PMGRrAddDependencies.c changed way stringSize is calculated for portDependency variable +++to eliminate a potential buffer over run. While I have never duplicated a buffer overrun +++the portmanager.core file received from "TJ Varghese" from a FreeBSD +++4.11 system proves it is possible. +++ ++ ++ from 0.2.9_2 to 0.2.9_3 (March 2005) ++ ++@@ -40,7 +49,7 @@ ++ ++ 2) Added conflict handling when upgrading ports ++ ++- 3) If running in xter, now indicates %done in title bar. +++ 3) If running in xterm, now indicates %done in title bar. ++ ++ from 0.2.6 to 0.2.7 (February 2005) ++ ++@@ -50,7 +59,7 @@ ++ ++ from 0.2.5 to 0.2.6 (February 2005) ++ ++- Added -sl and -slid options to help users safely remove uneeded +++ Added -sl and -slid options to help users safely remove unneeded ++ ports ports from their system. ++ ++ from 0.2.4 to 0.2.5 (February 2005) ++@@ -68,7 +77,7 @@ ++ ++ from 0.2.2 to 0.2.3 (January 2005) ++ ++- Major rewrite of libMG routines. Now most datbase related code is +++ Major rewrite of libMG routines. Now most database related code is ++ object oriented, this will simplify adding user requested features ++ in future releases. ++ ++@@ -80,7 +89,7 @@ ++ for an index to the others. Be warned, many still need to be written, ++ I'll try to add a few with each new version of portmanager. ++ ++- One final thing, found a major openfile leak while running pmstatus +++ One final thing, found a major open file leak while running pmstatus ++ which is run once with portmanager -s or several times with ++ portmanager -u. In this version (0.2.3) pmstatus and pmupgrade were ++ merged into portmanager and the open files grew to: ++@@ -90,7 +99,7 @@ ++ After tracking down the problem and fixing it individual ports seem ++ to build faster. It is likely that previous versions of portmanager ++ caused a few ports to fail to build because it was hogging too many ++- open file handles, if so I appologize and promise to tighly monitor +++ open file handles, if so I apologize and promise to tightly monitor ++ memory leaks and open files in future versions. BTW, this version under ++ extensive monitoring with top and fstat -p shows no leakage at all in my ++ initial tests. ++@@ -114,10 +123,10 @@ ++ ++ 5) pmupgrade.c fixed hard coded paths ++ ++- 6) pmupgrade.c Major cleanup of code, seperated upgrade routine into +++ 6) pmupgrade.c Major cleanup of code, separated upgrade routine into ++ upgrade, checkForOldDepencies, and doUpgrade routines. ++ ++- 7) fixed portmanager seg faulting when it selfupdates. (thanks to +++ 7) fixed portmanager seg faulting when it self updates. (thanks to ++ "Noah" for reporting ++ ++ from 0.2.0 to 0.2.1 (December 2004) ++@@ -127,7 +136,7 @@ ++ ++ 2) Replaced html docs with a portmanager.1 man page. ++ ++- 3) Eleminated several useless header files +++ 3) Eliminated several useless header files ++ ++ 4) Added better error checking or /var/db/{portname}/+CONTENTS ++ files ++@@ -137,13 +146,13 @@ ++ from 0.1.9 to 0.2.0 ++ ++ added patches (with some mods) provided by Gudin Francis to ++- pmupgrade.c (add error checking durring make) and +++ pmupgrade.c (add error checking during make) and ++ PMGRrMakeDescribe (modify's how make describe is called by ++ placing options before target) ++ ++ reworked config file, now renamed to pm-020.conf ++ ++- added -pkgadd switch though this may not be a permament change +++ added -pkgadd switch though this may not be a permanent change ++ yet. ++ ++ from 0.1.8 to 0.1.9 ++@@ -172,9 +181,9 @@ ++ ++ from 0.1.4 to 0.1.5 ++ ++- if pmStatus receives a segfault it will reset the cache ++- automatically. pmUpgrade and portmanager -s will automatically ++- retry pmStatus one time after a cache reset. +++ if pmstatus receives a seg fault it will reset the cache +++ automatically. pmupgrade and portmanager -s will automatically +++ retry pmstatus one time after a cache reset. ++ ++ from 0.1.3 to 0.1.4 ++ ++@@ -219,10 +228,10 @@ ++ ++ April 20, 2004 ++ ++- 1 Added portmanager the executable which serves to run pmUpgrade ++- and pmStatus. +++ 1 Added portmanager the executable which serves to run pmupgrade +++ and pmstatus. ++ ++- 2 Renamed port from portManager to portmanager because the cap +++ 2 Renamed port from portmanager to portmanager because the cap ++ in the middle may be annoying to remember for users running it ++ from the command line. ++ ++diff -ruN ../../0.2.9_3/portmanager/libPMGR/src/PMGRrAddDependencies.c ./libPMGR/src/PMGRrAddDependencies.c ++--- ../../0.2.9_3/portmanager/libPMGR/src/PMGRrAddDependencies.c Wed Apr 6 19:50:14 2005 +++++ ./libPMGR/src/PMGRrAddDependencies.c Fri Apr 22 12:30:40 2005 ++@@ -102,11 +102,20 @@ ++ while( ( portDependency = strnstr( buffPtr, "@pkgdep ", bufferSize - (buffPtr - buffer) ) ) ) ++ { ++ portDependency += strlen( "@pkgdep " ); +++ +++/* ++ stringSize = strstr( portDependency, "\n" ) - portDependency; ++ if(stringSize < 1) ++ { ++ break; ++ } +++*/ +++ stringSize = 0; +++ while( portDependency[stringSize] != LINEFEED && stringSize < 256 ) +++ { +++ stringSize++; +++ } +++ ++ portDependency[stringSize] = 0; ++ ++ buffPtr = portDependency + stringSize + 1; ++@@ -173,4 +182,5 @@ ++ } ++ return(0); ++ } +++ ++ ++diff -ruN ../../0.2.9_3/portmanager/libPMGR/src/PMGRrVerifyContentsFile.c ./libPMGR/src/PMGRrVerifyContentsFile.c ++--- ../../0.2.9_3/portmanager/libPMGR/src/PMGRrVerifyContentsFile.c Wed Apr 6 19:50:14 2005 +++++ ./libPMGR/src/PMGRrVerifyContentsFile.c Fri Apr 22 12:09:41 2005 ++@@ -34,6 +34,7 @@ ++ int stringSize = 0; ++ signed int fopenIdx = 0; ++ signed int mallocIdx = 0; +++ pid_t pid; ++ ++ stringSize = strlen(PKGDBDIR) ++ + strlen("/") ++@@ -72,7 +73,15 @@ ++ { ++ fprintf( stderr, "%s %s error: could not open %s\n", id, VERSION, contentsFileName ); ++ perror( "system message" ); ++- assert(0); +++ pid = fork(); +++ if( !pid ) +++ { +++ execl( "/usr/sbin/pkg_info", "pkg_info", portName, 0 ); +++ } +++ wait( pid ); +++ fprintf( stderr, "%s %s error: portmanager cannot continue, recommend you manually reinstall %s\n", id, VERSION, portName ); +++ free( contentsFileName ); +++ exit( 1 ); ++ } ++ ++ bufferSize = MGrFileSize( contentsFileName ); +diff -ruN ../../0.2.9_3/portmanager/rePackage.sh ./rePackage.sh +--- ../../0.2.9_3/portmanager/rePackage.sh Wed Apr 6 19:50:14 2005 ++++ ./rePackage.sh Mon Apr 18 12:15:09 2005 +@@ -1,31 +1,35 @@ + #!/bin/sh + +-echo /usr/local/bin/autoheader259 ++echo "sh cleanUp.sh" ++ sh cleanUp.sh ++ ++echo "touch NEWS README AUTHORS ChangeLog THANKS" ++ touch NEWS README AUTHORS ChangeLog THANKS ++ ++echo "/usr/local/bin/autoheader259" + /usr/local/bin/autoheader259 + +-echo /usr/local/bin/aclocal19 +- /usr/local/bin/aclocal19 ++echo "/usr/local/bin/aclocal15" ++ /usr/local/bin/aclocal15 ++ ++echo "cat /usr/local/share/aclocal/libtool15.m4 >> acinclude.m4" ++ cat /usr/local/share/aclocal/libtool15.m4 >> acinclude.m4 + + echo "cat acinclude.m4 >> aclocal.m4" + cat acinclude.m4 >> aclocal.m4 + +-echo /usr/local/bin/libtoolize15 --force --copy ++echo "/usr/local/bin/libtoolize15 --force --copy" + /usr/local/bin/libtoolize15 --force --copy + +-echo /usr/local/bin/automake19 --add-missing --copy +- /usr/local/bin/automake19 --add-missing --copy ++echo "/usr/local/bin/automake15 --add-missing --copy" ++ /usr/local/bin/automake15 --add-missing --copy + +-echo /usr/local/bin/autoconf259 ++echo "/usr/local/bin/autoconf259" + /usr/local/bin/autoconf259 + +-#echo ./configure +-# ./configure ++echo "./configure --with-debug" ++ ./configure --with-debug + +-#echo make +-# make ++echo "make" ++ make + +-#echo make dist +-# make dist +- +-#echo make clean +-# make clean --- portmanager-0.2.9_4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: