summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <a3li@gentoo.org>2009-06-29 09:15:03 +0000
committerAlex Legler <a3li@gentoo.org>2009-06-29 09:15:03 +0000
commit27d2a7d0324a4d1c113769c4ea184f925aa98282 (patch)
tree9380c5f8c267e739045f9ac9b434d6030f92fe84 /www-apps
parentAdd another upstream patch. Solve a partial hang on IMAP connection errors. (diff)
downloadgentoo-2-27d2a7d0324a4d1c113769c4ea184f925aa98282.tar.gz
gentoo-2-27d2a7d0324a4d1c113769c4ea184f925aa98282.tar.bz2
gentoo-2-27d2a7d0324a4d1c113769c4ea184f925aa98282.zip
Non-maintainer commit: Version bump for security bug 272431. amd64 stable.
(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/dokuwiki/ChangeLog12
-rw-r--r--www-apps/dokuwiki/dokuwiki-20090214b.ebuild (renamed from www-apps/dokuwiki/dokuwiki-20080505.ebuild)12
2 files changed, 17 insertions, 7 deletions
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index c7eb945d57ad..aba0ce176d00 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-apps/dokuwiki
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.37 2008/05/30 07:23:09 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.38 2009/06/29 09:15:03 a3li Exp $
+
+*dokuwiki-20090214b (29 Jun 2009)
+
+ 29 Jun 2009; Alex Legler <a3li@gentoo.org> -dokuwiki-20080505.ebuild,
+ +dokuwiki-20090214b.ebuild:
+ Non-maintainer commit: Version bump for security bug 272431. amd64 stable.
+ Thanks to Philippe Chaintreuil for proposing an updated ebuild. Removing
+ vulnerable version in ~arch.
30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986).
diff --git a/www-apps/dokuwiki/dokuwiki-20080505.ebuild b/www-apps/dokuwiki/dokuwiki-20090214b.ebuild
index 25ec45a3500a..a2cc25056148 100644
--- a/www-apps/dokuwiki/dokuwiki-20080505.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20090214b.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20080505.ebuild,v 1.1 2008/05/08 15:36:40 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20090214b.ebuild,v 1.1 2009/06/29 09:15:03 a3li Exp $
inherit webapp depend.php
# upstream uses dashes in the datestamp
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}"
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PV="${MY_BASE_PV}${PV:8:1}"
DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's 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 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
@@ -21,6 +22,8 @@ RDEPEND=""
need_httpd_cgi
need_php_httpd
+S="${WORKDIR}/${PN}-${MY_BASE_PV}"
+
pkg_setup() {
webapp_pkg_setup
has_php
@@ -33,7 +36,6 @@ pkg_setup() {
src_unpack() {
unpack ${A}
- mv ${PN}-${MY_PV} ${P}
cd "${S}"
# create initial changes file