n/mediawiki: Upgraded to mediawiki-1.18.1.

n/mediawiki/UPGRADE

@@ -0,0 +1,17 @@
+UPGRADE FROM A PREVIOUS MEDIAWIKI INSTALLATION
+
+* For each MediaWiki instance, backup the database and the whole
+  instance directory.
+
+* Upgrade the package.
+
+* To upgrade an instance installed in /var/www/htdocs/wiki:
+
+  # cd /var/www/htdocs
+  # mv wiki wiki.bak
+  # create-mwiki wiki
+  # cp -r wiki.bak/LocalSettings.php wiki.bak/images wiki/
+  # cd wiki
+  # chown root:apache LocalSettings.php images
+  # chmod 775 images
+  # php maintenance/update.php --conf LocalSettings.php

n/mediawiki/create-mwiki.sh

@@ -17,11 +17,9 @@ set -e
 mkdir -p "$1"
 cd "$1"
 cp $MWIKI_SHARED_DIR/*.php .
-mkdir cache images config
-for d in bin extensions includes languages maintenance skins ; do
+mkdir cache images
+chgrp apache cache images
+chmod 775 cache images
+for d in bin extensions includes languages maintenance mw-config resources skins ; do
     ln -s $MWIKI_SHARED_DIR/$d $d
 done
-cd config
-for f in Installer.php index.php ; do
-    ln -s $MWIKI_SHARED_DIR/config/$f $f
-done

n/mediawiki/extensions

@@ -1,6 +1,7 @@
-Cite 62678
-Collection 66255
-Configure 66255
-OggHandler r62757
-ParserFunctions 62695
-SyntaxHighlight_GeSHi 62591
+Cite 98759
+Collection 100383
+Configure 92462
+Math 103240
+OggHandler 100383
+ParserFunctions 98766
+SyntaxHighlight_GeSHi 90546

n/mediawiki/mediawiki-1.16.1.tar.gz.sha1

@@ -1 +0,0 @@
-9287498265f2d881e19731fba303bd59bad61fe9  mediawiki-1.16.1.tar.gz

n/mediawiki/mediawiki-1.18.1.tar.gz.sha1

@@ -0,0 +1 @@
+1c433523a5ae2835e97462053e08ad7c01e178d2  mediawiki-1.18.1.tar.gz

n/mediawiki/mediawiki.SlackBuild

@@ -29,14 +29,14 @@
 
 # Source package infos
 NAMESRC=${NAMESRC:-mediawiki}
-VERSION=${VERSION:-1.16.1}
+VERSION=${VERSION:-1.18.1}
 ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
 WGET=${WGET:-http://download.wikimedia.org/mediawiki/${VERSION%.*}/$ARCHIVE}
 SVN=${SVN:-http://svn.wikimedia.org/svnroot}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-mediawiki}
-BUILD=${BUILD:-3GGD}
+BUILD=${BUILD:-1GGD}
 ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
 EXT=${EXT:-txz}
 
@@ -71,6 +71,7 @@ cat $CWD/extensions | while read extension revision ; do
     if [ ! -r $extension-$revision.tar.gz ]; then
         svn export -r $revision $SVN/mediawiki/trunk/extensions/$extension $extension
         tar czf $extension-$revision.tar.gz $extension
+        rm -rf $extension
     fi
 done
 
@@ -81,25 +82,25 @@ tar xf $CWD/$ARCHIVE
 mv $NAME mediawiki
 cd mediawiki
 
-# Build and install texcv
+# Install extensions
+cat $CWD/extensions | while read extension revision ; do
+    tar xf $CWD/$extension-$revision.tar.gz -C extensions
+done
+
+# Build and install texcv from the Math extension
 (
-  cd math
+  cd extensions/Math/math
   patch < $CWD/texvc-fix-paths-$ARCH.patch
   make
   install -s -D -m 755 texvc $PKG/usr/bin/texvc
 )
 
-# Install extensions
-cat $CWD/extensions | while read extension revision ; do
-    tar xf $CWD/$extension-$revision.tar.gz -C extensions
-done
-
 # Install unversioned extension makearticle
 cp -r $CWD/makearticle extensions/makearticle
 
 # Install documentation
 mkdir -p $PKG/usr/doc/$NAME
-mv COPYING CREDITS FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE docs \
+mv COPYING CREDITS FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE docs \
   $PKG/usr/doc/$NAME/
 
 # Remove useless files and directories

n/mediawiki/texvc-fix-paths-i486.patch

@@ -1,18 +1,22 @@
---- render.ml.orig	2011-01-21 23:52:26.156626688 +0100
-+++ render.ml	2011-01-21 23:53:37.560741107 +0100
-@@ -1,11 +1,11 @@
+--- render.ml.orig	2012-01-17 13:02:13.600433449 +0100
++++ render.ml	2012-01-17 13:04:18.447041745 +0100
+@@ -1,15 +1,15 @@
+ (* vim: set sw=8 ts=8 et: *)
+ 
 -let cmd_dvips tmpprefix = "dvips -q -R -E " ^ tmpprefix ^ ".dvi -f >" ^ tmpprefix ^ ".ps"
 -let cmd_latex tmpprefix = "latex " ^ tmpprefix ^ ".tex >/dev/null"
-+let cmd_dvips tmpprefix = "/opt/texlive/2011/bin/i486-linux/dvips -q -R -E " ^ tmpprefix ^ ".dvi -f >" ^ tmpprefix ^ ".ps"
-+let cmd_latex tmpprefix = "/opt/texlive/2011/bin/i486-linux/latex " ^ tmpprefix ^ ".tex >/dev/null"
++let cmd_dvips tmpprefix = "/opt/texlive/2011/bin/i486/dvips -q -R -E " ^ tmpprefix ^ ".dvi -f >" ^ tmpprefix ^ ".ps"
++let cmd_latex tmpprefix = "/opt/texlive/2011/bin/i486/latex " ^ tmpprefix ^ ".tex >/dev/null"
+ 
  (* Putting -transparent white in converts arguments will sort-of give you transperancy *)
 -let cmd_convert tmpprefix finalpath = "convert -quality 100 -density 120 " ^ tmpprefix ^ ".ps " ^ finalpath ^ " >/dev/null 2>/dev/null"
 +let cmd_convert tmpprefix finalpath = "/usr/bin/convert -quality 100 -density 120 " ^ tmpprefix ^ ".ps " ^ finalpath ^ " >/dev/null 2>/dev/null"
+ 
  (* Putting -bg Transparent in dvipng's arguments will give full-alpha transparency *)
  (* Note that IE have problems with such PNGs and need an additional javascript snippet *)
  (* Putting -bg transparent in dvipng's arguments will give binary transparency *)
 -let cmd_dvipng tmpprefix finalpath backcolor = "dvipng -bg \'" ^ backcolor ^ "\' -gamma 1.5 -D 120 -T tight --strict " ^ tmpprefix ^ ".dvi -o " ^ finalpath ^ " >/dev/null 2>/dev/null"
-+let cmd_dvipng tmpprefix finalpath backcolor = "/opt/texlive/2011/bin/i486-linux/dvipng -bg \'" ^ backcolor ^ "\' -gamma 1.5 -D 120 -T tight --strict " ^ tmpprefix ^ ".dvi -o " ^ finalpath ^ " >/dev/null 2>/dev/null"
++let cmd_dvipng tmpprefix finalpath backcolor = "/opt/texlive/2011/bin/i486/dvipng -bg \'" ^ backcolor ^ "\' -gamma 1.5 -D 120 -T tight --strict " ^ tmpprefix ^ ".dvi -o " ^ finalpath ^ " >/dev/null 2>/dev/null"
  
  exception ExternalCommandFailure of string
  

n/mediawiki/texvc-fix-paths-x86_64.patch

@@ -1,13 +1,17 @@
---- render.ml.orig	2011-01-21 23:52:26.156626688 +0100
-+++ render.ml	2011-01-21 23:53:37.560741107 +0100
-@@ -1,11 +1,11 @@
+--- render.ml.orig	2012-01-17 13:02:13.600433449 +0100
++++ render.ml	2012-01-17 13:03:21.513676322 +0100
+@@ -1,15 +1,15 @@
+ (* vim: set sw=8 ts=8 et: *)
+ 
 -let cmd_dvips tmpprefix = "dvips -q -R -E " ^ tmpprefix ^ ".dvi -f >" ^ tmpprefix ^ ".ps"
 -let cmd_latex tmpprefix = "latex " ^ tmpprefix ^ ".tex >/dev/null"
 +let cmd_dvips tmpprefix = "/opt/texlive/2011/bin/x86_64-linux/dvips -q -R -E " ^ tmpprefix ^ ".dvi -f >" ^ tmpprefix ^ ".ps"
 +let cmd_latex tmpprefix = "/opt/texlive/2011/bin/x86_64-linux/latex " ^ tmpprefix ^ ".tex >/dev/null"
+ 
  (* Putting -transparent white in converts arguments will sort-of give you transperancy *)
 -let cmd_convert tmpprefix finalpath = "convert -quality 100 -density 120 " ^ tmpprefix ^ ".ps " ^ finalpath ^ " >/dev/null 2>/dev/null"
 +let cmd_convert tmpprefix finalpath = "/usr/bin/convert -quality 100 -density 120 " ^ tmpprefix ^ ".ps " ^ finalpath ^ " >/dev/null 2>/dev/null"
+ 
  (* Putting -bg Transparent in dvipng's arguments will give full-alpha transparency *)
  (* Note that IE have problems with such PNGs and need an additional javascript snippet *)
  (* Putting -bg transparent in dvipng's arguments will give binary transparency *)