Attachment 186113 Details for Bug 222097 – 0001-bug-fix.patch reworked

[patch] 0001-bug-fix.patch reworked

phpvirtualbox.patch (text/plain), 8.53 KB, created by Ivan Rozhuk on 2017-09-06 10:33:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2017-09-06 10:33:23 UTC

Size: 8.53 KB

patch

obsolete

>Index: www/phpvirtualbox/Makefile
>===================================================================
>--- www/phpvirtualbox/Makefile	(revision 449326)
>+++ www/phpvirtualbox/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	phpvirtualbox
> DISTVERSION=	5.1-1
>+PORTREVISION=	1
> CATEGORIES=	www
> 
> MAINTAINER=	vbox@FreeBSD.org
>Index: www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php
>===================================================================
>--- www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php	(revision 449326)
>+++ www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php	(working copy)
>@@ -5,7 +5,7 @@
>  			foreach($checks as $iso) {
>  				try {
> -					$gem = $this->vbox->openMedium($iso,'DVD','ReadOnly');
>-+					$gem = $this->vbox->openMedium($iso,'DVD','ReadOnly',null);
>++					$gem = $this->vbox->openMedium($iso, 'DVD', 'ReadOnly', false);
>  					break;
>  				} catch (Exception $e) {
>  					// Ignore
>@@ -14,7 +14,7 @@
>  		}
>  		/* @var $m IMachine */
> -		$m = $this->vbox->createMachine($this->vbox->composeMachineFilename($args['name'],null,null),$args['name'],null,null,null,false);
>-+		$m = $this->vbox->createMachine($this->vbox->composeMachineFilename($args['name'],null,null,null),$args['name'],null,null,null,false);
>++		$m = $this->vbox->createMachine($this->vbox->composeMachineFilename($args['name'], null, null, null), $args['name'], null, null, null, false);
>  		$sfpath = $m->settingsFilePath;
>  
>  		/* @var $cm CloneMode */
>@@ -23,7 +23,7 @@
>  								}
>  							} else {
> -								$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type']);
>-+								$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],null,null);
>++								$med = $this->vbox->openMedium($ma['medium']['location'], $ma['type'], 'ReadWrite', false);
>  							}
>  						} else {
>  							$med = null;
>@@ -36,12 +36,21 @@
>  				$eprops = array_combine($eprops[1],$eprops[0]);
>  				$iprops = array_map(create_function('$a','$b=explode("=",$a); return array($b[0]=>$b[1]);'),preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties']));
>  				$inprops = array();
>+@@ -1942,7 +1942,7 @@ class vboxconnector {
>+ 			if($args['bootOrder'][$i]) {
>+ 				$m->setBootOrder(($i + 1),$args['bootOrder'][$i]);
>+ 			} else {
>+-				$m->setBootOrder(($i + 1),null);
>++				$m->setBootOrder(($i + 1), 'Null');
>+ 			}
>+ 		}
>+ 
> @@ -2028,7 +2028,7 @@ class vboxconnector {
>  						}
>  					} else {
>  						/* @var $med IMedium */
> -						$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type']);
>-+						$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],null,null);
>++						$med = $this->vbox->openMedium($ma['medium']['location'], $ma['type'], 'ReadWrite', false);
>  					}
>  				} else {
>  					$med = null;
>@@ -59,7 +68,7 @@
>  	public function remote_vboxGetEnumerationMap($args) {
>  
> -		$c = new $args['class'];
>-+		$c = new $args['class'](null,null);
>++		$c = new $args['class'](null, null);
>  		return (@isset($args['ValueMap']) ? $c->ValueMap : $c->NameMap);
>  	}
>  
>@@ -68,7 +77,7 @@
>  			$delete = $machine->unregister('DetachAllReturnHardDisksOnly');
>  			foreach($delete as $hd) {
> -				$hds[] = $this->vbox->openMedium($hd->location,'HardDisk')->handle;
>-+				$hds[] = $this->vbox->openMedium($hd->location,'HardDisk',null,null)->handle;
>++				$hds[] = $this->vbox->openMedium($hd->location, 'HardDisk', 'ReadWrite', false)->handle;
>  			}
>  
>  			/* @var $progress IProgress */
>@@ -77,7 +86,7 @@
>  
>  		/* Check if file exists */
> -		$filename = $this->vbox->composeMachineFilename($args['name'],($this->settings->phpVboxGroups ? '' : $args['group']),$this->vbox->systemProperties->defaultMachineFolder);
>-+		$filename = $this->vbox->composeMachineFilename($args['name'],($this->settings->phpVboxGroups ? '' : $args['group']),$this->vbox->systemProperties->defaultMachineFolder,null);
>++		$filename = $this->vbox->composeMachineFilename($args['name'], ($this->settings->phpVboxGroups ? '' : $args['group']), $this->vbox->systemProperties->defaultMachineFolder, null);
>  
>  		if($this->remote_fileExists(array('file'=>$filename))) {
>  			return array('exists' => $filename);
>@@ -86,7 +95,7 @@
>  				$sc->releaseRemote();
>  
> -				$m = $this->vbox->openMedium($args['disk'],'HardDisk');
>-+				$m = $this->vbox->openMedium($args['disk'],'HardDisk',null,null);
>++				$m = $this->vbox->openMedium($args['disk'], 'HardDisk', 'ReadWrite', false);
>  
>  				$this->session->machine->attachDevice(trans($HDbusType,'UIMachineSettingsStorage'),0,0,'HardDisk',$m->handle);
>  
>@@ -113,7 +122,7 @@
>  
>  			/* @var $progress IProgress */
> -			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description']);
>-+			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description'],null);
>++			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description'], null);
>  
>  			// Does an exception exist?
>  			try {
>@@ -122,7 +131,7 @@
>  	    $this->connect();
>  
> -	    $m = $this->vbox->openMedium($args['medium'],'HardDisk');
>-+	    $m = $this->vbox->openMedium($args['medium'],'HardDisk',null,null);
>++	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
>  
>  	    $retval = $m->checkEncryptionPassword($args['password']);
>  
>@@ -131,7 +140,7 @@
>  	    $this->connect();
>  
> -	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite');
>-+	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite',null);
>++	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
>  
>  	    /* @var $progress IProgress */
>  	    $progress = $m->changeEncryption($args['old_password'],
>@@ -140,7 +149,7 @@
>  		$this->connect();
>  
> -		$m = $this->vbox->openMedium($args['medium'], 'HardDisk');
>-+		$m = $this->vbox->openMedium($args['medium'], 'HardDisk',null,null);
>++		$m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
>  
>  		/* @var $progress IProgress */
>  		$progress = $m->resize($args['bytes']);
>@@ -149,7 +158,7 @@
>  
>  		/* @var $src IMedium */
> -		$src = $this->vbox->openMedium($args['src'], 'HardDisk');
>-+		$src = $this->vbox->openMedium($args['src'], 'HardDisk',null,null);
>++		$src = $this->vbox->openMedium($args['src'], 'HardDisk', 'ReadWrite', false);
>  
>  		$type = array(($args['type'] == 'fixed' ? 'Fixed' : 'Standard'));
>  		if($args['split']) $type[] = 'VmdkSplit2G';
>@@ -158,7 +167,7 @@
>  
>  		/* @var $m IMedium */
> -		$m = $this->vbox->openMedium($args['medium'], 'HardDisk');
>-+		$m = $this->vbox->openMedium($args['medium'], 'HardDisk',null,null);
>++		$m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
>  		$m->type = $args['type'];
>  		$m->releaseRemote();
>  
>@@ -167,7 +176,7 @@
>  		$this->connect();
>  
> -		return $this->vbox->composeMachineFilename($args['name'],($this->settings->phpVboxGroups ? '' : $args['group']),$this->vbox->systemProperties->defaultMachineFolder);
>-+		return $this->vbox->composeMachineFilename($args['name'],($this->settings->phpVboxGroups ? '' : $args['group']),$this->vbox->systemProperties->defaultMachineFolder,null);
>++		return $this->vbox->composeMachineFilename($args['name'], ($this->settings->phpVboxGroups ? '' : $args['group']), $this->vbox->systemProperties->defaultMachineFolder, null);
>  
>  	}
>  
>@@ -176,7 +185,7 @@
>  
>  		/* @var $m IMedium */
> -		$m = $this->vbox->openMedium($args['medium'],$args['type']);
>-+		$m = $this->vbox->openMedium($args['medium'],$args['type'],null,null);
>++		$m = $this->vbox->openMedium($args['medium'], $args['type'], 'ReadWrite', false);
>  		$mediumid = $m->id;
>  
>  		// connected to...
>@@ -185,7 +194,7 @@
>  
>  		/* @var $m IMedium */
> -		$m = $this->vbox->openMedium($args['medium'],$args['type']);
>-+		$m = $this->vbox->openMedium($args['medium'],$args['type'],null,null);
>++		$m = $this->vbox->openMedium($args['medium'], $args['type'], 'ReadWrite', false);
>  
>  		if($args['delete'] && @$this->settings->deleteOnRemove && (string)$m->deviceType == 'HardDisk') {
>  
>@@ -194,7 +203,7 @@
>  			} else {
>  				/* @var $med IMedium */
> -				$med = $this->vbox->openMedium($args['medium']['location'],$args['medium']['deviceType']);
>-+				$med = $this->vbox->openMedium($args['medium']['location'],$args['medium']['deviceType'],null,null);
>++				$med = $this->vbox->openMedium($args['medium']['location'], $args['medium']['deviceType'], 'ReadWrite', false);
>  			}
>  		}
>  
>@@ -203,7 +212,7 @@
>  
>  		// For $fixed value
> -		$mvenum = new MediumVariant();
>-+		$mvenum = new MediumVariant(null,null);
>++		$mvenum = new MediumVariant(null, null);
>  		$variant = 0;
>  
>  		foreach($m->variant as $mv) {

Actions: View | Diff

Attachments on bug 222097: 186113