diff options
Diffstat (limited to 'sysutils/portmanager/files/patch-0.3.9_7')
| -rw-r--r-- | sysutils/portmanager/files/patch-0.3.9_7 | 172 |
1 files changed, 0 insertions, 172 deletions
diff --git a/sysutils/portmanager/files/patch-0.3.9_7 b/sysutils/portmanager/files/patch-0.3.9_7 deleted file mode 100644 index 9a0ea215c9d0..000000000000 --- a/sysutils/portmanager/files/patch-0.3.9_7 +++ /dev/null @@ -1,172 +0,0 @@ -diff -ruN ../0.3.9_6/libMGPM/src/MGPMrUpdate.c ./libMGPM/src/MGPMrUpdate.c ---- ../0.3.9_6/libMGPM/src/MGPMrUpdate.c Sat Dec 3 14:45:00 2005 -+++ ./libMGPM/src/MGPMrUpdate.c Sat Dec 3 17:50:47 2005 -@@ -203,17 +203,20 @@ - property->fieldConfigDbKey, - STOP, - property->fieldConfigDbKey, -- exact ) -- && -- strncmp( oldPortDir, -- MGdbGet( property->configDb, -- MGdbGetRecno( property->configDb ) - 1, -- property->fieldConfigDbValue ), -- strlen( oldPortDir ) ) == 0 ) -+ exact ) ) - { - stopPortDirPtr = MGdbGet( property->configDb, - MGdbGetRecno( property->configDb ) - 1, - property->fieldConfigDbValue ); -+ -+ if( strncmp( oldPortDir, MGdbGet( property->configDb, -+ MGdbGetRecno( property->configDb ) - 1, -+ property->fieldConfigDbValue ), -+ strlen( oldPortDir ) ) ) -+ { -+ continue; -+ } -+ - if( stopPortDirPtr[strlen( oldPortDir )] == SPACE ) - { - strncpy( localProperty.stopPortDir, stopPortDirPtr, strlen( oldPortDir ) ); -@@ -230,17 +233,21 @@ - property->fieldConfigDbKey, - START, - property->fieldConfigDbKey, -- exact ) -- && -- strncmp( oldPortDir, -- MGdbGet( property->configDb, -- MGdbGetRecno( property->configDb ) - 1, -- property->fieldConfigDbValue ), -- strlen( oldPortDir ) ) == 0 ) -+ exact ) ) -+ - { - startPortDirPtr = MGdbGet( property->configDb, - MGdbGetRecno( property->configDb ) - 1, - property->fieldConfigDbValue ); -+ -+ if( strncmp( oldPortDir, MGdbGet( property->configDb, -+ MGdbGetRecno( property->configDb ) - 1, -+ property->fieldConfigDbValue ), -+ strlen( oldPortDir ) ) ) -+ { -+ continue; -+ } -+ - if( startPortDirPtr[strlen( oldPortDir )] == SPACE ) - { - strncpy( localProperty.startPortDir, startPortDirPtr, strlen( oldPortDir ) ); -@@ -1082,33 +1089,9 @@ - pHandle = popen( localProperty.stopPortCmd, "r" ); - fread( localProperty.buffer, bufferSize, 1, pHandle ); - pclose( pHandle ); --/* -- idx = 0; -- while( idx < bufferSize ) -- { -- if( localProperty.buffer[idx] == LINEFEED -- || -- localProperty.buffer[idx] == TAB -- || -- localProperty.buffer[idx] == SPACE ) -- { -- localProperty.buffer[idx] = 0; -- break; -- } -- idx++; -- } --*/ -- if( property->log ) -- { -- strcpy( localProperty.command, "echo \" stopping " ); -- strcat( localProperty.command, oldPortName ); -- strcat( localProperty.command, " " ); -- strcat( localProperty.command, oldPortDir ); -- strcat( localProperty.command, " execution by running " ); -- strcat( localProperty.command, localProperty.stopPortCmd ); -- strcat( localProperty.command, " \">> /var/log/portmanager.log" ); -- system( localProperty.command ); -- } -+ -+ MGPMlogAdd( property, "stopping ", oldPortName, oldPortDir, " execution by running ", localProperty.stopPortCmd ); -+ - fprintf( stdout, "%s reply: %s\n", localProperty.stopPortCmd, localProperty.buffer ); - while( fflush( stdout ) ); - } -@@ -1264,19 +1247,6 @@ - system( localProperty.command ); - } - } -- -- /* -- * 5 second time delay -- */ --/* -- property->STDIN = fopen( "/dev/STDIN", "r" ); -- signal( SIGALRM, MGPMrTimer ); -- alarm( 5 ); -- answer = getc( property->STDIN ); -- alarm(0); -- fclose( property->STDIN ); --*/ -- - strcpy( localProperty.command, "cp /tmp/*.db " ); - strcat( localProperty.command, SHAREDIR ); - fprintf( stdout, "restoring databases localProperty.command:%s\n", localProperty.command ); -@@ -1298,33 +1268,8 @@ - pHandle = popen( localProperty.startPortCmd, "r" ); - fread( localProperty.buffer, bufferSize, 1, pHandle ); - pclose( pHandle ); --/* -- idx = 0; -- while( idx < bufferSize ) -- { -- if( localProperty.buffer[idx] == LINEFEED -- || -- localProperty.buffer[idx] == TAB -- || -- localProperty.buffer[idx] == SPACE ) -- { -- localProperty.buffer[idx] = 0; -- break; -- } -- idx++; -- } --*/ -- if( property->log ) -- { -- strcpy( localProperty.command, "echo \" starting " ); -- strcat( localProperty.command, oldPortName ); -- strcat( localProperty.command, " " ); -- strcat( localProperty.command, oldPortDir ); -- strcat( localProperty.command, " execution by running " ); -- strcat( localProperty.command, localProperty.startPortCmd ); -- strcat( localProperty.command, " \">> /var/log/portmanager.log" ); -- system( localProperty.command ); -- } -+ -+ MGPMlogAdd( property, "starting ", oldPortName, oldPortDir, " execution by running ", localProperty.startPortCmd ); - - fprintf( stdout, "%s reply: %s\n", localProperty.startPortCmd, localProperty.buffer ); - while( fflush( stdout ) ); -@@ -1362,8 +1307,6 @@ - fprintf( stdout, "restoring databases localProperty.command:%s\n", localProperty.command ); - while( fflush( stdout ) ); - system( localProperty.command ); -- -- - } - else - { -@@ -1656,9 +1599,6 @@ - strcat( command, curDir ); - - strcat( command, "/work 2>&1" ); --/* -- strcat( command, "/work" ); --*/ - fprintf( stdout, "===> Cleaning for %s\n", portDir ); - while( fflush( stdout ) ); - |