version bump wrt security #212288

Package-Manager: portage-2.1.4.4

3 files changed, 125 insertions, 5 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index f13e187d8e91..cad2b4609264 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/viewvc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.17 2008/02/22 08:55:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.18 2008/03/07 10:02:42 hollow Exp $
+
+*viewvc-1.0.5 (07 Mar 2008)
+
+  07 Mar 2008; Benedikt Böhm <hollow@gentoo.org> +viewvc-1.0.5.ebuild:
+  version bump wrt security #212288
 
   22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> viewvc-1.0.4-r1.ebuild:
   fix #210994
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index 8355dff49afc..efd3ac6e3a41 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 DIST viewvc-1.0.4.tar.gz 383491 RMD160 2f08d6697d69bbdf0d6660be0000d1a1aef76faa SHA1 6946266c8d7392f8c8b7b890723c23d57926891f SHA256 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f
+DIST viewvc-1.0.5.tar.gz 522323 RMD160 9a1e76076f8216ba481213f29befa60870291926 SHA1 dccda7e35881a90662f638694f37b0aa2ecb1998 SHA256 0caf17fa0137231c0a78a5c57e758da73475212516d4758fe521def007a8fddd
 EBUILD viewvc-1.0.4-r1.ebuild 2626 RMD160 f2c16e79c61b2bd8753a48d1ae14202dc7f8a121 SHA1 9ed872b15c415611464e0f250e9549b2da079d74 SHA256 ac85a24e2c16e52ea11830acde78ae54bd78e93159123c6bf006f994ae61271c
 EBUILD viewvc-1.0.4.ebuild 2900 RMD160 5ba64c9f405a45cbc6e4d6e78fdaf974afa052a6 SHA1 c39e5bd71c8dcc770f4339081038a905bee67c6e SHA256 3945562ad0176601a25c44f9c4ddf6954003be80241602b54f7e82a0db5f2cda
-MISC ChangeLog 2265 RMD160 f9329d0f530a7f0a11c2611403fd860dd218b74d SHA1 f2baea77514dea2dd8ef86ac5c395dfb012baa0b SHA256 2ea391d933e3475e5e8f922d6b285450529ed1be6445b7b1de1afaf0c7a8c32b
+EBUILD viewvc-1.0.5.ebuild 2623 RMD160 f46bfcbed8f6925fb179b8de6793d4fdfc9d3842 SHA1 63bf8843c090a1eb68ae70b7a5b27a15e2f247f4 SHA256 1c77f05e87354171f34b046be6977d69a0ccb997a190ddcbd9387948c27b709b
+MISC ChangeLog 2403 RMD160 0ed1b6928a5cfdad97e9ec6f1abaf8b02535dcdd SHA1 906f0ce11cff15f4180b5aa4fdf0abed45b946d2 SHA256 f6664de21431409ace2b016b0d593c82f130916fcd4faa8ff879900d79aad167
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAke+jiEACgkQmPFBzbX68WGlhwCggNv5wMV1mJ04zHeaYNZyxUQV
-LW0An0pV3dcY64gTV1UxvEhnStyQWjtx
-=Xwcn
+iEYEARECAAYFAkfREswACgkQmPFBzbX68WHrZgCgh0gAbZ+nBqqFteJqqA+CZWNe
+POQAnjaSafazumwLgIbZKjRJuV6T1JXJ
+=K5of
 -----END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.0.5.ebuild b/www-apps/viewvc/viewvc-1.0.5.ebuild
new file mode 100644
index 000000000000..e72296014ee1
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.0.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.0.5.ebuild,v 1.1 2008/03/07 10:02:42 hollow Exp $
+
+inherit confutils webapp python eutils
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/41694/${P}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cvs cvsgraph enscript highlight mod_python mysql subversion"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="
+	cvs? (
+		>=dev-lang/python-1.5.2
+		app-text/rcs
+	)
+
+	subversion? (
+		>=dev-lang/python-2.0
+		>=dev-util/subversion-1.2.0
+	)
+
+	mod_python? ( www-apache/mod_python )
+	!mod_python? ( virtual/httpd-cgi )
+
+	cvsgraph? ( >=dev-util/cvsgraph-1.5.0 )
+	enscript? ( app-text/enscript )
+	highlight? ( >=app-text/highlight-2.2.10 )
+	mysql? ( >=dev-python/mysql-python-0.9.0 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	confutils_require_any cvs subversion
+	confutils_use_depend_built_with_all subversion dev-util/subversion python
+
+	python_version
+	MOD_PATH=/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	find bin/ -type f -print0 | xargs -0 sed -i \
+		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${MOD_PATH}\"|g" \
+		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
+
+	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
+		lib/config.py
+
+	sed -i -e "s|^template_dir.*|#&|" viewvc.conf.dist
+	mv viewvc.conf{.dist,}
+	mv cvsgraph.conf{.dist,}
+}
+
+src_install() {
+	webapp_src_preinst
+	python_version
+
+	dodoc CHANGES COMMITTERS INSTALL README TODO
+	dohtml -r viewvc.org/*
+
+	insinto "${MOD_PATH}"
+	doins -r lib/*
+
+	insinto "${MY_APPDIR}"
+	doins -r templates/
+
+	if use mysql; then
+		exeinto "${MY_HOSTROOTDIR}"/bin
+		doexe bin/{*dbadmin,make-database,loginfo-handler}
+	fi
+
+	insinto "${MY_HOSTROOTDIR}"/conf
+	doins {viewvc,cvsgraph}.conf
+
+	if use mod_python; then
+		insinto "${MY_HTDOCSDIR}"
+		doins bin/mod_python/viewvc.py
+		doins bin/mod_python/handler.py
+		doins bin/mod_python/.htaccess
+		use mysql && doins bin/mod_python/query.py
+	else
+		exeinto "${MY_CGIBINDIR}"
+		doexe bin/cgi/viewvc.cgi
+		use mysql && doexe bin/cgi/query.cgi
+	fi
+
+	webapp_configfile "${MY_HOSTROOTDIR}"/conf/{viewvc,cvsgraph}.conf
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	python_version
+	python_mod_optimize "${ROOT}${MOD_PATH}"
+	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}