Fix for security bug #102380

(Portage version: 2.0.51.22-r2)

4 files changed, 59 insertions, 16 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index fd5e643fa670..6020def9f37c 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/phpwiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.10 2005/08/23 19:38:19 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.11 2005/08/24 21:37:19 stuart Exp $
+
+*phpwiki-1.3.10-r2 (24 Aug 2005)
+
+  24 Aug 2005; Stuart Herbert <stuart@gentoo.org> +phpwiki-1.3.10-r2.ebuild:
+  Fix for security bug #102380
 
   23 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwiki-1.2.4.ebuild,
   phpwiki-1.3.10.ebuild, phpwiki-1.3.10-r1.ebuild:
diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index 58a188e1f488..7b62c2f9e711 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1b8ab8cea9f53a0baae7d8e03ebf5f70 phpwiki-1.3.10-r1.ebuild 1086
-MD5 6d587086fb3566876bfd247bc58c35f9 phpwiki-1.3.10.ebuild 1036
 MD5 3e9c82ecac026514bc97dd0f8179b887 ChangeLog 1530
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 34741d64857cb87b65ea9400953237d8 phpwiki-1.2.4.ebuild 803
-MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10 67
+MD5 6d587086fb3566876bfd247bc58c35f9 phpwiki-1.3.10.ebuild 1036
+MD5 1b8ab8cea9f53a0baae7d8e03ebf5f70 phpwiki-1.3.10-r1.ebuild 1086
+MD5 33e19c777002a06ca214135a53107721 phpwiki-1.3.10-r2.ebuild 1228
+MD5 61ddc0899b2191583eb5755c954e5f14 files/digest-phpwiki-1.2.4 65
 MD5 c913f380e9beddcca756ea5d0c6fd85f files/postinstall-en.txt 149
-MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10-r1 67
+MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10 67
 MD5 4bd0a80d3c53ac5861e9a63e2540f996 files/postinstall-1.3-en.txt 252
 MD5 3259bf9dc4bef8f25c35478900932b96 files/phpwiki-1.3.10-xmlrpc.patch 959
-MD5 61ddc0899b2191583eb5755c954e5f14 files/digest-phpwiki-1.2.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDC3tLEzitwsaoONoRAm0GAJ9X5jVRC1eOZPTyC2gQmNuIVK6AsACfWjgp
-7jn7FyX/Swbn9uHW8kCiC+8=
-=aDlz
------END PGP SIGNATURE-----
+MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10-r1 67
+MD5 d6a81010992f94a63b01bf0eb9b37b43 files/digest-phpwiki-1.3.10-r2 132
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r2 b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r2
new file mode 100644
index 000000000000..c72ea8981bb0
--- /dev/null
+++ b/www-apps/phpwiki/files/digest-phpwiki-1.3.10-r2
@@ -0,0 +1,2 @@
+MD5 8747352d84836671445a6eb95b2184a7 phpwiki-1.3.10.tar.gz 2072469
+MD5 3af1716bca6a945399b77ceefbdba854 phpwiki-xmlrpc.tar.gz 19988
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
new file mode 100644
index 000000000000..f3d69a93074e
--- /dev/null
+++ b/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 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.1 2005/08/24 21:37:19 stuart 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}
+
+	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
+}