ports/78387: [MAINTAINER] sysutils/portmanager update to 0.2.9_2
ringworm01 at gmail.com
ringworm01 at gmail.com
Fri Mar 4 03:50:05 UTC 2005
>Number: 78387
>Category: ports
>Synopsis: [MAINTAINER] sysutils/portmanager update to 0.2.9_2
>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 Mar 04 03:50:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Michael C. Shultz
>Release: FreeBSD 5.4-PRERELEASE i386
>Organization:
MojaveGreen Software Co.
>Environment:
System: FreeBSD ringworm.mechee.com 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Thu Feb 24 05:35:32 PST 2005 root at ringworm.mechee.com:/ROUTER/obj/usr/src/sys/RINGWORM i386
>Description:
sysutils/portmanager update to 0.2.9_2
note to committer: please add files/patch-0.2.9_2
1) Patch fixes bug where IGNORE entries in pm-020.conf are being missed
Thanks to "Blazing Shellz" <blazingshellz at hotmail.com> for reporting it.
>How-To-Repeat:
Try to add IGNORE|lang/perl5.8| to pm-020.conf
>Fix:
--- portmanager-0.2.9_2.diff begins here ---
diff -ruN portmanager/Makefile portmanager-0.2.9_2/Makefile
--- portmanager/Makefile Thu Mar 3 00:51:59 2005
+++ portmanager-0.2.9_2/Makefile Thu Mar 3 19:03:12 2005
@@ -7,7 +7,7 @@
PORTNAME= portmanager
PORTVERSION= 0.2.9
-PORTREVISION= 1
+PORTREVISION= 2
#-----------------------------------------
#for local use, remove before submitting PR
CATEGORIES= sysutils
diff -ruN portmanager/files/patch-0.2.9_2 portmanager-0.2.9_2/files/patch-0.2.9_2
--- portmanager/files/patch-0.2.9_2 Wed Dec 31 16:00:00 1969
+++ portmanager-0.2.9_2/files/patch-0.2.9_2 Thu Mar 3 19:26:49 2005
@@ -0,0 +1,80 @@
+diff -ruN --exclude=Makefile.in --exclude=externVars.h.in --exclude=config.h.in --exclude=config.h.in~ --exclude=Makefile ./libPMGR/src/PMGRrDbCreate.c ../../0.2.9_2/portmanager/libPMGR/src/PMGRrDbCreate.c
+--- ./libPMGR/src/PMGRrDbCreate.c Wed Mar 2 15:38:33 2005
++++ ../../0.2.9_2/portmanager/libPMGR/src/PMGRrDbCreate.c Thu Mar 3 19:25:56 2005
+@@ -28,6 +28,7 @@
+ char pkgDir[] = PKGDBDIR;
+ char* fieldKey = NULL;
+ char* fieldValue = NULL;
++ char* ignoredPortDir = NULL;
+ char* installedPortDir = NULL;
+ char* installedPortName = NULL;
+ classDir* dir = NULL;
+@@ -35,39 +36,57 @@
+ int QTY_configDb = 0;
+ int dirMode = 7;
+ int errorCode = 0;
++ int stringSize = 0;
+ signed int fopenIdx = 0;
+ signed int mallocIdx = 0;
+
+ property->objIdx = 0;
+
+- /***************************************************************/
+- /* add any ignored ports in config.db to ignore.db */
+- /***************************************************************/
++ /*
++ * add any ignored ports in config.db to ignore.db
++ */
+ IDX_configDb = 1;
+ QTY_configDb = MGdbGetRecordQty( property->configDb );
+
+-
+ while( IDX_configDb < QTY_configDb )
+ {
+ fieldKey = MGdbGet( property->configDb, IDX_configDb, property->fieldKey );
+- if( !strcmp( fieldKey, "IGNORE" ) )
++ if( strstr( fieldKey, "IGNORE" ) )
+ {
+ fieldValue = MGdbGet( property->configDb, IDX_configDb, property->fieldValue );
++
++ if( fieldValue[0] != '/' )
++ {
++ stringSize = 1 + strlen( fieldValue ) + 1;
++ ignoredPortDir = malloc( stringSize );
++ ignoredPortDir[0] = 0;
++ strcat( ignoredPortDir, "/" );
++ strcat( ignoredPortDir, fieldValue );
++ }
++ else
++ {
++ stringSize = strlen( fieldValue ) + 1;
++ ignoredPortDir = malloc( stringSize );
++ ignoredPortDir[0] = 0;
++ strcat( ignoredPortDir, fieldValue );
++ }
++
+ MGdbGoTop( property->ignoreDb );
+- if( !MGdbSeek( property->ignoreDb, property->fieldIgnorePortDir, fieldValue,
++ if( !MGdbSeek( property->ignoreDb, property->fieldIgnorePortDir, ignoredPortDir,
+ property->fieldIgnorePortDir ) )
+ {
+ fprintf( stdout, "%s %s info: adding %s to ignore.db reason: pm-020.conf option\n",
+- id, VERSION, fieldValue );
+- MGdbAdd( property->ignoreDb, fieldValue, "pm-020.conf option", NULL );
++ id, VERSION, ignoredPortDir );
++ MGdbAdd( property->ignoreDb, ignoredPortDir, "pm-020.conf option", NULL );
+ }
++ free( ignoredPortDir );
+ }
+ IDX_configDb++;
+ }
+
+- /***************************************************************/
+- /* create initial data bases */
+- /***************************************************************/
++ /*
++ * create initial data bases
++ */
+
+ /*zzzzzzzzzzzzzz*/
+ property->objIdx++;
--- portmanager-0.2.9_2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list