gentoo auto-resync : 10:09:2024 - 12:30:41

4 files changed, 114 insertions, 7 deletions

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index f917dd448f14..f56d38654641 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -2,10 +2,12 @@ AUX apache.conf 1235 BLAKE2B ecc04426bc5d354579bfa404bfdddce09b4bc3621b5fbb2013e
 AUX nginx.include 328 BLAKE2B a202780d56334cfe5c226300b88e40dd9e1490c97c852fee7ef984fa8676c1d6b0b6f3dc4b9d7b5b8bde41c3bc15d708ee28ac6574cafe56fbbe192cccaff48c SHA512 82e82397041da79f72ac316175689d981f935c5568fb6352ebdf666928963395b76bd65eeea4b6b09e755118b3e040ab82678fdd0b34e67cd44de0055d96a3dc
 AUX postinstall-en.txt 1318 BLAKE2B c5d4a74d67951bd9d3f9db677e7c526a29af108cab31a771e1623f425f1c0e4e16fca1ffc2f3cd7d8016a12fa87edab854002e5b513b07099128eb37d1cadc26 SHA512 0a1cddd68e6abba8e91d11d5ea32df18f71b64ef5f1dedcab3f5337b19fb272f05b289541da1117dac694f3d7ecb5b92d3bd3ccca96d7cbcbe3b9fad22b0ee37
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
-DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
+DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
+DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
 EBUILD bareos-webui-22.1.2.ebuild 2608 BLAKE2B 8717ac735698244f95f53288c15a1b2d256d17c8e1a92bda98fe8838b3022fa73149dca6ba072659c71730d40f131d205f6e4da5582a0c4f2e9bf0ada8cfa26e SHA512 00e1b963bffd1625170b7d99921dccd700d5c79baf731d5952c8b4e2b4e3271c4b5e9e57632a0448733aec83a0853ce277b4d9ed2989bc215090ad9e441a9109
-EBUILD bareos-webui-23.0.1.ebuild 2608 BLAKE2B 8717ac735698244f95f53288c15a1b2d256d17c8e1a92bda98fe8838b3022fa73149dca6ba072659c71730d40f131d205f6e4da5582a0c4f2e9bf0ada8cfa26e SHA512 00e1b963bffd1625170b7d99921dccd700d5c79baf731d5952c8b4e2b4e3271c4b5e9e57632a0448733aec83a0853ce277b4d9ed2989bc215090ad9e441a9109
+EBUILD bareos-webui-22.1.6.ebuild 2607 BLAKE2B 9c94d1d363410e5af9363ba50daa1ad5589b38bdada014f5d36e65bcd019fb86703af33708ecc83f45e6d43dda85d8fd4ffb6864fbc9aca950910e460d411555 SHA512 6987d79adb856046c64a2052b9b05281c9332d3f0fd63f87126b104fa930a6136ef7c23790fc70e9eb572eb899fbfdaadffd60d7ab8e1603a3935eb99c4a1cc4
 EBUILD bareos-webui-23.0.2.ebuild 2608 BLAKE2B 8717ac735698244f95f53288c15a1b2d256d17c8e1a92bda98fe8838b3022fa73149dca6ba072659c71730d40f131d205f6e4da5582a0c4f2e9bf0ada8cfa26e SHA512 00e1b963bffd1625170b7d99921dccd700d5c79baf731d5952c8b4e2b4e3271c4b5e9e57632a0448733aec83a0853ce277b4d9ed2989bc215090ad9e441a9109
-EBUILD bareos-webui-9999.ebuild 2608 BLAKE2B 8717ac735698244f95f53288c15a1b2d256d17c8e1a92bda98fe8838b3022fa73149dca6ba072659c71730d40f131d205f6e4da5582a0c4f2e9bf0ada8cfa26e SHA512 00e1b963bffd1625170b7d99921dccd700d5c79baf731d5952c8b4e2b4e3271c4b5e9e57632a0448733aec83a0853ce277b4d9ed2989bc215090ad9e441a9109
+EBUILD bareos-webui-23.0.4.ebuild 2607 BLAKE2B 9c94d1d363410e5af9363ba50daa1ad5589b38bdada014f5d36e65bcd019fb86703af33708ecc83f45e6d43dda85d8fd4ffb6864fbc9aca950910e460d411555 SHA512 6987d79adb856046c64a2052b9b05281c9332d3f0fd63f87126b104fa930a6136ef7c23790fc70e9eb572eb899fbfdaadffd60d7ab8e1603a3935eb99c4a1cc4
+EBUILD bareos-webui-9999.ebuild 2607 BLAKE2B 9c94d1d363410e5af9363ba50daa1ad5589b38bdada014f5d36e65bcd019fb86703af33708ecc83f45e6d43dda85d8fd4ffb6864fbc9aca950910e460d411555 SHA512 6987d79adb856046c64a2052b9b05281c9332d3f0fd63f87126b104fa930a6136ef7c23790fc70e9eb572eb899fbfdaadffd60d7ab8e1603a3935eb99c4a1cc4
 MISC metadata.xml 328 BLAKE2B 47dda9d82b55f78bbf9b78f8ac463db48ede507dd62dfecd1fec01426e834f2669203956b0a5da31ae133bb0f362ab1263123318babf65abaa6619e1feb209f1 SHA512 c16ba92ff73595406f24c4f2cb18bb2059d7990273d2c91c4f83486f1349ab0ca3d709f27f929956987b60a24ff8426687dafc7f79be0d32df0a176ee2528d93
diff --git a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
index 1891ba820469..77c9bfd5119b 100644
--- a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
@@ -25,9 +25,8 @@ fi
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
 LICENSE="AGPL-3"
+RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
new file mode 100644
index 000000000000..77c9bfd5119b
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_WARN_UNUSED_CLI=no
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake webapp
+
+MY_PV=${PV/_/-}
+MY_PN="bareos"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	S=${WORKDIR}/${PF}/webui
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+else
+	S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+LICENSE="AGPL-3"
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-lang/php[bzip2,ctype,curl,fileinfo,filter,fpm,gd,iconv,intl,mhash,nls,pdo,postgres,session,simplexml,ssl,xml,xmlreader,xmlwriter,zip]
+	virtual/httpd-php
+"
+
+need_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# fix missing VERSION
+	sed -i "s/@BAREOS_FULL_VERSION@/${PV}/g" version.php.in || die
+
+	cmake_src_prepare
+	default
+}
+
+src_configure() {
+	if [[ ${PV} == 9999 ]]; then
+		pushd "${WORKDIR}/${PF}"
+	else
+		pushd "${S}"/..
+	fi
+	CURRENT_VERSION=$(echo $(cmake -P get_version.cmake) | sed 's/[- ]//g')
+	popd
+	local mycmakeargs=(
+		-DVERSION_STRING=${CURRENT_VERSION}
+		-Wno-dev
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README.md doc/README-TRANSLATION.md
+
+	dodir /etc/bareos/bareos-dir.d
+	cp -r install/bareos/bareos-dir.d/* "${D}"/etc/bareos/bareos-dir.d
+
+	webapp_server_configfile nginx "${FILESDIR}"/nginx.include
+	webapp_server_configfile apache "${FILESDIR}"/apache.conf
+
+	insinto /etc/"${PN}"
+	doins install/{configuration,directors}.ini
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/application.config.php
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/autoload/global.php
+
+	keepdir "${MY_HTDOCSDIR#${EPREFIX}}"/data
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/data
+
+	# cleanup
+	find  "${D}/${MY_HTDOCSDIR#${EPREFIX}}" -name "*.in" -delete
+	rm -rf "${D}/${MY_HTDOCSDIR#${EPREFIX}}"/{CMakeLists.txt,install,cmake,phpunit.xml,scripts,doc,tests}
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The webui uses 'webapp-config' to be installed to the webservers docroot"
+	einfo "E.g. to install webapp-config may be called like so:"
+	einfo ""
+	einfo "  ~# webapp-config -h localhost -d bareos-webui -I bareos-webui ${PV}"
+	einfo ""
+	einfo "See 'man webapp-config' for details."
+	einfo ""
+}
diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 1891ba820469..77c9bfd5119b 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -25,9 +25,8 @@ fi
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
 LICENSE="AGPL-3"
+RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="${DEPEND}