Attachment 223770 Details for Bug 254079 – Updated patch

[patch] Updated patch

phpvirtualbox.diff (text/plain), 7.67 KB, created by Guido Falsi on 2021-04-02 15:55:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2021-04-02 15:55:40 UTC

Size: 7.67 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 569609)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,18 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20210403:
>+  AFFECTS: users of www/phpvirtualbox
>+  AUTHOR: dereks@lifeofadishwasher.com
>+
>+  www/phpvirtualbox has been updated to version 6.1. This new version
>+  only supports version 6.1 of VirtualBox.
>+
>+  Version 5.x of phpvirtualbox has been preserved as
>+  www/phpvirtualbox-legacy. If you require support for VirtualBox
>+  5.x please install this version. Remember to copy your configuration
>+  file in the new legacy installation.
>+
> 20210328:
>   AFFECTS: users of www/caddy
>   AUTHOR: adamw@FreeBSD.org
>Index: www/Makefile
>===================================================================
>--- www/Makefile	(revision 569609)
>+++ www/Makefile	(working copy)
>@@ -1383,6 +1383,7 @@
>     SUBDIR += phprecipebook
>     SUBDIR += phpsysinfo
>     SUBDIR += phpvirtualbox
>+    SUBDIR += phpvirtualbox-legacy
>     SUBDIR += piwigo
>     SUBDIR += plasma5-plasma-browser-integration
>     SUBDIR += plugger
>Index: www/phpvirtualbox/Makefile
>===================================================================
>--- www/phpvirtualbox/Makefile	(revision 569609)
>+++ www/phpvirtualbox/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	phpvirtualbox
>-DISTVERSION=	5.2-1
>-PORTREVISION=	1
>+DISTVERSION=	6.1
> CATEGORIES=	www
> 
> MAINTAINER=	vbox@FreeBSD.org
>@@ -18,12 +17,14 @@
> NO_BUILD=	yes
> 
> USE_GITHUB=	yes
>+GH_TAGNAME=	cf82d58f2
> 
> DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
> ETCDIR=		${WWWDIR}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' ${WRKSRC}/phpvirtualbox.conf
>+	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' \
>+		${WRKSRC}/phpvirtualbox.conf
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${WWWDIR}
>Index: www/phpvirtualbox/distinfo
>===================================================================
>--- www/phpvirtualbox/distinfo	(revision 569609)
>+++ www/phpvirtualbox/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1555800469
>-SHA256 (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = a7d172dfd9b73f1c8f6ebe5bc98d3ae1fb12395350ac3b932cb811658fc88521
>-SIZE (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = 3882921
>+TIMESTAMP = 1615074145
>+SHA256 (phpvirtualbox-phpvirtualbox-6.1-cf82d58f2_GH0.tar.gz) = 03e1f5e2f48c715aa26dabf22764995e2df24767bede1badef18c1ec73d74d6b
>+SIZE (phpvirtualbox-phpvirtualbox-6.1-cf82d58f2_GH0.tar.gz) = 4173105
>Index: www/phpvirtualbox/files/patch-js_utils.js
>===================================================================
>--- www/phpvirtualbox/files/patch-js_utils.js	(revision 569609)
>+++ www/phpvirtualbox/files/patch-js_utils.js	(nonexistent)
>@@ -1,11 +0,0 @@
>---- js/utils.js.orig	2018-11-09 09:43:10 UTC
>-+++ js/utils.js
>-@@ -1112,7 +1112,7 @@ function phpVirtualBoxFailure(msg) {
>-  * @param {Date} expire - when cookie should expire
>-  */
>- function vboxSetCookie(k,v,expire) {
>--	var exp = (v ? (expire ? expire : new Date(2020,12,24)) : new Date().setDate(new Date().getDate() - 1));
>-+	var exp = (v ? (expire ? expire : new Date(Date.now() + 7 * 1000 * 60 * 60 * 24)) : new Date().setDate(new Date().getDate() - 1));
>- 	document.cookie = k+"="+v+"; expires="+exp.toGMTString()+"; path=/";
>- 	$('#vboxPane').data('vboxCookies')[k] = v;
>- }
>
>Property changes on: www/phpvirtualbox/files/patch-js_utils.js
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/phpvirtualbox/pkg-plist
>===================================================================
>--- www/phpvirtualbox/pkg-plist	(revision 569609)
>+++ www/phpvirtualbox/pkg-plist	(working copy)
>@@ -31,7 +31,11 @@
> %%WWWDIR%%/endpoints/lib/vboxServiceWrappers.php
> %%WWWDIR%%/endpoints/lib/vboxconnector.php
> %%WWWDIR%%/endpoints/lib/vboxweb-5.2.wsdl
>+%%WWWDIR%%/endpoints/lib/vboxweb-6.0.wsdl
>+%%WWWDIR%%/endpoints/lib/vboxweb-6.1.wsdl
> %%WWWDIR%%/endpoints/lib/vboxwebService-5.2.wsdl
>+%%WWWDIR%%/endpoints/lib/vboxwebService-6.0.wsdl
>+%%WWWDIR%%/endpoints/lib/vboxwebService-6.1.wsdl
> %%WWWDIR%%/endpoints/rdp.php
> %%WWWDIR%%/endpoints/screen.php
> %%WWWDIR%%/images/30white.png
>@@ -261,6 +265,7 @@
> %%WWWDIR%%/images/vbox/os_win2k.png
> %%WWWDIR%%/images/vbox/os_win2k12_64.png
> %%WWWDIR%%/images/vbox/os_win2k16_64.png
>+%%WWWDIR%%/images/vbox/os_win2k19_64.png
> %%WWWDIR%%/images/vbox/os_win2k3.png
> %%WWWDIR%%/images/vbox/os_win2k3_64.png
> %%WWWDIR%%/images/vbox/os_win2k8.png
>@@ -409,6 +414,10 @@
> %%WWWDIR%%/images/vbox/video_capture_on_16px.png
> %%WWWDIR%%/images/vbox/video_capture_on_disabled_16px.png
> %%WWWDIR%%/images/vbox/video_capture_settings_16px.png
>+%%WWWDIR%%/images/vbox/virtio_scsi_add_16px.png
>+%%WWWDIR%%/images/vbox/virtio_scsi_add_disabled_16px.png
>+%%WWWDIR%%/images/vbox/virtio_scsi_collapse_16px.png
>+%%WWWDIR%%/images/vbox/virtio_scsi_expand_16px.png
> %%WWWDIR%%/images/vbox/virtualbox-hdd.png
> %%WWWDIR%%/images/vbox/virtualbox-ova.png
> %%WWWDIR%%/images/vbox/virtualbox-ovf.png
>@@ -493,6 +502,7 @@
> %%WWWDIR%%/js/phpvirtualbox.js
> %%WWWDIR%%/js/utils.js
> %%WWWDIR%%/languages/cs.xml
>+%%WWWDIR%%/languages/da.xml
> %%WWWDIR%%/languages/de.xml
> %%WWWDIR%%/languages/en.xml
> %%WWWDIR%%/languages/es.xml
>@@ -522,6 +532,8 @@
> %%WWWDIR%%/languages/source/zh_tw.dat
> %%WWWDIR%%/languages/zh_cn.xml
> %%WWWDIR%%/languages/zh_tw.xml
>+%%WWWDIR%%/packaging/install-scripts/install.bash
>+%%WWWDIR%%/packaging/install-scripts/uninstall.bash
> %%WWWDIR%%/panes/about.html
> %%WWWDIR%%/panes/chooser.html
> %%WWWDIR%%/panes/guestNetAdapters.html
>Index: www/phpvirtualbox-legacy/Makefile
>===================================================================
>--- www/phpvirtualbox-legacy/Makefile	(revision 569609)
>+++ www/phpvirtualbox-legacy/Makefile	(working copy)
>@@ -5,6 +5,7 @@
> DISTVERSION=	5.2-1
> PORTREVISION=	1
> CATEGORIES=	www
>+PKGNAMESUFFIX=	-legacy
> 
> MAINTAINER=	vbox@FreeBSD.org
> COMMENT=	AJAX Web Interface for VirtualBox
>@@ -20,10 +21,14 @@
> USE_GITHUB=	yes
> 
> DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
>+WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
> ETCDIR=		${WWWDIR}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' ${WRKSRC}/phpvirtualbox.conf
>+	@${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf
>+	@${REINPLACE_CMD} -e 's#Alias /phpvirtualbox#Alias /phpvirtualbox-legacy#' \
>+		-e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' \
>+		${WRKSRC}/phpvirtualbox-legacy.conf
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${WWWDIR}
>Index: www/phpvirtualbox-legacy/distinfo
>===================================================================
>Index: www/phpvirtualbox-legacy/files/patch-js_utils.js
>===================================================================
>Index: www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html
>===================================================================
>Index: www/phpvirtualbox-legacy/pkg-descr
>===================================================================
>Index: www/phpvirtualbox-legacy/pkg-plist
>===================================================================
>--- www/phpvirtualbox-legacy/pkg-plist	(revision 569609)
>+++ www/phpvirtualbox-legacy/pkg-plist	(working copy)
>@@ -569,7 +569,7 @@
> %%WWWDIR%%/panes/wizardNewHDAdvanced.html
> %%WWWDIR%%/panes/wizardNewVM.html
> %%WWWDIR%%/panes/wizardNewVMAdvanced.html
>-%%WWWDIR%%/phpvirtualbox.conf
>+%%WWWDIR%%/phpvirtualbox-legacy.conf
> %%WWWDIR%%/rdpweb/RDPClientUI.swf
> %%WWWDIR%%/rdpweb/license_3rd.txt
> %%WWWDIR%%/rdpweb/swfobject.js

Actions: View | Diff

Attachments on bug 254079: 223038 | 223730 | 223770