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

#237843).
Package-Manager: portage-2.1.4.4

5 files changed, 22 insertions, 164 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/Manifest b/www-apps/twiki/Manifest
index db81c7ae5e57..8795a253ae02 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -4,18 +4,14 @@ Hash: SHA1
 AUX postinstall-en.txt 1022 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 SHA1 a36fca72aa00b60a9249fc684ed7eba3af03454f SHA256 724d08ac4f12335a3bf5a5c9c3411b9780d3df1df1302d45adaeb075cc16fe27
 AUX postupgrade-en.txt 106 RMD160 39efa9b5cdb5ff0337c199a5f8a3a2bee59e3bc8 SHA1 dde90244780744c354daea040edc1fedde4902f9 SHA256 f789b40a01c44b0bb80a47de0885a659d728ffcbb8a3c1e421b24bd560396aca
 AUX reconfig 553 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 SHA1 8d7f6dc57be19d806f56dd08bbc74b36241cbd4e SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851
-DIST TWiki-4.1.2.tgz 4700165 RMD160 b5e719c72258eec919a8566501d699b9da95049e SHA1 6865a77514e225ee82aab8b89b4b3c43736568f6 SHA256 0f7117ee5b5d31959e349bd43011db5ad26ac2309085677c5629bc604d0b73a3
-DIST TWiki-4.2.0.tgz 5380501 RMD160 fdd2147a5945d5ed3b77c216d6dafe926ce59137 SHA1 cd324a99c6fdd3e79e13a700b8879762c01990ed SHA256 dd999df750a9745cef93aa5701bc2fd11c46de55fb0c39a3762485428b344317
-DIST TWiki-4.2.2.tgz 5383974 RMD160 871df0f1a1967b5a13c8ef95bb817b4b53326974 SHA1 41c6b7f48144a8aea6b5f85db097812e80f1e716 SHA256 601aa8656b5efe5f878c761cf4e8c5d2408c10fd3f7769af8b2bcb8083219199
-EBUILD twiki-4.1.2.ebuild 1797 RMD160 6b4434978443081369e2eb3ad87a4b98af14984d SHA1 5a099cc72edd3b7a6f9e0411de62cf26bde29c83 SHA256 ad89956deeb668a8dd04733ace67ed6fb24dabe383c933cf5ca8b05c1facf7ad
-EBUILD twiki-4.2.0.ebuild 1797 RMD160 af389c67edbf409216fa9aed9af7fe4168e371b9 SHA1 62de593399f3eb8b49b213ecce39082960fc10c5 SHA256 498d872cc9797dbf1b9dcd450c40095abc2366009e9c356a65305ddd3120ffda
-EBUILD twiki-4.2.2.ebuild 1787 RMD160 f351b08ba3c9eed99d4113dbb35951bf631c0af9 SHA1 fc19cc7d920a306772b4af28355a33250fd6840d SHA256 f4b09081da61c509aae0a26aa1ae9c125807e8214d601acf901d659670713028
-MISC ChangeLog 7523 RMD160 acab695373c99cb40d4b33bed638f49980c76a1a SHA1 02af8dde750cbdc52021a7e5821473ab644d4457 SHA256 bc9911bed174df97d4b1342b39a26ff24f67ae816d072828ee26b67af9664b42
+DIST TWiki-4.2.3.tgz 5509392 RMD160 d1286e1ff9fb6b4477d9d2960ffe969897082d86 SHA1 fc57f47b9db13350f24fa8f37598d6806ade3ec5 SHA256 d70cbd3da9a3d3125a8c73231bb8a9e61ed110c1716b5e921280f50b1b0b2258
+EBUILD twiki-4.2.3.ebuild 1977 RMD160 932219fc10550d626963e0e7016777654a0da899 SHA1 8c572ef5f9f2a18665afedc37598a62df2314da1 SHA256 3e733f9b9071c440a8f3d2f19e9f5adff2e03f740740c72d81350737d9e6bfd0
+MISC ChangeLog 7757 RMD160 203da8488a707697d2c4e4b561e9493eb604c9b6 SHA1 aa28c7147ced3ed4e3f6c3839bec9203e36e445d SHA256 3d4863fcf36f0f205504d1bbca225d74454605640c11e80f30c38973a4fa3eea
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIx4JhEEcxCpcDQ74RAm+GAJ4g2nxlVmj3XzFiCarlyHwjTPydxACfXxxx
-ylwhSwABJM1efmN/+YTlqF8=
-=POQC
+iD8DBQFI1lrbEEcxCpcDQ74RAryLAJ9UBg9sAY78dfk7makJ0Gdy1S7qZgCggPyL
+m3wTj2mjS3AmxXVbk7e2QUM=
+=gxdx
 -----END PGP SIGNATURE-----
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