summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2019-08-23 12:52:55 +0000
committerCaleb Maclennan2019-08-23 13:10:46 +0000
commitf5d79797498452a87ea87cef464e029597fb74d1 (patch)
treeddfb0400d975069b6a18ebf6fd30429d4edeb2cf
parent9c8f9c6dc71107b6857f9462b4e9e3edcc4c6f86 (diff)
downloadaur-f5d79797498452a87ea87cef464e029597fb74d1.tar.gz
Update to 5.14.0
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
-rw-r--r--mattermost-ldflags.patch14
3 files changed, 21 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0cba4d84d4e9..47d80f221fc1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mattermost
pkgdesc = Open source Slack-alternative in Golang and React
- pkgver = 5.12.2
+ pkgver = 5.14.0
pkgrel = 1
url = https://mattermost.com
arch = i686
@@ -22,15 +22,15 @@ pkgbase = mattermost
optdepends = percona-server: SQL server storage
optdepends = postgresql: SQL server storage
backup = etc/webapps/mattermost/config.json
- source = mattermost-server-5.12.2.tar.gz::https://github.com/mattermost/mattermost-server/archive/v5.12.2.tar.gz
- source = mattermost-webapp-5.12.2.tar.gz::https://github.com/mattermost/mattermost-webapp/archive/v5.12.2.tar.gz
+ source = mattermost-server-5.14.0.tar.gz::https://github.com/mattermost/mattermost-server/archive/v5.14.0.tar.gz
+ source = mattermost-webapp-5.14.0.tar.gz::https://github.com/mattermost/mattermost-webapp/archive/v5.14.0.tar.gz
source = mattermost-ldflags.patch
source = mattermost.service
source = mattermost.sysusers
source = mattermost.tmpfiles
- sha512sums = aef104a8cdbe943743d34c51b00defca1637ed800423a6d4943cd5cb539eea05230bae7c27480a638e6878563aec1260a570819ba8123860cecb4f7d3436a052
- sha512sums = 69468ef8d3dda31586ab9c125bda2f513cda4d1a670a2fe609f1b2e6fb93c6d545edbd54b75ffe3e8364814a096185fd2c1e981c8f84592cb5ba5c7715ae4475
- sha512sums = 7262595fb66757ea7b83c9a680144a43d3cc175f1aa91b1bb7651b26c05655f4f958b801a20f6ad8b14238bb774a74f8536deb6bc698f5b5b1f0a51b96a8e1f6
+ sha512sums = 7845cd37ecf85a4414eca887ebb3894be34dff66c2f832bedf58d8d08e69ccdbdf41218322cdaade44e460a676728a0d480eb86c1387faba260257a7d0a3cf89
+ sha512sums = 16e6671dab37b8e422915920111a9b69e84adc042a66c14fe5638a665e242f14c474e795d5abb65e76093dc7ce5b5d94e82fe77f6d58f7bdd14cbcfa1b8817b4
+ sha512sums = 5b761c5715387e6abf3afbe653de218b9a45708d7ffbc699856f53cc3e62760fbd0ce175615f36a4b9090182705c3343d07fca72d12275411080ab516cee3eeb
sha512sums = 6fc1b41f1ddcc44dab3e1f6bc15b7566e7c33132346b7eb0bc91d9709b4cec89ae969a57a57b6097c75868af21f438c2affda5ba1507f485c8689ab8004efd70
sha512sums = f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc
sha512sums = e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9
diff --git a/PKGBUILD b/PKGBUILD
index 9ffea0386928..374fe3563ead 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Bruno Pagani <archange at archlinux dot org>
pkgname=mattermost
-pkgver=5.12.2
+pkgver=5.14.0
pkgrel=1
pkgdesc='Open source Slack-alternative in Golang and React'
arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -30,14 +30,12 @@ source=(
"${pkgname}.sysusers"
"${pkgname}.tmpfiles"
)
-sha512sums=(
- 'aef104a8cdbe943743d34c51b00defca1637ed800423a6d4943cd5cb539eea05230bae7c27480a638e6878563aec1260a570819ba8123860cecb4f7d3436a052'
- '69468ef8d3dda31586ab9c125bda2f513cda4d1a670a2fe609f1b2e6fb93c6d545edbd54b75ffe3e8364814a096185fd2c1e981c8f84592cb5ba5c7715ae4475'
- '7262595fb66757ea7b83c9a680144a43d3cc175f1aa91b1bb7651b26c05655f4f958b801a20f6ad8b14238bb774a74f8536deb6bc698f5b5b1f0a51b96a8e1f6'
- '6fc1b41f1ddcc44dab3e1f6bc15b7566e7c33132346b7eb0bc91d9709b4cec89ae969a57a57b6097c75868af21f438c2affda5ba1507f485c8689ab8004efd70'
- 'f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc'
- 'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9'
-)
+sha512sums=('7845cd37ecf85a4414eca887ebb3894be34dff66c2f832bedf58d8d08e69ccdbdf41218322cdaade44e460a676728a0d480eb86c1387faba260257a7d0a3cf89'
+ '16e6671dab37b8e422915920111a9b69e84adc042a66c14fe5638a665e242f14c474e795d5abb65e76093dc7ce5b5d94e82fe77f6d58f7bdd14cbcfa1b8817b4'
+ '5b761c5715387e6abf3afbe653de218b9a45708d7ffbc699856f53cc3e62760fbd0ce175615f36a4b9090182705c3343d07fca72d12275411080ab516cee3eeb'
+ '6fc1b41f1ddcc44dab3e1f6bc15b7566e7c33132346b7eb0bc91d9709b4cec89ae969a57a57b6097c75868af21f438c2affda5ba1507f485c8689ab8004efd70'
+ 'f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc'
+ 'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9')
prepare() {
# cp cannot copy from a symbolic link to the destination link itself
diff --git a/mattermost-ldflags.patch b/mattermost-ldflags.patch
index 1ec32ae5931d..43e47c03b57d 100644
--- a/mattermost-ldflags.patch
+++ b/mattermost-ldflags.patch
@@ -1,15 +1,16 @@
--- src/mattermost-server-5.12.0/Makefile 2019-06-14 21:13:52.000000000 +0200
+++ src/mattermost-server-5.12.0/Makefile.new 2019-07-01 03:04:42.875342812 +0200
-@@ -49,11 +49,18 @@
+@@ -49,11 +49,20 @@
GOFLAGS ?= $(GOFLAGS:)
GO=go
DELVE=dlv
+-LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)"
++
+# We need to use the second flavour of makefile variables and use a dedicated
+# variable here, otherwise this will cause an infinite loop.
+# src.: https://www.gnu.org/software/make/manual/make.html#Flavors
+LDFLAGS_MATTERMOST := $(LDFLAGS)
--LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)"
-+LDFLAGS = -X "github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)"
++LDFLAGS = -X "github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
@@ -17,6 +18,7 @@
+# The link mode needs to be at the end of the LDFLAGS statement otherwise the
+# build pieces of info won't be populated to the about dialog in the app.
+LDFLAGS += -linkmode external -extldflags '$(LDFLAGS_MATTERMOST)' -s -w
-
- # GOOS/GOARCH of the build host, used to determine whether we're cross-compiling or not
- BUILDER_GOOS_GOARCH="$(shell $(GO) env GOOS)_$(shell $(GO) env GOARCH)"
++
+ GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
+ GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
+ MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1