[arch-commits] Commit in phpvirtualbox/repos/community-any (3 files)

[Sergej Pupykin]

    Date: Sunday, January 3, 2016 @ 21:32:01
  Author: spupykin
Revision: 155238

archrelease: copy trunk to community-any

Added:
  phpvirtualbox/repos/community-any/PKGBUILD
    (from rev 155237, phpvirtualbox/trunk/PKGBUILD)
  phpvirtualbox/repos/community-any/php7.patch
    (from rev 155237, phpvirtualbox/trunk/php7.patch)
Deleted:
  phpvirtualbox/repos/community-any/PKGBUILD

------------+
 PKGBUILD   |   89 +++++++++++++++++++++++++++++++----------------------------
 php7.patch |   33 +++++++++++++++++++++
 2 files changed, 81 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-03 20:31:53 UTC (rev 155237)
+++ PKGBUILD	2016-01-03 20:32:01 UTC (rev 155238)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s at gmail.com>
-# Contributor:Techlive Zheng <techlivezheng at gmail dot com>
-
-pkgname=phpvirtualbox
-pkgver=5.0_4
-pkgrel=1
-pkgdesc="PHP/AJAX web interface for VirtualBox 4.*"
-arch=(any)
-url="http://sourceforge.net/projects/phpvirtualbox/"
-license=('GPL')
-depends=('php')
-backup=("etc/webapps/phpvirtualbox/config.php")
-source=(http://downloads.sourceforge.net/project/phpvirtualbox/phpvirtualbox-${pkgver/_/-}.zip)
-md5sums=('9671d4db39681baa7f90cff9e8cfee8c')
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-
-  mkdir -p ${pkgdir}/etc/webapps/phpvirtualbox
-
-  install -D -m644 config.php-example ${pkgdir}/etc/webapps/phpvirtualbox/config.php
-
-#  sed -e "s/var \\\$username = 'vbox';/var \\\$username = '';/g" \
-#      -e "s/var \\\$password = 'pass';/var \\\$password = '';/g" \
-#      -e "s/#var \\\$noAuth = true;/var \\\$noAuth = true;/g" \
-#      -i ${pkgdir}/etc/webapps/phpvirtualbox/config.php
-
-  # Apache configuration
-  cat > ${pkgdir}/etc/webapps/phpvirtualbox/apache.example.conf <<EOF
-  Alias /phpvirtualbox "/usr/share/webapps/phpvirtualbox"
-  <Directory "/usr/share/webapps/phpvirtualbox">
-    Options FollowSymlinks
-    AllowOverride All
-    Require all granted
-  </Directory>
-EOF
-
-  find . -type f -exec install -D -m644 {,${pkgdir}/usr/share/webapps/${pkgname}/}{} \;
-  ln -s /etc/webapps/phpvirtualbox/config.php ${pkgdir}/usr/share/webapps/phpvirtualbox/config.php
-}

Copied: phpvirtualbox/repos/community-any/PKGBUILD (from rev 155237, phpvirtualbox/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-01-03 20:32:01 UTC (rev 155238)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s at gmail.com>
+# Contributor:Techlive Zheng <techlivezheng at gmail dot com>
+
+pkgname=phpvirtualbox
+pkgver=5.0_4
+pkgrel=2
+pkgdesc="PHP/AJAX web interface for VirtualBox 4.*"
+arch=(any)
+url="http://sourceforge.net/projects/phpvirtualbox/"
+license=('GPL')
+depends=('php')
+backup=("etc/webapps/phpvirtualbox/config.php")
+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/_/-}
+
+  mkdir -p ${pkgdir}/etc/webapps/phpvirtualbox
+
+  install -D -m644 config.php-example ${pkgdir}/etc/webapps/phpvirtualbox/config.php
+
+#  sed -e "s/var \\\$username = 'vbox';/var \\\$username = '';/g" \
+#      -e "s/var \\\$password = 'pass';/var \\\$password = '';/g" \
+#      -e "s/#var \\\$noAuth = true;/var \\\$noAuth = true;/g" \
+#      -i ${pkgdir}/etc/webapps/phpvirtualbox/config.php
+
+  # Apache configuration
+  cat > ${pkgdir}/etc/webapps/phpvirtualbox/apache.example.conf <<EOF
+  Alias /phpvirtualbox "/usr/share/webapps/phpvirtualbox"
+  <Directory "/usr/share/webapps/phpvirtualbox">
+    Options FollowSymlinks
+    AllowOverride All
+    Require all granted
+  </Directory>
+EOF
+
+  find . -type f -exec install -D -m644 {,${pkgdir}/usr/share/webapps/${pkgname}/}{} \;
+  ln -s /etc/webapps/phpvirtualbox/config.php ${pkgdir}/usr/share/webapps/phpvirtualbox/config.php
+}

Copied: phpvirtualbox/repos/community-any/php7.patch (from rev 155237, phpvirtualbox/trunk/php7.patch)
===================================================================
--- php7.patch	                        (rev 0)
+++ php7.patch	2016-01-03 20:32:01 UTC (rev 155238)
@@ -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']));