Bump github.com/mattermost/mattermost-server in /dependabot (#67)

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

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.15.1 to 5.16.0.
- [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.15.1...v5.16.0)

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

.github/lock.yml

@@ -0,0 +1,7 @@
+# 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

.travis.yml

@@ -30,10 +30,7 @@ before_install:
   - docker pull "${DOCKER_IMAGE}"
   - chmod +x build.sh
 script:
-  - f(){ printf ' '; sleep 60; f; }; f &
-  - docker run --interactive=true --mount="type=bind,source=${PWD},destination=${DOCKER_PWD}" --rm=true --tty=true --workdir="${DOCKER_PWD}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e GOOS -e GOARCH "${DOCKER_IMAGE}" ./build.sh > .build.log 2>&1
-after_failure:
-  - tail -n-9000 .build.log
+  - docker run --interactive=true --mount="type=bind,source=${PWD},destination=${DOCKER_PWD}" --rm=true --tty=true --workdir="${DOCKER_PWD}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e GOOS -e GOARCH "${DOCKER_IMAGE}" ./build.sh
 before_deploy:
   - git config --local user.name 'Travis CI'
   - git config --local user.email 'travis@travis-ci.org'

build-release.patch

@@ -11,7 +11,7 @@ diff --git a/build/release.mk b/build/release.mk
 index 238343e..1b7859f 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -66,7 +66,7 @@ endif
+@@ -70,7 +70,7 @@ endif
  	done
  
  	@# ----- PLATFORM SPECIFIC -----
@@ -20,10 +20,10 @@ index 238343e..1b7859f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -96,7 +96,7 @@ endif
- 	@# Cleanup
+@@ -110,7 +110,7 @@ endif
  	rm -f $(DIST_PATH)/bin/mattermost.exe
  	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/prepackaged_plugins/*
 -
 +package-linux: package
  	@# Make linux package

build.sh

@@ -31,9 +31,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	apt-get update
 	# dependencies to setup repositories
 	apt-get install --quiet \
-		gnupg2 dirmngr apt-transport-https ca-certificates
-	# receive missing key
-	apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys "${NODE_KEY}"
+		gnupg2 dirmngr apt-transport-https ca-certificates parallel
+	# receive missing key (retry on failure)
+	parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
 	# add required additional repositories
 	printf 'deb-src http://deb.debian.org/debian %s main' "${DEBIAN_RELEASE}" \
 		> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-source.list"
@@ -66,8 +66,6 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 fi
 # as non-root user
 cd "${HOME}"
-# install yarn
-npm install yarn
 # download and extract Mattermost sources
 for COMPONENT in server webapp; do
 	install --directory "${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}"
@@ -77,6 +75,9 @@ for COMPONENT in server webapp; do
 		--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz"
 done
 # build Mattermost webapp
+npm set progress false
+sed -i -e 's#--verbose#--display minimal#' \
+	"${HOME}/go/src/github.com/mattermost/mattermost-webapp/package.json"
 make --directory="${HOME}/go/src/github.com/mattermost/mattermost-webapp" \
 	build
 # build Mattermost server
@@ -88,6 +89,14 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
 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"
+sed -i \
+	-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
+	-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \
+	-e 's#PWD#CURDIR#' \
+	"${HOME}/go/src/github.com/mattermost/mattermost-server/Makefile" \
+	"${HOME}/go/src/github.com/mattermost/mattermost-server/build/release.mk"
 make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
 	config-reset build-linux package-linux \
 	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \

dependabot/Gopkg.lock

@@ -9,6 +9,14 @@
   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"
@@ -26,23 +34,39 @@
   revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
 
 [[projects]]
-  digest = "1:076b7474c1750f34c86f5031d24e13414e39eff70d60a221b4871939de23d06e"
+  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:3addeb71a2f43a7b2892183d1d2f101ce429b724ddd1071c3f088d7311a6f321"
   name = "github.com/mattermost/mattermost-server"
   packages = [
     "mlog",
     "model",
+    "services/timezones",
     "utils/jsonutils",
     "utils/markdown",
   ]
   pruneopts = ""
-  revision = "7e5fda43bda67cd061e527b64046f241c2d6cc32"
-  version = "v5.7.0"
+  revision = "c81e4f87c20a717b1dc52b2b77780fa789e19148"
+  version = "v5.17.0"
 
 [[projects]]
   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
   name = "github.com/nicksnyder/go-i18n"
   packages = [
-    "i18n",
     "i18n/bundle",
     "i18n/language",
     "i18n/translation",
@@ -117,6 +141,38 @@
   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"

dependabot/Gopkg.toml

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

go-backport.patch

@@ -0,0 +1,27 @@
+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