From 1835234f0d11a7df738e545dbf8f9ba2f593d6f1 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Thu, 15 Mar 2007 22:33:44 +0000 Subject: [PATCH] Version bump, security bug #163781. Package-Manager: portage-2.1.2.2 --- www-apps/dokuwiki/ChangeLog | 7 +- www-apps/dokuwiki/Manifest | 32 +++++--- www-apps/dokuwiki/dokuwiki-20061106.ebuild | 73 +++++++++++++++++++ .../dokuwiki/files/digest-dokuwiki-20061106 | 3 + www-apps/dokuwiki/metadata.xml | 5 ++ 5 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 www-apps/dokuwiki/dokuwiki-20061106.ebuild create mode 100644 www-apps/dokuwiki/files/digest-dokuwiki-20061106 diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog index caaafc6c1f01..602836915cdc 100644 --- a/www-apps/dokuwiki/ChangeLog +++ b/www-apps/dokuwiki/ChangeLog @@ -1,6 +1,11 @@ # 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.17 2007/03/01 01:13:06 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.18 2007/03/15 22:33:44 ticho Exp $ + +*dokuwiki-20061106 (15 Mar 2007) + + 15 Mar 2007; Andrej Kacian +dokuwiki-20061106.ebuild: + Version bump, security bug #163781. 01 Mar 2007; Renat Lumpau -dokuwiki-20060309-r1.ebuild, -dokuwiki-20060309c.ebuild, -dokuwiki-20060309d.ebuild: diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest index 51e54b553ce1..be6c17a9edf9 100644 --- a/www-apps/dokuwiki/Manifest +++ b/www-apps/dokuwiki/Manifest @@ -6,25 +6,33 @@ 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 -MISC ChangeLog 3005 RMD160 74a67d59a189bc489b363c1c33bf6b8bbc1a02f0 SHA1 ad5dd01724ccde8dfc58a171f03e83a9b62995d6 SHA256 71dfbddb8b18b95dc47fb0fba33ac59c0fc8b461ccdb534359a4946a92ff32b1 -MD5 0f58f42aeacd600d008bf38edd52db0b ChangeLog 3005 -RMD160 74a67d59a189bc489b363c1c33bf6b8bbc1a02f0 ChangeLog 3005 -SHA256 71dfbddb8b18b95dc47fb0fba33ac59c0fc8b461ccdb534359a4946a92ff32b1 ChangeLog 3005 -MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 -MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704 -RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704 -SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 metadata.xml 704 +EBUILD dokuwiki-20061106.ebuild 1834 RMD160 f5c2ca39bc6cbe605163e4842e333818f88d254a SHA1 4a45cf032f91748a9f16d456c9804edb5f98e85b SHA256 ad56a121bbd8715ab25bb8081d6427e45fa0924632f8a9c88bbaa74f1de732aa +MD5 4ac1bba6dd49a8c78a82d7606719e443 dokuwiki-20061106.ebuild 1834 +RMD160 f5c2ca39bc6cbe605163e4842e333818f88d254a dokuwiki-20061106.ebuild 1834 +SHA256 ad56a121bbd8715ab25bb8081d6427e45fa0924632f8a9c88bbaa74f1de732aa dokuwiki-20061106.ebuild 1834 +MISC ChangeLog 3154 RMD160 75a5d995eb5a67fc0fbf85ff413ebdf6667e8532 SHA1 88dfbdec892a2c7791a8a9794d9118c61c46099d SHA256 d64b406d83a3d2b3f7f7004d64ccf7e60e21b8e1c3cc89f14e2cf9bac76996ff +MD5 bf18010afd4c4c4cbd3b1337734354ea ChangeLog 3154 +RMD160 75a5d995eb5a67fc0fbf85ff413ebdf6667e8532 ChangeLog 3154 +SHA256 d64b406d83a3d2b3f7f7004d64ccf7e60e21b8e1c3cc89f14e2cf9bac76996ff ChangeLog 3154 +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.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF5iiqEzitwsaoONoRAmfDAJ0eyBR1234pA+IGY8spwVmRMXZzigCdFAzM -HBHZlGTVl5hHOkwzvIKmx4c= -=+qz9 +iD8DBQFF+cnSQlM6RnzZP+IRArvLAJ9Tgw8XihmHTl34nPgfom5n+fGAdgCeLUSB +hz2RR3xDiM0FjObpxp8WKkg= +=jO20 -----END PGP SIGNATURE----- diff --git a/www-apps/dokuwiki/dokuwiki-20061106.ebuild b/www-apps/dokuwiki/dokuwiki-20061106.ebuild new file mode 100644 index 000000000000..13fb547c577b --- /dev/null +++ b/www-apps/dokuwiki/dokuwiki-20061106.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20061106.ebuild,v 1.1 2007/03/15 22:33:44 ticho Exp $ + +inherit webapp + +# Upstream uses dashes in the datestamp +MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" + +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-20061106 b/www-apps/dokuwiki/files/digest-dokuwiki-20061106 new file mode 100644 index 000000000000..ddfb1ba514e0 --- /dev/null +++ b/www-apps/dokuwiki/files/digest-dokuwiki-20061106 @@ -0,0 +1,3 @@ +MD5 4abab36f55f90ff1f780b5b48b4c47f1 dokuwiki-2006-11-06.tgz 1058194 +RMD160 6b1eee41b7eb464e3a7aaa314a2332256906790e dokuwiki-2006-11-06.tgz 1058194 +SHA256 97c63ef56234a5031223b9a69582910ff692a3d0929e18481ff39203b13aeb7d dokuwiki-2006-11-06.tgz 1058194 diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml index c881626d8ae2..c9be0f890745 100644 --- a/www-apps/dokuwiki/metadata.xml +++ b/www-apps/dokuwiki/metadata.xml @@ -6,6 +6,11 @@ ramereth@gentoo.org Lance Albertson + + ticho@gentoo.org + Andrej Kacian + Backup maintainer + DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating documentation of any kind. It is targeted at developer teams, -- 2.26.2