From owner-svn-ports-head@freebsd.org Wed Sep 6 11:28:30 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2965DE222D6; Wed, 6 Sep 2017 11:28:30 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2F6C1EE1; Wed, 6 Sep 2017 11:28:29 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86BSSNF013671; Wed, 6 Sep 2017 11:28:28 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86BSSjA013669; Wed, 6 Sep 2017 11:28:28 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201709061128.v86BSSjA013669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Wed, 6 Sep 2017 11:28:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449338 - in head/www/phpvirtualbox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/www/phpvirtualbox: . files X-SVN-Commit-Revision: 449338 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 11:28:30 -0000 Author: decke Date: Wed Sep 6 11:28:28 2017 New Revision: 449338 URL: https://svnweb.freebsd.org/changeset/ports/449338 Log: Fix SOAP Validation constraint violation with newer VirtualBox 5.1.26 PR: 222097 Submitted by: rozhuk.im@gmail.com Obtained from: Thomas Pochetat See: https://bugs.archlinux.org/task/55228 Modified: head/www/phpvirtualbox/Makefile head/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php Modified: head/www/phpvirtualbox/Makefile ============================================================================== --- head/www/phpvirtualbox/Makefile Wed Sep 6 11:21:07 2017 (r449337) +++ head/www/phpvirtualbox/Makefile Wed Sep 6 11:28:28 2017 (r449338) @@ -3,6 +3,7 @@ PORTNAME= phpvirtualbox DISTVERSION= 5.1-1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= vbox@FreeBSD.org Modified: head/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php ============================================================================== --- head/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php Wed Sep 6 11:21:07 2017 (r449337) +++ head/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php Wed Sep 6 11:28:28 2017 (r449338) @@ -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 @@ -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; @@ -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 */ @@ -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(); @@ -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); } }