Apply hotfix for CVE-2006-2942.

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 98 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index df0426ef8961..20f5b8dbe2e2 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310 RMD160 4624c5dacea4df0f1010107ce2498d46585d88c9 SHA1 8ea6603695d30d11025f7035d4b5be9e0c088c80 SHA256 549f0670531c23ffbff8f92bd4b49113822b682079a530a12d0f036d85bb13c7
+MD5 1a276861ca99a62106f85612aa4ce59b files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
+RMD160 4624c5dacea4df0f1010107ce2498d46585d88c9 files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
+SHA256 549f0670531c23ffbff8f92bd4b49113822b682079a530a12d0f036d85bb13c7 files/CVE-2006-2942-hotfix-4.0.0-4.0.2.diff 3310
 AUX postinstall-en.txt 1022 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 SHA1 a36fca72aa00b60a9249fc684ed7eba3af03454f SHA256 724d08ac4f12335a3bf5a5c9c3411b9780d3df1df1302d45adaeb075cc16fe27
 MD5 76e9639da36e9fdfd92e24e565f8c090 files/postinstall-en.txt 1022
 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 files/postinstall-en.txt 1022
@@ -14,25 +18,25 @@ MD5 b54ed2926e5754a14d265cfa477ebb8a files/reconfig 553
 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 files/reconfig 553
 SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851 files/reconfig 553
 DIST TWiki-4.0.2.tgz 4014446 RMD160 41a3e678fa27ad2d9bdf0e94871df2ca2daa58e0 SHA1 16c48d1d856eeb861412f4269bb321e5b0fc4bdb SHA256 22c5c2e3fe703ae29ca3a6ec08950c95460ef28aea73ef3708bf59d0185872ed
-EBUILD twiki-4.0.2.ebuild 2090 RMD160 057875954f92917ee4bbbad6d87be0d0ee14c113 SHA1 d611d9dad3df2e5b4429e33f7e5b309df0205635 SHA256 de047abbcdc24b5d5500994315267f58f980939e5e98b3a6a6be9943dd551362
-MD5 6b77ee849bab956ea944b0cf1cf563a6 twiki-4.0.2.ebuild 2090
-RMD160 057875954f92917ee4bbbad6d87be0d0ee14c113 twiki-4.0.2.ebuild 2090
-SHA256 de047abbcdc24b5d5500994315267f58f980939e5e98b3a6a6be9943dd551362 twiki-4.0.2.ebuild 2090
-MISC ChangeLog 5343 RMD160 9ac75893f9bc32f5a53c0e2cf2372d54af2c7a05 SHA1 3d37f027487ce32151acaa5df16ff210259847e2 SHA256 dad16c8c51190326fa22553a60e0120a6c0365393b35fc40d5dd4c3f8076b352
-MD5 73004809f83d9aa14f8f094a5c1a14aa ChangeLog 5343
-RMD160 9ac75893f9bc32f5a53c0e2cf2372d54af2c7a05 ChangeLog 5343
-SHA256 dad16c8c51190326fa22553a60e0120a6c0365393b35fc40d5dd4c3f8076b352 ChangeLog 5343
+EBUILD twiki-4.0.2-r1.ebuild 2140 RMD160 28ab8c0e57834838e606d4503bac0f6ba02e322b SHA1 d25acc7815a75db468bff5a520b6c0b6acdf07d0 SHA256 988007817a6cf20c4a2768438e5121e74e8c1ff5d1474a577b4423ca8f5d64b3
+MD5 a59e354afa4b085f5c2bdd42968c7cd6 twiki-4.0.2-r1.ebuild 2140
+RMD160 28ab8c0e57834838e606d4503bac0f6ba02e322b twiki-4.0.2-r1.ebuild 2140
+SHA256 988007817a6cf20c4a2768438e5121e74e8c1ff5d1474a577b4423ca8f5d64b3 twiki-4.0.2-r1.ebuild 2140
+MISC ChangeLog 5550 RMD160 9f13544386d385bc2d6e68389dd095a41bfaccaa SHA1 1f65bea1cb458a61499350f4c0aae28caf4c1183 SHA256 3a2731fb6cad5cc5b9816d207f020b90e53ad0b663f2a40b0a71a42bdd0a36e4
+MD5 4118229363f74e96227e5d203c6a39cf ChangeLog 5550
+RMD160 9f13544386d385bc2d6e68389dd095a41bfaccaa ChangeLog 5550
+SHA256 3a2731fb6cad5cc5b9816d207f020b90e53ad0b663f2a40b0a71a42bdd0a36e4 ChangeLog 5550
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
-MD5 b08a28e4184d3b4f3a6dd5c196f6a732 files/digest-twiki-4.0.2 229
-RMD160 a68285875f9efc6dc688109a2cc335e8ef808794 files/digest-twiki-4.0.2 229
-SHA256 d579a4a87c38900c2f55720d88d33cd9ed63b26f7bcf882abc64805308aeb7ec files/digest-twiki-4.0.2 229
+MD5 b08a28e4184d3b4f3a6dd5c196f6a732 files/digest-twiki-4.0.2-r1 229
+RMD160 a68285875f9efc6dc688109a2cc335e8ef808794 files/digest-twiki-4.0.2-r1 229
+SHA256 d579a4a87c38900c2f55720d88d33cd9ed63b26f7bcf882abc64805308aeb7ec files/digest-twiki-4.0.2-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEibN5EzitwsaoONoRAmONAJ48tTXRv8frKFm7WuHFmZpyMjfAuACgt1od
-JQQpuJ5tIwFqr7+jlGVpAjI=
-=OSE4
+iD8DBQFElKE8EzitwsaoONoRAtYEAJoCc7p8WOPf7fUs/VlT+lAGfG3AcwCffrTS
+DIh9tjCP4J2XwbkkRXq+h6s=
+=rkXI
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-4.0.2 b/www-apps/twiki/files/digest-twiki-4.0.2
deleted file mode 100644
index 4485135441bb..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 434fd3dd09138c283bc3f1884e84faa5 TWiki-4.0.2.tgz 4014446
-RMD160 41a3e678fa27ad2d9bdf0e94871df2ca2daa58e0 TWiki-4.0.2.tgz 4014446
-SHA256 22c5c2e3fe703ae29ca3a6ec08950c95460ef28aea73ef3708bf59d0185872ed TWiki-4.0.2.tgz 4014446
diff --git a/www-apps/twiki/twiki-4.0.2.ebuild b/www-apps/twiki/twiki-4.0.2.ebuild
deleted file mode 100644
index 0205c1d1d59e..000000000000
--- a/www-apps/twiki/twiki-4.0.2.ebuild
+++ /dev/null
@@ -1,81 +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/twiki/twiki-4.0.2.ebuild,v 1.2 2006/04/30 14:42:02 rl03 Exp $
-
-inherit webapp eutils versionator
-
-MY_PN="TWiki"
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="apache2"
-
-S=${WORKDIR}
-
-RDEPEND=">=dev-lang/perl-5.8
-		>=app-text/rcs-5.7
-		sys-apps/diffutils
-		dev-perl/Algorithm-Diff
-		>=virtual/perl-CGI-3.20
-		perl-core/File-Spec
-		dev-perl/Text-Diff
-		perl-core/Time-Local
-		dev-perl/CGI-Session
-		perl-core/digest-base
-		dev-perl/Digest-SHA1
-		dev-perl/locale-maketext-lexicon
-		virtual/perl-libnet
-		dev-perl/URI
-		virtual/cron
-		apache2? ( >=net-www/apache-2.0.54 )
-		!apache2? ( =net-www/apache-1* )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg
-	mv ${S}/lib/LocalSite.cfg.txt ${S}/lib/LocalSite.cfg
-	# change web user to apache
-	cd ${S}/lib/TWiki
-	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	dodoc readme.txt
-	dohtml T*.html
-
-	for file in $(find data pub) lib/LocalSite.cfg; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	for a in bin/setlib.cfg bin/LocalLib.cfg lib/TWiki.cfg lib/LocalSite.cfg; do
-		webapp_configfile ${MY_HTDOCSDIR}/${a}
-	done
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from an older version of TWiki, back up your"
-	ewarn "data/ and pub/ directories and any local changes before upgrading!"
-	ewarn
-	ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
-	ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
-	ewarn
-	einfo "webapp-config will not be run automatically"
-	einfo
-	# webapp_pkg_postinst
-}