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

Package-Manager: portage-2.1.1

5 files changed, 23 insertions, 128 deletions

diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index 0a2ab6d0d6a4..599c4745eb83 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX phpwiki-1.3.10-xmlrpc.patch 959 RMD160 2905d21a1d7a374294aa709c8adc267477905f67 SHA1 93952b037ce4fcd3d4e9ffaaf336ea51b9e2aa94 SHA256 fdfb8144b77918dc67e0710a0b95b724956cb5c648df29eb59904eae0db87dbf
 MD5 3259bf9dc4bef8f25c35478900932b96 files/phpwiki-1.3.10-xmlrpc.patch 959
 RMD160 2905d21a1d7a374294aa709c8adc267477905f67 files/phpwiki-1.3.10-xmlrpc.patch 959
@@ -10,25 +7,24 @@ MD5 ff24b9aaad40f0010b48db737984659d files/postinstall-1.3-en.txt 248
 RMD160 5c573060068506d1ee2596b2d88434dff2e0d1c1 files/postinstall-1.3-en.txt 248
 SHA256 9fdf6c2c25342d247107beb7069ad7c9ab79f2cd9cea2c5993fa517135b936fd files/postinstall-1.3-en.txt 248
 DIST phpwiki-1.3.10.tar.gz 2072469 RMD160 25a616bcebc17015d0d65ce4de1267be605403d1 SHA1 80ef6d438a19dc1d17b7563ad240562f6c8d2e4c SHA256 a59cc42af4c7ad8554e65f7bdd3bfd94841a2e9a97165a309b4606ac1cb10af9
-DIST phpwiki-1.3.11p1.tar.gz 2998606 RMD160 bf05a86009666b237f90907c9d5175095adac261 SHA1 5af526b0516b3d5c33dbd37616b2f66d7372b43c SHA256 83bdc16ae2f1e7569930c8c5f401009e24cc16c2d5b2feb90f30d3e0b6abb058
-DIST phpwiki-1.3.12p2.tar.gz 3082523 RMD160 9509e592e35c278ece4975d3e3c93fc1e73c3cb4 SHA1 98cdcc5a991ebebd3f9f4eb0c01cbb0dc33ab5e7 SHA256 8e3739279a072756d23a47efb782208ebd80f1d94e90b46ce283653e539d26f8
+DIST phpwiki-1.3.13rc1.tar.bz2 2502391 RMD160 a8b725f617aff3653c26a8531552f1448512f28b SHA1 7fb892e74a3e86db7f07ffdd9dea940552037149 SHA256 f9f44db088300d6370fc35bdc51f4453d33db6898c1970d9e485776415c09356
 DIST phpwiki-xmlrpc.tar.gz 19988 RMD160 a9cee0e390017355a16b331857feab0effecc509 SHA1 1ffe6f12da49b9016e28ee3e6b8a722781fe26f7 SHA256 ae48412d382bdf67144f216c4d9ff6044dfce0e069e1898f86ee7fdc0ee6b573
-EBUILD phpwiki-1.3.10-r2.ebuild 1229 RMD160 a5ad2776a166e4a70a2cc28f7a8e454a7f229a6e SHA1 cc655bc00e9159d5805d5530f72523f816631d94 SHA256 b7aa4d74d052bc4c476f826852178b055988d683cf299a866778b569d5d59db8
-MD5 0e0656e94faa81334e0b0e937dc06b3f phpwiki-1.3.10-r2.ebuild 1229
-RMD160 a5ad2776a166e4a70a2cc28f7a8e454a7f229a6e phpwiki-1.3.10-r2.ebuild 1229
-SHA256 b7aa4d74d052bc4c476f826852178b055988d683cf299a866778b569d5d59db8 phpwiki-1.3.10-r2.ebuild 1229
-EBUILD phpwiki-1.3.11_p1.ebuild 1081 RMD160 e0d32866fdb04559577a9a0a4e3c3b3c598c64a4 SHA1 dc5e12e8c239406b4aaff2e6e76f9419dec9c87f SHA256 dd6eee2b3b3061f3b9d0755aebde6820089d31d621b8a909dbbbc50e176cc3c4
-MD5 05402f09b238564a595c82bc530e7c16 phpwiki-1.3.11_p1.ebuild 1081
-RMD160 e0d32866fdb04559577a9a0a4e3c3b3c598c64a4 phpwiki-1.3.11_p1.ebuild 1081
-SHA256 dd6eee2b3b3061f3b9d0755aebde6820089d31d621b8a909dbbbc50e176cc3c4 phpwiki-1.3.11_p1.ebuild 1081
-EBUILD phpwiki-1.3.12_p2.ebuild 1120 RMD160 a3052ebb0ad7dfe7cbad57e7a8700b50413c19b7 SHA1 6b390d7ebc26fce93f6c70277e00d9a8f0310e5b SHA256 2ddb72361d3759bc48f30d8915efa84d65c7b66619be4b96780f6ee34ac0c831
-MD5 6d0d0a695bf725115034a066ae36cccd phpwiki-1.3.12_p2.ebuild 1120
-RMD160 a3052ebb0ad7dfe7cbad57e7a8700b50413c19b7 phpwiki-1.3.12_p2.ebuild 1120
-SHA256 2ddb72361d3759bc48f30d8915efa84d65c7b66619be4b96780f6ee34ac0c831 phpwiki-1.3.12_p2.ebuild 1120
-MISC ChangeLog 2539 RMD160 92f0386cddb580db9972d6613e9239b650c7a1d2 SHA1 ac78b60405016f3ac432ce3f969bb3b1fbb50935 SHA256 55c46f61c9205a9dd361cc3e63e35d9ffd468c5ff3ca9dd71a1a846c92361787
-MD5 7ed53ec72dfc463ffa4ef84c99b2b905 ChangeLog 2539
-RMD160 92f0386cddb580db9972d6613e9239b650c7a1d2 ChangeLog 2539
-SHA256 55c46f61c9205a9dd361cc3e63e35d9ffd468c5ff3ca9dd71a1a846c92361787 ChangeLog 2539
+EBUILD phpwiki-1.3.10-r2.ebuild 1229 RMD160 b969b354304c13b247b0f29cc0e8c2a95f946a6e SHA1 af5fb2dbc6e74247a608c7d85d6076794fb1078b SHA256 11064014d4c49a595da535ed0ebb00ca1e6210745e1e77499a83197508a21f11
+MD5 6c48dd9700bdf9508f77054a9a265b91 phpwiki-1.3.10-r2.ebuild 1229
+RMD160 b969b354304c13b247b0f29cc0e8c2a95f946a6e phpwiki-1.3.10-r2.ebuild 1229
+SHA256 11064014d4c49a595da535ed0ebb00ca1e6210745e1e77499a83197508a21f11 phpwiki-1.3.10-r2.ebuild 1229
+EBUILD phpwiki-1.3.10-r3.ebuild 1369 RMD160 07c9e445112c07c24d575adc98aed4666344f423 SHA1 f93829ad1f8a7610cdde0584a34c62edb544500f SHA256 a2b883759f2a3fc5b0334c6dd9f69ed07f96417528b778a8e8563741c7f1c9a3
+MD5 c436e4e976b7871e6efe69900610fde3 phpwiki-1.3.10-r3.ebuild 1369
+RMD160 07c9e445112c07c24d575adc98aed4666344f423 phpwiki-1.3.10-r3.ebuild 1369
+SHA256 a2b883759f2a3fc5b0334c6dd9f69ed07f96417528b778a8e8563741c7f1c9a3 phpwiki-1.3.10-r3.ebuild 1369
+EBUILD phpwiki-1.3.13_rc1.ebuild 1274 RMD160 07935b89e22d0245453173113dd9682921bc891b SHA1 22d305c4cf4b6bfcffbaa6ed22849862472bff99 SHA256 f131fad7c609f5cb9741ef5ce96d6a76a22a999c3b4b38b2d45acd53aa3cddc3
+MD5 005013c6ecd5239f89889d87b7d55d0c phpwiki-1.3.13_rc1.ebuild 1274
+RMD160 07935b89e22d0245453173113dd9682921bc891b phpwiki-1.3.13_rc1.ebuild 1274
+SHA256 f131fad7c609f5cb9741ef5ce96d6a76a22a999c3b4b38b2d45acd53aa3cddc3 phpwiki-1.3.13_rc1.ebuild 1274
+MISC ChangeLog 2834 RMD160 2472617efb3f1148df2a4ee2ad165be10b224a8c SHA1 7f61d64707423366dfb9df42403f6986d4672179 SHA256 5264312d2c7ffb59ee9bb2049ef3963e2c5a35a3b5064c29ab5ed11db193fd73
+MD5 c57d21251df7158b816fad1072ac1138 ChangeLog 2834
+RMD160 2472617efb3f1148df2a4ee2ad165be10b224a8c ChangeLog 2834
+SHA256 5264312d2c7ffb59ee9bb2049ef3963e2c5a35a3b5064c29ab5ed11db193fd73 ChangeLog 2834
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -36,16 +32,9 @@ SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata
 MD5 16307ad280f432530edf8ff5748bf8d9 files/digest-phpwiki-1.3.10-r2 488
 RMD160 4ed456fee66fd4f381015588cf0d1b4e327552d9 files/digest-phpwiki-1.3.10-r2 488
 SHA256 fff58399138d5dc7983b372926d4842ba318e3b08bfc3e11898693d33c6962ae files/digest-phpwiki-1.3.10-r2 488
-MD5 98ea1605fbcb53173691ab18d12447b5 files/digest-phpwiki-1.3.11_p1 253
-RMD160 6731c2db857397bcff64651dc3ce6bf30fdfd6ad files/digest-phpwiki-1.3.11_p1 253
-SHA256 1f8adb6771fa1caafea3242067028cb5f7978d1983e6a716c957f12e90441710 files/digest-phpwiki-1.3.11_p1 253
-MD5 0dfe88db7f96194bdae4f110e421ec7c files/digest-phpwiki-1.3.12_p2 253
-RMD160 dd207d87fe906d4c69d358e6981fbb2d75ef73ce files/digest-phpwiki-1.3.12_p2 253
-SHA256 cee53f4541ce255057d9c3a4e2d45b0ae422e34bcfb3dba43c4eaf83de249dbc files/digest-phpwiki-1.3.12_p2 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFF3FXFEzitwsaoONoRAmy2AKCcNZlJnxQnLeW9mqRWh09XkOpU1wCfdixq
-JKMsOrpxSY1hEKZEThHN0Co=
-=2qjV
------END PGP SIGNATURE-----
+MD5 16307ad280f432530edf8ff5748bf8d9 files/digest-phpwiki-1.3.10-r3 488
+RMD160 4ed456fee66fd4f381015588cf0d1b4e327552d9 files/digest-phpwiki-1.3.10-r3 488
+SHA256 fff58399138d5dc7983b372926d4842ba318e3b08bfc3e11898693d33c6962ae files/digest-phpwiki-1.3.10-r3 488
+MD5 44cb8e9deb115d0a1a472a098ae75f27 files/digest-phpwiki-1.3.13_rc1 259
+RMD160 a6982fece098f182e4e7da729c06c935abef906b files/digest-phpwiki-1.3.13_rc1 259
+SHA256 bede82c3633c5a571ae33ebc7b96fad32430e3aa44b0e5c46513eda56f21df96 files/digest-phpwiki-1.3.13_rc1 259
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.11_p1 b/www-apps/phpwiki/files/digest-phpwiki-1.3.11_p1
deleted file mode 100644
index ead1b18930a1..000000000000
--- a/www-apps/phpwiki/files/digest-phpwiki-1.3.11_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7036d6a5ca8acf8e51f1273cf9f313b4 phpwiki-1.3.11p1.tar.gz 2998606
-RMD160 bf05a86009666b237f90907c9d5175095adac261 phpwiki-1.3.11p1.tar.gz 2998606
-SHA256 83bdc16ae2f1e7569930c8c5f401009e24cc16c2d5b2feb90f30d3e0b6abb058 phpwiki-1.3.11p1.tar.gz 2998606
diff --git a/www-apps/phpwiki/files/digest-phpwiki-1.3.12_p2 b/www-apps/phpwiki/files/digest-phpwiki-1.3.12_p2
deleted file mode 100644
index 124ad54cd11f..000000000000
--- a/www-apps/phpwiki/files/digest-phpwiki-1.3.12_p2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e405f9a86f3e341e971250d540971410 phpwiki-1.3.12p2.tar.gz 3082523
-RMD160 9509e592e35c278ece4975d3e3c93fc1e73c3cb4 phpwiki-1.3.12p2.tar.gz 3082523
-SHA256 8e3739279a072756d23a47efb782208ebd80f1d94e90b46ce283653e539d26f8 phpwiki-1.3.12p2.tar.gz 3082523
diff --git a/www-apps/phpwiki/phpwiki-1.3.11_p1.ebuild b/www-apps/phpwiki/phpwiki-1.3.11_p1.ebuild
deleted file mode 100644
index d33cfa49dbdb..000000000000
--- a/www-apps/phpwiki/phpwiki-1.3.11_p1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.11_p1.ebuild,v 1.1 2005/11/27 16:03:16 rl03 Exp $
-
-inherit webapp
-
-MY_P=${P/_p/p}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
-HOMEPAGE="http://phpwiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/php
-	net-www/apache"
-
-src_unpack() {
-	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}
-
-	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
-}
diff --git a/www-apps/phpwiki/phpwiki-1.3.12_p2.ebuild b/www-apps/phpwiki/phpwiki-1.3.12_p2.ebuild
deleted file mode 100644
index 8df02d7696c4..000000000000
--- a/www-apps/phpwiki/phpwiki-1.3.12_p2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.12_p2.ebuild,v 1.1 2006/03/29 14:33:25 rl03 Exp $
-
-inherit webapp depend.php
-
-MY_P=${P/_p/p}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
-HOMEPAGE="http://phpwiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-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}
-
-	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
-}