Apply PKGBUILD changes from Mattermost package

1 files changed, 73 insertions, 59 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2731e1907194..4b4b6e38988a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,21 @@
 
 pkgname=mattermost-git
 _pkgname="${pkgname%-git}"
-pkgver=4.2.0.rc1.r61.g3463e1fc9
+pkgver=4.4.0.rc2.r9.gae8fd3733
 pkgrel=1
 pkgdesc="Open source Slack-alternative in Golang and React"
-arch=('i686' 'x86_64')
-
-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=('AGPL3')
-
-makedepends=('git' 'go' 'libpng12' 'npm' 'yarn')
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://mattermost.com"
+license=('AGPL' 'Apache')
+
+makedepends=('git' 'go' 'libpng12' 'npm' 'yarn' 'mozjpeg')
+# mozjpeg isn't needed on amd64, but the version brought with node_modules does
+# not run on an architecture other than amd64. The one provided with Arch Linux
+# does. Including it even for amd64 prevents us to have a bunch of architecture
+# specific makedepends arrays.
 provides=('mattermost')
 conflicts=('mattermost')
-backup=('etc/webapps/mattermost/config.json')
+backup=("etc/webapps/${_pkgname}/config.json")
 optdepends=(
     'mariadb: SQL server storage'
     'percona-server: SQL server storage'
@@ -31,26 +30,26 @@ source=(
     #'mattermost-server::git+file:///home/user/whatever/mattermost-server#branch=release-4.2'
     # For the URL syntax, please check this link:
     # https://wiki.archlinux.org/index.php/VCS_package_guidelines#VCS_sources
-    'git+https://github.com/mattermost/mattermost-server'
-    'git+https://github.com/mattermost/mattermost-webapp'
-    'mattermost.service'
-    'mattermost.sh'
-    'tmpfile.conf'
-    'user.conf')
+    "git+https://github.com/${_pkgname}/${_pkgname}-server"
+    "git+https://github.com/${_pkgname}/${_pkgname}-webapp"
+    "${_pkgname}.service"
+    "${_pkgname}.sh"
+    "${_pkgname}.sysusers"
+    "${_pkgname}.tmpfiles")
 sha512sums=(
     'SKIP'
     'SKIP'
     '3e3d46dc7778be256da9a366ec96cde684fcb07732d0adfd40ea00d6ec61a161a9d7e784f7773d34e4f058e6919b13053ac228255a05f175e7ce20538f07ec93'
     '5fe6c343e9739b12f8ea9390dafd729fa9f980978bbc0fa7eb6a2eb2d437929078d3efede23c28a6b399c407b8b5e92755169a468462088de0eb148b360acc4b'
-    'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9'
-    'b95bf2c0d840d0e85baebc1051c872056fa4990d263334fecc7b11d96085cb65a69dd866f18889e209336028f17c02152c13a92d2be1c21848939f22203439f0')
+    'b95bf2c0d840d0e85baebc1051c872056fa4990d263334fecc7b11d96085cb65a69dd866f18889e209336028f17c02152c13a92d2be1c21848939f22203439f0'
+    'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9')
 
 # Using the most recent un-annotated tag reachable from the last commit
 # src.: https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
 # Remove the v prefix:
 # src.: http://stackoverflow.com/a/7979255/3514658
 pkgver() {
-    cd "$srcdir"/src/github.com/mattermost/mattermost-server
+    cd "${srcdir}"/src/github.com/${_pkgname}/${_pkgname}-server
     git describe --long --tags | \
         sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
@@ -63,17 +62,17 @@ prepare() {
     # then, use the command mattermost_prepare_pkgbuild.sh. See its help
     # available here: https://github.com/wget/mattermost-prepare-pkgbuild
 
-    mkdir -p src/github.com/mattermost
-    cd src/github.com/mattermost
+    mkdir -p src/github.com/${_pkgname}
+    cd src/github.com/${_pkgname}
+
     # Remove previous platform folder if any previous clone was effective
-    rm -f mattermost-server
-    rm -f mattermost-webapp
-    # Even if we do not have a repository called platform any more, creating
-    # this directory structure is needed as the Mattermost Go namespaces are
-    # still named this way.
-    ln -s "$srcdir"/mattermost-server mattermost-server
-    ln -s "$srcdir"/mattermost-webapp mattermost-webapp
-    cd mattermost-server
+    rm -f ${_pkgname}-server
+    rm -f ${_pkgname}-webapp
+
+    # Create the directory structure to match Go namespaces
+    ln -s "$srcdir"/${_pkgname}-server ${_pkgname}-server
+    ln -s "$srcdir"/${_pkgname}-webapp ${_pkgname}-webapp
+    cd ${_pkgname}-server
 
     # We are not using docker, no need to stop it.
     sed -r -i Makefile \
@@ -82,13 +81,31 @@ prepare() {
     # Enforce build hash to Arch Linux (Enterprise hash is already set to
     # none), instead of the official git hash value.
     sed -r -i Makefile \
-        -e 's/^(\s*)BUILD_HASH(_ENTERPRISE)? =.*/\1BUILD_HASH\2 = Arch Linux/' \
+        -e "s/^(\s*)BUILD_HASH(_ENTERPRISE)? =.*/\1BUILD_HASH\2 = Arch Linux \(${CARCH}\)/" \
         -e 's/-X (.*)(\$\(BUILD_HASH(_ENTERPRISE)?\))(.*)/-X '\''\1\2'\''\4/'
 
     # The configuration isn't available at this time yet, modify the default.
     sed -r -i build/release.mk \
         -e 's/\$\(DIST_PATH\)\/config\/config.json/\$\(DIST_PATH\)\/config\/default.json/'
 
+    # The Go programming language only supports 8 instruction sets, therefore
+    # we cannot rely on ${CARCH} and need to cast manually.
+    # src.: https://golang.org/doc/install/source#introduction
+    case "${CARCH}" in
+        i686)
+            sed -r -i build/release.mk \
+                -e "5,6s/amd64/386/"
+            ;;
+        arm*64*)
+            sed -r -i build/release.mk \
+                -e "5,6s/amd64/arm64/"
+            ;;
+        arm*)
+            sed -r -i build/release.mk \
+                -e "5,6s/amd64/arm/"
+            ;;
+    esac
+
     # Remove platform specific lines from the Makefile from the line beginning
     # with that statement to the end of file (we do not care of the additional
     # file copy, nor the tar compression defined below the file).
@@ -99,49 +116,46 @@ build() {
     # No need to build mattermost-webapp as the server is taking care of this
     # step via its build-client make instruction.
 
-    cd "$srcdir"/src/github.com/mattermost/mattermost-server
+    cd "${srcdir}"/src/github.com/${_pkgname}/${_pkgname}-server
     # Prevent the build to crash when some dependencies are not met or
     # outdated. This clean the webapp as well (cf. mattermost-server/Makefile,
     # clean target).
     make clean
-    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make build-linux
-    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make build-client
-    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make package
+    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make build-linux
+    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make build-client
+    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make package
 }
 
 package() {
-    cd "$srcdir"/src/github.com/mattermost/mattermost-server
+    cd "${srcdir}"/src/github.com/${_pkgname}/${_pkgname}-server
 
     install -dm755 \
-        "$pkgdir"/usr/share/webapps \
-        "$pkgdir"/var/log/$_pkgname \
-        "$pkgdir"/etc/webapps \
-        "$pkgdir"/usr/share/{licenses,doc}/$_pkgname
+        "${pkgdir}"/usr/share/webapps \
+        "${pkgdir}"/var/log/${_pkgname} \
+        "${pkgdir}"/etc/webapps \
+        "${pkgdir}"/usr/share/doc/${_pkgname}
 
-    cp -a dist/mattermost "$pkgdir"/usr/share/webapps/$_pkgname
+    cp -a dist/${_pkgname} "${pkgdir}"/usr/share/webapps/
 
-    cd "$pkgdir"/usr/share/webapps/$_pkgname
+    cd "${pkgdir}"/usr/share/webapps/${_pkgname}
 
     rm -rf logs
-    ln -s /var/log/$_pkgname logs
+    ln -s /var/log/${_pkgname} logs
 
     cp config/default.json config/config.json
-    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
-
-    # 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 NOTICE.txt README.md MIT-COMPILED-LICENSE.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 tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mattermost.conf
-    install -Dm644 user.conf "$pkgdir"/usr/lib/sysusers.d/mattermost.conf
+        -i "${pkgdir}"/etc/webapps/${_pkgname}/config.json
+
+    mv NOTICE.txt README.md "${pkgdir}"/usr/share/doc/${_pkgname}
+
+    cd "${srcdir}"
+    install -Dm755 bin/platform -t "${pkgdir}"/usr/share/webapps/${_pkgname}/bin/
+    install -Dm755 ${_pkgname}.sh "${pkgdir}"/usr/bin/${_pkgname}
+    install -Dm644 ${_pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
+    install -Dm644 ${_pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${_pkgname}.conf
+    install -Dm644 ${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
 }