Pullup ticket #3224 - requested by taca www/mediawiki: security update Revisions pulled up: - www/mediawiki/Makefile 1.13 - www/mediawiki/distinfo 1.9 - www/mediawiki/patches/patch-aa 1.1 --- Module Name: pkgsrc Committed By: taca Date: Thu Sep 16 14:52:02 UTC 2010 Modified Files: pkgsrc/www/mediawiki: Makefile distinfo Added Files: pkgsrc/www/mediawiki/patches: patch-aa Log Message: 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_SVNdiff -r1.12 -r1.12.2.1 pkgsrc/www/mediawiki/Makefile
(tron)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/05/28 08:11:32 martti Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2010/09/20 08:24:47 tron Exp $
DISTNAME= mediawiki-${VER}.${PVER}
CATEGORIES= www
@@ -20,7 +20,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
VER= 1.15
-PVER= 4
+PVER= 5
APACHE_USER?= www
APACHE_GROUP?= www
@@ -41,6 +41,13 @@
SUBST_FILES.paths= ../mediawiki.conf
SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g"
+SUBST_CLASSES+= sh
+SUBST_STAGE.sh= post-patch
+SUBST_MESSAGE.sh= Fixing path to sh
+SUBST_FILES.sh+= bin/ulimit-tvf.sh bin/ulimit.sh bin/ulimit4.sh
+SUBST_FILES.sh+= maintenance/storage/make-blobs
+SUBST_SED.sh= -e "s|/bin/bash|${SH}|"
+
SUBST_CLASSES+= perl
SUBST_STAGE.perl= post-patch
SUBST_MESSAGE.perl= Fixing path to perl
@@ -55,9 +62,10 @@
cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \
${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \
${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \;
- cd ${WRKSRC} && ${FIND} . \! -type d -exec ${INSTALL_DATA} {} \
- ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \
- ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \;
+ cd ${WRKSRC} && ${FIND} . \! -type d \! -name '*.orig' \
+ -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \
+ -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \
+ ${DESTDIR}${MEDIAWIKI}/{} \;
${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \
${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2010/05/28 08:11:32 martti Exp $
+$NetBSD: distinfo,v 1.8.2.1 2010/09/20 08:24:47 tron Exp $
-SHA1 (mediawiki-1.15.4.tar.gz) = c00267663a0a05ace4bd28b53b0b3b0f08dad551
+SHA1 (mediawiki-1.15.5.tar.gz) = b157fe37bb89c78e5ffa0f27b14beb886db3a5f4
-RMD160 (mediawiki-1.15.4.tar.gz) = f4879c0f9cb1b8a6f5682f9fad14010703d49c27
+RMD160 (mediawiki-1.15.5.tar.gz) = 5113beb1df46c56275a90d5a1cb85c2b01ca541f
-Size (mediawiki-1.15.4.tar.gz) = 11531488 bytes
+Size (mediawiki-1.15.5.tar.gz) = 11595008 bytes
+SHA1 (patch-aa) = 555de67e4f0d28d68a3c253681e68438ce7a2309