Removed vulnerable version from the tree.

Package-Manager: portage-2.1.2.2

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 6ae1b5e923214a97bfb7a9d70e665872beffab14..e103bc426123d2e99b76796139d533b4bb59b3fb 100644 (file)
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.19 2007/03/16 06:50:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.20 2007/03/16 06:54:42 ticho Exp $
+
+  16 Mar 2007; Andrej Kacian <ticho@gentoo.org> -dokuwiki-20060309e.ebuild:
+  Removed vulnerable version from the tree.
 
   16 Mar 2007; Andrej Kacian <ticho@gentoo.org> dokuwiki-20061106.ebuild:
   Stable on x86, security bug #163781.

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 47e2563bc02f214027c13451afd62a3f0b77cbfe..d23bf625e2434893d4e1eeca7940270d8bba5afb 100644 (file)
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -5,34 +5,26 @@ AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1
 MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/postinstall-en.txt 1590
-DIST dokuwiki-2006-03-09e.tgz 835945 RMD160 77d703eaea0aa417b955f37424c9af052a2ac68a SHA1 d45aeb3aaebd777e0d7b3b45939aa35aeead9cf3 SHA256 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93
 DIST dokuwiki-2006-11-06.tgz 1058194 RMD160 6b1eee41b7eb464e3a7aaa314a2332256906790e SHA1 2b3022285a4d2ccfd31c19f0ec9aa6ea4bfd5f9c SHA256 97c63ef56234a5031223b9a69582910ff692a3d0929e18481ff39203b13aeb7d
-EBUILD dokuwiki-20060309e.ebuild 1846 RMD160 4d49416aa1ff76cbd92671525c845b10ae2be62b SHA1 447026903f64f8b3560c54366dae2c5714e5bff3 SHA256 91678261ba7ff7d574800f7fcfa0f62de9709e058f95d3a5d24a983f8348efdc
-MD5 bb7a81e8d9885035eee7a482d673804f dokuwiki-20060309e.ebuild 1846
-RMD160 4d49416aa1ff76cbd92671525c845b10ae2be62b dokuwiki-20060309e.ebuild 1846
-SHA256 91678261ba7ff7d574800f7fcfa0f62de9709e058f95d3a5d24a983f8348efdc dokuwiki-20060309e.ebuild 1846
 EBUILD dokuwiki-20061106.ebuild 1833 RMD160 59748e0dc828350ca9622b6a3e52846aab8e159f SHA1 b47b7b967d49dd9a542115c28133d3ab31ed2b67 SHA256 e55bd763f3ebf832e1ef7ec8a949b6223747fea376ba9ab8ae27f40183754308
 MD5 a5c5829d365f12957e76a01bb6a43e4c dokuwiki-20061106.ebuild 1833
 RMD160 59748e0dc828350ca9622b6a3e52846aab8e159f dokuwiki-20061106.ebuild 1833
 SHA256 e55bd763f3ebf832e1ef7ec8a949b6223747fea376ba9ab8ae27f40183754308 dokuwiki-20061106.ebuild 1833
-MISC ChangeLog 3268 RMD160 2a77e21911eae5e943d8741bcc5487ff86f3a79e SHA1 4caa1d78b5dead966b09c520196b651ee4309476 SHA256 dd23b1c5a59aa8c12ad73d05bfff9e41e655b7521a7d7478fc0131215cde48f9
-MD5 80fd460b80d4cffb23825ee16a9f0403 ChangeLog 3268
-RMD160 2a77e21911eae5e943d8741bcc5487ff86f3a79e ChangeLog 3268
-SHA256 dd23b1c5a59aa8c12ad73d05bfff9e41e655b7521a7d7478fc0131215cde48f9 ChangeLog 3268
+MISC ChangeLog 3389 RMD160 b80190f011bdf1f457bf1c57594a91ec837f2937 SHA1 5772735330f5b93dee08a9baccdf5c9883ec752f SHA256 57f11ee07e928fd962e0ff21234ba923ed306d4a39678ff0e5e6df3536bc2dc3
+MD5 fc281c29d2976962205d9d6e85bfd50d ChangeLog 3389
+RMD160 b80190f011bdf1f457bf1c57594a91ec837f2937 ChangeLog 3389
+SHA256 57f11ee07e928fd962e0ff21234ba923ed306d4a39678ff0e5e6df3536bc2dc3 ChangeLog 3389
 MISC metadata.xml 843 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f SHA1 022976ebf107c25d6db434e4765adbaa9645ae5b SHA256 2d1d093fc0a1eb15ba44bebe61142c3c3e17bb87ec7adee4aadb1d8f6a90c693
 MD5 faff62ef368ab735f9a3cd36ccfbeac6 metadata.xml 843
 RMD160 61c80553f74e108ce84fec44467c6c4e6dc2cb9f metadata.xml 843
 SHA256 2d1d093fc0a1eb15ba44bebe61142c3c3e17bb87ec7adee4aadb1d8f6a90c693 metadata.xml 843
-MD5 e527c2bab3312ebd2bc527001716fb9b files/digest-dokuwiki-20060309e 253
-RMD160 5eff2118181cc6a82db6a478e38ee4eb7539f2b0 files/digest-dokuwiki-20060309e 253
-SHA256 f389638b39e7ce033cfff29754df0a9a5226e1d7146a36c9a4e9aee350d833b3 files/digest-dokuwiki-20060309e 253
 MD5 5edaed586a08d7e987d67969c7eb45a6 files/digest-dokuwiki-20061106 253
 RMD160 a65af752fc6a4892ffa870ecc9386a52e3f6a113 files/digest-dokuwiki-20061106 253
 SHA256 479d8e94ec88253088b7c35e02cd788b45a480bf8fe6e08c1abd35bbd0f48262 files/digest-dokuwiki-20061106 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF+j5uQlM6RnzZP+IRAidmAJ9kfLQNbkOjCBmAcuuRamRDkL8osACfQFsO
-2um8zkeQNIPuf/RKBONgPKU=
-=FCwd
+iD8DBQFF+j87QlM6RnzZP+IRAhcvAJwMXJDqoRLJxopgyZ4tOYD/XrE4rwCfQV3M
+0HGjaIZdQWilsb6Ffz5JiVw=
+=4Ecv
 -----END PGP SIGNATURE-----

diff --git a/www-apps/dokuwiki/dokuwiki-20060309e.ebuild b/www-apps/dokuwiki/dokuwiki-20060309e.ebuild
deleted file mode 100644 (file)
index d22fe93..0000000
--- a/www-apps/dokuwiki/dokuwiki-20060309e.ebuild
+++ /dev/null
@@ -1,73 +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/dokuwiki/dokuwiki-20060309e.ebuild,v 1.2 2006/09/28 13:54:10 wolf31o2 Exp $
-
-inherit webapp
-
-# Upstream uses dashes in the datestamp
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
-documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/php"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-       cd ${WORKDIR}
-       unpack ${PN}-${MY_PV}.tgz
-       mv ${PN}-${MY_PV} ${P}
-}
-
-src_compile() {
-       # Default compile hangs
-       echo "Nothing to compile"
-}
-
-src_install() {
-       local docs="README"
-       webapp_src_preinst
-
-       # NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
-       einfo "Installing docs"
-       dodoc ${docs}
-       for doc in ${docs} COPYING; do
-               rm -f ${doc}
-       done
-
-       # Move bin directory to safe location (outside of docroot)
-       # To resolve security bug #146800
-       docinto scripts
-       dodoc bin/*
-       rm -rf bin
-
-       einfo "Copying main files"
-       cp -r . ${D}/${MY_HTDOCSDIR}
-
-       # Install the htaccess file for pretty urls
-       cp .htaccess ${D}/${MY_HTDOCSDIR}
-
-       # Create initial changes file
-       touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
-
-       # The data dir needs to be owned by the server
-       for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
-               webapp_serverowned ${MY_HTDOCSDIR}/$x
-       done
-
-       webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-       webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-
-       webapp_configfile ${MY_HTDOCSDIR}/conf
-       for x in $( cd ${D}/${MY_HTDOCSDIR}/conf && echo * ) ; do
-               webapp_configfile ${MY_HTDOCSDIR}/conf/$x
-       done
-
-       webapp_src_install
-}

diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060309e b/www-apps/dokuwiki/files/digest-dokuwiki-20060309e
deleted file mode 100644 (file)
index 1c23c26..0000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060309e
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6d3aa9e2f32ebbdb04ee07cd84a19e5 dokuwiki-2006-03-09e.tgz 835945
-RMD160 77d703eaea0aa417b955f37424c9af052a2ac68a dokuwiki-2006-03-09e.tgz 835945
-SHA256 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93 dokuwiki-2006-03-09e.tgz 835945