gentoo resync : 30.06.2019

6 files changed, 96 insertions, 65 deletions

diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index e5e94aee0952..220faadc8262 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,4 +1,5 @@
-AUX postinstall-en.txt 507 BLAKE2B 998b017b45e9588d8638cdcbb28e31603b77a2946df0c667fbdbe339d5a4ccb7a76a293f161fdb3850d0d0ef4914838f12291708f90c659b7db2f9224f5a9a32 SHA512 dc54de4de270eacd4ef765ad1537333229a6acbf6495f88f6c6a7f555fcf643177f03f690c426f08eea63a4988d113b39fb519162b26c6200b14ee387f1ebed0
-DIST phpBB-3.1.10.tar.bz2 2150999 BLAKE2B c0dce8b554f9bfd19f0e470fa0b96637f26969339f4ef6f87d04d5e492f0028d24e0adc76c8600b7a7d95c6531aa6971b646a02f22f731195c5a9491ea465bd0 SHA512 077a529075ea4e0691f9125be521b3fa8d4a078f9234b40bc5495faf00e1389808da40176ab8c8d9c66db259ebbf252d7292919d5c8e96e93c0bbda8d19695e2
-EBUILD phpBB-3.1.10-r1.ebuild 1199 BLAKE2B 28bebab93f72387a354c58e1e38760e64b9829f39d9087bdbb411016a9b3bbc745aad6f14d9aacbba3ef1fe451a0e62b79faf5387deb9ef9cd14c24ce6744f21 SHA512 b53966dbb23b4bbcc16f379df5cc787b74d3043db1db23755829139e48d0cf028dac6d67e111cb3fde7391fec89a43e3c40e37562a2b53be49d03267f5f41c59
-MISC metadata.xml 358 BLAKE2B a5b1c946e0c10bbe23eddc905a4d6fdff1495c606e4d3aca1237fa3bde6bc741bafe7268c1f9bcda87ca08032ddccd967760e83c43c717146db36b963b5835d7 SHA512 3cd787058b5689c07b47499aed4f85871c6a97ef58b097da1bcc743cff4852de56d62e9758dc1707b8cdf147aaad1d0daf1858d8c44e61de1594eea954779760
+AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
+AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
+DIST phpBB-3.2.7.tar.bz2 4384851 BLAKE2B 68af960efa04a30f81869b205d9c43ace86a4a4411a4cb969cdf5d52c8bf4f87f806fc3b2c71941f15be295afe5faa0d606af72a734356c3a7f0f97fb73d3f01 SHA512 f6cf728c022d803f2b39560037b987e832f4ee4583a377f63e01a1529b58e275db4f13386a0d70b50cfb40621d7573a26e349702f901a549cedda9db7f79d4d2
+EBUILD phpBB-3.2.7.ebuild 1501 BLAKE2B 259d96c2c47492231586bd0d13fec2bdaca9d59aa384b5670f30f0f486749e05e9453b92d5e75a692524eb41bd31b93aa495ac84d469268e371a024982d3a868 SHA512 2106a4a65de676d9327fabbe85275c1161813732550c98f4c03663d64238bd436ec591b24d32c41cf879a60edd1ac1e321ca584014a82d6845267e76569e88ab
+MISC metadata.xml 875 BLAKE2B 1b4bf9ef1b179b5bee6bf42a7b7d1f25b28273f4cbd18ceb830f478c788ed055921d05aa5154512bacd5e86b48ee87b8401c47878ae9adb567ebbc7192235fa2 SHA512 25c485aa4cb248afaf4500c9c7ef1d84e23245ca11f2dbe60eb809da4766d4566a9d76df4e6f9ecf19059b75c05f13fabd5f56e3bd4751a5b5cfcd33529b93a7
diff --git a/www-apps/phpBB/files/permissions b/www-apps/phpBB/files/permissions
new file mode 100755
index 000000000000..b5c21c879eb1
--- /dev/null
+++ b/www-apps/phpBB/files/permissions
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+if [[ $1 = install ]]; then
+	# Ensure database credentials are not world-readable.
+	chmod -v o= "${MY_INSTALLDIR}"/config.php
+
+	# These paths need to be writeable by the PHP user.
+	PATHS=( "${MY_INSTALLDIR}"/{cache/,config.php,download/,files/,store/,images/avatars/upload/} )
+
+	# Assume the PHP user is in the config group.
+	GID=${VHOST_CONFIG_GID}
+
+	# If that group is root, assume the web server group instead.
+	[[ ${GID} = 0 || ${GID} = root ]] && GID=${VHOST_SERVER_GID}
+
+	# Make the paths writeable by that group.
+	chgrp -v "${GID}" "${PATHS[@]}"
+	chmod -v g+w "${PATHS[@]}"
+fi
diff --git a/www-apps/phpBB/files/postinstall-en.txt b/www-apps/phpBB/files/postinstall-en.txt
index 6787a37ca813..8bdf1386e4de 100644
--- a/www-apps/phpBB/files/postinstall-en.txt
+++ b/www-apps/phpBB/files/postinstall-en.txt
@@ -1,22 +1,14 @@
-You are almost done!
+IMPORTANT! Ensure that the group assigned to group-writeable paths
+such as config.php (see above) is one your PHP user is a member
+of. This may or may not be your web server group, ${VHOST_SERVER_GID}.
+If not, adjust your PHP user and/or reinstall the application with
+webapp-config while specifying an appropriate group with -g. Then...
 
-  0. Setup a database (e.g. MySQL: see 
-                       http://www.gentoo.org/doc/en/mysql-howto.xml)
+1. Set up a database.
+2. Continue the installation by visiting the URL in your browser.
+3. Delete the "install" folder as follows:
 
-  1. Login on
+   # cd ${MY_INSTALLDIR}
+   # rm -rf install
 
-     http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
-
-     and finish the installation.
-
-  2. Move into the directory where you installed phpBB and remove
-     the "install" folder:
-
-     # cd ${MY_INSTALLDIR}
-     # rm -rf install
-
-  3. You can now launch your browser and point it to your phpBB site:
-
-     http://${VHOST_HOSTNAME}/${VHOST_APPDIR} 
-
-  Enjoy phpBB!
+4. phpBB is now ready to use. Enjoy!
diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml
index 575e4216b633..14d03d3e9a1f 100644
--- a/www-apps/phpBB/metadata.xml
+++ b/www-apps/phpBB/metadata.xml
@@ -9,4 +9,15 @@
 		<email>chewi@gentoo.org</email>
 		<name>James Le Cuirot</name>
 	</maintainer>
+	<longdescription>
+		phpBB is a free flat-forum bulletin board software solution that can be used
+		to stay in touch with a group of people or can power your entire website.
+		With an extensive database of user-created extensions and styles database
+		containing hundreds of style and image packages to customise your board,
+		you can create a very unique forum in minutes.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://tracker.phpbb.com</bugs-to>
+		<remote-id type="github">phpbb/phpbb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phpBB/phpBB-3.1.10-r1.ebuild b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
deleted file mode 100644
index ebc5ae0c5507..000000000000
--- a/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="An open-source bulletin board package"
-HOMEPAGE="https://www.phpbb.com/"
-SRC_URI="https://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86"
-IUSE="ftp gd imagemagick mssql mysqli postgres sqlite xml zlib"
-
-PHPV="5*:*"
-RDEPEND="=virtual/httpd-php-${PHPV}
-	=dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?]
-	imagemagick? ( virtual/imagemagick-tools )"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${PN}${PV%%.*}"
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/cache
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/upload
-	webapp_serverowned "${MY_HTDOCSDIR}"/store
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	# phpBB needs docs together with the other files.
-	dosym "${MY_HTDOCSDIR}"/docs /usr/share/doc/${PF}
-}
diff --git a/www-apps/phpBB/phpBB-3.2.7.ebuild b/www-apps/phpBB/phpBB-3.2.7.ebuild
new file mode 100644
index 000000000000..95dfe1c22767
--- /dev/null
+++ b/www-apps/phpBB/phpBB-3.2.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="An open-source PHP-based bulletin board package"
+HOMEPAGE="https://www.phpbb.com/"
+SRC_URI="https://www.phpbb.com/files/release/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE="ftp gd mssql mysqli postgres sqlite zlib"
+REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
+
+PHPV="5.4:*"
+RDEPEND=">=virtual/httpd-php-${PHPV}
+	>=dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}${PV%%.*}"
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+	webapp_hook_script "${FILESDIR}"/permissions
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	# phpBB needs docs together with the other files.
+	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
+	einfo "example configuration is provided via .htaccess files. For lighttpd and"
+	einfo "NGINX, example configuration files can be found in the documentation."
+
+	if use vhosts; then
+		echo
+		ewarn "When installing with webapp-config, specify a group that includes your"
+		ewarn "PHP user with the -g option. It will default to the web server group"
+		ewarn "when running webapp-config as root."
+	fi
+}