[arch-commits] Commit in phpvirtualbox/trunk (PKGBUILD php7.patch)
Sergej Pupykin
spupykin at archlinux.org
Mon Feb 13 12:15:25 UTC 2017
Date: Monday, February 13, 2017 @ 12:15:24
Author: spupykin
Revision: 212114
upgpkg: phpvirtualbox 5.0_5-2
upd
Modified:
phpvirtualbox/trunk/PKGBUILD
Deleted:
phpvirtualbox/trunk/php7.patch
------------+
PKGBUILD | 24 +++++++++++++-----------
php7.patch | 33 ---------------------------------
2 files changed, 13 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-13 12:15:20 UTC (rev 212113)
+++ PKGBUILD 2017-02-13 12:15:24 UTC (rev 212114)
@@ -4,7 +4,7 @@
pkgname=phpvirtualbox
pkgver=5.0_5
-pkgrel=1
+pkgrel=2
pkgdesc="PHP/AJAX web interface for VirtualBox 4.*"
arch=(any)
url="http://sourceforge.net/projects/phpvirtualbox/"
@@ -12,13 +12,21 @@
depends=('php')
backup=("etc/webapps/phpvirtualbox/config.php")
source=(http://downloads.sourceforge.net/project/phpvirtualbox/phpvirtualbox-${pkgver/_/-}.zip
- php7.patch)
-md5sums=('97fc19f384009279294f3da8e407b5fb'
- 'c7eaf73450fe97e49983259eb51d5729')
+ https://github.com/imoore76/phpvirtualbox/commit/10b6a7383c810dfa6261869cb1f9cc8bca2ad814.patch
+ https://github.com/imoore76/phpvirtualbox/commit/207b1decbb9de27f2c884ecb75f70d78d9820c80.patch
+ https://github.com/imoore76/phpvirtualbox/commit/4e9f9fd85dd2caad6bb7c50a742e1558aee57f77.patch)
+sha256sums=('c80c423fda30e5795872c9b9adc68429deee5726e468729472a573c324303c05'
+ '0b2bad7e69911a251a126cc835ce647b5ec86cd506fe99c984367ec9e885569e'
+ 'db51fceccd16de6c959055ed5794e788173894c1a4ac23e064a7f2d467157dea'
+ '308c7652e895c799363c758218a11c8d2c9b5e3f9ee41ffd65b2679be5f1a56c')
prepare() {
cd "$srcdir"/${pkgname}-${pkgver/_/-}
-# patch -p1 <"$srcdir"/php7.patch
+ rm -f endpoints/lib/*.wsdl
+ for p in $(ls -1 $srcdir/*.patch); do
+ patch -p1 <$p
+ done
+ sed -i "s|${pkgver/_/-}|5.1-1|" endpoints/lib/config.php
}
package() {
@@ -25,14 +33,8 @@
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"
Deleted: php7.patch
===================================================================
--- php7.patch 2017-02-13 12:15:20 UTC (rev 212113)
+++ php7.patch 2017-02-13 12:15:24 UTC (rev 212114)
@@ -1,33 +0,0 @@
-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']));
More information about the arch-commits
mailing list