Update to Mattermost 5.35.1 (#113)

* Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.34.1 to 5.34.2.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.34.1...v5.34.2)

Signed-off-by: dependabot[bot] <support@github.com>

* Fixing dependabot again

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/dependabot"
+  schedule:
+    interval: daily
+    time: "00:15"
+  open-pull-requests-limit: 99
+  target-branch: master

.github/lock.yml

@@ -1,7 +0,0 @@
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 3
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: false

.github/workflows/lock.yml

@@ -0,0 +1,15 @@
+name: 'Lock threads'
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: 3
+          pr-lock-inactive-days: 3

.travis.yml

@@ -1,13 +1,14 @@
 language: c
-dist: trusty
-sudo: required
-service:
+os: linux
+dist: bionic
+services:
   - docker
 env:
   global:
-    - DEBIAN_RELEASE='stretch'
+    - DEBIAN_RELEASE='buster'
     - DOCKER_PWD='/root'
     - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
+    - GO_VERSION='1.15.5'
   matrix:
     - GOOS='dragonfly' GOARCH='amd64'
     - GOOS='freebsd' GOARCH='amd64'
@@ -26,7 +27,7 @@ env:
     - GOOS='openbsd' GOARCH='amd64'
     - GOOS='openbsd' GOARCH='arm'
 before_install:
-  - export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)"
+  - export MATTERMOST_RELEASE="$(grep 'mattermost' dependabot/go.mod | cut -d' ' -f3)"
   - docker pull "${DOCKER_IMAGE}"
   - chmod +x build.sh
 script:

build-release.patch

@@ -1,18 +1,18 @@
-From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Wed, 6 Jun 2018 12:34:56 +0100
-Subject: [PATCH] Split make goal
-
----
- build/release.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
 diff --git a/build/release.mk b/build/release.mk
-index 238343e..1b7859f 100644
+index 3e9a11339..c8bd5409f 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -70,7 +70,7 @@ endif
- 	done
+@@ -97,7 +97,7 @@ package:
+ 	cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
+ 
+ 	@#Download MMCTL
+-	scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin
++	#scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin
+ 
+ 	@# Help files
+ ifeq ($(BUILD_ENTERPRISE_READY),true)
+@@ -126,7 +126,7 @@ endif
+ 
  
  	@# ----- PLATFORM SPECIFIC -----
 -
@@ -20,14 +20,21 @@ index 238343e..1b7859f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -110,7 +110,7 @@ endif
- 	rm -f $(DIST_PATH)/bin/mattermost.exe
+@@ -196,7 +196,7 @@ endif
  	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/bin/mmctl.exe
  	rm -f $(DIST_PATH)/prepackaged_plugins/*
 -
 +package-linux: package
  	@# Make linux package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
--- 
-2.11.0
+@@ -207,7 +207,7 @@ else
+ 	cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
+ endif
+ 	#Download MMCTL for Linux
+-	scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
++	#scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
+ 	@# Prepackage plugins
+ 	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
+ 		ARCH="linux-amd64"; \

build.sh

@@ -10,6 +10,8 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}"
 # node key id and release
 NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
 NODE_RELEASE="${NODE_RELEASE:-10}"
+# golang version
+GO_VERSION="${GO_VERSION:-1.15.5}"
 
 if [ "$(id -u)" -eq 0 ]; then # as root user
 	# create build user, if needed
@@ -43,15 +45,18 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 		> '/etc/apt/sources.list.d/nodesource.list'
 	# update repositories
 	apt-get update
-	# install go from Debian backports
-	apt-get install --quiet --target-release "${DEBIAN_RELEASE}-backports" \
-		golang-go
 	# install dependencies
 	apt-get install --quiet \
 		wget build-essential patch git nodejs
 	# install 'pngquant' build dependencies (required by node module)
 	apt-get build-dep --quiet \
 		pngquant
+	# install go from golang.org
+	wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz
+	tar -xvf go${GO_VERSION}.linux-amd64.tar.gz
+	mv go /usr/local
+	export GOROOT=/usr/local/go
+	export PATH=$GOROOT/bin:$PATH
 	# FIXME go (executed by build user) writes to GOROOT
 	install --directory --owner="${BUILD_USER_NAME}" \
 		"$(go env GOROOT)/pkg/$(go env GOOS)_$(go env GOARCH)"
@@ -65,6 +70,8 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	exit 0
 fi
 # as non-root user
+export GOROOT=/usr/local/go
+export PATH=$GOROOT/bin:$PATH
 cd "${HOME}"
 # download and extract Mattermost sources
 for COMPONENT in server webapp; do
@@ -88,9 +95,7 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
 		"${HOME}/go/bin/linux_amd64"
 fi
 patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
-	--strip=1 < "${HOME}/build-release.patch"
-patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
-	--strip=1 < "${HOME}/go-backport.patch"
+	--strip=1 -t < "${HOME}/build-release.patch"
 sed -i \
 	-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
 	-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \

dependabot/Gopkg.lock

@@ -1,197 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1"
-  name = "github.com/blang/semver"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f"
-  version = "v3.5.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b89d54b3534c2a85153cc60a39e1a9764f9cc6c7b3d1b31265fd53cd70ea77dd"
-  name = "github.com/dyatlov/go-opengraph"
-  packages = ["opengraph"]
-  pruneopts = ""
-  revision = "816b6608b3c8c1e871bc9cf777f390e2532081fe"
-
-[[projects]]
-  digest = "1:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
-  name = "github.com/google/uuid"
-  packages = ["."]
-  pruneopts = ""
-  revision = "d460ce9f8df2e77fb1ba55ca87fafed96c607494"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ad21af51a0276292e9f6f5c37b966630138986478b1ecdbb94b907168fe25281"
-  name = "github.com/gorilla/websocket"
-  packages = ["."]
-  pruneopts = ""
-  revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
-
-[[projects]]
-  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
-  name = "github.com/mattermost/go-i18n"
-  packages = ["i18n"]
-  pruneopts = ""
-  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
-  version = "v1.10.0"
-
-[[projects]]
-  digest = "1:e2df3d086086eadfe8ef94d8f1f333d75b5332987b4c6116f5df8d6bf2a69417"
-  name = "github.com/mattermost/ldap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "fee0a369f21be68ea3d647c0da8272a352fa1528"
-  version = "v3.0.4"
-
-[[projects]]
-  digest = "1:956bb9e1bca6146cea0047ea6cbdc65c36c871285efb7455d94bb06e786fc71d"
-  name = "github.com/mattermost/mattermost-server"
-  packages = [
-    "mlog",
-    "model",
-    "services/timezones",
-    "utils/jsonutils",
-    "utils/markdown",
-  ]
-  pruneopts = ""
-  revision = "6597fdb40134965e26f715854dc85f5e6cfaa6df"
-  version = "v5.16.0"
-
-[[projects]]
-  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
-  name = "github.com/nicksnyder/go-i18n"
-  packages = [
-    "i18n/bundle",
-    "i18n/language",
-    "i18n/translation",
-  ]
-  pruneopts = ""
-  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
-  version = "v1.10.0"
-
-[[projects]]
-  digest = "1:a5484d4fa43127138ae6e7b2299a6a52ae006c7f803d98d717f60abf3e97192e"
-  name = "github.com/pborman/uuid"
-  packages = ["."]
-  pruneopts = ""
-  revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1"
-  version = "v1.2"
-
-[[projects]]
-  digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  pruneopts = ""
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  digest = "1:74f86c458e82e1c4efbab95233e0cf51b7cc02dc03193be9f62cd81224e10401"
-  name = "go.uber.org/atomic"
-  packages = ["."]
-  pruneopts = ""
-  revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"
-  version = "v1.3.2"
-
-[[projects]]
-  digest = "1:22c7effcb4da0eacb2bb1940ee173fac010e9ef3c691f5de4b524d538bd980f5"
-  name = "go.uber.org/multierr"
-  packages = ["."]
-  pruneopts = ""
-  revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:246f378f80fba6fcf0f191c486b6613265abd2bc0f2fa55a36b928c67352021e"
-  name = "go.uber.org/zap"
-  packages = [
-    ".",
-    "buffer",
-    "internal/bufferpool",
-    "internal/color",
-    "internal/exit",
-    "zapcore",
-  ]
-  pruneopts = ""
-  revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982"
-  version = "v1.9.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:efb97ebbd73c3a7068579327f5d98a17c09f6d8caf1fa3212c506e8bb78126b5"
-  name = "golang.org/x/crypto"
-  packages = [
-    "bcrypt",
-    "blowfish",
-  ]
-  pruneopts = ""
-  revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4f7cbb08d72e1163302e2d21415200a7bc281653f5f34eda8a15c0da11a337b0"
-  name = "golang.org/x/net"
-  packages = [
-    "html",
-    "html/atom",
-  ]
-  pruneopts = ""
-  revision = "3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898"
-
-[[projects]]
-  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
-  name = "golang.org/x/text"
-  packages = [
-    "internal/gen",
-    "internal/tag",
-    "language",
-    "unicode/cldr",
-  ]
-  pruneopts = ""
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:039b95e6ba078fe5a22315dcae7bc9859226ee34672ce9ab01708576bf2abd38"
-  name = "gopkg.in/asn1-ber.v1"
-  packages = ["."]
-  pruneopts = ""
-  revision = "f715ec2f112d1e4195b827ad68cf44017a3ef2b1"
-  version = "v1.3"
-
-[[projects]]
-  digest = "1:11c58e19ff7ce22740423bb933f1ddca3bf575def40d5ac3437ec12871b1648b"
-  name = "gopkg.in/natefinch/lumberjack.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
-  version = "v2.1"
-
-[[projects]]
-  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-  version = "v2.2.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = ["github.com/mattermost/mattermost-server/model"]
-  solver-name = "gps-cdcl"
-  solver-version = 1

dependabot/Gopkg.toml

@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/mattermost/mattermost-server"
-  version = "v5.16.0"

dependabot/dummy.go

@@ -1,3 +1,3 @@
 package main
 import _ "github.com/mattermost/mattermost-server/model"
-func() main() {/* dummy file */}
+func main() {/* dummy file */}

dependabot/go.mod

@@ -0,0 +1,3 @@
+module github.com/SmartHoneybee/ubiquitous-memory/dependabot
+
+require github.com/mattermost/mattermost-server/v5 v5.35.1

go-backport.patch

@@ -1,27 +0,0 @@
-From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Wed, 6 Jun 2018 12:34:56 +0100
-Subject: [PATCH] go 1.11 backport
-
----
- store/sqlstore/channel_store.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
-index cf63c706d..dae7c8c9c 100644
---- a/store/sqlstore/channel_store.go
-+++ b/store/sqlstore/channel_store.go
-@@ -2072,9 +2072,9 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
- 
- 	likeClause, likeTerm := s.buildLIKEClause(term, "c.Name, c.DisplayName, c.Purpose")
- 	if len(likeTerm) > 0 {
--		likeClause = strings.ReplaceAll(likeClause, ":LikeTerm", "'"+likeTerm+"'")
-+		likeClause = strings.Replace(likeClause, ":LikeTerm", "'"+likeTerm+"'", -1)
- 		fulltextClause, fulltextTerm := s.buildFulltextClause(term, "c.Name, c.DisplayName, c.Purpose")
--		fulltextClause = strings.ReplaceAll(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'")
-+		fulltextClause = strings.Replace(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'", -1)
- 		query = query.Where("(" + likeClause + " OR " + fulltextClause + ")")
- 	}
- 
--- 
-2.11.0