[arch-commits] Commit in phpvirtualbox/trunk (PKGBUILD php7.patch)

[Sergej Pupykin]

    Date: Sunday, January 3, 2016 @ 21:31:53
  Author: spupykin
Revision: 155237

upgpkg: phpvirtualbox 5.0_4-2

upd

Added:
  phpvirtualbox/trunk/php7.patch
Modified:
  phpvirtualbox/trunk/PKGBUILD

------------+
 PKGBUILD   |   13 ++++++++++---
 php7.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-03 19:31:09 UTC (rev 155236)
+++ PKGBUILD	2016-01-03 20:31:53 UTC (rev 155237)
@@ -4,7 +4,7 @@
 
 pkgname=phpvirtualbox
 pkgver=5.0_4
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP/AJAX web interface for VirtualBox 4.*"
 arch=(any)
 url="http://sourceforge.net/projects/phpvirtualbox/"
@@ -11,9 +11,16 @@
 license=('GPL')
 depends=('php')
 backup=("etc/webapps/phpvirtualbox/config.php")
-source=(http://downloads.sourceforge.net/project/phpvirtualbox/phpvirtualbox-${pkgver/_/-}.zip)
-md5sums=('9671d4db39681baa7f90cff9e8cfee8c')
+source=(http://downloads.sourceforge.net/project/phpvirtualbox/phpvirtualbox-${pkgver/_/-}.zip
+	php7.patch)
+md5sums=('9671d4db39681baa7f90cff9e8cfee8c'
+         'c7eaf73450fe97e49983259eb51d5729')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+  patch -p1 <$srcdir/php7.patch
+}
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver/_/-}
 

Added: php7.patch
===================================================================
--- php7.patch	                        (rev 0)
+++ php7.patch	2016-01-03 20:31:53 UTC (rev 155237)
@@ -0,0 +1,33 @@
+diff -wbBur phpvirtualbox-5.0-4/endpoints/api.php phpvirtualbox-5.0-4.q/endpoints/api.php
+--- phpvirtualbox-5.0-4/endpoints/api.php	2015-12-07 16:49:21.000000000 +0300
++++ phpvirtualbox-5.0-4.q/endpoints/api.php	2016-01-03 23:28:42.853589422 +0300
+@@ -313,7 +313,7 @@
+ 			/*
+ 			 * Call to vboxconnector
+ 			 */
+-			$vbox->$request['fn']($request['params'],array(&$response));
++			$vbox->{$request['fn']}($request['params'],array(&$response));
+ 
+ 
+ 			/*
+diff -wbBur phpvirtualbox-5.0-4/endpoints/lib/auth/Builtin.php phpvirtualbox-5.0-4.q/endpoints/lib/auth/Builtin.php
+--- phpvirtualbox-5.0-4/endpoints/lib/auth/Builtin.php	2015-12-07 16:49:21.000000000 +0300
++++ phpvirtualbox-5.0-4.q/endpoints/lib/auth/Builtin.php	2016-01-03 23:29:06.016923275 +0300
+@@ -167,7 +167,7 @@
+ 		global $_SESSION;
+ 
+ 		// Must be an admin
+-		if(!$_SESSION['admin']) break;
++		if(!$_SESSION['admin']) return;
+ 
+ 		// Use main / auth server
+ 		$vbox = new vboxconnector(true);
+@@ -175,7 +175,7 @@
+ 
+ 		// See if it exists
+ 		if(!$skipExistCheck && $vbox->vbox->getExtraData('phpvb/users/'.$vboxRequest['u'].'/pass'))
+-			break;
++			return;
+ 
+ 		if($vboxRequest['p'])
+ 			$vbox->vbox->setExtraData('phpvb/users/'.$vboxRequest['u'].'/pass', hash('sha512', $vboxRequest['p']));