summaryrefslogtreecommitdiff
path: root/www/mediawiki
diff options
context:
space:
mode:
authorwen <wen>2012-09-02 00:29:34 +0000
committerwen <wen>2012-09-02 00:29:34 +0000
commit419f5b0da28e0f8e96d0ad0f41f5985944607d5e (patch)
tree68da960fc86ac52a25ee07e9a172947e028bbc34 /www/mediawiki
parent3c0bb10fe9550ecfcc2571942bed11334a436541 (diff)
downloadpkgsrc-419f5b0da28e0f8e96d0ad0f41f5985944607d5e.tar.gz
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
Diffstat (limited to 'www/mediawiki')
-rw-r--r--www/mediawiki/Makefile24
-rw-r--r--www/mediawiki/PLIST4
-rw-r--r--www/mediawiki/distinfo8
3 files changed, 29 insertions, 7 deletions
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index fe44a7d4fc2..a2ef2809299 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/06/19 11:55:25 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/02 00:29:34 wen Exp $
DISTNAME= mediawiki-${VER}.${PVER}
CATEGORIES= www
@@ -20,7 +20,7 @@ INSTALLATION_DIRS= ${EGDIR} share/mediawiki
PKG_INSTALLATION_TYPES= overwrite pkgviews
VER= 1.19
-PVER= 1
+PVER= 2
APACHE_USER?= www
APACHE_GROUP?= www
@@ -48,6 +48,7 @@ SUBST_FILES.sh+= bin/ulimit-tvf.sh bin/ulimit.sh bin/ulimit4.sh
SUBST_FILES.sh+= maintenance/storage/make-blobs
SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh
SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh
+SUBST_FILES.sh+= extensions/WikiEditor/modules/images/toolbar/png24/generate.sh
SUBST_SED.sh= -e "s|/bin/bash|${SH}|"
SUBST_CLASSES+= perl
@@ -57,6 +58,25 @@ SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl
SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl
SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|"
+SUBST_CLASSES+= python
+SUBST_STAGE.python= post-patch
+SUBST_MESSAGE.python= Fixing python path
+SUBST_FILES.python+= extensions/ConfirmEdit/captcha.py includes/zhtable/Makefile.py
+SUBST_FILES.python+= maintenance/cssjanus/cssjanus.py maintenance/cssjanus/csslex.py
+SUBST_SED.python= -e "s,/usr/bin/python,${PYTHONBIN},"
+
+SUBST_CLASSES+= php
+SUBST_MESSAGE.php= Fixing the path of php.
+SUBST_STAGE.php= post-patch
+SUBST_FILES.php+= includes/normal/UtfNormalTest2.php tests/RunSeleniumTests.php
+SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
+
+SUBST_CLASSES+= php2
+SUBST_MESSAGE.php2= Fixing the path of php.
+SUBST_STAGE.php2= post-patch
+SUBST_FILES.php2+= tests/phpunit/phpunit.php
+SUBST_SED.php2= -e "s,/usr/bin/env php,${PREFIX}/bin/php,g"
+
post-extract:
${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf
diff --git a/www/mediawiki/PLIST b/www/mediawiki/PLIST
index c5c6668527b..64f9fa28a31 100644
--- a/www/mediawiki/PLIST
+++ b/www/mediawiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/06/19 11:55:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/09/02 00:29:34 wen Exp $
share/examples/mediawiki/mediawiki.conf
share/mediawiki/COPYING
share/mediawiki/CREDITS
@@ -1627,8 +1627,10 @@ share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_field.sql
share/mediawiki/maintenance/oracle/archives/patch-job_timestamp_index.sql
share/mediawiki/maintenance/oracle/archives/patch-logging_type_action_index.sql
share/mediawiki/maintenance/oracle/archives/patch-page_redirect_namespace_len.sql
+share/mediawiki/maintenance/oracle/archives/patch-page_restrictions_pkuk_fix.sql
share/mediawiki/maintenance/oracle/archives/patch-rev_sha1_field.sql
share/mediawiki/maintenance/oracle/archives/patch-testrun.sql
+share/mediawiki/maintenance/oracle/archives/patch-ufg_group-length-increase.sql
share/mediawiki/maintenance/oracle/archives/patch-ug_group-length-increase.sql
share/mediawiki/maintenance/oracle/archives/patch-up_property.sql
share/mediawiki/maintenance/oracle/archives/patch-uploadstash.sql
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 4d2f8bc581e..b784a3e0f69 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2012/06/19 11:55:25 wiz Exp $
+$NetBSD: distinfo,v 1.15 2012/09/02 00:29:34 wen Exp $
-SHA1 (mediawiki-1.19.1.tar.gz) = 7e827714aab2110719bb13ae0f10919ed01c08d7
-RMD160 (mediawiki-1.19.1.tar.gz) = c54d8ae8534146237766b392dac4578ecf883b0c
-Size (mediawiki-1.19.1.tar.gz) = 17929538 bytes
+SHA1 (mediawiki-1.19.2.tar.gz) = 0e95a4c376bbcf77450adb1dca0180ac16da1b67
+RMD160 (mediawiki-1.19.2.tar.gz) = a5799d3853327d4e279c3ea46613344471de2fa1
+Size (mediawiki-1.19.2.tar.gz) = 18266096 bytes