Update to 1.31.6

2 files changed, 75 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23ae7188e253..08a6b892a831 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,42 @@
 pkgbase = mediawiki-lts
+	pkgdesc = Latests MediaWiki LTS engine
+	pkgver = 1.31.6
+	pkgrel = 1
+	url = http://www.mediawiki.org/wiki/MediaWiki
+	install = mediawiki.install
+	arch = any
+	license = GPL
+	makedepends = git
+	makedepends = texvc
+	depends = php
+	optdepends = texvc: for math rendering
+	optdepends = python2
+	optdepends = pcre: for regular expressions support
+	optdepends = php-intl: to handle Unicode normalization
+	optdepends = php-pgsql: for PostgreSQL database support
+	optdepends = php-sqlite: for sqlite database support
+	optdepends = memcached: for cache support
+	optdepends = php-gd: for thumbnails rendering
+	optdepends = imagemagick: for thumbnails rendering
+	optdepends = smtp-forwarder: for mail sending
+	options = !strip
+	source = https://releases.wikimedia.org/mediawiki/1.31/mediawiki-1.31.6.tar.gz
+	source = https://releases.wikimedia.org/mediawiki/1.31/mediawiki-1.31.6.tar.gz.sig
+	source = mediawiki-math-1.31.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL1_31
+	source = apache.example.conf
+	validpgpkeys = 41B2ABE817ADD3E52BDA946F72BC1C5D23107F8A
+	validpgpkeys = 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0
+	sha256sums = 9f3c64f4d86c5aa72a69a4b25eab14b1a14653e522d5bf80a85570070db36783
+	sha256sums = SKIP
+	sha256sums = c5cb0101ab19cdbbba8ffb90ced5c43ff13c01cde5035946c4b723c2273c9099
+	sha256sums = cfeff68331e930b6a93f166c12666ac59a84aa24334f94520eff3f988f37ce2b
+
 pkgname = mediawiki-lts
-pkgdesc = Latests MediaWiki LTS engine
-pkgver = 1.27.1
-pkgrel = 1
-url = http://www.mediawiki.org/wiki/MediaWiki
-arch = any
-license = GPL
-depends = php
-source = http://releases.wikimedia.org/mediawiki/1.27/mediawiki-1.27.1.tar.gz
-sha256sums = 08a676c392625cf3c5730a6c1b9390ab1e11dcc17cfd0ff97a2ae3917ef5a36a
+
+pkgname = mediawiki-math-lts
+	pkgdesc = MediaWiki math extension
+	depends = mediawiki-lts
+	depends = texvc
+	optdepends = 
+	backup = 
+
diff --git a/PKGBUILD b/PKGBUILD
index d7333c7ff685..576b57e7d906 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,20 @@
-# Maintainer: Marc Mettke <marc@itmettke.de>
+# Maintainer: ny-a <nyaarch64@gmail..com>
+# Contributor: Marc Mettke <marc@itmettke.de>
 
 pkgbase=mediawiki-lts
 _pkgname=mediawiki
-pkgname=('mediawiki-lts' 'mediawiki-math')
-_basever=1.27
+pkgname=('mediawiki-lts' 'mediawiki-math-lts')
+pkgver=1.31.6
+_basever=${pkgver%.*}
+_hash=a1263db
 pkgrel=1
-pkgver=${_basever}.${pkgrel}
 pkgdesc="Latests MediaWiki LTS engine"
 arch=('any')
 url="http://www.mediawiki.org/wiki/MediaWiki"
 # + http://www.mediawiki.org/wiki/Extension:Math
 license=("GPL")
 depends=('php')
-makedepends=('git')
+makedepends=('git' 'texvc')
 optdepends=('texvc: for math rendering'
 	    'python2'
 	    'pcre: for regular expressions support'
@@ -20,57 +22,60 @@ optdepends=('texvc: for math rendering'
 #	    'php-mysql: for MySQL database support'
 	    'php-pgsql: for PostgreSQL database support'
 	    'php-sqlite: for sqlite database support'
-	    'php-apc: for cache support'
-	    'php-xcache: for cache support'
+#	    'php-apcu: for cache support'
+#	    'php-xcache: for cache support'
 	    'memcached: for cache support'
 	    'php-gd: for thumbnails rendering'
 	    'imagemagick: for thumbnails rendering'
 	    'smtp-forwarder: for mail sending')
 install=mediawiki.install
 options=(!strip)
+validpgpkeys=('41B2ABE817ADD3E52BDA946F72BC1C5D23107F8A'
+              '1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0')
 #	mediawiki-math-${_basever}::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${_basever/./_}
-source=("http://releases.wikimedia.org/mediawiki/${_basever}/mediawiki-$pkgver.tar.gz"
+source=("https://releases.wikimedia.org/mediawiki/${_basever}/mediawiki-$pkgver.tar.gz"{,.sig}
 	"mediawiki-math-${_basever}.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${_basever/./_}"
 	apache.example.conf)
-sha256sums=('08a676c392625cf3c5730a6c1b9390ab1e11dcc17cfd0ff97a2ae3917ef5a36a'
-         '9fb1d9cd450ad579f6e95a3be9a66240485fe50697aea5322af949698dfcb2be'
-         'cfeff68331e930b6a93f166c12666ac59a84aa24334f94520eff3f988f37ce2b')
-         
+sha256sums=('9f3c64f4d86c5aa72a69a4b25eab14b1a14653e522d5bf80a85570070db36783'
+            'SKIP'
+            'c5cb0101ab19cdbbba8ffb90ced5c43ff13c01cde5035946c4b723c2273c9099'
+            'cfeff68331e930b6a93f166c12666ac59a84aa24334f94520eff3f988f37ce2b')
 
 package_mediawiki-lts() {
-  cd $srcdir
-  install -vdm0755 $pkgdir/usr/share/webapps
-  install -vdm0755 $pkgdir/etc/webapps/mediawiki
-  cp -a $_pkgname-$pkgver $pkgdir/usr/share/webapps/mediawiki
+  cd "$srcdir"
+  install -vdm0755 "$pkgdir"/usr/share/webapps
+  install -vdm0755 "$pkgdir"/etc/webapps/mediawiki
+  cp -a $_pkgname-$pkgver "$pkgdir"/usr/share/webapps/mediawiki
 
-  install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/mediawiki/apache.example.conf
+  install -vDm0644 "$srcdir"/apache.example.conf "$pkgdir"/etc/webapps/mediawiki/apache.example.conf
 
   # move cache and images to /var
-  install -vdm0755 -o http -g http $pkgdir/var/cache/mediawiki
-  install -vdm0755 -o http -g http $pkgdir/var/lib/mediawiki
+  install -vdm0755 -o http -g http "$pkgdir"/var/cache/mediawiki
+  install -vdm0755 -o http -g http "$pkgdir"/var/lib/mediawiki
 
-  cd $pkgdir/usr/share/webapps/mediawiki
+  cd "$pkgdir"/usr/share/webapps/mediawiki
 
-  mv cache/.htaccess $pkgdir/var/cache/mediawiki/
+  mv cache/.htaccess "$pkgdir"/var/cache/mediawiki/
   rmdir cache
   ln -sf /var/cache/mediawiki cache
 
-  mv images/* $pkgdir/var/lib/mediawiki/
-  mv images/.htaccess $pkgdir/var/lib/mediawiki/
+  mv images/* "$pkgdir"/var/lib/mediawiki/
+  mv images/.htaccess "$pkgdir"/var/lib/mediawiki/
   rmdir images
   ln -sf /var/lib/mediawiki images
 }
 
-package_mediawiki-math() {
-  depends=('mediawiki' 'texvc')
+package_mediawiki-math-lts() {
+  depends=('mediawiki-lts' 'texvc')
   optdepends=()
   backup=()
   pkgdesc="MediaWiki math extension"
   unset install
 
-  cd $srcdir
-  install -vdm0755 $pkgdir/usr/share/webapps/mediawiki/extensions
-#  cp -a mediawiki-math-${_basever} $pkgdir/usr/share/webapps/mediawiki/extensions/Math
-  cp -a wikimedia-mediawiki-extensions-Math-efdd7c2 $pkgdir/usr/share/webapps/mediawiki/extensions/Math
-  ln -s /usr/bin/texvc $pkgdir/usr/share/webapps/mediawiki/extensions/Math/math/texvc
+  cd "$srcdir"
+  install -vdm0755 "$pkgdir"/usr/share/webapps/mediawiki/extensions
+#  cp -a mediawiki-math-${_basever} "$pkgdir"/usr/share/webapps/mediawiki/extensions/Math
+  cp -a wikimedia-mediawiki-extensions-Math-${_hash} "$pkgdir"/usr/share/webapps/mediawiki/extensions/Math
+  ln -s /usr/bin/texvc "$pkgdir"/usr/share/webapps/mediawiki/extensions/Math/math/texvc
 }
+