Security fix; see bug #75858

4 files changed, 61 insertions, 16 deletions

diff --git a/www-apps/phprojekt/ChangeLog b/www-apps/phprojekt/ChangeLog
index fdefc56589ce..14d0fdff7806 100644
--- a/www-apps/phprojekt/ChangeLog
+++ b/www-apps/phprojekt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/phprojekt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/ChangeLog,v 1.9 2004/12/10 17:24:59 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/ChangeLog,v 1.10 2004/12/29 13:01:25 stuart Exp $
+
+  29 Dec 2004; Stuart Herbert <stuart@gentoo.org> :
+  Security fix; see bug #75858
 
   08 Dec 2004; Olivier Crete <tester@gentoo.org> phprojekt-4.2-r1.ebuild:
   Stable on x86 wrt security bug 73021
diff --git a/www-apps/phprojekt/Manifest b/www-apps/phprojekt/Manifest
index 386edd7a7713..fc23f67fbc6f 100644
--- a/www-apps/phprojekt/Manifest
+++ b/www-apps/phprojekt/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fcd1e8420489804fc718b24d3a3cb9db ChangeLog 2731
-MD5 a17a98187231826b89b8aa103692b7a7 phprojekt-4.0-r1.ebuild 840
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 69f32d50f100105086226af5522e5593 phprojekt-4.2-r1.ebuild 1113
-MD5 5ffb04c6604cca9afcba6dde36ae7292 phprojekt-4.2.ebuild 965
 MD5 374a53239ebb4faadcbe47ec1b7f6ba8 phprojekt-3.2a.ebuild 852
+MD5 a17a98187231826b89b8aa103692b7a7 phprojekt-4.0-r1.ebuild 840
 MD5 2feb03e3c6c4d906cca711b6639b4816 phprojekt-4.1.ebuild 836
+MD5 5ffb04c6604cca9afcba6dde36ae7292 phprojekt-4.2.ebuild 965
+MD5 69f32d50f100105086226af5522e5593 phprojekt-4.2-r1.ebuild 1113
+MD5 2bfd9bc8eeeaa625d25a6baee1d84dd2 phprojekt-4.2-r2.ebuild 1282
 MD5 a5312d2a7dbb70b1d0416e37c9fd82d8 files/digest-phprojekt-3.2a 61
-MD5 9795a83201163bd130899be5e47aaad3 files/digest-phprojekt-4.2 66
-MD5 b22d3aff81f01ade762c248b632b59af files/postinstall-en.txt 566
 MD5 a4fc4523f14a2ad77b9d00dd7e386b88 files/digest-phprojekt-4.0-r1 65
 MD5 6d1069d70f3ff3b4f87db9ca117da41d files/digest-phprojekt-4.1 65
+MD5 9795a83201163bd130899be5e47aaad3 files/digest-phprojekt-4.2 66
+MD5 b22d3aff81f01ade762c248b632b59af files/postinstall-en.txt 566
 MD5 938b9d2863dfb43c71b95e95dfa47fec files/digest-phprojekt-4.2-r1 118
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBudv8wDHaUUJ0mYMRAu3DAJ4qEDFKPrXPboZ4p3GhumIqOSXYugCgpA1w
-NUSwaSEzavIG7cJ5ib4FLVQ=
-=8wUd
------END PGP SIGNATURE-----
+MD5 06ec2426a542cce49d52bdb2e293404d files/digest-phprojekt-4.2-r2 168
diff --git a/www-apps/phprojekt/files/digest-phprojekt-4.2-r2 b/www-apps/phprojekt/files/digest-phprojekt-4.2-r2
new file mode 100644
index 000000000000..de195dcb6930
--- /dev/null
+++ b/www-apps/phprojekt/files/digest-phprojekt-4.2-r2
@@ -0,0 +1,3 @@
+MD5 6dd8d5a6bfc4b0d73d99c42afb10a6c1 phprojekt-4.2.tar.gz 1011733
+MD5 4d8ca59d86c32650c34e06691b335841 setup.zip 2830
+MD5 25d69434fb367f39db402c33df6cebd4 lib.zip 2149
diff --git a/www-apps/phprojekt/phprojekt-4.2-r2.ebuild b/www-apps/phprojekt/phprojekt-4.2-r2.ebuild
new file mode 100644
index 000000000000..2c49dd717099
--- /dev/null
+++ b/www-apps/phprojekt/phprojekt-4.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/phprojekt-4.2-r2.ebuild,v 1.1 2004/12/29 13:01:25 stuart Exp $
+
+inherit webapp
+
+DESCRIPTION="Project management and coordination system"
+HOMEPAGE="http://www.phprojekt.com/"
+IUSE="postgres mysql"
+SRC_URI="mirror://gentoo/${P}.tar.gz http://phprojekt.com/files/4.2/setup.zip http://phprojekt.com/files/4.2/lib.zip"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
+RDEPEND="net-www/apache
+		postgres? ( dev-db/postgresql )
+		mysql? ( dev-db/mysql )
+		virtual/php"
+
+src_unpack () {
+	unpack ${A}
+
+	# patch for security flaw - see bug #73021
+	cp ${WORKDIR}/setup.php ${S}
+
+	# patch for security flaw - see bug #75858
+	cp ${WORKDIR}/authform.inc.php ${S}/lib/
+	cp ${WORKDIR}/gpcs_vars.inc.php ${S}/lib/
+}
+
+pkg_setup () {
+	webapp_pkg_setup
+	einfo "Please make sure that your PHP is compiled with support for IMAP and your database of choice"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc ChangeLog install readme
+	rm -f ChangeLog install readme
+	cp -R . ${D}/${MY_HTDOCSDIR}
+	for file in chat attach upload; do
+		webapp_serverowned ${MY_HTDOCSDIR}/${file}
+	done
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}