9 files changed, 23 insertions, 159 deletions
diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 9b59eff8fc5e..813b0cfae3c8 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/trac
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.23 2005/11/20 03:43:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.24 2005/12/02 18:20:46 dju Exp $
+
+*trac-0.9.1 (02 Dec 2005)
+
+  02 Dec 2005; Julien Allanos <dju@gentoo.org> +files/0.9.1-postinst-en.txt,
+  -files/0.9_beta2-postinst-en.txt, -files/0.9-postinst-en.txt,
+  -trac-0.9_beta2.ebuild, -trac-0.9.ebuild, +trac-0.9.1.ebuild:
+  Version bump to 0.9.1 due to security issue (bug #114205). Removing
+  vulnerable versions from 0.9 serie.
 
   20 Nov 2005; Joseph Jezak <josejx@gentoo.org> trac-0.9.ebuild:
   Marked ~ppc for bug #111069.
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index bde796fc9462..078f7adf14c0 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bd15a5ca0c3b50a967843b84cb95f6a7 trac-0.9_beta2.ebuild 2132
+MD5 b8efd134e63686ae9ab3eaf413cf663b trac-0.9.ebuild 2106
+MD5 27f7772354835a2f5284425c68429e54 trac-0.9.1.ebuild 1976
+MD5 dc7f3171220dede396380a7d76b9d5e0 trac-0.8.2.ebuild 1838
 MD5 f08967cbcd0f6b25b4d58ecd436c43b6 ChangeLog 4679
-MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8.1-postinst-en.txt 1242
-MD5 469236380f880bdb92903ecee4587ae3 files/0.8.4-postinst-en.txt 1035
-MD5 1ef68ae7232130e8152d6e007afc4352 files/0.9-postinst-en.txt 2275
-MD5 d14afae5ff44b00733239243fc47890a files/0.9_beta2-postinst-en.txt 2204
+MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
+MD5 f605a49aef73a61cbcc7527da21fd418 trac-0.8.4.ebuild 1511
+MD5 9cc88e9b369b785a340664742074faf1 files/digest-trac-0.9 60
 MD5 ba2d3ff29f0357234fd123f84c210ec3 files/digest-trac-0.8.2 62
 MD5 8923e5fb9575c109266bbab2350940ff files/digest-trac-0.8.4 62
-MD5 9cc88e9b369b785a340664742074faf1 files/digest-trac-0.9 60
+MD5 85fe6b3c01eac493008299fb8d690112 files/digest-trac-0.9.1 62
+MD5 469236380f880bdb92903ecee4587ae3 files/0.8.4-postinst-en.txt 1035
+MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8.1-postinst-en.txt 1242
 MD5 fea08b6123da2cd35a5428f420a55dbf files/digest-trac-0.9_beta2 62
-MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
-MD5 dc7f3171220dede396380a7d76b9d5e0 trac-0.8.2.ebuild 1838
-MD5 f605a49aef73a61cbcc7527da21fd418 trac-0.8.4.ebuild 1511
-MD5 b8efd134e63686ae9ab3eaf413cf663b trac-0.9.ebuild 2106
-MD5 bd15a5ca0c3b50a967843b84cb95f6a7 trac-0.9_beta2.ebuild 2132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf/EGcsIHjyDViGQRAjeTAKCCKICCbtOoXR9WYQyMOcHUWjxO+ACdHe93
-S7zonajP8lE0WmxghrZu+0Y=
-=v9gD
------END PGP SIGNATURE-----
+MD5 1ef68ae7232130e8152d6e007afc4352 files/0.9-postinst-en.txt 2275
+MD5 d14afae5ff44b00733239243fc47890a files/0.9_beta2-postinst-en.txt 2204
diff --git a/www-apps/trac/files/0.9-postinst-en.txt b/www-apps/trac/files/0.9.1-postinst-en.txt
index f052d00c3855..f052d00c3855 100644
--- a/www-apps/trac/files/0.9-postinst-en.txt
+++ b/www-apps/trac/files/0.9.1-postinst-en.txt
diff --git a/www-apps/trac/files/0.9_beta2-postinst-en.txt b/www-apps/trac/files/0.9_beta2-postinst-en.txt
deleted file mode 100644
index 1847d283b026..000000000000
--- a/www-apps/trac/files/0.9_beta2-postinst-en.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Install Instructions
-====================
-
-To complete the install, create your first Trac environment by running this command:
-
-	trac-admin /var/lib/trac/<project-name> initenv
-
-For security, trac relies on the webserver for authentication. The following command
-creates a password database for Basic Authentication with Apache 2: 
-
-	htpasswd2 -c /etc/apache2/trac.htpasswd <user-name>
-
-Please adjust for the webserver of your choice, and refer to your webserver's
-documentation.
-
-Now, all you need to do is to configure your webserver. The following is a configuration
-example for CGI and Apache:
-
-	<Location "/cgi-bin/trac.cgi">
-		SetEnv TRAC_ENV "/var/lib/trac/<project-name>"
-	</Location>
-	<Location "/cgi-bin/trac.cgi/login">
-		AuthType Basic
-		AuthName "trac"
-		AuthUserFile /etc/apache2/trac.htpasswd
-		Require valid-user
-	</Location>
-
-Again, please adjust for the webserver of your choice.
-
-Fast-CGI users: you have to emerge and configure your Fast-CGI engine separately.
-
-You can also use Trac without having to install a webserver. See
-http://projects.edgewall.com/trac/wiki/TracStandalone to know more.
-
-Don't forget to update the configuration file! It is located at
-/var/lib/trac/<project-name>/conf/trac.ini. See its reference at
-http://projects.edgewall.com/trac/wiki/TracIni.
-
-More information (multiple projects setup, installation with Apache 2's mod_python,
-lighttpd...) can be found on the Trac wiki:
-
-	http://projects.edgewall.com/trac/wiki/
-
-Upgrade Instructions
-====================
-
-If you are upgrading from a previous Trac version, please follow the
-instructions here:
-
-	http://projects.edgewall.com/trac/wiki/TracUpgrade
-
-Trac 0.9.x now uses sqlite-3 instead of sqlite-2. You have to upgrade your database file
-or else you won't be able to use Trac. You can issue the following commands:
-
-	mv /var/lib/trac/<project-name>/db/trac.db /var/lib/trac/<project-name>/db/trac2.db
-	sqlite /var/lib/trac/<project-name>/db/trac2.db .dump | sqlite3 /var/lib/trac/<project-name>/db/trac.db
-	trac-admin /var/lib/trac/<project-name> upgrade
-	trac-admin /var/lib/trac/<project-name> resync
-	trac-admin /var/lib/trac/<project-name> wiki upgrade
-
-And review the trac.ini configuration file.
diff --git a/www-apps/trac/files/digest-trac-0.9 b/www-apps/trac/files/digest-trac-0.9
deleted file mode 100644
index 88b2c7fb212b..000000000000
--- a/www-apps/trac/files/digest-trac-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d90ea5114b2a2c5285ea2a474da9fdf trac-0.9.tar.gz 333250
diff --git a/www-apps/trac/files/digest-trac-0.9.1 b/www-apps/trac/files/digest-trac-0.9.1
new file mode 100644
index 000000000000..468f40ed159c
--- /dev/null
+++ b/www-apps/trac/files/digest-trac-0.9.1
@@ -0,0 +1 @@
+MD5 2a764cc8b3360a395492e29b0217a25a trac-0.9.1.tar.gz 335088
diff --git a/www-apps/trac/files/digest-trac-0.9_beta2 b/www-apps/trac/files/digest-trac-0.9_beta2
deleted file mode 100644
index 70ebd235f93d..000000000000
--- a/www-apps/trac/files/digest-trac-0.9_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2fa7c250ad2dab17d486a24b67fc844 trac-0.9b2.tar.gz 320768
diff --git a/www-apps/trac/trac-0.9.ebuild b/www-apps/trac/trac-0.9.1.ebuild
index 4814e016a3ff..fad791ec413c 100644
--- a/www-apps/trac/trac-0.9.ebuild
+++ b/www-apps/trac/trac-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.ebuild,v 1.4 2005/11/20 03:43:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.1.ebuild,v 1.1 2005/12/02 18:20:46 dju Exp $
 
 inherit distutils webapp
 
@@ -48,7 +48,6 @@ src_install () {
 	distutils_src_install
 
 	dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE
-	rm ${D}/usr/share/doc/${P}/COPYING.gz
 	rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz
 	rm ${D}/usr/share/doc/${P}/PKG-INFO.gz
 
diff --git a/www-apps/trac/trac-0.9_beta2.ebuild b/www-apps/trac/trac-0.9_beta2.ebuild
deleted file mode 100644
index 4f9e0e39686f..000000000000
--- a/www-apps/trac/trac-0.9_beta2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9_beta2.ebuild,v 1.1 2005/09/28 22:35:52 dju Exp $
-
-inherit distutils webapp
-
-MY_P=${P/_beta/b}
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
-HOMEPAGE="http://trac.edgewall.com/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="trac"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="vhosts cgi fastcgi postgres sqlite enscript silvercity"
-
-# doing so because utils (such as trac-admin), manpages... overlap
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-# we need virtual/httpd-cgi to bring apache/lighttpd/whatever in when USE cgi
-# we need virtual/httpd-fcgi to bring mod_fastcgi/lighttpd/whtever in when USE fastcgi
-# we need virtual/httpd-python to bring mod_python/whatever in (when USE python?)
-DEPEND="$DEPEND
-	>=dev-lang/python-2.3
-	>=dev-python/docutils-0.3.3
-	dev-libs/clearsilver
-	>=dev-util/subversion-1.1
-	sqlite? ( >=dev-python/pysqlite-2 )
-	postgres? ( dev-python/psycopg )
-	enscript? ( app-text/enscript )
-	silvercity? ( app-text/silvercity )"
-
-pkg_setup () {
-	if ! use postgres && ! use sqlite ; then
-		eerror "You must select at least one database backend,"
-		eerror "using sqlite or postgres USE flags."
-		die "no database backend selected!"
-	fi
-
-	webapp_pkg_setup
-}
-
-src_install () {
-	# project databases might go in here
-	keepdir /var/lib/trac
-
-	webapp_src_preinst
-	distutils_src_install
-
-	dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE
-	rm ${D}/usr/share/doc/${P}/COPYING.gz
-	rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz
-	rm ${D}/usr/share/doc/${P}/PKG-INFO.gz
-
-	# if needed, install cgi/fcgi scripts for webapp-config
-	local my_dir=${D}/usr/share/trac
-	if use cgi ; then
-		mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
-	fi
-	if use fastcgi ; then
-		mv ${my_dir}/cgi-bin/trac.fcgi ${D}${MY_CGIBINDIR} || die
-	fi
-	rm -rf ${my_dir}/cgi-bin || die
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} ${FILESDIR}/${PV}-postinst-${lang}.txt
-	done
-
-	webapp_src_install
-}