Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/
Date: Tue, 22 Feb 2011 12:42:14
Message-Id: a6f35e509ee0195220d4072efbb0c806d80c83e4.blueness@gentoo
1 commit: a6f35e509ee0195220d4072efbb0c806d80c83e4
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 22 12:41:56 2011 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 22 12:41:56 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a6f35e50
7
8 www-apps/moodle: version bumps to address security issues
9
10 (Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 www-apps/moodle/ChangeLog | 7 ++
14 www-apps/moodle/Manifest | 6 ++-
15 www-apps/moodle/moodle-1.9.11.ebuild | 121 +++++++++++++++++++++++++++++++
16 www-apps/moodle/moodle-2.0.2.ebuild | 133 ++++++++++++++++++++++++++++++++++
17 4 files changed, 266 insertions(+), 1 deletions(-)
18
19 diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
20 index 2fff710..a8927f8 100644
21 --- a/www-apps/moodle/ChangeLog
22 +++ b/www-apps/moodle/ChangeLog
23 @@ -2,6 +2,13 @@
24 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/07/19 14:05:32 blueness Exp $
26
27 +*moodle-2.0.2 (22 Feb 2011)
28 +*moodle-1.9.11 (22 Feb 2011)
29 +
30 + 22 Feb 2011; Anthony G. Basile <blueness@g.o>
31 + +moodle-1.9.11.ebuild, +moodle-2.0.2.ebuild:
32 + Version bumps.
33 +
34 08 Jan 2011; Anthony G. Basile <blueness@g.o> -moodle-2.0.1.ebuild:
35 moved to tree
36
37
38 diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
39 index 76710a0..59afe81 100644
40 --- a/www-apps/moodle/Manifest
41 +++ b/www-apps/moodle/Manifest
42 @@ -1,5 +1,9 @@
43 AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d
44 AUX postinstall-en.txt 6524 RMD160 d3799bc5cdc283e787c1b5d08935a8d7851d0c8d SHA1 097744447c046848611bfe53d5191518465f1c6d SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667
45 AUX postinstall-nodb-en.txt 171 RMD160 88ff71d95c63f1b5d76e398c3566ada75954cdf4 SHA1 26748e5f24207ef5cb145e3668e1f17cdcddf699 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a
46 -MISC ChangeLog 2405 RMD160 220e053cc3181eed055f28e5a702fe467b535f3b SHA1 e276d612fd479b72862f6d93ee8cc7b1cbd34e60 SHA256 3bfe2ef9de7b7109ffb6db76bff00fdf598e8e7bdfe63915f99e74d7eb1e8f61
47 +DIST moodle-1.9.11.tgz 14045392 RMD160 d50216d4cf535533aed7ca7dcc9211cbbe2fb52f SHA1 0355999061bff37693e2cf8f55e11abcfc0a7744 SHA256 b21da3a8e73c061b2115242b73e5328d078f979b9ca86523a392857c4fc59531
48 +DIST moodle-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4bb099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe
49 +EBUILD moodle-1.9.11.ebuild 3019 RMD160 e89e36d92c7a66a212b32d0c9e9b17544a001edc SHA1 7f51fd0eeb1821e0c44adc09a75421350f5ec094 SHA256 ca63bb55126abc1ad93d4670c2607440abeaae27ab2a4973a7fcec1730becba2
50 +EBUILD moodle-2.0.2.ebuild 3582 RMD160 7de28d2289a51b25a6ee06e908f127a1c6751589 SHA1 38dd39644547d2307a6e127803ad3e3c6f266eb4 SHA256 40497a4218c753fdc2d63baa3c321aa164b29ca052550f3b78d04310ee2c7709
51 +MISC ChangeLog 2583 RMD160 e5d88e582fc351705feb2c2499270db9e74cc226 SHA1 2e56d355290e041d70d34d4ea2241362e111f8ed SHA256 8dc0b2b8507d509d1ab49cb2019a991f4c0dfbe8dbbb071d81a00fc7493c55b1
52 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
53
54 diff --git a/www-apps/moodle/moodle-1.9.11.ebuild b/www-apps/moodle/moodle-1.9.11.ebuild
55 new file mode 100644
56 index 0000000..d37fe0e
57 --- /dev/null
58 +++ b/www-apps/moodle/moodle-1.9.11.ebuild
59 @@ -0,0 +1,121 @@
60 +# Copyright 1999-2011 Gentoo Foundation
61 +# Distributed under the terms of the GNU General Public License v2
62 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.10.ebuild,v 1.1 2010/10/29 15:55:40 blueness Exp $
63 +
64 +EAPI="2"
65 +
66 +inherit versionator webapp
67 +
68 +AVC=( $(get_version_components) )
69 +MY_BRANCH="stable${AVC[0]}${AVC[1]}"
70 +
71 +DESCRIPTION="The Moodle Course Management System"
72 +HOMEPAGE="http://moodle.org"
73 +SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
74 +S="${WORKDIR}/${PN}"
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
78 +#SLOT empty due to webapp
79 +
80 +DBFLAGS="mysql?,postgres?"
81 +DBTYPES=${DBFLAGS//\?/}
82 +DBTYPES=${DBTYPES//,/ }
83 +
84 +AUTHFLAGS="imap?,ldap?,odbc?"
85 +AUTHMODES=${AUTHFLAGS//\?/}
86 +AUTHMODES=${AUTHMODES//,/ }
87 +
88 +PHPFLAGS="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
89 +
90 +IUSE="${DBTYPES} ${AUTHMODES} vhosts"
91 +
92 +# No forced dependency on
93 +# mysql? ( virtual/mysql )
94 +# postgres? ( dev-db/postgresql-server-7* )
95 +# which may live on another server
96 +DEPEND=""
97 +RDEPEND=">=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS}]
98 + virtual/httpd-php
99 + virtual/cron"
100 +
101 +pkg_setup() {
102 + webapp_pkg_setup
103 +
104 + # How many dbs were selected? If one and only one, which one is it?
105 + MYDB=""
106 + DBCOUNT=0
107 + for db in ${DBTYPES}; do
108 + if use ${db}; then
109 + MYDB=${db}
110 + DBCOUNT=$(($DBCOUNT+1))
111 + fi
112 + done
113 +
114 + if [[ ${DBCOUNT} -eq 0 ]]; then
115 + eerror
116 + eerror "\033[1;31m**************************************************\033[1;31m"
117 + eerror "No database selected in your USE flags,"
118 + eerror "You must select at least one."
119 + eerror "\033[1;31m**************************************************\033[1;31m"
120 + eerror
121 + die
122 + fi
123 +
124 + if [[ ${DBCOUNT} -gt 1 ]]; then
125 + MYDB=""
126 + ewarn
127 + ewarn "\033[1;33m**************************************************\033[1;33m"
128 + ewarn "Multiple databases selected in your USE flags,"
129 + ewarn "You will have to choose your database manually."
130 + ewarn "\033[1;33m**************************************************\033[1;33m"
131 + ewarn
132 + fi
133 +}
134 +
135 +src_prepare() {
136 + rm COPYING.txt
137 + cp "${FILESDIR}"/config.php .
138 +
139 + #
140 + # Moodle expect postgres7, not postgres
141 + #
142 + MYDB=${MYDB/postgres/postgres7}
143 + if [[ ${DBCOUNT} -eq 1 ]] ; then
144 + sed -i -e "s|mydb|${MYDB}|" config.php
145 + fi
146 +}
147 +
148 +src_install() {
149 + webapp_src_preinst
150 +
151 + local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
152 + dodir ${MOODLEDATA}
153 + webapp_serverowned -R "${MOODLEDATA}"
154 +
155 + local MOODLEROOT="${MY_HTDOCSDIR}"
156 + insinto ${MOODLEROOT} || die "Unable to insinto ${MOODLEROOT}"
157 + doins -r *
158 +
159 + webapp_configfile "${MOODLEROOT}"/config.php
160 +
161 + if [[ ${DBCOUNT} -eq 1 ]]; then
162 + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
163 + else
164 + webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
165 + fi
166 +
167 + webapp_src_install
168 +}
169 +
170 +pkg_postinst() {
171 + einfo
172 + einfo "\033[1;32m**************************************************\033[1;32m"
173 + einfo
174 + einfo "To see the post install instructions, do"
175 + einfo
176 + einfo " webapp-config --show-postinst ${PN} ${PVR}"
177 + einfo
178 + einfo "\033[1;32m**************************************************\033[1;32m"
179 + einfo
180 +}
181
182 diff --git a/www-apps/moodle/moodle-2.0.2.ebuild b/www-apps/moodle/moodle-2.0.2.ebuild
183 new file mode 100644
184 index 0000000..b3c205d
185 --- /dev/null
186 +++ b/www-apps/moodle/moodle-2.0.2.ebuild
187 @@ -0,0 +1,133 @@
188 +# Copyright 1999-2011 Gentoo Foundation
189 +# Distributed under the terms of the GNU General Public License v2
190 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.1.ebuild,v 1.1 2011/01/08 23:21:15 blueness Exp $
191 +
192 +EAPI="2"
193 +
194 +inherit versionator webapp
195 +
196 +AVC=( $(get_version_components) )
197 +MY_BRANCH="stable${AVC[0]}${AVC[1]}"
198 +
199 +DESCRIPTION="The Moodle Course Management System"
200 +HOMEPAGE="http://moodle.org"
201 +SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
202 +S="${WORKDIR}/${PN}"
203 +
204 +LICENSE="GPL-2"
205 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
206 +#SLOT empty due to webapp
207 +
208 +DB_FLAGS="mysqli?,postgres?"
209 +DB_TYPES=${DB_FLAGS//\?/}
210 +DB_TYPES=${DB_TYPES//,/ }
211 +
212 +AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
213 +AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
214 +AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
215 +
216 +PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
217 +PHP_OPTIONAL_FLAGS_52="gd,soap,ssl,tokenizer,xmlrpc"
218 +PHP_FLAGS_52="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}"
219 +
220 +PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
221 +PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
222 +PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
223 +
224 +IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
225 +
226 +# No forced dependency on
227 +# mysql? ( virtual/mysql )
228 +# postgres? ( dev-db/postgresql-server-7* )
229 +# which may live on another server
230 +DEPEND=""
231 +RDEPEND="
232 + || (
233 + =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52}]
234 + =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
235 + )
236 + virtual/httpd-php
237 + virtual/cron"
238 +
239 +pkg_setup() {
240 + webapp_pkg_setup
241 +
242 + # How many dbs were selected? If one and only one, which one is it?
243 + MYDB=""
244 + DB_COUNT=0
245 + for db in ${DB_TYPES}; do
246 + if use ${db}; then
247 + MYDB=${db}
248 + DB_COUNT=$(($DB_COUNT+1))
249 + fi
250 + done
251 +
252 + if [[ ${DB_COUNT} -eq 0 ]]; then
253 + eerror
254 + eerror "\033[1;31m**************************************************\033[1;31m"
255 + eerror "No database selected in your USE flags,"
256 + eerror "You must select at least one."
257 + eerror "\033[1;31m**************************************************\033[1;31m"
258 + eerror
259 + die
260 + fi
261 +
262 + if [[ ${DB_COUNT} -gt 1 ]]; then
263 + MYDB=""
264 + ewarn
265 + ewarn "\033[1;33m**************************************************\033[1;33m"
266 + ewarn "Multiple databases selected in your USE flags,"
267 + ewarn "You will have to choose your database manually."
268 + ewarn "\033[1;33m**************************************************\033[1;33m"
269 + ewarn
270 + fi
271 +}
272 +
273 +src_prepare() {
274 + rm COPYING.txt
275 + cp "${FILESDIR}"/config.php .
276 +
277 + # Moodle expect postgres7, not postgres
278 + MYDB=${MYDB/postgres/postgres7}
279 +
280 + # Moodle expects mysql, not mysqli
281 + MYDB=${MYDB/mysqli/mysql}
282 +
283 + if [[ ${DB_COUNT} -eq 1 ]] ; then
284 + sed -i -e "s|mydb|${MYDB}|" config.php
285 + fi
286 +}
287 +
288 +src_install() {
289 + webapp_src_preinst
290 +
291 + local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
292 + dodir ${MOODLEDATA}
293 + webapp_serverowned -R "${MOODLEDATA}"
294 +
295 + local MOODLEROOT="${MY_HTDOCSDIR}"
296 + insinto ${MOODLEROOT} || die "Unable to insinto ${MOODLEROOT}"
297 + doins -r *
298 +
299 + webapp_configfile "${MOODLEROOT}"/config.php
300 +
301 + if [[ ${DB_COUNT} -eq 1 ]]; then
302 + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
303 + else
304 + webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
305 + fi
306 +
307 + webapp_src_install
308 +}
309 +
310 +pkg_postinst() {
311 + einfo
312 + einfo "\033[1;32m**************************************************\033[1;32m"
313 + einfo
314 + einfo "To see the post install instructions, do"
315 + einfo
316 + einfo " webapp-config --show-postinst ${PN} ${PVR}"
317 + einfo
318 + einfo "\033[1;32m**************************************************\033[1;32m"
319 + einfo
320 +}
Report Message
Find on MARC Find on Google Groups