Upgrade to 4.1.0

+ add comments
+ sync PKGBUILD with mattermost-git
+ remove pngquant, compilation and some tests in UI didn't require it.

2 files changed, 99 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9de92beb8e0..b0865b9e7bdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,31 @@
-# Generated by mksrcinfo v8
-# Mon Jul 31 07:45:40 UTC 2017
 pkgbase = mattermost
 	pkgdesc = Open source Slack-alternative in Golang and React
-	pkgver = 4.0.2
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = http://mattermost.org
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = go
-	makedepends = yarn
-	makedepends = npm
-	makedepends = python2
 	makedepends = git
-	makedepends = mercurial
+	makedepends = go
 	makedepends = libpng12
-	depends = glibc
+	makedepends = npm
+	makedepends = pngquant
+	makedepends = yarn
 	optdepends = mariadb: SQL server storage
 	optdepends = percona-server: SQL server storage
 	optdepends = postgresql: SQL server storage
 	backup = etc/webapps/mattermost/config.json
-	source = https://github.com/mattermost/platform/archive/v4.0.2/mattermost-4.0.2.tar.gz
+	source = https://github.com/mattermost/platform/archive/v4.1.0.tar.gz
 	source = mattermost.service
-	source = user.conf
-	source = tmpfile.conf
 	source = mattermost.sh
-	sha256sums = e3a76c0d0cf8c195d057b181e888bed8379fb8b1cfc29aa99c0a5c6d06f04cb6
-	sha256sums = b3fbb2d04e72396677b2c8e34df089ff135796f7a0e8a42d45e989773d6d5b07
-	sha256sums = 7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd
-	sha256sums = 42277f740be74081126e5ac20a90bdf11cc9588f9b16e6bc1e2f6f106bedb8a6
-	sha256sums = 7f4993798d1a2ae9a78fed5fc3fe88d44a7a669e7ffefda7fa6a36c27c6c5840
+	source = tmpfile.conf
+	source = user.conf
+	sha512sums = 504364620e8b9e6b5213f8194fe7cf020fdd3afd9d82ed275605e65cae55c7b9ae58953c4c608c9dcb763a75e81e01c97e5acb3e283377cb1a457ccc07b043b8
+	sha512sums = 3e3d46dc7778be256da9a366ec96cde684fcb07732d0adfd40ea00d6ec61a161a9d7e784f7773d34e4f058e6919b13053ac228255a05f175e7ce20538f07ec93
+	sha512sums = 5fe6c343e9739b12f8ea9390dafd729fa9f980978bbc0fa7eb6a2eb2d437929078d3efede23c28a6b399c407b8b5e92755169a468462088de0eb148b360acc4b
+	sha512sums = e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9
+	sha512sums = b95bf2c0d840d0e85baebc1051c872056fa4990d263334fecc7b11d96085cb65a69dd866f18889e209336028f17c02152c13a92d2be1c21848939f22203439f0
 
 pkgname = mattermost
 
diff --git a/PKGBUILD b/PKGBUILD
index 2516ebe73378..5485643e2214 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,108 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Maintainer: William Gathoye <william + aur at gathoye dot be>
+# Maintainer: Massimiliano Torromeo <massimiliano dot torromeo at gmail dot com>
 
 pkgname=mattermost
-pkgver=4.0.2
-_pkgver=${pkgver/rc/-rc}
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="Open source Slack-alternative in Golang and React"
+pkgdesc='Open source Slack-alternative in Golang and React'
 arch=('i686' 'x86_64')
-url="http://mattermost.org"
+
+url='http://mattermost.org'
+# The official releases are under MIT, while the ones compiled from the source
+# code in /platform must be under AGPL v3.
+# src.: https://pre-release.mattermost.com/core/pl/cj61agrh5jgmukxxahgdwfx5ww
+# src.: https://www.mattermost.org/licensing
 license=('MIT')
-depends=('glibc')
-makedepends=('go' 'yarn' 'npm' 'python2' 'git' 'mercurial' 'libpng12')
+
+makedepends=('git' 'go' 'libpng12' 'npm' 'yarn')
 backup=('etc/webapps/mattermost/config.json')
-optdepends=('mariadb: SQL server storage'
-            'percona-server: SQL server storage'
-            'postgresql: SQL server storage')
-source=(https://github.com/mattermost/platform/archive/v$_pkgver/$pkgname-$_pkgver.tar.gz
-        mattermost.service
-        user.conf
-        tmpfile.conf
-        mattermost.sh)
-sha256sums=('e3a76c0d0cf8c195d057b181e888bed8379fb8b1cfc29aa99c0a5c6d06f04cb6'
-            'b3fbb2d04e72396677b2c8e34df089ff135796f7a0e8a42d45e989773d6d5b07'
-            '7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd'
-            '42277f740be74081126e5ac20a90bdf11cc9588f9b16e6bc1e2f6f106bedb8a6'
-            '7f4993798d1a2ae9a78fed5fc3fe88d44a7a669e7ffefda7fa6a36c27c6c5840')
+optdepends=(
+    'mariadb: SQL server storage'
+    'percona-server: SQL server storage'
+    'postgresql: SQL server storage'
+)
+
+source=(
+    "https://github.com/mattermost/platform/archive/v${pkgver}.tar.gz"
+    'mattermost.service'
+    'mattermost.sh'
+    'tmpfile.conf'
+    'user.conf'
+)
+sha512sums=(
+    '504364620e8b9e6b5213f8194fe7cf020fdd3afd9d82ed275605e65cae55c7b9ae58953c4c608c9dcb763a75e81e01c97e5acb3e283377cb1a457ccc07b043b8'
+    '3e3d46dc7778be256da9a366ec96cde684fcb07732d0adfd40ea00d6ec61a161a9d7e784f7773d34e4f058e6919b13053ac228255a05f175e7ce20538f07ec93'
+    '5fe6c343e9739b12f8ea9390dafd729fa9f980978bbc0fa7eb6a2eb2d437929078d3efede23c28a6b399c407b8b5e92755169a468462088de0eb148b360acc4b'
+    'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9'
+    'b95bf2c0d840d0e85baebc1051c872056fa4990d263334fecc7b11d96085cb65a69dd866f18889e209336028f17c02152c13a92d2be1c21848939f22203439f0'
+)
 
 prepare() {
-  mkdir -p src/github.com/mattermost
-  cd src/github.com/mattermost
-  rm -f platform
-  ln -s "$srcdir"/platform-$_pkgver platform
-  cd platform
-
-  sed -n '1,/cp README.md/p;/^run-server:/,$p' -i Makefile
-  sed -r -i Makefile \
-    -e 's/^package: build build-client/package: build-linux build-client/' \
-    -e 's/GOARCH=amd64//' \
-    -e 's/^(\s*)BUILD_HASH(_ENTERPRISE)? =.*/\1BUILD_HASH\2 = none/'
+    mkdir -p src/github.com/mattermost
+    cd src/github.com/mattermost
+    # Remove previous platform folder if any previous clone was effective
+    rm -f platform
+    ln -s "$srcdir"/platform-${pkgver} platform
+    cd platform
+
+    # Prevent the build to crash when some dependencies are not met or
+    # outdated.
+    make clean
+
+    # Remove platform specific lines from the Makefile from the line beginning
+    # with "cp README.md" to the line beginning with run-server
+    sed -n '1,/cp README.md/p;/^run-server:/,$p' -i Makefile
+
+    # Build build-linux directly, because the package target in the
+    # Makefile has as dependency build which itself has build-linux,
+    # build-osx and build-windows as dependencies.
+    #
+    # Remove GOARCH=amd64 statement
+    #
+    # Enforce build hash to none (Enterprise hash is already set to none).
+    sed -r -i Makefile \
+        -e 's/^package: build build-client/package: build-linux build-client/' \
+        -e 's/GOARCH=amd64//' \
+        -e 's/^(\s*)BUILD_HASH(_ENTERPRISE)? =.*/\1BUILD_HASH\2 = none/'
 }
 
 build() {
-  cd "$srcdir"/src/github.com/mattermost/platform/webapp
-  make clean
-  cd ..
-  GOPATH="$srcdir" BUILD_NUMBER=$_pkgver-$pkgrel make package
+    cd "$srcdir"/src/github.com/mattermost/platform
+    GOPATH="$srcdir" BUILD_NUMBER=$_pkgver-$pkgrel make package
 }
 
 package() {
-  cd "$srcdir"/src/github.com/mattermost/platform
+    cd "$srcdir"/src/github.com/mattermost/platform
 
-  install -dm755 "$pkgdir"/usr/share/webapps \
-                 "$pkgdir"/var/log/$pkgname \
-                 "$pkgdir"/etc/webapps \
-                 "$pkgdir"/usr/share/{licenses,doc}/$pkgname
+    install -dm755 \
+        "$pkgdir"/usr/share/webapps \
+        "$pkgdir"/var/log/$pkgname \
+        "$pkgdir"/etc/webapps \
+        "$pkgdir"/usr/share/{licenses,doc}/$pkgname
 
-  cp -a dist/mattermost "$pkgdir"/usr/share/webapps/$pkgname
+    cp -a dist/mattermost "$pkgdir"/usr/share/webapps/$pkgname
 
-  cd "$pkgdir"/usr/share/webapps/$pkgname
-  rm -rf logs
-  ln -s /var/log/$pkgname logs
+    cd "$pkgdir"/usr/share/webapps/$pkgname
+    rm -rf logs
+    ln -s /var/log/$pkgname logs
 
-  mv config "$pkgdir"/etc/webapps/$pkgname
-  ln -s /etc/webapps/$pkgname config
+    mv config "$pkgdir"/etc/webapps/$pkgname
+    ln -s /etc/webapps/$pkgname config
 
-  sed -e 's@"Directory": ".*"@"Directory": "/var/lib/mattermost/"@g' \
-      -e 's@tcp(dockerhost:3306)@unix(/run/mysqld/mysqld.sock)@g' \
-      -i "$pkgdir"/etc/webapps/$pkgname/config.json
+    sed -e 's@"Directory": ".*"@"Directory": "/var/lib/mattermost/"@g' \
+        -e 's@tcp(dockerhost:3306)@unix(/run/mysqld/mysqld.sock)@g' \
+        -i "$pkgdir"/etc/webapps/$pkgname/config.json
 
-  mv MIT-COMPILED-LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname
-  mv NOTICE.txt README.md "$pkgdir"/usr/share/doc/$pkgname
+    # When MIT license, the one bundled with the package must always be copied
+    # on the system.
+    # src.: https://wiki.archlinux.org/index.php/PKGBUILD#license
+    mv MIT-COMPILED-LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname
+    mv NOTICE.txt README.md "$pkgdir"/usr/share/doc/$pkgname
 
-  cd "$srcdir"
-  install -Dm755 bin/platform "$pkgdir"/usr/share/webapps/$pkgname/bin/platform
-  install -Dm755 mattermost.sh "$pkgdir"/usr/bin/mattermost
-  install -Dm644 mattermost.service "$pkgdir"/usr/lib/systemd/system/mattermost.service
-  install -Dm644 user.conf "$pkgdir"/usr/lib/sysusers.d/mattermost.conf
-  install -Dm644 tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mattermost.conf
+    cd "$srcdir"
+    install -Dm755 bin/platform "$pkgdir"/usr/share/webapps/$pkgname/bin/platform
+    install -Dm755 mattermost.sh "$pkgdir"/usr/bin/mattermost
+    install -Dm644 mattermost.service "$pkgdir"/usr/lib/systemd/system/mattermost.service
+    install -Dm644 user.conf "$pkgdir"/usr/lib/sysusers.d/mattermost.conf
+    install -Dm644 tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mattermost.conf
 }