Version bumped. This is a Security release. See 56915

11 files changed, 52 insertions, 162 deletions

diff --git a/www-apps/phpBB/ChangeLog b/www-apps/phpBB/ChangeLog
index e5e4a47386b0..bfaf9f1b1b44 100644
--- a/www-apps/phpBB/ChangeLog
+++ b/www-apps/phpBB/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/phpBB
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.1 2004/08/15 15:27:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.2 2004/08/27 16:02:19 mholzer Exp $
+
+*phpBB-2.0.10 (27 Aug 2004)
+
+  27 Aug 2004; Martin Holzer <mholzer@gentoo.org>
+  +files/2.0.10-postinstall-en.txt, +phpBB-2.0.10.ebuild:
+  Version bumped. This is a Security release. See 56915
 
 *phpBB-2.0.6-r2 (15 Aug 2004)
 
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index c8e7fdb58879..cea1c6321c22 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,12 +1,14 @@
-MD5 027f5c27500ac5e0d1995b99edfebb88 phpBB-2.0.6-r2.ebuild 1253
-MD5 19f06d9922ace0164de775f71ddf2ee7 phpBB-2.0.8a-r1.ebuild 901
-MD5 af2de1970bde51c2e2c7af4bc2e70185 phpBB-2.0.6-r1.ebuild 1331
-MD5 638e20ef55fddb8f71886ca123a6e2b3 ChangeLog 1882
+MD5 c27a6bfdbfe8029c3549adaf55b3b9ce ChangeLog 2192
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 eb9819c0b566913da73847f98d14d454 phpBB-2.0.8a.ebuild 1251
+MD5 5c713197e25ab64ec7836eee9bfae4e9 phpBB-2.0.6-r1.ebuild 1330
+MD5 7117cb7107f52d31865621a2513b5e01 phpBB-2.0.6-r2.ebuild 1252
+MD5 4641318ccee0b707e5e5753247c54974 phpBB-2.0.8a-r1.ebuild 900
+MD5 8ba24f650f0d15fda0196cd85fc7741a phpBB-2.0.8a.ebuild 1250
+MD5 5bff50e85840abf8570461a08b0b24e8 phpBB-2.0.10.ebuild 880
+MD5 a2ffb1296c4ce58eee7df10b2ccaaebc files/2.0.8-postinstall-en.txt 116
 MD5 2bcc15b387e45c0342ace8fe007ada43 files/digest-phpBB-2.0.6-r1 64
 MD5 81edef11555fd2672d5ccc894ce8b711 files/digest-phpBB-2.0.6-r2 64
-MD5 a2ffb1296c4ce58eee7df10b2ccaaebc files/2.0.8-postinstall-en.txt 116
-MD5 a5490792af02884bb7bfd22efa001697 files/digest-phpBB-2.0.8a-r1 65
 MD5 a5490792af02884bb7bfd22efa001697 files/digest-phpBB-2.0.8a 65
+MD5 a5490792af02884bb7bfd22efa001697 files/digest-phpBB-2.0.8a-r1 65
 MD5 baf12ebb39a1b14b5b0bf0fa9320eba8 files/phpBB-2.0.6-security.patch 248
+MD5 e91be9c94d3c82fb8b3b1b11c6470b34 files/digest-phpBB-2.0.10 65
diff --git a/www-apps/phpBB/files/2.0.10-postinstall-en.txt b/www-apps/phpBB/files/2.0.10-postinstall-en.txt
new file mode 100644
index 000000000000..3857a85759c6
--- /dev/null
+++ b/www-apps/phpBB/files/2.0.10-postinstall-en.txt
@@ -0,0 +1,3 @@
+Please use install/install.php to configure a new install of phpBB.
+Use install/update_to_210.php to upgrade your existing version.
+After that, please delete the contribs/ and install/ directories
diff --git a/www-apps/phpBB/files/digest-phpBB-2.0.10 b/www-apps/phpBB/files/digest-phpBB-2.0.10
new file mode 100644
index 000000000000..a8b061cc66e2
--- /dev/null
+++ b/www-apps/phpBB/files/digest-phpBB-2.0.10
@@ -0,0 +1 @@
+MD5 9aaf577d3160f6e3ba069eb2e670e2a4 phpBB-2.0.10.tar.bz2 453378
diff --git a/www-apps/phpBB/files/digest-phpBB-2.0.6-r1 b/www-apps/phpBB/files/digest-phpBB-2.0.6-r1
deleted file mode 100644
index 0dd9b2c15144..000000000000
--- a/www-apps/phpBB/files/digest-phpBB-2.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c2a43e1f482dffbcdb91dd366c9894f phpBB-2.0.6.tar.bz2 447960
diff --git a/www-apps/phpBB/files/digest-phpBB-2.0.6-r2 b/www-apps/phpBB/files/digest-phpBB-2.0.6-r2
deleted file mode 100644
index a0e46018c53b..000000000000
--- a/www-apps/phpBB/files/digest-phpBB-2.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3e462b3696e483bda81b281eca2c828 phpBB-2.0.6.tar.bz2 453896
diff --git a/www-apps/phpBB/files/digest-phpBB-2.0.8a b/www-apps/phpBB/files/digest-phpBB-2.0.8a
deleted file mode 100644
index 76fef3c11048..000000000000
--- a/www-apps/phpBB/files/digest-phpBB-2.0.8a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44d33a5851800f8f278d3c100fb2fcb3 phpBB-2.0.8a.tar.bz2 457308
diff --git a/www-apps/phpBB/phpBB-2.0.10.ebuild b/www-apps/phpBB/phpBB-2.0.10.ebuild
new file mode 100644
index 000000000000..0f0ccc30b0d7
--- /dev/null
+++ b/www-apps/phpBB/phpBB-2.0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.10.ebuild,v 1.1 2004/08/27 16:02:19 mholzer Exp $
+
+inherit webapp
+
+DESCRIPTION="phpBB is an open-source bulletin board package."
+HOMEPAGE="http://www.phpbb.com/"
+SRC_URI="mirror://sourceforge/phpbb/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+RDEPEND="virtual/php"
+
+S=${WORKDIR}/${PN}2
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc ${S}/docs/*
+	rm -rf ${S}/docs/
+
+	cp -a * "${D}/${MY_HTDOCSDIR}"
+
+	echo "<?php trigger_error('Please use install/install.php to configure phpBB for your system!', E_USER_ERROR); ?>" > "${D}/${MY_HTDOCSDIR}/config.php"
+	webapp_serverowned "${MY_HTDOCSDIR}/config.php"
+
+	webapp_postinst_txt en ${FILESDIR}/2.0.10-postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/phpBB/phpBB-2.0.6-r1.ebuild b/www-apps/phpBB/phpBB-2.0.6-r1.ebuild
deleted file mode 100644
index 97da239bfe2d..000000000000
--- a/www-apps/phpBB/phpBB-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.6-r1.ebuild,v 1.1 2004/08/15 15:27:23 stuart Exp $
-
-inherit webapp-apache eutils
-
-DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
-HOMEPAGE="http://www.phpbb.com/"
-SRC_URI="mirror://sourceforge/phpbb/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-RESTRICT="nomirror"
-
-DEPEND=">=sys-devel/patch-2.5.9"
-RDEPEND="virtual/php"
-
-S=${WORKDIR}/${PN}2
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-
-	webapp-pkg_setup "${NO_WEBSERVER}"
-
-	if [ -d ${HTTPD_ROOT}/phpbb ] ; then
-		ewarn "You need to unmerge your old phpBB version first."
-		ewarn "phpBB will be installed into ${HTTPD_ROOT}/phpbb"
-		ewarn "directly instead of a version-dependant directory."
-		die "need to unmerge old version first"
-	fi
-
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-security.patch || die "Security patch failed"
-}
-
-src_install() {
-	webapp-mkdirs
-
-	dodir "${HTTPD_ROOT}/phpbb"
-	cp -a * "${D}/${HTTPD_ROOT}/phpbb"
-	dodoc ${S}/docs/*
-
-	cd "${D}/${HTTPD_ROOT}"
-	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpbb"
-}
diff --git a/www-apps/phpBB/phpBB-2.0.6-r2.ebuild b/www-apps/phpBB/phpBB-2.0.6-r2.ebuild
deleted file mode 100644
index 93af162ed4c5..000000000000
--- a/www-apps/phpBB/phpBB-2.0.6-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.6-r2.ebuild,v 1.1 2004/08/15 15:27:23 stuart Exp $
-
-inherit webapp-apache
-
-DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
-HOMEPAGE="http://www.phpbb.com/"
-SRC_URI="mirror://sourceforge/phpbb/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-RESTRICT="nomirror"
-
-DEPEND=">=sys-devel/patch-2.5.9"
-RDEPEND="virtual/php"
-
-S=${WORKDIR}/${PN}2
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-
-	webapp-pkg_setup "${NO_WEBSERVER}"
-
-	if [ -d ${HTTPD_ROOT}/phpbb ] ; then
-		ewarn "You need to unmerge your old phpBB version first."
-		ewarn "phpBB will be installed into ${HTTPD_ROOT}/phpbb"
-		ewarn "directly instead of a version-dependant directory."
-		die "need to unmerge old version first"
-	fi
-
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_install() {
-	webapp-mkdirs
-
-	dodir "${HTTPD_ROOT}/phpbb"
-	cp -a * "${D}/${HTTPD_ROOT}/phpbb"
-	dodoc ${S}/docs/*
-
-	cd "${D}/${HTTPD_ROOT}"
-	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpbb"
-}
diff --git a/www-apps/phpBB/phpBB-2.0.8a.ebuild b/www-apps/phpBB/phpBB-2.0.8a.ebuild
deleted file mode 100644
index eec2fa279c97..000000000000
--- a/www-apps/phpBB/phpBB-2.0.8a.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.8a.ebuild,v 1.1 2004/08/15 15:27:23 stuart Exp $
-
-inherit webapp-apache
-
-DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
-HOMEPAGE="http://www.phpbb.com/"
-SRC_URI="mirror://sourceforge/phpbb/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-RESTRICT="nomirror"
-
-DEPEND=">=sys-devel/patch-2.5.9"
-RDEPEND="virtual/php"
-
-S=${WORKDIR}/${PN}2
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-
-	webapp-pkg_setup "${NO_WEBSERVER}"
-
-	if [ -d ${HTTPD_ROOT}/phpbb ] ; then
-		ewarn "You need to unmerge your old phpBB version first."
-		ewarn "phpBB will be installed into ${HTTPD_ROOT}/phpbb"
-		ewarn "directly instead of a version-dependant directory."
-		die "need to unmerge old version first"
-	fi
-
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_install() {
-	webapp-mkdirs
-
-	dodir "${HTTPD_ROOT}/phpbb"
-	cp -a * "${D}/${HTTPD_ROOT}/phpbb"
-	dodoc ${S}/docs/*
-
-	cd "${D}/${HTTPD_ROOT}"
-	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpbb"
-}