Added twiki-4.2.3, removed vulnerable -4.1.2, -4.2.0, -4.2.2 (sec issue

#237843).
(Portage version: 2.1.4.4)

4 files changed, 16 insertions, 154 deletions

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 4e88fab74466..a73f332a05c7 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.44 2008/09/10 08:15:49 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.45 2008/09/21 14:31:39 wrobel Exp $
+
+*twiki-4.2.3 (21 Sep 2008)
+
+  21 Sep 2008; wrobel@gentoo.org -twiki-4.1.2.ebuild, -twiki-4.2.0.ebuild,
+  -twiki-4.2.2.ebuild, +twiki-4.2.3.ebuild:
+  Added twiki-4.2.3, removed vulnerable -4.1.2, -4.2.0, -4.2.2 (sec issue
+  #237843).
 
 *twiki-4.2.2 (10 Sep 2008)
 
diff --git a/www-apps/twiki/twiki-4.2.0.ebuild b/www-apps/twiki/twiki-4.2.0.ebuild
deleted file mode 100644
index c675c0037f45..000000000000
--- a/www-apps/twiki/twiki-4.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild,v 1.1 2008/02/24 00:00:38 hollow Exp $
-
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit webapp
-
-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=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-text/rcs-5.7
-	sys-apps/diffutils
-	>=dev-lang/perl-5.8
-	dev-perl/Algorithm-Diff
-	dev-perl/CGI-Session
-	dev-perl/Digest-SHA1
-	dev-perl/HTML-Parser
-	dev-perl/locale-maketext-lexicon
-	dev-perl/Text-Diff
-	dev-perl/URI
-	virtual/cron
-	>=virtual/perl-CGI-3.20
-	virtual/perl-digest-base
-	virtual/perl-File-Spec
-	virtual/perl-libnet
-	virtual/perl-Time-Local"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS COPYRIGHT readme.txt
-	dohtml T*.html INSTALL.html
-	rm -f readme.txt T*.html INSTALL.html
-
-	mv bin/LocalLib.cfg{.txt,}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for f in $(find data pub); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
-	done
-
-	for f in bin/setlib.cfg bin/LocalLib.cfg; do
-		webapp_configfile "${MY_HTDOCSDIR}"/${f}
-	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
-	webapp_pkg_postinst
-}
diff --git a/www-apps/twiki/twiki-4.2.2.ebuild b/www-apps/twiki/twiki-4.2.2.ebuild
deleted file mode 100644
index 2c080dab8974..000000000000
--- a/www-apps/twiki/twiki-4.2.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.2.ebuild,v 1.1 2008/09/10 08:15:49 wrobel Exp $
-
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit webapp
-
-MY_PN="TWiki"
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-text/rcs-5.7
-	sys-apps/diffutils
-	>=dev-lang/perl-5.8
-	dev-perl/Algorithm-Diff
-	dev-perl/CGI-Session
-	dev-perl/Digest-SHA1
-	dev-perl/HTML-Parser
-	dev-perl/locale-maketext-lexicon
-	dev-perl/Text-Diff
-	dev-perl/URI
-	virtual/cron
-	>=virtual/perl-CGI-3.20
-	virtual/perl-digest-base
-	virtual/perl-File-Spec
-	virtual/perl-libnet
-	virtual/perl-Time-Local"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS COPYRIGHT readme.txt
-	dohtml T*.html INSTALL.html
-	rm -f readme.txt T*.html INSTALL.html
-
-	mv bin/LocalLib.cfg{.txt,}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for f in $(find data pub); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
-	done
-
-	for f in bin/setlib.cfg bin/LocalLib.cfg; do
-		webapp_configfile "${MY_HTDOCSDIR}"/${f}
-	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
-	webapp_pkg_postinst
-}
diff --git a/www-apps/twiki/twiki-4.1.2.ebuild b/www-apps/twiki/twiki-4.2.3.ebuild
index b99eb7510f9f..208d23bc0e53 100644
--- a/www-apps/twiki/twiki-4.1.2.ebuild
+++ b/www-apps/twiki/twiki-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.2 2008/02/24 00:00:38 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.3.ebuild,v 1.1 2008/09/21 14:31:39 wrobel Exp $
 
 WEBAPP_NO_AUTO_INSTALL="yes"
 
@@ -14,6 +14,7 @@ SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+RESTRICT="fetch"
 IUSE=""
 
 S="${WORKDIR}"
@@ -37,6 +38,12 @@ RDEPEND=">=app-text/rcs-5.7
 
 need_httpd_cgi
 
+pkg_nofetch() {
+	einfo "Please download ${MY_PN}_${PV}.tgz from:"
+	einfo "http://twiki.org/cgi-bin/view/Codev/DownloadTWiki"
+	einfo "and move it to ${DISTDIR}"
+}
+
 src_install() {
 	webapp_src_preinst