Thu Sep 16 14:52:02 2010 UTC ()
Update mediawiki to 1.15.5.

== MediaWiki 1.15.5 ==

2010-07-28

This is a security and maintenance release.

MediaWiki is now using a "continuous integration" development model with
quarterly snapshot releases. The latest development code is always kept
"ready to run", and in fact runs our own sites on Wikipedia.

Release branches will continue to receive security updates for about a year
from first release, but nonessential bugfixes and feature developments
will be made on the development trunk and appear in the next quarterly release.

Those wishing to use the latest code instead of a branch release can obtain
it from source control: http://www.mediawiki.org/wiki/Download_from_SVN


(taca)
diff -r1.12 -r1.13 pkgsrc/www/mediawiki/Makefile
diff -r1.8 -r1.9 pkgsrc/www/mediawiki/distinfo
diff -r0 -r1.1 pkgsrc/www/mediawiki/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/www/mediawiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/mediawiki/Makefile 2010/05/28 08:11:32 1.12
+++ pkgsrc/www/mediawiki/Makefile 2010/09/16 14:52:02 1.13
@@ -1,66 +1,74 @@ @@ -1,66 +1,74 @@
1# $NetBSD: Makefile,v 1.12 2010/05/28 08:11:32 martti Exp $ 1# $NetBSD: Makefile,v 1.13 2010/09/16 14:52:02 taca 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= martti@NetBSD.org 7MAINTAINER= martti@NetBSD.org
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.15 22VER= 1.15
23PVER= 4 23PVER= 5
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
37 37
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
 45SUBST_STAGE.sh= post-patch
 46SUBST_MESSAGE.sh= Fixing path to sh
 47SUBST_FILES.sh+= bin/ulimit-tvf.sh bin/ulimit.sh bin/ulimit4.sh
 48SUBST_FILES.sh+= maintenance/storage/make-blobs
 49SUBST_SED.sh= -e "s|/bin/bash|${SH}|"
 50
44SUBST_CLASSES+= perl 51SUBST_CLASSES+= perl
45SUBST_STAGE.perl= post-patch 52SUBST_STAGE.perl= post-patch
46SUBST_MESSAGE.perl= Fixing path to perl 53SUBST_MESSAGE.perl= Fixing path to perl
47SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl 54SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl
48SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl 55SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl
49SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|" 56SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|"
50 57
51post-extract: 58post-extract:
52 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf 59 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf
53 60
54do-install: 61do-install:
55 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \ 62 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \
56 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \ 63 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \
57 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \; 64 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \;
58 cd ${WRKSRC} && ${FIND} . \! -type d -exec ${INSTALL_DATA} {} \ 65 cd ${WRKSRC} && ${FIND} . \! -type d \! -name '*.orig' \
59 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \ 66 -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \
60 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \; 67 -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \
 68 ${DESTDIR}${MEDIAWIKI}/{} \;
61 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \ 69 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \
62 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf 70 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf
63 71
64.include "../../lang/php/phpversion.mk" 72.include "../../lang/php/phpversion.mk"
65.include "../../mk/apache.mk" 73.include "../../mk/apache.mk"
66.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/www/mediawiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/mediawiki/distinfo 2010/05/28 08:11:32 1.8
+++ pkgsrc/www/mediawiki/distinfo 2010/09/16 14:52:02 1.9
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.8 2010/05/28 08:11:32 martti Exp $ 1$NetBSD: distinfo,v 1.9 2010/09/16 14:52:02 taca Exp $
2 2
3SHA1 (mediawiki-1.15.4.tar.gz) = c00267663a0a05ace4bd28b53b0b3b0f08dad551 3SHA1 (mediawiki-1.15.5.tar.gz) = b157fe37bb89c78e5ffa0f27b14beb886db3a5f4
4RMD160 (mediawiki-1.15.4.tar.gz) = f4879c0f9cb1b8a6f5682f9fad14010703d49c27 4RMD160 (mediawiki-1.15.5.tar.gz) = 5113beb1df46c56275a90d5a1cb85c2b01ca541f
5Size (mediawiki-1.15.4.tar.gz) = 11531488 bytes 5Size (mediawiki-1.15.5.tar.gz) = 11595008 bytes
 6SHA1 (patch-aa) = 555de67e4f0d28d68a3c253681e68438ce7a2309
File Added: pkgsrc/www/mediawiki/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2010/09/16 14:52:02 taca Exp $

--- maintenance/storage/make-blobs.orig	2006-01-10 11:50:10.000000000 +0000
+++ maintenance/storage/make-blobs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ X$2 == X ];then
+if [ $# != 2 ];then
 	echo 'Usage: make-blobs <server> <db>'
 	exit 1
 fi