Attachment 218867 Details for Bug 250440 – Patch for bareos-webui port upgrade to 19.2.8.

[patch] Patch for bareos-webui port upgrade to 19.2.8.

bareos.diff (text/plain), 9.17 KB, created by Brad Ackerman on 2020-10-19 01:29:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Ackerman

Created: 2020-10-19 01:29:05 UTC

Size: 9.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 552608)
>+++ Makefile	(working copy)
>@@ -1,10 +1,10 @@
> # $FreeBSD$
> 
>-PORTNAME=       bareos
>-DISTVERSIONPREFIX=      Release/
>-DISTVERSION=    19.2.7
>-CATEGORIES?=    www sysutils
>-PKGNAMESUFFIX= -webui
>+PORTNAME=	bareos
>+DISTVERSIONPREFIX=	Release/
>+DISTVERSION=	19.2.8
>+CATEGORIES?=	www sysutils
>+PKGNAMESUFFIX=	-webui
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	PHP-Frontend to manage Bareos over the web
>@@ -12,54 +12,39 @@
> LICENSE=	AGPLv3+
> 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
>+USE_GITHUB=	yes
> 
>+USERS=		bareos
>+GROUPS=		${USERS}
>+
>+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/bareos
> 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
>+	${FIND} ${WRKSRC}/webui -name .gitignore -delete
> 
>-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
>-
>-do-install:
>-	@${ECHO} "Installing in ${WWWDIR}"
>-	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
>-	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
>-	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
>-	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config data module public vendor" \
>-		${STAGEDIR}${WWWDIR}
>-	${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/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
>+post-install:
>+	${FIND} ${STAGEDIR} -name \*.in -delete
>+	${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${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
>-
>+	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
>+	${INSTALL_DATA} ${WRKSRC}/webui/composer.json ${STAGEDIR}${WWWDIR}
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 552608)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589249023
>-SHA256 (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 283c1fa9cb6a96b1f09b402cd507ecd8bf798458bafcbfad867da08d33d12653
>-SIZE (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 12602338
>+TIMESTAMP = 1602826372
>+SHA256 (bareos-bareos-Release-19.2.8_GH0.tar.gz) = 694ccf3ce5e84800335fda1d20bc681fcab77ab746f70c072b7c37b5b9f71a44
>+SIZE (bareos-bareos-Release-19.2.8_GH0.tar.gz) = 12604929
>Index: files/patch-webui_CMakeLists.txt
>===================================================================
>--- files/patch-webui_CMakeLists.txt	(nonexistent)
>+++ files/patch-webui_CMakeLists.txt	(working copy)
>@@ -0,0 +1,43 @@
>+--- webui/CMakeLists.txt.orig	2020-07-09 17:39:20 UTC
>++++ webui/CMakeLists.txt
>+@@ -109,7 +109,7 @@ configure_file(
>+   ${CMAKE_CURRENT_SOURCE_DIR}/module/Application/view/layout/login.phtml @ONLY
>+ )
>+ 
>+-set(WEBUI_DIR ${SHARE_INSTALL_PREFIX}/bareos-webui)
>++set(WEBUI_DIR ${SHARE_INSTALL_PREFIX}/bareos)
>+ set(WEBUI_TESTS_DIR ${WEBUI_DIR}/tests/regress)
>+ if(PHP)
>+   configure_file(
>+@@ -132,25 +132,28 @@ endif()
>+ 
>+ if(NOT client-only)
>+   install(FILES version.php init_autoloader.php
>+-          DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui
>++          DESTINATION ${SHARE_INSTALL_PREFIX}/bareos
>+   )
>+   install(DIRECTORY tests config data module public vendor
>+-          DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui
>++          DESTINATION ${SHARE_INSTALL_PREFIX}/bareos
>+   )
>+ 
>+   install(FILES install/bareos/bareos-dir.d/console/admin.conf.example
>+           DESTINATION ${confdir}/bareos-dir.d/console/
>++	  RENAME admin.conf.sample
>+   )
>+   install(FILES install/bareos/bareos-dir.d/profile/webui-admin.conf
>+           DESTINATION ${confdir}/bareos-dir.d/profile/
>++	  RENAME webui-admin.conf.sample
>+   )
>+   install(FILES install/bareos/bareos-dir.d/profile/webui-limited.conf.example
>+           DESTINATION ${confdir}/bareos-dir.d/profile/
>++	  RENAME webui-limited.conf.sample
>+   )
>+   install(FILES install/bareos/bareos-dir.d/profile/webui-readonly.conf
>+           DESTINATION ${confdir}/bareos-dir.d/profile/
>++	  RENAME webui-readonly.conf.sample
>+   )
>+-  install(FILES install/apache/bareos-webui.conf DESTINATION ${HTTPD_CONF}/)
>+ 
>+   install(FILES install/directors.ini DESTINATION ${webuiconfdir})
>+   install(FILES install/configuration.ini DESTINATION ${webuiconfdir})
>
>Property changes on: files/patch-webui_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 552608)
>+++ files/pkg-message.in	(working copy)
>@@ -1,15 +1,12 @@
> [
> { type: install
>   message: <<EOM
>-bareos webui was installed
>+The Bareos web UI has been installed in %%BAREOSWEBUIDIR%%. You can find
>+configuration instructions at:
> 
>-Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
>-look bareos-webui installation/configuration instructions at:
>+https://docs.bareos.org/IntroductionAndTutorial/InstallingBareosWebui.html
> 
>-https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
>-
>-1) Configuration files are stored at %%ETCDIR%%
>-2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
>+The configuration files are stored in %%ETCDIR%%.
> EOM
> }
> ]
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 552608)
>+++ pkg-plist	(working copy)
>@@ -1,8 +1,10 @@
> @owner %%WWWOWN%%
> @group %%WWWGRP%%
> %%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
>+@sample(bareos,bareos,640) %%ETCDIR%%/bareos-dir.d/console/admin.conf.sample
>+@sample(bareos,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/webui-admin.conf.sample
>+@sample(bareos,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/webui-limited.conf.sample
>+@sample(bareos,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/webui-readonly.conf.sample
> %%ETCDIR%%/configuration.ini
> %%ETCDIR%%/directors.ini
> %%ETCDIR%%/nginx-bareos-webui.conf
>@@ -10,7 +12,6 @@
> %%WWWDIR%%/config/application.config.php
> %%WWWDIR%%/config/autoload/README.md
> %%WWWDIR%%/config/autoload/global.php
>-%%WWWDIR%%/config/autoload/global.php.bak
> %%WWWDIR%%/init_autoloader.php
> %%WWWDIR%%/module/Application/Module.php
> %%WWWDIR%%/module/Application/autoload_classmap.php
>@@ -286,6 +287,13 @@
> %%WWWDIR%%/public/js/respond.min.js
> %%WWWDIR%%/public/js/responsive.bootstrap.js
> %%WWWDIR%%/public/js/responsive.bootstrap.min.js
>+%%WWWDIR%%/tests/phpunit/Bootstrap.php
>+%%WWWDIR%%/tests/regress/webui-bsock-connection-test
>+%%WWWDIR%%/tests/regress/webui-bsock-connection-test-tls
>+%%WWWDIR%%/tests/regress/webui-bsock-connection-test-tls.php
>+%%WWWDIR%%/tests/regress/webui-bsock-connection-test.php
>+%%WWWDIR%%/tests/selenium/README.md
>+%%WWWDIR%%/tests/selenium/webui-selenium-test.py
> %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
> %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockAbstractServiceFactory.php
> %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockInterface.php

Actions: View | Diff

Attachments on bug 250440: 218867