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

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apps/mediawiki: ChangeLog mediawiki-1.12.1.ebuild mediawiki-1.13.2.ebuild mediawiki-1.13.1.ebuild mediawiki-1.12.0.ebuild
Date: Mon, 06 Oct 2008 04:47:25
Message-Id: E1Kmi00-0001QX-2m@stork.gentoo.org
1 pva 08/10/06 04:47:12
2
3 Modified: ChangeLog
4 Added: mediawiki-1.12.1.ebuild mediawiki-1.13.2.ebuild
5 Removed: mediawiki-1.13.1.ebuild mediawiki-1.12.0.ebuild
6 Log:
7 Version bump, fixes security issue #239342, thank Hanno Boeck for report.
8 (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)
9
10 Revision Changes Path
11 1.112 www-apps/mediawiki/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.112&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.112&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?r1=1.111&r2=1.112
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v
20 retrieving revision 1.111
21 retrieving revision 1.112
22 diff -u -r1.111 -r1.112
23 --- ChangeLog 29 Sep 2008 06:38:47 -0000 1.111
24 +++ ChangeLog 6 Oct 2008 04:47:11 -0000 1.112
25 @@ -1,6 +1,14 @@
26 # ChangeLog for www-apps/mediawiki
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.111 2008/09/29 06:38:47 pva Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.112 2008/10/06 04:47:11 pva Exp $
30 +
31 +*mediawiki-1.13.2 (06 Oct 2008)
32 +*mediawiki-1.12.1 (06 Oct 2008)
33 +
34 + 06 Oct 2008; Peter Volkov <pva@g.o> -mediawiki-1.12.0.ebuild,
35 + +mediawiki-1.12.1.ebuild, -mediawiki-1.13.1.ebuild,
36 + +mediawiki-1.13.2.ebuild:
37 + Version bump, fixes security issue #239342, thank Hanno Boeck for report.
38
39 *mediawiki-1.13.1 (29 Sep 2008)
40
41
42
43
44 1.1 www-apps/mediawiki/mediawiki-1.12.1.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: mediawiki-1.12.1.ebuild
50 ===================================================================
51 # Copyright 1999-2008 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.1.ebuild,v 1.1 2008/10/06 04:47:11 pva Exp $
54
55 EAPI="1"
56 inherit webapp depend.php versionator eutils
57
58 MY_BRANCH=$(get_version_component_range 1-2)
59
60 DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
61 HOMEPAGE="http://www.mediawiki.org"
62 SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
63
64 LICENSE="GPL-2"
65 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
66 IUSE="imagemagick math mysql postgres restrict +ocamlopt"
67
68 DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
69 RDEPEND="${DEPEND}
70 math? (
71 app-text/dvipng
72 virtual/tex-base
73 virtual/ghostscript
74 media-gfx/imagemagick
75 )
76 imagemagick? ( media-gfx/imagemagick )"
77
78 RESTRICT="test"
79
80 need_httpd_cgi
81 need_php_httpd
82
83 pkg_setup() {
84 webapp_pkg_setup
85 local flags="pcre session xml"
86 use mysql && flags="${flags} mysql"
87 use postgres && flags="${flags} postgres"
88 if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
89 ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
90 die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
91 fi
92
93 # see Bug 204812
94 if use ocamlopt && use math && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
95 eerror "In order to build ${PN} with native code support from ocaml"
96 eerror "You first need to have a native code ocaml compiler."
97 eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
98 die "Please install ocaml with ocamlopt useflag"
99 fi
100 }
101
102 src_unpack() {
103 unpack ${A}
104 cd "${S}"
105
106 # XXX: besides, is/was this patch really that required? if so, why? (trapni)
107 # epatch ${FILESDIR}/jobindexlength-mysql.patch
108
109 if use restrict ; then
110 epatch "${FILESDIR}/access_restrict_1.12.0.patch"
111 fi
112 }
113
114 src_compile() {
115 if use math; then
116 einfo "Compiling math support"
117 cd math || die
118 if ! use ocamlopt; then
119 sed -i -e "s/ocamlopt/ocamlc/" Makefile
120 sed -i -e "s/cmxa/cma/" Makefile
121 sed -i -e "s/cmx/cmo/g" Makefile
122 fi
123 emake || die
124 else
125 einfo "No math support enabled. Skipping."
126 fi
127
128 # TODO: think about includes/zhtable/ support
129 }
130
131 src_install() {
132 webapp_src_preinst
133
134 # copy the app's main files excluding math support, docs, and tests
135 local DIRS=(
136 "bin"
137 "config"
138 "extensions"
139 "images"
140 "includes"
141 "includes/api"
142 "includes/cbt"
143 "includes/filerepo"
144 "includes/media"
145 "includes/normal"
146 "includes/templates"
147 "includes/zhtable"
148 "languages"
149 "languages/classes"
150 "languages/messages"
151 "locale"
152 "maintenance"
153 "maintenance/archives"
154 "maintenance/dtrace"
155 "maintenance/language"
156 "maintenance/ora"
157 "maintenance/postgres"
158 "maintenance/postgres/archives"
159 "maintenance/storage"
160 "serialized"
161 "skins"
162 "skins/chick"
163 "skins/common"
164 "skins/common/images"
165 "skins/common/images/icons"
166 "skins/disabled"
167 "skins/htmldump"
168 "skins/monobook"
169 "skins/myskin"
170 "skins/simple"
171 )
172
173 insinto ${MY_HTDOCSDIR}
174 doins *.php *.inc *.phtml
175 for DIR in ${DIRS[*]}; do
176 insinto ${MY_HTDOCSDIR}/${DIR}
177 doins ${DIR}/*
178 [[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
179 done
180
181 # installing some docs
182 local DOCS="AdminSettings.sample FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
183 dodoc ${DOCS} docs/*.txt
184 rm -f ${DOCS} COPYING docs/*.txt
185
186 docinto php-memcached
187 dodoc docs/php-memcached/*
188
189 # If imagemagick is enabled then setup for image upload.
190 # We ensure the directory is prepared for writing. The post-
191 # install instructions guide the user to enable the feature.
192 if use imagemagick; then
193 webapp_serverowned ${MY_HTDOCSDIR}/images
194 fi
195
196 # If we've enabled math USE-flag, install math support.
197 # We ensure the directories are prepared for writing. The post-
198 # install instructions guide the user to enable the feature.
199 if use math; then
200 einfo "Installing math support"
201 exeinto ${MY_HTDOCSDIR}/math
202 doexe math/texvc
203
204 # Docs
205 docinto math
206 dodoc math/{README,TODO}
207
208 # Working directories. Server writeable.
209 dodir ${MY_HTDOCSDIR}/images/math
210 webapp_serverowned ${MY_HTDOCSDIR}/images/math
211 dodir ${MY_HTDOCSDIR}/images/tmp
212 webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
213 fi
214
215 webapp_postinst_txt en "${FILESDIR}/postinstall-1.11-en.txt"
216 webapp_src_install
217 }
218
219
220
221 1.1 www-apps/mediawiki/mediawiki-1.13.2.ebuild
222
223 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.2.ebuild?rev=1.1&view=markup
224 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.2.ebuild?rev=1.1&content-type=text/plain
225
226 Index: mediawiki-1.13.2.ebuild
227 ===================================================================
228 # Copyright 1999-2008 Gentoo Foundation
229 # Distributed under the terms of the GNU General Public License v2
230 # $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.2.ebuild,v 1.1 2008/10/06 04:47:11 pva Exp $
231
232 EAPI="1"
233 inherit webapp depend.php versionator eutils
234
235 MY_BRANCH=$(get_version_component_range 1-2)
236
237 DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
238 HOMEPAGE="http://www.mediawiki.org"
239 SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
240
241 LICENSE="GPL-2"
242 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
243 IUSE="imagemagick math mysql postgres +ocamlopt"
244
245 DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
246 RDEPEND="${DEPEND}
247 math? (
248 app-text/dvipng
249 virtual/tex-base
250 virtual/ghostscript
251 media-gfx/imagemagick
252 )
253 imagemagick? ( media-gfx/imagemagick )"
254
255 RESTRICT="test"
256
257 need_httpd_cgi
258 need_php_httpd
259
260 pkg_setup() {
261 webapp_pkg_setup
262 local flags="pcre session xml"
263 use mysql && flags="${flags} mysql"
264 use postgres && flags="${flags} postgres"
265 if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
266 ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
267 die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
268 fi
269
270 # see Bug 204812
271 if use ocamlopt && use math && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
272 eerror "In order to build ${PN} with native code support from ocaml"
273 eerror "You first need to have a native code ocaml compiler."
274 eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
275 die "Please install ocaml with ocamlopt useflag"
276 fi
277 }
278
279 src_compile() {
280 if use math; then
281 einfo "Compiling math support"
282 cd math || die
283 if ! use ocamlopt; then
284 sed -e "s/ocamlopt/ocamlc/" \
285 -e "s/cmxa/cma/" \
286 -e "s/cmx/cmo/g" -i Makefile || die
287 fi
288 emake || die
289 else
290 einfo "No math support enabled. Skipping."
291 fi
292
293 # TODO: 1. think about includes/zhtable/ support
294 # 2. generate docs (?): echo '0' | php mwdocgen.php
295 }
296
297 src_install() {
298 webapp_src_preinst
299
300 # First we install math, docs and then copy everything left into htdocs dir
301 # to avoid bugs like #236411.
302
303 # If we've enabled math USE-flag, install math support.
304 # We ensure the directories are prepared for writing. The post-
305 # install instructions guide the user to enable the feature.
306 if use math; then
307 einfo "Installing math support"
308 exeinto "${MY_HTDOCSDIR}"/math
309 doexe math/texvc || die "Failed to create math support executable."
310
311 docinto math
312 dodoc math/{README,TODO}
313 docinto ""
314
315 # Working directories. Server writeable.
316 dodir "${MY_HTDOCSDIR}"/images/math
317 webapp_serverowned "${MY_HTDOCSDIR}"/images/math
318 dodir "${MY_HTDOCSDIR}"/images/tmp
319 webapp_serverowned "${MY_HTDOCSDIR}"/images/tmp
320 fi
321
322 local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
323 dodoc ${DOCS} docs/*.txt
324 docinto php-memcached
325 dodoc docs/php-memcached/*
326
327 # Clean everything not used at the site...
328 rm -rf ${DOCS} COPYING tests math t docs
329 find . -name Makefile -delete
330 # and install
331 insinto "${MY_HTDOCSDIR}"
332 doins -r .
333
334 # If imagemagick is enabled then setup for image upload.
335 # We ensure the directory is prepared for writing.
336 if use imagemagick; then
337 webapp_serverowned "${MY_HTDOCSDIR}"/images
338 fi
339
340 webapp_postinst_txt en "${FILESDIR}/postinstall-1.13-en.txt"
341 webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.13-en.txt"
342 webapp_src_install
343 }
344
345 pkg_preinst() {
346 prev_instal="false"
347 if has_version ${CATEGORY}/${PN}; then
348 prev_instal="true"
349 fi
350 }
351
352 pkg_postinst() {
353 webapp_pkg_postinst
354 if ${prev_instal}; then
355 einfo
356 elog "=== Consult the release notes ==="
357 elog "Before doing anything, stop and consult the release notes"
358 elog "/usr/share/doc/${PF}/RELEASE-NOTES.bz2"
359 elog
360 elog "These detail bug fixes, new features and functionality, and any"
361 elog "particular points that may need to be noted during the upgrade procedure."
362 einfo
363 ewarn "Back up existing files and the database before upgrade."
364 ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
365 ewarn "provides an overview of the backup process."
366 einfo
367 fi
368 }
Report Message
Find on MARC Find on Google Groups