View | Details | Raw Unified | Return to bug 254079 | Differences between
and this patch

Collapse All | Expand All

(-)UPDATING (+12 lines)
Lines 5-10 Link Here
5
You should get into the habit of checking this file for changes each time
5
You should get into the habit of checking this file for changes each time
6
you update your ports collection, before attempting any port upgrades.
6
you update your ports collection, before attempting any port upgrades.
7
7
8
20210403:
9
  AFFECTS: users of www/phpvirtualbox
10
  AUTHOR: dereks@lifeofadishwasher.com
11
12
  www/phpvirtualbox has been updated to version 6.1. This new version
13
  only supports version 6.1 of VirtualBox.
14
15
  Version 5.x of phpvirtualbox has been preserved as
16
  www/phpvirtualbox-legacy. If you require support for VirtualBox
17
  5.x please install this version. Remember to copy your configuration
18
  file in the new legacy installation.
19
8
20210328:
20
20210328:
9
  AFFECTS: users of www/caddy
21
  AFFECTS: users of www/caddy
10
  AUTHOR: adamw@FreeBSD.org
22
  AUTHOR: adamw@FreeBSD.org
(-)www/Makefile (+1 lines)
Lines 1383-1388 Link Here
1383
    SUBDIR += phprecipebook
1383
    SUBDIR += phprecipebook
1384
    SUBDIR += phpsysinfo
1384
    SUBDIR += phpsysinfo
1385
    SUBDIR += phpvirtualbox
1385
    SUBDIR += phpvirtualbox
1386
    SUBDIR += phpvirtualbox-legacy
1386
    SUBDIR += piwigo
1387
    SUBDIR += piwigo
1387
    SUBDIR += plasma5-plasma-browser-integration
1388
    SUBDIR += plasma5-plasma-browser-integration
1388
    SUBDIR += plugger
1389
    SUBDIR += plugger
(-)www/phpvirtualbox/Makefile (-3 / +4 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	phpvirtualbox
4
PORTNAME=	phpvirtualbox
5
DISTVERSION=	5.2-1
5
DISTVERSION=	6.1
6
PORTREVISION=	1
7
CATEGORIES=	www
6
CATEGORIES=	www
8
7
9
MAINTAINER=	vbox@FreeBSD.org
8
MAINTAINER=	vbox@FreeBSD.org
Lines 18-29 Link Here
18
NO_BUILD=	yes
17
NO_BUILD=	yes
19
18
20
USE_GITHUB=	yes
19
USE_GITHUB=	yes
20
GH_TAGNAME=	cf82d58f2
21
21
22
DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
22
DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
23
ETCDIR=		${WWWDIR}
23
ETCDIR=		${WWWDIR}
24
24
25
post-patch:
25
post-patch:
26
	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' ${WRKSRC}/phpvirtualbox.conf
26
	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' \
27
		${WRKSRC}/phpvirtualbox.conf
27
28
28
do-install:
29
do-install:
29
	${MKDIR} ${STAGEDIR}${WWWDIR}
30
	${MKDIR} ${STAGEDIR}${WWWDIR}
(-)www/phpvirtualbox/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1555800469
1
TIMESTAMP = 1615074145
2
SHA256 (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = a7d172dfd9b73f1c8f6ebe5bc98d3ae1fb12395350ac3b932cb811658fc88521
2
SHA256 (phpvirtualbox-phpvirtualbox-6.1-cf82d58f2_GH0.tar.gz) = 03e1f5e2f48c715aa26dabf22764995e2df24767bede1badef18c1ec73d74d6b
3
SIZE (phpvirtualbox-phpvirtualbox-5.2-1_GH0.tar.gz) = 3882921
3
SIZE (phpvirtualbox-phpvirtualbox-6.1-cf82d58f2_GH0.tar.gz) = 4173105
(-)www/phpvirtualbox/files/patch-js_utils.js (-11 lines)
Lines 1-11 Link Here
1
--- js/utils.js.orig	2018-11-09 09:43:10 UTC
2
+++ js/utils.js
3
@@ -1112,7 +1112,7 @@ function phpVirtualBoxFailure(msg) {
4
  * @param {Date} expire - when cookie should expire
5
  */
6
 function vboxSetCookie(k,v,expire) {
7
-	var exp = (v ? (expire ? expire : new Date(2020,12,24)) : new Date().setDate(new Date().getDate() - 1));
8
+	var exp = (v ? (expire ? expire : new Date(Date.now() + 7 * 1000 * 60 * 60 * 24)) : new Date().setDate(new Date().getDate() - 1));
9
 	document.cookie = k+"="+v+"; expires="+exp.toGMTString()+"; path=/";
10
 	$('#vboxPane').data('vboxCookies')[k] = v;
11
 }
(-)www/phpvirtualbox/pkg-plist (+12 lines)
Lines 31-37 Link Here
31
%%WWWDIR%%/endpoints/lib/vboxServiceWrappers.php
31
%%WWWDIR%%/endpoints/lib/vboxServiceWrappers.php
32
%%WWWDIR%%/endpoints/lib/vboxconnector.php
32
%%WWWDIR%%/endpoints/lib/vboxconnector.php
33
%%WWWDIR%%/endpoints/lib/vboxweb-5.2.wsdl
33
%%WWWDIR%%/endpoints/lib/vboxweb-5.2.wsdl
34
%%WWWDIR%%/endpoints/lib/vboxweb-6.0.wsdl
35
%%WWWDIR%%/endpoints/lib/vboxweb-6.1.wsdl
34
%%WWWDIR%%/endpoints/lib/vboxwebService-5.2.wsdl
36
%%WWWDIR%%/endpoints/lib/vboxwebService-5.2.wsdl
37
%%WWWDIR%%/endpoints/lib/vboxwebService-6.0.wsdl
38
%%WWWDIR%%/endpoints/lib/vboxwebService-6.1.wsdl
35
%%WWWDIR%%/endpoints/rdp.php
39
%%WWWDIR%%/endpoints/rdp.php
36
%%WWWDIR%%/endpoints/screen.php
40
%%WWWDIR%%/endpoints/screen.php
37
%%WWWDIR%%/images/30white.png
41
%%WWWDIR%%/images/30white.png
Lines 261-266 Link Here
261
%%WWWDIR%%/images/vbox/os_win2k.png
265
%%WWWDIR%%/images/vbox/os_win2k.png
262
%%WWWDIR%%/images/vbox/os_win2k12_64.png
266
%%WWWDIR%%/images/vbox/os_win2k12_64.png
263
%%WWWDIR%%/images/vbox/os_win2k16_64.png
267
%%WWWDIR%%/images/vbox/os_win2k16_64.png
268
%%WWWDIR%%/images/vbox/os_win2k19_64.png
264
%%WWWDIR%%/images/vbox/os_win2k3.png
269
%%WWWDIR%%/images/vbox/os_win2k3.png
265
%%WWWDIR%%/images/vbox/os_win2k3_64.png
270
%%WWWDIR%%/images/vbox/os_win2k3_64.png
266
%%WWWDIR%%/images/vbox/os_win2k8.png
271
%%WWWDIR%%/images/vbox/os_win2k8.png
Lines 409-414 Link Here
409
%%WWWDIR%%/images/vbox/video_capture_on_16px.png
414
%%WWWDIR%%/images/vbox/video_capture_on_16px.png
410
%%WWWDIR%%/images/vbox/video_capture_on_disabled_16px.png
415
%%WWWDIR%%/images/vbox/video_capture_on_disabled_16px.png
411
%%WWWDIR%%/images/vbox/video_capture_settings_16px.png
416
%%WWWDIR%%/images/vbox/video_capture_settings_16px.png
417
%%WWWDIR%%/images/vbox/virtio_scsi_add_16px.png
418
%%WWWDIR%%/images/vbox/virtio_scsi_add_disabled_16px.png
419
%%WWWDIR%%/images/vbox/virtio_scsi_collapse_16px.png
420
%%WWWDIR%%/images/vbox/virtio_scsi_expand_16px.png
412
%%WWWDIR%%/images/vbox/virtualbox-hdd.png
421
%%WWWDIR%%/images/vbox/virtualbox-hdd.png
413
%%WWWDIR%%/images/vbox/virtualbox-ova.png
422
%%WWWDIR%%/images/vbox/virtualbox-ova.png
414
%%WWWDIR%%/images/vbox/virtualbox-ovf.png
423
%%WWWDIR%%/images/vbox/virtualbox-ovf.png
Lines 493-498 Link Here
493
%%WWWDIR%%/js/phpvirtualbox.js
502
%%WWWDIR%%/js/phpvirtualbox.js
494
%%WWWDIR%%/js/utils.js
503
%%WWWDIR%%/js/utils.js
495
%%WWWDIR%%/languages/cs.xml
504
%%WWWDIR%%/languages/cs.xml
505
%%WWWDIR%%/languages/da.xml
496
%%WWWDIR%%/languages/de.xml
506
%%WWWDIR%%/languages/de.xml
497
%%WWWDIR%%/languages/en.xml
507
%%WWWDIR%%/languages/en.xml
498
%%WWWDIR%%/languages/es.xml
508
%%WWWDIR%%/languages/es.xml
Lines 522-527 Link Here
522
%%WWWDIR%%/languages/source/zh_tw.dat
532
%%WWWDIR%%/languages/source/zh_tw.dat
523
%%WWWDIR%%/languages/zh_cn.xml
533
%%WWWDIR%%/languages/zh_cn.xml
524
%%WWWDIR%%/languages/zh_tw.xml
534
%%WWWDIR%%/languages/zh_tw.xml
535
%%WWWDIR%%/packaging/install-scripts/install.bash
536
%%WWWDIR%%/packaging/install-scripts/uninstall.bash
525
%%WWWDIR%%/panes/about.html
537
%%WWWDIR%%/panes/about.html
526
%%WWWDIR%%/panes/chooser.html
538
%%WWWDIR%%/panes/chooser.html
527
%%WWWDIR%%/panes/guestNetAdapters.html
539
%%WWWDIR%%/panes/guestNetAdapters.html
(-)www/phpvirtualbox-legacy/Makefile (-1 / +6 lines)
Lines 5-10 Link Here
5
DISTVERSION=	5.2-1
5
DISTVERSION=	5.2-1
6
PORTREVISION=	1
6
PORTREVISION=	1
7
CATEGORIES=	www
7
CATEGORIES=	www
8
PKGNAMESUFFIX=	-legacy
8
9
9
MAINTAINER=	vbox@FreeBSD.org
10
MAINTAINER=	vbox@FreeBSD.org
10
COMMENT=	AJAX Web Interface for VirtualBox
11
COMMENT=	AJAX Web Interface for VirtualBox
Lines 20-29 Link Here
20
USE_GITHUB=	yes
21
USE_GITHUB=	yes
21
22
22
DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
23
DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
24
WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
23
ETCDIR=		${WWWDIR}
25
ETCDIR=		${WWWDIR}
24
26
25
post-patch:
27
post-patch:
26
	@${REINPLACE_CMD} -e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' ${WRKSRC}/phpvirtualbox.conf
28
	@${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf
29
	@${REINPLACE_CMD} -e 's#Alias /phpvirtualbox#Alias /phpvirtualbox-legacy#' \
30
		-e 's#/usr/share/phpvirtualbox#${WWWDIR}#g' \
31
		${WRKSRC}/phpvirtualbox-legacy.conf
27
32
28
do-install:
33
do-install:
29
	${MKDIR} ${STAGEDIR}${WWWDIR}
34
	${MKDIR} ${STAGEDIR}${WWWDIR}
(-)www/phpvirtualbox-legacy/pkg-plist (-1 / +1 lines)
Lines 569-575 Link Here
569
%%WWWDIR%%/panes/wizardNewHDAdvanced.html
569
%%WWWDIR%%/panes/wizardNewHDAdvanced.html
570
%%WWWDIR%%/panes/wizardNewVM.html
570
%%WWWDIR%%/panes/wizardNewVM.html
571
%%WWWDIR%%/panes/wizardNewVMAdvanced.html
571
%%WWWDIR%%/panes/wizardNewVMAdvanced.html
572
%%WWWDIR%%/phpvirtualbox.conf
572
%%WWWDIR%%/phpvirtualbox-legacy.conf
573
%%WWWDIR%%/rdpweb/RDPClientUI.swf
573
%%WWWDIR%%/rdpweb/RDPClientUI.swf
574
%%WWWDIR%%/rdpweb/license_3rd.txt
574
%%WWWDIR%%/rdpweb/license_3rd.txt
575
%%WWWDIR%%/rdpweb/swfobject.js
575
%%WWWDIR%%/rdpweb/swfobject.js

Return to bug 254079