Date: Sat, 26 Nov 2005 14:24:06 -0800 (PST) From: "Michael C. Shultz" <ringworm01@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gerard Seibert <gerard@seibercom.net> Subject: ports/89609: [MAINTAINER] update sysutils/portmanager Message-ID: <20051126222406.62688130C2B@ringworm.mechee.com> Resent-Message-ID: <200511262240.jAQMe27f073718@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89609 >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 22:40: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_3 1. Fixes bug where if run with -f switch when portmanager updates itsself goes into endless loop. Thanks to Gerard Seibert for helping to track this one down! Note to comitter: Adds files/patch-0.3.9_3 >How-To-Repeat: N/A >Fix: --- portmanager-0.3.9_3.diff begins here --- diff -ruN portmanager/Makefile portmanager-0.3.9_3/Makefile --- portmanager/Makefile Sat Nov 26 04:47:07 2005 +++ portmanager-0.3.9_3/Makefile Sat Nov 26 14:15:56 2005 @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.3.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://portmanager.sunsite.dk/distfiles/ \ ${MASTER_SITE_SOURCEFORGE} diff -ruN portmanager/files/patch-0.3.9_3 portmanager-0.3.9_3/files/patch-0.3.9_3 --- portmanager/files/patch-0.3.9_3 Wed Dec 31 16:00:00 1969 +++ portmanager-0.3.9_3/files/patch-0.3.9_3 Sat Nov 26 14:15:45 2005 @@ -0,0 +1,58 @@ +diff -ruN ../0.3.9_2/libMGPM/src/MGPMrUpdate.c ./libMGPM/src/MGPMrUpdate.c +--- ../0.3.9_2/libMGPM/src/MGPMrUpdate.c Sat Nov 26 04:48:47 2005 ++++ ./libMGPM/src/MGPMrUpdate.c Sat Nov 26 13:43:36 2005 +@@ -78,16 +78,6 @@ + int installedPortsDbQTY = 0; + + structLocalProperty localProperty; +-/* +-fprintf( stdout, "%s debug: oldPortDir-=>%s\n", id, oldPortDir ); +-while( fflush( stdout ) ); +-*/ +- if( ( strcmp( "/sysutils/portmanager", oldPortDir ) == 0 || strcmp( "/local/sysutils/portmanager", oldPortDir ) == 0 ) && property->forced ) +- { +- fprintf( stdout, "skipping portmanager, will not self update in forced mode by design\n" ); +- while( fflush( stdout ) ); +- return( 0 ); +- } + + property->optionsChanged = 0; + +@@ -118,6 +108,19 @@ + property->installedPortsDb = MGdbOpen( property->installedPortsDbFileName ); + property->strikesDb = MGdbOpen( property->strikesDbFileName ); + ++ ++ if( ( strcmp( "/sysutils/portmanager", oldPortDir ) == 0 || strcmp( "/local/sysutils/portmanager", oldPortDir ) == 0 ) && property->forced ) ++ { ++ fprintf( stdout, "ignoring portmanager, will not self update in forced mode by design\n" ); ++ MGPMlogAdd( property, "ignoring portmanager ", "will not self update in forced mode by design", ++ oldPortDir, "added to ignore.db", " " ); ++ ++ MGdbAdd( property->ignoreDb, oldPortDir, "skipping portmanager, will not self update in forced mode by design\n", NULL ); ++ while( fflush( stdout ) ); ++ rCleanUp( property, &localProperty ); ++ return( 0 ); ++ } ++ + /* + * test for bsd.ports.mk patch + */ +@@ -418,16 +421,7 @@ + * options changed so need to purge oldPortDir's records + * from availablePortsDb and availableDependenciesDb + */ +- if( property->log ) +- { +- strcpy( localProperty.command, "echo \" options changed so returning " ); +- strcat( localProperty.command, oldPortName ); +- strcat( localProperty.command, " " ); +- strcat( localProperty.command, oldPortDir ); +- strcat( localProperty.command, " to out of date pool " ); +- strcat( localProperty.command, " \">> /var/log/portmanager.log" ); +- system( localProperty.command ); +- } ++ MGPMlogAdd( property, "options changed so returning ", oldPortName, oldPortDir, " to out of date pool ", " " ); + property->optionsChanged = 1; + MGdbGoTop( property->availablePortsDb ); + while( MGdbSeek( property->availablePortsDb, --- portmanager-0.3.9_3.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?20051126222406.62688130C2B>