Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
Date: Wed, 28 Jun 2017 11:24:12
Message-Id: 1498649042.4a06816c6d0740c2659d2041bf40db8403681c5c.whissi@gentoo
1 commit: 4a06816c6d0740c2659d2041bf40db8403681c5c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 28 11:23:45 2017 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 28 11:24:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a06816c
7
8 www-apps/viewvc: Security cleanup (bug #608738)
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 www-apps/viewvc/Manifest | 1 -
13 www-apps/viewvc/viewvc-1.1.20-r1.ebuild | 112 --------------------------------
14 2 files changed, 113 deletions(-)
15
16 diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
17 index a58658d633f..dff6fce03c1 100644
18 --- a/www-apps/viewvc/Manifest
19 +++ b/www-apps/viewvc/Manifest
20 @@ -1,2 +1 @@
21 -DIST viewvc-1.1.20.tar.gz 616561 SHA256 ecd9b77ddcdc33594edce34751b0feae64338580c177804e2a8395874cb31ff2 SHA512 1c0129be983e6832f12cf4850ee6fe03c6a4f694d9e7643f0efe65bd3e8c7d820fdaf3bb16fd3bb3628ea133b58b1e03196f2eb439cfb6ab4727d6178516d8d1 WHIRLPOOL 5746826abcdc061b7c7fc2de49bb3034c54b8fd889038334a2b55ae5523796710b7e1f83bdddfe1127f3d795d12275939dd43c38ceb29110cf6d3a4ab1a11cd4
22 DIST viewvc-1.1.26.tar.gz 616103 SHA256 9d718237df7fc04d511302812c0bec0363cf6b8334ab796953a764c2de426e43 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e WHIRLPOOL d8d6348d9d4c48176ff71af6aec74c4d3d73a58217b7b6b23f27d47503548df66cb0121b7d17d89c2a9a0524280b22960fcbf3a7b11a35c8411626f8759c2d50
23
24 diff --git a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
25 deleted file mode 100644
26 index 3a8caa2fa09..00000000000
27 --- a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
28 +++ /dev/null
29 @@ -1,112 +0,0 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=6
34 -PYTHON_COMPAT=( python2_7 )
35 -
36 -inherit eutils python-single-r1 webapp
37 -
38 -WEBAPP_MANUAL_SLOT="yes"
39 -
40 -DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
41 -HOMEPAGE="http://viewvc.org/"
42 -DOWNLOAD_NUMBER="49275"
43 -SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.tar.gz"
44 -
45 -LICENSE="BSD-2"
46 -SLOT="0"
47 -KEYWORDS="amd64 ~ppc x86"
48 -IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
49 -
50 -DEPEND=""
51 -RDEPEND="${PYTHON_DEPS}
52 - cvs? ( dev-vcs/rcs )
53 - subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
54 -
55 - mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
56 - !mod_wsgi? ( virtual/httpd-cgi )
57 -
58 - cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
59 - mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
60 - pygments? (
61 - dev-python/pygments[${PYTHON_USEDEP}]
62 - app-misc/mime-types
63 - )
64 -"
65 -
66 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
67 - || ( cvs subversion )"
68 -
69 -pkg_setup() {
70 - python-single-r1_pkg_setup
71 - webapp_pkg_setup
72 -}
73 -
74 -src_prepare() {
75 - eapply_user
76 -
77 - find bin/ -type f -print0 | xargs -0 sed -i \
78 - -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
79 - -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
80 -
81 - sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
82 - lib/config.py || die
83 -
84 - sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
85 - sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
86 - mv conf/viewvc.conf{.dist,} || die
87 - mv conf/cvsgraph.conf{.dist,} || die
88 -
89 - python_fix_shebang .
90 -}
91 -
92 -src_install() {
93 - webapp_src_preinst
94 -
95 - newbin bin/standalone.py viewvc-standalone-server
96 -
97 - dodoc CHANGES COMMITTERS INSTALL README
98 -
99 - python_moduleinto viewvc
100 - python_domodule lib/.
101 -
102 - insinto "${MY_APPDIR}"
103 - doins -r templates/ || die "doins failed"
104 - doins -r templates-contrib/
105 -
106 - if use mysql; then
107 - exeinto "${MY_HOSTROOTDIR}/bin"
108 - doexe bin/{*dbadmin,make-database,loginfo-handler}
109 - fi
110 -
111 - insinto "${MY_HOSTROOTDIR}/conf"
112 - doins conf/{viewvc,cvsgraph}.conf
113 -
114 - exeinto "${MY_CGIBINDIR}"
115 - doexe bin/cgi/viewvc.cgi
116 - if use mysql; then
117 - doexe bin/cgi/query.cgi
118 - fi
119 -
120 - exeinto "${MY_CGIBINDIR}"
121 - if use mod_wsgi; then
122 - doexe bin/wsgi/viewvc.wsgi
123 - if use mysql; then
124 - doexe bin/wsgi/query.wsgi
125 - fi
126 - else
127 - doexe bin/wsgi/viewvc.fcgi
128 - if use mysql; then
129 - doexe bin/wsgi/query.fcgi
130 - fi
131 - fi
132 -
133 - webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
134 -
135 - webapp_src_install
136 -}
137 -
138 -pkg_postinst() {
139 - webapp_pkg_postinst
140 - elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
141 -}