Date: Fri, 25 Nov 2005 19:36:57 -0800 (PST) From: "Michael C. Shultz" <ringworm01@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Wes Santee <wsantee@gmail.com> Subject: ports/89564: [MAINTAINER] update sysutils/portmanager Message-ID: <20051126033657.AD936130C21@ringworm.mechee.com> Resent-Message-ID: <200511260350.jAQ3o2S5091294@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89564 >Category: ports >Synopsis: [MAINTAINER] update sysutils/portmanager >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: Sat Nov 26 03:50:02 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: Fri Nov 25 15:08:09 PST 2005 root@ringworm.mechee.com:/usr5/obj/usr5/src/sys/RINGWORM5 i386 >Description: update sysutils/portmanager to 0.3.9_2 1. fixes portmanager seg faulting if either /usr/local/etc/pkgtools.conf or /usr/local/bin/ruby are not installed. Note to comitter, adds patch-0.3.9_2 to files/ >How-To-Repeat: N/A >Fix: --- portmanager-0.3.9_2.diff begins here --- diff -ruN portmanager/Makefile portmanager-0.3.9_2/Makefile --- portmanager/Makefile Fri Nov 25 13:18:04 2005 +++ portmanager-0.3.9_2/Makefile Fri Nov 25 19:15:13 2005 @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://portmanager.sunsite.dk/distfiles/ \ ${MASTER_SITE_SOURCEFORGE} diff -ruN portmanager/files/patch-0.3.9_2 portmanager-0.3.9_2/files/patch-0.3.9_2 --- portmanager/files/patch-0.3.9_2 Wed Dec 31 16:00:00 1969 +++ portmanager-0.3.9_2/files/patch-0.3.9_2 Fri Nov 25 19:15:04 2005 @@ -0,0 +1,81 @@ +diff -ruN ../0.3.9_1/libMGPM/src/MGPMrCommandLine.c ./libMGPM/src/MGPMrCommandLine.c +--- ../0.3.9_1/libMGPM/src/MGPMrCommandLine.c Fri Nov 25 11:47:19 2005 ++++ ./libMGPM/src/MGPMrCommandLine.c Fri Nov 25 18:58:23 2005 +@@ -96,6 +96,7 @@ + property.pristine = 0; /* 1 = run in pristine mode */ + property.resume = 0; /* 1 = portmanager updated itself, don't rebuild databases in -u -f mode */ + property.timeout = 300; /* default timeout in seconds */ ++ property.NoPkgtools = 0; /* 1 = pkgtools.conf or ruby not installed */ + + if( argv[2] && strcmp( "package-depends", argv[2] ) == 0 ) + { +diff -ruN ../0.3.9_1/libMGPM/src/MGPMrReadConfigure.c ./libMGPM/src/MGPMrReadConfigure.c +--- ../0.3.9_1/libMGPM/src/MGPMrReadConfigure.c Fri Nov 25 11:47:19 2005 ++++ ./libMGPM/src/MGPMrReadConfigure.c Fri Nov 25 19:06:25 2005 +@@ -164,16 +164,27 @@ + strcat( command, "/pkgtools.db" ); + rReadConfigureAwkConfigure( property, configFileNameOld, command ); + } ++ else ++ { ++ property->NoPkgtools = 1; ++ } ++ } ++ else ++ { ++ property->NoPkgtools = 1; + } +- + strcpy( command, SHAREDIR ); + strcat( command, "/pkgtools.db" ); +- rReadConfigureCleanPkgToolsDb( property, command ); +- strcpy( command, "cat " ); +- strcat( command, SHAREDIR ); +- strcat( command, "/pkgtools.db >>" ); +- strcat( command, property->configDbFileName ); +- system( command ); ++ ++ if( property->NoPkgtools == 0 ) ++ { ++ rReadConfigureCleanPkgToolsDb( property, command ); ++ strcpy( command, "cat " ); ++ strcat( command, SHAREDIR ); ++ strcat( command, "/pkgtools.db >>" ); ++ strcat( command, property->configDbFileName ); ++ system( command ); ++ } + + /* + strcpy( command, "rm -f " ); +@@ -441,8 +452,16 @@ + + value = calloc( 0xfff, 1 ); + +- pkgtoolsDb = MGdbOpen( pkgtoolsFileName ); +- pkgtoolsQTY = MGdbGetRecordQty( pkgtoolsDb ); ++ if( MGrIfFileExist( pkgtoolsFileName ) ) ++ { ++ pkgtoolsDb = MGdbOpen( pkgtoolsFileName ); ++ pkgtoolsQTY = MGdbGetRecordQty( pkgtoolsDb ); ++ } ++ else ++ { ++ free( value ); ++ return( 1 ); ++ } + + while( pkgtoolsIDX < pkgtoolsQTY ) + { +diff -ruN ../0.3.9_1/libMGPM/src/libMGPM.h ./libMGPM/src/libMGPM.h +--- ../0.3.9_1/libMGPM/src/libMGPM.h Fri Nov 25 11:47:19 2005 ++++ ./libMGPM/src/libMGPM.h Fri Nov 25 18:57:49 2005 +@@ -146,7 +146,8 @@ + char* configConfFileName; + char* helpFile; + int timeOut; /* see MGPMrGetPortName.c */ +- ++ int NoPkgtools; /* 1 = pkgtools.conf or ruby not installed */ ++ + /* + * data base structures/file names/fieldnames + */ --- portmanager-0.3.9_2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051126033657.AD936130C21>