- Update to 20.0.0

ChangeLog at: https://docs.bareos.org/Appendix/ReleaseNotes.html

4 files changed, 46 insertions, 30 deletions

diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index d1904db0eb1a..254780bde7f8 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=       bareos
 DISTVERSIONPREFIX=      Release/
-DISTVERSION=    19.2.9
+DISTVERSION=    20.0.0
 CATEGORIES?=    www sysutils
 PKGNAMESUFFIX= -webui
 
@@ -14,36 +14,29 @@ LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
 
-USES=		php
+USES=		php:build cmake gettext
 USE_PHP=	openssl gettext ctype hash json session iconv
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+CMAKE_SOURCE_PATH=	${WRKSRC}/webui
+CMAKE_INSTALL_PREFIX=	${STAGEDIR}
+CMAKE_ARGS+=	-DSHARE_INSTALL_PREFIX:PATH=${PREFIX}/www \
+		-DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=${PREFIX}/etc \
+		-Dsysconfdir=${PREFIX}/etc \
+		-Dwebuiconfdir=${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}
+
 SUB_FILES=	pkg-message
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-SUB_LIST=	BAREOSWEBUIDIR=${WWWDIR}
 
-OPTIONS_DEFINE=		MYSQL PGSQL ZENDFRAMEWORK
+OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
-ZENDFRAMEWORK_DESC=	Install zend framework
 
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
-ZENDFRAMEWORK_RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
 post-extract:
-	${RM} ${WRKSRC}/webui/config/autoload/.gitignore
-	${RM} ${WRKSRC}/webui/data/cache/.gitignore
-	${RM} ${WRKSRC}/webui/vendor/.gitignore
-	${MV} ${WRKSRC}/webui/version.php.in ${WRKSRC}/webui/version.php
-	${MV} ${WRKSRC}/webui/config/autoload/global.php.in ${WRKSRC}/webui/config/autoload/global.php
-	${MV} ${WRKSRC}/webui/module/Application/view/layout/layout.phtml.in ${WRKSRC}/webui/module/Application/view/layout/layout.phtml
-	${MV} ${WRKSRC}/webui/module/Application/view/layout/login.phtml.in ${WRKSRC}/webui/module/Application/view/layout/login.phtml
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' -e 's|@WEBUICONFDIR@|${ETCDIR}|g' -e \
-		's|@dirport@|9101|g' ${WRKSRC}/webui/config/autoload/global.php
-	@${REINPLACE_CMD} -e 's|@BAREOS_FULL_VERSION@|${PORTVERSION}|g' ${WRKSRC}/webui/version.php
+	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
@@ -55,10 +48,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini.in ${STAGEDIR}${ETCDIR}/directors.ini
-	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini.in ${STAGEDIR}${ETCDIR}/configuration.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${ETCDIR}/directors.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${ETCDIR}/configuration.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-readonly.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-readonly.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
 
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index c1585c628e29..d20e79d35666 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607999377
-SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723
-SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739
+TIMESTAMP = 1609049906
+SHA256 (bareos-bareos-Release-20.0.0_GH0.tar.gz) = c66914a19dbd75c214f559b55830ab8bf468d02f50fd85694fe190153fd5695d
+SIZE (bareos-bareos-Release-20.0.0_GH0.tar.gz) = 13325939
diff --git a/www/bareos-webui/files/pkg-message.in b/www/bareos-webui/files/pkg-message.in
index 2b120024b65e..22b6f592e93f 100644
--- a/www/bareos-webui/files/pkg-message.in
+++ b/www/bareos-webui/files/pkg-message.in
@@ -3,13 +3,15 @@
   message: <<EOM
 bareos webui was installed
 
-Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
+Please note that everything has been installed in %%WWWDIR%%. You can
 look bareos-webui installation/configuration instructions at:
 
-https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
+https://docs.bareos.org/IntroductionAndTutorial/InstallingBareosWebui.html
 
-1) Configuration files are stored at %%ETCDIR%%
-2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
+1) Configuration files (webserver and webui) are stored at %%ETCDIR%%
+2) This install some bareos-dir configuration samples at %%PREFIX%%/etc/bareos.
+   Don't forget change permissions to user/group used by bareos-dir on server 
+   where it is installed
 EOM
 }
 ]
diff --git a/www/bareos-webui/pkg-plist b/www/bareos-webui/pkg-plist
index e7d627534dce..8400aeb488b6 100644
--- a/www/bareos-webui/pkg-plist
+++ b/www/bareos-webui/pkg-plist
@@ -3,14 +3,16 @@
 %%ETCDIR%%/apache-bareos-webui.conf
 @sample(,www,640) %%ETCDIR%%/bareos-dir.d/console/admin.conf.sample
 @sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-admin.conf.sample
-%%ETCDIR%%/configuration.ini
-%%ETCDIR%%/directors.ini
+@sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-limited.conf.sample
+@sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-readonly.conf.sample
+@(,www,640) %%ETCDIR%%/configuration.ini
+@(,www,640) %%ETCDIR%%/directors.ini
 %%ETCDIR%%/nginx-bareos-webui.conf
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/application.config.php
 %%WWWDIR%%/config/autoload/README.md
 %%WWWDIR%%/config/autoload/global.php
-%%WWWDIR%%/config/autoload/global.php.bak
+%%WWWDIR%%/config/autoload/global.php.in
 %%WWWDIR%%/init_autoloader.php
 %%WWWDIR%%/module/Application/Module.php
 %%WWWDIR%%/module/Application/autoload_classmap.php
@@ -45,6 +47,8 @@
 %%WWWDIR%%/module/Application/language/sk_SK.po
 %%WWWDIR%%/module/Application/language/tr_TR.mo
 %%WWWDIR%%/module/Application/language/tr_TR.po
+%%WWWDIR%%/module/Application/language/uk_UA.mo
+%%WWWDIR%%/module/Application/language/uk_UA.po
 %%WWWDIR%%/module/Application/language/webui.pot
 %%WWWDIR%%/module/Application/src/Application/Controller/IndexController.php
 %%WWWDIR%%/module/Application/src/Application/Controller/Plugin/CommandACLPlugin.php
@@ -60,7 +64,9 @@
 %%WWWDIR%%/module/Application/view/layout/install.phtml
 %%WWWDIR%%/module/Application/view/layout/json.phtml
 %%WWWDIR%%/module/Application/view/layout/layout.phtml
+%%WWWDIR%%/module/Application/view/layout/layout.phtml.in
 %%WWWDIR%%/module/Application/view/layout/login.phtml
+%%WWWDIR%%/module/Application/view/layout/login.phtml.in
 %%WWWDIR%%/module/Application/view/partial/breadcrumb.phtml
 %%WWWDIR%%/module/Application/view/partial/paginator.phtml
 %%WWWDIR%%/module/Auth/Module.php
@@ -186,6 +192,10 @@
 %%WWWDIR%%/public/css/bootstrap-select.css
 %%WWWDIR%%/public/css/bootstrap-select.css.map
 %%WWWDIR%%/public/css/bootstrap-select.min.css
+%%WWWDIR%%/public/css/bootstrap-slider.css
+%%WWWDIR%%/public/css/bootstrap-slider.min.css
+%%WWWDIR%%/public/css/bootstrap-table-filter-control.css
+%%WWWDIR%%/public/css/bootstrap-table-filter-control.min.css
 %%WWWDIR%%/public/css/bootstrap-table.css
 %%WWWDIR%%/public/css/bootstrap-table.min.css
 %%WWWDIR%%/public/css/bootstrap-theme.css
@@ -194,6 +204,7 @@
 %%WWWDIR%%/public/css/bootstrap.css
 %%WWWDIR%%/public/css/bootstrap.css.map
 %%WWWDIR%%/public/css/bootstrap.min.css
+%%WWWDIR%%/public/css/bootstrap.min.css.map
 %%WWWDIR%%/public/css/jstree.css
 %%WWWDIR%%/public/css/jstree.min.css
 %%WWWDIR%%/public/css/spinner.gif
@@ -224,8 +235,13 @@
 %%WWWDIR%%/public/js/bootstrap-select.js
 %%WWWDIR%%/public/js/bootstrap-select.js.map
 %%WWWDIR%%/public/js/bootstrap-select.min.js
+%%WWWDIR%%/public/js/bootstrap-slider.js
+%%WWWDIR%%/public/js/bootstrap-slider.min.js
 %%WWWDIR%%/public/js/bootstrap-table-cookie.js
 %%WWWDIR%%/public/js/bootstrap-table-cookie.min.js
+%%WWWDIR%%/public/js/bootstrap-table-filter-control.js
+%%WWWDIR%%/public/js/bootstrap-table-filter-control.min.js
+%%WWWDIR%%/public/js/bootstrap-table-formatter.js
 %%WWWDIR%%/public/js/bootstrap-table-locale-all.js
 %%WWWDIR%%/public/js/bootstrap-table-locale-all.min.js
 %%WWWDIR%%/public/js/bootstrap-table.js
@@ -248,6 +264,7 @@
 %%WWWDIR%%/public/js/jquery.min.map
 %%WWWDIR%%/public/js/jstree.js
 %%WWWDIR%%/public/js/jstree.min.js
+%%WWWDIR%%/public/js/jstreegrid-helper.js
 %%WWWDIR%%/public/js/jstreegrid.js
 %%WWWDIR%%/public/js/locale/cn_CN/LC_MESSAGES/cn_CN.mo
 %%WWWDIR%%/public/js/locale/cn_CN/LC_MESSAGES/cn_CN.po
@@ -275,6 +292,8 @@
 %%WWWDIR%%/public/js/locale/sk_SK/LC_MESSAGES/sk_SK.po
 %%WWWDIR%%/public/js/locale/tr_TR/LC_MESSAGES/tr_TR.mo
 %%WWWDIR%%/public/js/locale/tr_TR/LC_MESSAGES/tr_TR.po
+%%WWWDIR%%/public/js/locale/uk_UA/LC_MESSAGES/uk_UA.mo
+%%WWWDIR%%/public/js/locale/uk_UA/LC_MESSAGES/uk_UA.po
 %%WWWDIR%%/public/js/moment-timezone-with-data.js
 %%WWWDIR%%/public/js/moment-timezone-with-data.min.js
 %%WWWDIR%%/public/js/moment-with-locales.js