Sun Sep 2 00:29:34 2012 UTC ()
Update to 1.19.2
It is a security update, fix CVE-2012-4377 CVE-2012-4378 CVE-2012-4379
CVE-2012-4380 CVE-2012-4381 CVE-2012-4382.

Upstream changes:
Changes since 1.19.1
(bug 39700) File: link to non-existing file can inject html
(bug 39823) Hidden block text leaking to admins
(bug 39184) LDAP password leakage
(bug 39180) Disallow framing of api results
(bug 37587) Enforce language codes to be html safe
(bug 39824) Check global blocks on account creation


(wen)
diff -r1.21 -r1.22 pkgsrc/www/mediawiki/Makefile
diff -r1.10 -r1.11 pkgsrc/www/mediawiki/PLIST
diff -r1.14 -r1.15 pkgsrc/www/mediawiki/distinfo
cvs diff -r1.21 -r1.22 pkgsrc/www/mediawiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/mediawiki/Makefile 2012/06/19 11:55:25 1.21
+++ pkgsrc/www/mediawiki/Makefile 2012/09/02 00:29:34 1.22
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.21 2012/06/19 11:55:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2012/09/02 00:29:34 wen Exp $
2 2
3DISTNAME= mediawiki-${VER}.${PVER} 3DISTNAME= mediawiki-${VER}.${PVER}
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://download.wikimedia.org/mediawiki/${VER}/ 5MASTER_SITES= http://download.wikimedia.org/mediawiki/${VER}/
6 6
7MAINTAINER= wenheping@gmail.com 7MAINTAINER= wenheping@gmail.com
8HOMEPAGE= http://www.mediawiki.org/ 8HOMEPAGE= http://www.mediawiki.org/
9COMMENT= Free software wiki package originally written for Wikipedia 9COMMENT= Free software wiki package originally written for Wikipedia
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12EGDIR= share/examples/mediawiki 12EGDIR= share/examples/mediawiki
13MEDIAWIKI= ${PREFIX}/share/mediawiki 13MEDIAWIKI= ${PREFIX}/share/mediawiki
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16INSTALLATION_DIRS= ${EGDIR} share/mediawiki 16INSTALLATION_DIRS= ${EGDIR} share/mediawiki
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19.include "options.mk" 19.include "options.mk"
20 20
21PKG_INSTALLATION_TYPES= overwrite pkgviews 21PKG_INSTALLATION_TYPES= overwrite pkgviews
22VER= 1.19 22VER= 1.19
23PVER= 1 23PVER= 2
24 24
25APACHE_USER?= www 25APACHE_USER?= www
26APACHE_GROUP?= www 26APACHE_GROUP?= www
27BUILD_DEFS+= APACHE_USER APACHE_GROUP 27BUILD_DEFS+= APACHE_USER APACHE_GROUP
28 28
29PKG_SYSCONFSUBDIR?= httpd 29PKG_SYSCONFSUBDIR?= httpd
30MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 30MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
31 31
32CONF_FILES= ${PREFIX}/${EGDIR}/mediawiki.conf \ 32CONF_FILES= ${PREFIX}/${EGDIR}/mediawiki.conf \
33 ${PKG_SYSCONFDIR}/mediawiki.conf 33 ${PKG_SYSCONFDIR}/mediawiki.conf
34 34
35NO_CONFIGURE= YES 35NO_CONFIGURE= YES
36NO_BUILD= YES 36NO_BUILD= YES
@@ -38,35 +38,55 @@ NO_BUILD= YES @@ -38,35 +38,55 @@ NO_BUILD= YES
38SUBST_CLASSES+= paths 38SUBST_CLASSES+= paths
39SUBST_MESSAGE.paths= Fixing pathnames in configuration file. 39SUBST_MESSAGE.paths= Fixing pathnames in configuration file.
40SUBST_STAGE.paths= post-patch 40SUBST_STAGE.paths= post-patch
41SUBST_FILES.paths= ../mediawiki.conf 41SUBST_FILES.paths= ../mediawiki.conf
42SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g" 42SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g"
43 43
44SUBST_CLASSES+= sh 44SUBST_CLASSES+= sh
45SUBST_STAGE.sh= post-patch 45SUBST_STAGE.sh= post-patch
46SUBST_MESSAGE.sh= Fixing path to sh 46SUBST_MESSAGE.sh= Fixing path to sh
47SUBST_FILES.sh+= bin/ulimit-tvf.sh bin/ulimit.sh bin/ulimit4.sh 47SUBST_FILES.sh+= bin/ulimit-tvf.sh bin/ulimit.sh bin/ulimit4.sh
48SUBST_FILES.sh+= maintenance/storage/make-blobs 48SUBST_FILES.sh+= maintenance/storage/make-blobs
49SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh 49SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh
50SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh 50SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh
 51SUBST_FILES.sh+= extensions/WikiEditor/modules/images/toolbar/png24/generate.sh
51SUBST_SED.sh= -e "s|/bin/bash|${SH}|" 52SUBST_SED.sh= -e "s|/bin/bash|${SH}|"
52 53
53SUBST_CLASSES+= perl 54SUBST_CLASSES+= perl
54SUBST_STAGE.perl= post-patch 55SUBST_STAGE.perl= post-patch
55SUBST_MESSAGE.perl= Fixing path to perl 56SUBST_MESSAGE.perl= Fixing path to perl
56SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl 57SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl
57SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl 58SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl
58SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|" 59SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|"
59 60
 61SUBST_CLASSES+= python
 62SUBST_STAGE.python= post-patch
 63SUBST_MESSAGE.python= Fixing python path
 64SUBST_FILES.python+= extensions/ConfirmEdit/captcha.py includes/zhtable/Makefile.py
 65SUBST_FILES.python+= maintenance/cssjanus/cssjanus.py maintenance/cssjanus/csslex.py
 66SUBST_SED.python= -e "s,/usr/bin/python,${PYTHONBIN},"
 67
 68SUBST_CLASSES+= php
 69SUBST_MESSAGE.php= Fixing the path of php.
 70SUBST_STAGE.php= post-patch
 71SUBST_FILES.php+= includes/normal/UtfNormalTest2.php tests/RunSeleniumTests.php
 72SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
 73
 74SUBST_CLASSES+= php2
 75SUBST_MESSAGE.php2= Fixing the path of php.
 76SUBST_STAGE.php2= post-patch
 77SUBST_FILES.php2+= tests/phpunit/phpunit.php
 78SUBST_SED.php2= -e "s,/usr/bin/env php,${PREFIX}/bin/php,g"
 79
60post-extract: 80post-extract:
61 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf 81 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf
62 82
63do-install: 83do-install:
64 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \ 84 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \
65 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \ 85 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \
66 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \; 86 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \;
67 cd ${WRKSRC} && ${FIND} . \! -type d \! -name '.git*' \ 87 cd ${WRKSRC} && ${FIND} . \! -type d \! -name '.git*' \
68 -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \ 88 -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \
69 -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \ 89 -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \
70 ${DESTDIR}${MEDIAWIKI}/{} \; 90 ${DESTDIR}${MEDIAWIKI}/{} \;
71 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \ 91 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \
72 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf 92 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf
cvs diff -r1.10 -r1.11 pkgsrc/www/mediawiki/PLIST (expand / switch to unified diff)

--- pkgsrc/www/mediawiki/PLIST 2012/06/19 11:55:25 1.10
+++ pkgsrc/www/mediawiki/PLIST 2012/09/02 00:29:34 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2012/06/19 11:55:25 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.11 2012/09/02 00:29:34 wen Exp $
2share/examples/mediawiki/mediawiki.conf 2share/examples/mediawiki/mediawiki.conf
3share/mediawiki/COPYING 3share/mediawiki/COPYING
4share/mediawiki/CREDITS 4share/mediawiki/CREDITS
5share/mediawiki/FAQ 5share/mediawiki/FAQ
6share/mediawiki/HISTORY 6share/mediawiki/HISTORY
7share/mediawiki/INSTALL 7share/mediawiki/INSTALL
8share/mediawiki/README 8share/mediawiki/README
9share/mediawiki/RELEASE-NOTES-1.19 9share/mediawiki/RELEASE-NOTES-1.19
10share/mediawiki/StartProfiler.sample 10share/mediawiki/StartProfiler.sample
11share/mediawiki/UPGRADE 11share/mediawiki/UPGRADE
12share/mediawiki/api.php 12share/mediawiki/api.php
13share/mediawiki/api.php5 13share/mediawiki/api.php5
14share/mediawiki/bin/svnstat 14share/mediawiki/bin/svnstat
@@ -1617,28 +1617,30 @@ share/mediawiki/maintenance/minify.php @@ -1617,28 +1617,30 @@ share/mediawiki/maintenance/minify.php
1617share/mediawiki/maintenance/moveBatch.php 1617share/mediawiki/maintenance/moveBatch.php
1618share/mediawiki/maintenance/mssql/tables.sql 1618share/mediawiki/maintenance/mssql/tables.sql
1619share/mediawiki/maintenance/mwdocgen.php 1619share/mediawiki/maintenance/mwdocgen.php
1620share/mediawiki/maintenance/namespaceDupes.php 1620share/mediawiki/maintenance/namespaceDupes.php
1621share/mediawiki/maintenance/nextJobDB.php 1621share/mediawiki/maintenance/nextJobDB.php
1622share/mediawiki/maintenance/nukeNS.php 1622share/mediawiki/maintenance/nukeNS.php
1623share/mediawiki/maintenance/nukePage.php 1623share/mediawiki/maintenance/nukePage.php
1624share/mediawiki/maintenance/oracle/alterSharedConstraints.php 1624share/mediawiki/maintenance/oracle/alterSharedConstraints.php
1625share/mediawiki/maintenance/oracle/archives/patch-ar_sha1_field.sql 1625share/mediawiki/maintenance/oracle/archives/patch-ar_sha1_field.sql
1626share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_field.sql 1626share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_field.sql
1627share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_index.sql 1627share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_index.sql
1628share/mediawiki/maintenance/oracle/archives/patch-logging_type_action_index.sql 1628share/mediawiki/maintenance/oracle/archives/patch-logging_type_action_index.sql
1629share/mediawiki/maintenance/oracle/archives/patch-page_redirect_namespace_len.sql 1629share/mediawiki/maintenance/oracle/archives/patch-page_redirect_namespace_len.sql
 1630share/mediawiki/maintenance/oracle/archives/patch-page_restrictions_pkuk_fix.sql
1630share/mediawiki/maintenance/oracle/archives/patch-rev_sha1_field.sql 1631share/mediawiki/maintenance/oracle/archives/patch-rev_sha1_field.sql
1631share/mediawiki/maintenance/oracle/archives/patch-testrun.sql 1632share/mediawiki/maintenance/oracle/archives/patch-testrun.sql
 1633share/mediawiki/maintenance/oracle/archives/patch-ufg_group-length-increase.sql
1632share/mediawiki/maintenance/oracle/archives/patch-ug_group-length-increase.sql 1634share/mediawiki/maintenance/oracle/archives/patch-ug_group-length-increase.sql
1633share/mediawiki/maintenance/oracle/archives/patch-up_property.sql 1635share/mediawiki/maintenance/oracle/archives/patch-up_property.sql
1634share/mediawiki/maintenance/oracle/archives/patch-uploadstash.sql 1636share/mediawiki/maintenance/oracle/archives/patch-uploadstash.sql
1635share/mediawiki/maintenance/oracle/archives/patch-us_chunk_inx_field.sql 1637share/mediawiki/maintenance/oracle/archives/patch-us_chunk_inx_field.sql
1636share/mediawiki/maintenance/oracle/archives/patch-user_email_index.sql 1638share/mediawiki/maintenance/oracle/archives/patch-user_email_index.sql
1637share/mediawiki/maintenance/oracle/archives/patch-user_former_groups.sql 1639share/mediawiki/maintenance/oracle/archives/patch-user_former_groups.sql
1638share/mediawiki/maintenance/oracle/archives/patch_16_17_schema_changes.sql 1640share/mediawiki/maintenance/oracle/archives/patch_16_17_schema_changes.sql
1639share/mediawiki/maintenance/oracle/archives/patch_create_17_functions.sql 1641share/mediawiki/maintenance/oracle/archives/patch_create_17_functions.sql
1640share/mediawiki/maintenance/oracle/archives/patch_fk_rename_deferred.sql 1642share/mediawiki/maintenance/oracle/archives/patch_fk_rename_deferred.sql
1641share/mediawiki/maintenance/oracle/archives/patch_namespace_defaults.sql 1643share/mediawiki/maintenance/oracle/archives/patch_namespace_defaults.sql
1642share/mediawiki/maintenance/oracle/archives/patch_rebuild_dupfunc.sql 1644share/mediawiki/maintenance/oracle/archives/patch_rebuild_dupfunc.sql
1643share/mediawiki/maintenance/oracle/archives/patch_recentchanges_fk2_cascade.sql 1645share/mediawiki/maintenance/oracle/archives/patch_recentchanges_fk2_cascade.sql
1644share/mediawiki/maintenance/oracle/archives/patch_remove_not_null_empty_defs.sql 1646share/mediawiki/maintenance/oracle/archives/patch_remove_not_null_empty_defs.sql
cvs diff -r1.14 -r1.15 pkgsrc/www/mediawiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/mediawiki/distinfo 2012/06/19 11:55:25 1.14
+++ pkgsrc/www/mediawiki/distinfo 2012/09/02 00:29:34 1.15
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.14 2012/06/19 11:55:25 wiz Exp $ 1$NetBSD: distinfo,v 1.15 2012/09/02 00:29:34 wen Exp $
2 2
3SHA1 (mediawiki-1.19.1.tar.gz) = 7e827714aab2110719bb13ae0f10919ed01c08d7 3SHA1 (mediawiki-1.19.2.tar.gz) = 0e95a4c376bbcf77450adb1dca0180ac16da1b67
4RMD160 (mediawiki-1.19.1.tar.gz) = c54d8ae8534146237766b392dac4578ecf883b0c 4RMD160 (mediawiki-1.19.2.tar.gz) = a5799d3853327d4e279c3ea46613344471de2fa1
5Size (mediawiki-1.19.1.tar.gz) = 17929538 bytes 5Size (mediawiki-1.19.2.tar.gz) = 18266096 bytes