Security update to fix bug #174451. Added phpwiki-1.3.13_rc1 to the tree.

(Portage version: 2.1.1)

6 files changed, 115 insertions, 3 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index ccd162933fe9..467ccae32034 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/phpwiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.17 2007/02/21 14:22:59 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.18 2007/05/10 12:57:53 wrobel Exp $
+
+*phpwiki-1.3.13_rc1 (10 May 2007)
+*phpwiki-1.3.10-r3 (10 May 2007)
+
+  10 May 2007; <wrobel@gentoo.org> +phpwiki-1.3.10-r3.ebuild,
+  -phpwiki-1.3.11_p1.ebuild, -phpwiki-1.3.12_p2.ebuild,
+  +phpwiki-1.3.13_rc1.ebuild:
+  Security update to fix bug #174451. Added phpwiki-1.3.13_rc1 to the tree.
 
   21 Feb 2007; Renat Lumpau <rl03@gentoo.org>
   files/digest-phpwiki-1.3.10-r2, files/digest-phpwiki-1.3.11_p1, Manifest:
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r3 b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r3
new file mode 100644
index 000000000000..d72aa4eb26bd
--- /dev/null
+++ b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r3
@@ -0,0 +1,6 @@
+MD5 8747352d84836671445a6eb95b2184a7 phpwiki-1.3.10.tar.gz 2072469
+RMD160 25a616bcebc17015d0d65ce4de1267be605403d1 phpwiki-1.3.10.tar.gz 2072469
+SHA256 a59cc42af4c7ad8554e65f7bdd3bfd94841a2e9a97165a309b4606ac1cb10af9 phpwiki-1.3.10.tar.gz 2072469
+MD5 3af1716bca6a945399b77ceefbdba854 phpwiki-xmlrpc.tar.gz 19988
+RMD160 a9cee0e390017355a16b331857feab0effecc509 phpwiki-xmlrpc.tar.gz 19988
+SHA256 ae48412d382bdf67144f216c4d9ff6044dfce0e069e1898f86ee7fdc0ee6b573 phpwiki-xmlrpc.tar.gz 19988
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.13_rc1 b/www-apps/phpwiki/files/digest-phpwiki-1.3.13_rc1
new file mode 100644
index 000000000000..dfb87f96434a
--- /dev/null
+++ b/www-apps/phpwiki/files/digest-phpwiki-1.3.13_rc1
@@ -0,0 +1,3 @@
+MD5 da025b788c998d134e15b93a54e820c9 phpwiki-1.3.13rc1.tar.bz2 2502391
+RMD160 a8b725f617aff3653c26a8531552f1448512f28b phpwiki-1.3.13rc1.tar.bz2 2502391
+SHA256 f9f44db088300d6370fc35bdc51f4453d33db6898c1970d9e485776415c09356 phpwiki-1.3.13rc1.tar.bz2 2502391
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
index a2dc8e3267f8..56427374b909 100644
--- a/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild,v 1.2 2005/08/25 18:25:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild,v 1.3 2007/05/10 12:57:53 wrobel Exp $
 
 inherit eutils webapp
 
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r3.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r3.ebuild
new file mode 100644
index 000000000000..c9166a0eb5a4
--- /dev/null
+++ b/www-apps/phpwiki/phpwiki-1.3.10-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r3.ebuild,v 1.1 2007/05/10 12:57:53 wrobel Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
+HOMEPAGE="http://phpwiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~stuart/patches/${PN}-xmlrpc.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/php
+	net-www/apache"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/phpwiki-1.3.10-xmlrpc.patch
+	rm -f Makefile LICENSE
+
+	# patch for XMLRPC vulnerabilities
+	cp -f ${WORKDIR}/phpwiki-xmlrpc/* lib/XMLRPC/
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -pPR * ${D}/${MY_HTDOCSDIR}
+	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,UPGRADING}
+
+	# Fix for security issue (Gentoo bug #174451 and http://secunia.com/advisories/24888/)
+	rm -rf ${D}/${MY_HTDOCSDIR}/lib/plugin/UpLoad.php
+
+	dodoc README INSTALL UPGRADING doc/* schemas/*
+
+	# Create config file from distribution default, and fix up invalid defaults
+	cd ${D}/${MY_HTDOCSDIR}/config
+	sed "s:;DEBUG = 1:DEBUG = 0:" config-dist.ini > config.ini
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-1.3-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/config/config.ini
+
+	webapp_src_install
+}
diff --git a/www-apps/phpwiki/phpwiki-1.3.13_rc1.ebuild b/www-apps/phpwiki/phpwiki-1.3.13_rc1.ebuild
new file mode 100644
index 000000000000..e8258744f518
--- /dev/null
+++ b/www-apps/phpwiki/phpwiki-1.3.13_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.13_rc1.ebuild,v 1.1 2007/05/10 12:57:53 wrobel Exp $
+
+inherit webapp depend.php
+
+MY_P=${P/_r/r}
+S=${WORKDIR}/${PN}-${PV/_rc*/}
+
+DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
+HOMEPAGE="http://phpwiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/php
+	net-www/apache"
+
+src_unpack() {
+	require_php_with_use pcre
+
+	unpack ${A}
+	cd ${S}
+	rm -f Makefile LICENSE
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -pPR * ${D}/${MY_HTDOCSDIR}
+	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,TODO,UPGRADING}
+
+	# Fix for security issue (Gentoo bug #174451 and http://secunia.com/advisories/24888/)
+	rm -rf ${D}/${MY_HTDOCSDIR}/lib/plugin/UpLoad.php
+
+	dodoc README INSTALL TODO UPGRADING doc/* schemas/*
+
+	# Create config file from distribution default, and fix up invalid defaults
+	cd ${D}/${MY_HTDOCSDIR}/config
+	sed "s:;DEBUG = 1:DEBUG = 0:" config-dist.ini > config.ini
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-1.3-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/config/config.ini
+
+	webapp_src_install
+}