From 656826b3db2ea7ad1834043bab512108ccf9edf3 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 9 Dec 2023 14:23:14 +0000 Subject: [PATCH] mm: update to 8.1.7 --- build/mattermost/build.sh | 74 ++++---- build/mattermost/local.mog | 6 +- .../patches-mattermost-server/Makefile.patch | 9 - .../release.mk.patch | 48 ----- .../patches-mattermost-server/series | 3 - .../patches-mmctl/no_vendor_update.patch | 12 -- build/mattermost/patches-mmctl/series | 3 - .../backend_fen.go.patch} | 170 ++---------------- build/mattermost/patches/illumos-target.patch | 32 ++++ build/mattermost/patches/series | 4 + .../terminal.go.patch | 6 +- .../utils_unix.go.patch | 6 +- doc/packages.md | 2 +- 13 files changed, 102 insertions(+), 273 deletions(-) delete mode 100644 build/mattermost/patches-mattermost-server/Makefile.patch delete mode 100644 build/mattermost/patches-mattermost-server/release.mk.patch delete mode 100644 build/mattermost/patches-mattermost-server/series delete mode 100644 build/mattermost/patches-mmctl/no_vendor_update.patch delete mode 100644 build/mattermost/patches-mmctl/series rename build/mattermost/{patches-mattermost-server/fen.go.patch => patches/backend_fen.go.patch} (63%) create mode 100644 build/mattermost/patches/illumos-target.patch create mode 100644 build/mattermost/patches/series rename build/mattermost/{patches-mmctl => patches}/terminal.go.patch (81%) rename build/mattermost/{patches-mmctl => patches}/utils_unix.go.patch (51%) diff --git a/build/mattermost/build.sh b/build/mattermost/build.sh index 253ceed63..b0a12656c 100755 --- a/build/mattermost/build.sh +++ b/build/mattermost/build.sh @@ -17,8 +17,10 @@ . ../../lib/build.sh PROG=mattermost -VER=7.5.2 -MMCTLVER=7.5.0 +VER=8.1.7 +# check for the current morph version/commit hash and create a patched branch in +# https://github.com/omniosorg/morph; then point to that branch +MORPHBRANCH=il_1.0.5 PKG=ooce/application/mattermost SUMMARY="$PROG" DESC="All your team communication in one place, " @@ -72,32 +74,40 @@ EOM download_source() { gitenv - save_variables BUILDDIR EXTRACTED_SRC - clone_go_source mmctl $PROG v$MMCTLVER - restore_variables BUILDDIR EXTRACTED_SRC + clone_github_source -dependency $PROG $GITHUB/$PROG/$PROG v$VER - GOPATH=$TMPDIR/$BUILDDIR/$PROG-server/_deps - clone_go_source "$PROG-server" $PROG v$VER - restore_variables BUILDDIR EXTRACTED_SRC + export GOPATH=$TMPDIR/$BUILDDIR/$PROG/server/_deps - clone_github_source -dependency "$PROG-webapp" \ - "$GITHUB/$PROG/$PROG-webapp" v$VER - restore_variables BUILDDIR EXTRACTED_SRC + pushd $TMPDIR/$BUILDDIR/$PROG/server >/dev/null + logmsg "Replacing morph" + logcmd go mod edit -replace \ + github.com/mattermost/morph=github.com/omniosorg/morph@$MORPHBRANCH \ + || logerr "Failed to replace morph" + + logmsg "Getting go dependencies" + logcmd go get -d ./... || logerr "failed to get dependencies" + + logmsg "Fixing permissions on dependencies" + logcmd $CHMOD -R u+w $GOPATH + + set_builddir $BUILDDIR/$PROG + + patch_source ((EXTRACT_MODE)) && exit + + popd >/dev/null } build_component() { prog="$1"; shift - note -n "Building $prog" - - EXTRACTED_SRC+=/$prog patch_source patches-$prog + [ -n "$FLAVOR" -a "$FLAVOR" != "$prog" ] && return - export GOPATH=$TMPDIR/$BUILDDIR/$prog/_deps + note -n "Building $prog" - pushd $TMPDIR/$BUILDDIR/$prog > /dev/null + pushd $TMPDIR/$BUILDDIR/$prog >/dev/null logcmd $MAKE "$@" || logerr "Build failed" popd >/dev/null @@ -105,37 +115,29 @@ build_component() { logcmd $CHMOD -R u+w $GOPATH } -build_mmctl() { - build_component mmctl "ADVANCED_VET=FALSE" -} - -build_webapp() { +build() { save_variable LDFLAGS LDFLAGS+=" -R$OPREFIX/lib/amd64" subsume_arch $BUILDARCH LDFLAGS - build_component $PROG-webapp build + # we could build the webapp from within the server project + # using the build-client target + # however, node.js fails in a very weird way (missing dependencies) + build_component webapp dist restore_variable LDFLAGS -} - -build_server() { - build_component $PROG-server build-illumos package-illumos -} -build() { - for component in mmctl webapp server; do - [ -n "$FLAVOR" -a "$FLAVOR" != $component ] && continue - build_$component - done + build_component server build-illumos package-prep } install() { - logcmd $MKDIR -p $DESTDIR/$OPREFIX || logerr "mkdir" + logcmd $MKDIR -p $DESTDIR/$PREFIX/bin || logerr "mkdir" - logcmd $RSYNC -a $TMPDIR/$BUILDDIR/$PROG-server/dist/$PROG \ + logcmd $RSYNC -a $TMPDIR/$BUILDDIR/server/dist/$PROG \ $DESTDIR/$OPREFIX/ || logerr "copying dist" - logcmd $CP $TMPDIR/$BUILDDIR/mmctl/mmctl $DESTDIR/$PREFIX/bin \ - || logerr "copying mmctl" + logcmd $CP $TMPDIR/$BUILDDIR/server/bin/$PROG \ + $DESTDIR/$PREFIX/bin/ || logerr "copying $PROG" + logcmd $CP $TMPDIR/$BUILDDIR/server/bin/mmctl \ + $DESTDIR/$PREFIX/bin/ || logerr "copying mmctl" logmsg "Creating config path" logcmd $MKDIR -p $DESTDIR/etc/$PREFIX || logerr "creating config dir" diff --git a/build/mattermost/local.mog b/build/mattermost/local.mog index 814b63e7f..aa750f641 100644 --- a/build/mattermost/local.mog +++ b/build/mattermost/local.mog @@ -9,7 +9,7 @@ # http://www.illumos.org/license/CDDL. # -# Copyright 2020 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. dir group=bin mode=0755 owner=root path=var/$(PREFIX) dir group=$(PROG) mode=0700 owner=$(PROG) path=var/$(PREFIX)/data @@ -36,6 +36,6 @@ link path=$(OPREFIX)/bin/mmctl target=../$(PROG)/bin/mmctl set restart_fmri svc:/ooce/application/$(PROG):default> -license $(PROG)-server/LICENSE.txt license=Apache2 -license $(PROG)-server/build/MIT-COMPILED-LICENSE.md license=MIT +license LICENSE.txt license=Apache2 +license server/build/MIT-COMPILED-LICENSE.md license=MIT diff --git a/build/mattermost/patches-mattermost-server/Makefile.patch b/build/mattermost/patches-mattermost-server/Makefile.patch deleted file mode 100644 index 236c73eb2..000000000 --- a/build/mattermost/patches-mattermost-server/Makefile.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -wpruN '--exclude=*.orig' a~/Makefile a/Makefile ---- a~/Makefile 1970-01-01 00:00:00 -+++ a/Makefile 1970-01-01 00:00:00 -@@ -1,4 +1,4 @@ --.PHONY: build package run stop run-client run-server run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows package-prep package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race new-migration migrations-extract -+.PHONY: build package run stop run-client run-server run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-illumos build-linux build-osx build-windows package-prep package-illumos package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race new-migration migrations-extract - - ROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) - diff --git a/build/mattermost/patches-mattermost-server/release.mk.patch b/build/mattermost/patches-mattermost-server/release.mk.patch deleted file mode 100644 index e3f68f529..000000000 --- a/build/mattermost/patches-mattermost-server/release.mk.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -wpruN '--exclude=*.orig' a~/build/release.mk a/build/release.mk ---- a~/build/release.mk 1970-01-01 00:00:00 -+++ a/build/release.mk 1970-01-01 00:00:00 -@@ -1,5 +1,9 @@ - dist: | check-style test package - -+build-illumos: -+ @echo Build illumos amd64 -+ env GOOS=illumos GOARCH=amd64 $(GO) build -o $(GOBIN) $(GOFLAGS) -trimpath -ldflags '$(LDFLAGS)' ./... -+ - build-linux: - @echo Build Linux amd64 - ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64") -@@ -134,18 +138,6 @@ endif - cp ../manifest.txt $(DIST_PATH); \ - fi - -- @# Import Mattermost plugin public key -- gpg --import build/plugin-production-public-key.gpg -- -- @# Download prepackaged plugins -- mkdir -p tmpprepackaged -- @cd tmpprepackaged && for plugin_package in $(PLUGIN_PACKAGES) ; do \ -- for ARCH in "osx-amd64" "windows-amd64" "linux-amd64" ; do \ -- curl -f -O -L https://plugins-store.test.mattermost.com/release/$$plugin_package-$$ARCH.tar.gz; \ -- curl -f -O -L https://plugins-store.test.mattermost.com/release/$$plugin_package-$$ARCH.tar.gz.sig; \ -- done; \ -- done -- - package-general: - @# Create needed directories - mkdir -p $(DIST_PATH_GENERIC)/bin -@@ -190,6 +182,15 @@ else - done - endif - -+package-illumos: package-prep -+ @# Create needed directories -+ mkdir -p $(DIST_PATH)/bin -+ mkdir -p $(DIST_PATH)/logs -+ mkdir -p $(DIST_PATH)/prepackaged_plugins -+ -+ @# Copy binary -+ cp $(GOBIN)/mattermost $(DIST_PATH)/bin # from native bin dir, not cross-compiled -+ - package-osx-amd64: package-prep - DIST_PATH_GENERIC=$(DIST_PATH_OSX_AMD64) CURRENT_PACKAGE_ARCH=darwin_amd64 PLUGIN_ARCH=osx-amd64 MMCTL_PLATFORM="Darwin-x86_64" MM_BIN_NAME=mattermost $(MAKE) package-general - @# Package diff --git a/build/mattermost/patches-mattermost-server/series b/build/mattermost/patches-mattermost-server/series deleted file mode 100644 index d2c25b9cb..000000000 --- a/build/mattermost/patches-mattermost-server/series +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.patch -release.mk.patch -fen.go.patch diff --git a/build/mattermost/patches-mmctl/no_vendor_update.patch b/build/mattermost/patches-mmctl/no_vendor_update.patch deleted file mode 100644 index 45630d972..000000000 --- a/build/mattermost/patches-mmctl/no_vendor_update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wpruN '--exclude=*.orig' a~/Makefile a/Makefile ---- a~/Makefile 1970-01-01 00:00:00 -+++ a/Makefile 1970-01-01 00:00:00 -@@ -159,8 +159,6 @@ check: gofmt govet golangci-lint - - .PHONY: vendor - vendor: -- go mod vendor -- go mod tidy - - .PHONY: mocks - mocks: diff --git a/build/mattermost/patches-mmctl/series b/build/mattermost/patches-mmctl/series deleted file mode 100644 index abc65a62c..000000000 --- a/build/mattermost/patches-mmctl/series +++ /dev/null @@ -1,3 +0,0 @@ -no_vendor_update.patch -utils_unix.go.patch -terminal.go.patch diff --git a/build/mattermost/patches-mattermost-server/fen.go.patch b/build/mattermost/patches/backend_fen.go.patch similarity index 63% rename from build/mattermost/patches-mattermost-server/fen.go.patch rename to build/mattermost/patches/backend_fen.go.patch index 3cd2b3aee..9c09f1005 100644 --- a/build/mattermost/patches-mattermost-server/fen.go.patch +++ b/build/mattermost/patches/backend_fen.go.patch @@ -18,18 +18,10 @@ Co-authored-by: Martin Tournoij create mode 100644 backend_fen_test.go create mode 100644 internal/debug_solaris.go -diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.5.4/fen.go a/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.5.4/fen.go ---- a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.5.4/fen.go 1970-01-01 00:00:00 -+++ a/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.5.4/fen.go 1970-01-01 00:00:00 -@@ -1,7 +1,3 @@ --// Copyright 2010 The Go Authors. All rights reserved. --// Use of this source code is governed by a BSD-style --// license that can be found in the LICENSE file. -- - //go:build solaris - // +build solaris - -@@ -9,30 +5,582 @@ +diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.6.0/backend_fen.go a/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.6.0/backend_fen.go +--- a~/server/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.6.0/backend_fen.go 1970-01-01 00:00:00 ++++ a/server/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1.6.0/backend_fen.go 1970-01-01 00:00:00 +@@ -5,6 +5,12 @@ import ( "errors" @@ -41,104 +33,10 @@ diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1. + "golang.org/x/sys/unix" ) --// Watcher watches a set of files, delivering events to a channel. -+// Watcher watches a set of paths, delivering events on a channel. -+// -+// A watcher should not be copied (e.g. pass it by pointer, rather than by -+// value). -+// -+// # Linux notes -+// -+// When a file is removed a Remove event won't be emitted until all file -+// descriptors are closed, and deletes will always emit a Chmod. For example: -+// -+// fp := os.Open("file") -+// os.Remove("file") // Triggers Chmod -+// fp.Close() // Triggers Remove -+// -+// This is the event that inotify sends, so not much can be changed about this. -+// -+// The fs.inotify.max_user_watches sysctl variable specifies the upper limit -+// for the number of watches per user, and fs.inotify.max_user_instances -+// specifies the maximum number of inotify instances per user. Every Watcher you -+// create is an "instance", and every path you add is a "watch". -+// -+// These are also exposed in /proc as /proc/sys/fs/inotify/max_user_watches and -+// /proc/sys/fs/inotify/max_user_instances -+// -+// To increase them you can use sysctl or write the value to the /proc file: -+// -+// # Default values on Linux 5.18 -+// sysctl fs.inotify.max_user_watches=124983 -+// sysctl fs.inotify.max_user_instances=128 -+// -+// To make the changes persist on reboot edit /etc/sysctl.conf or -+// /usr/lib/sysctl.d/50-default.conf (details differ per Linux distro; check -+// your distro's documentation): -+// -+// fs.inotify.max_user_watches=124983 -+// fs.inotify.max_user_instances=128 -+// -+// Reaching the limit will result in a "no space left on device" or "too many open -+// files" error. -+// -+// # kqueue notes (macOS, BSD) -+// -+// kqueue requires opening a file descriptor for every file that's being watched; -+// so if you're watching a directory with five files then that's six file -+// descriptors. You will run in to your system's "max open files" limit faster on -+// these platforms. -+// -+// The sysctl variables kern.maxfiles and kern.maxfilesperproc can be used to -+// control the maximum number of open files, as well as /etc/login.conf on BSD -+// systems. -+// -+// # macOS notes -+// -+// Spotlight indexing on macOS can result in multiple events (see [#15]). A -+// temporary workaround is to add your folder(s) to the "Spotlight Privacy -+// Settings" until we have a native FSEvents implementation (see [#11]). -+// -+// [#11]: https://github.com/fsnotify/fsnotify/issues/11 -+// [#15]: https://github.com/fsnotify/fsnotify/issues/15 - type Watcher struct { -+ // Events sends the filesystem change events. -+ // -+ // fsnotify can send the following events; a "path" here can refer to a -+ // file, directory, symbolic link, or special file like a FIFO. -+ // -+ // fsnotify.Create A new path was created; this may be followed by one -+ // or more Write events if data also gets written to a -+ // file. -+ // -+ // fsnotify.Remove A path was removed. -+ // -+ // fsnotify.Rename A path was renamed. A rename is always sent with the -+ // old path as Event.Name, and a Create event will be -+ // sent with the new name. Renames are only sent for -+ // paths that are currently watched; e.g. moving an -+ // unmonitored file into a monitored directory will -+ // show up as just a Create. Similarly, renaming a file -+ // to outside a monitored directory will show up as -+ // only a Rename. -+ // -+ // fsnotify.Write A file or named pipe was written to. A Truncate will -+ // also trigger a Write. A single "write action" -+ // initiated by the user may show up as one or multiple -+ // writes, depending on when the system syncs things to -+ // disk. For example when compiling a large Go program -+ // you may get hundreds of Write events, so you -+ // probably want to wait until you've stopped receiving -+ // them (see the dedup example in cmd/fsnotify). -+ // -+ // fsnotify.Chmod Attributes were changed. On Linux this is also sent -+ // when a file is removed (or more accurately, when a -+ // link to an inode is removed). On kqueue it's sent -+ // and on kqueue when a file is truncated. On Windows -+ // it's never sent. - Events chan Event -+ -+ // Errors sends any errors. + // Watcher watches a set of paths, delivering events on a channel. +@@ -105,16 +111,76 @@ + + // Errors sends any errors. Errors chan error + + mu sync.Mutex @@ -148,8 +46,7 @@ diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1. + watches map[string]struct{} // Explicitly watched non-directories } --// NewWatcher establishes a new watcher with the underlying OS and begins waiting for events. -+// NewWatcher creates a new Watcher. + // NewWatcher creates a new Watcher. func NewWatcher() (*Watcher, error) { - return nil, errors.New("FEN based watcher not yet supported for fsnotify\n") + w := &Watcher{ @@ -215,37 +112,10 @@ diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1. + return w.port.Close() } --// Add starts watching the named file or directory (non-recursively). -+// Add starts monitoring the path for changes. -+// -+// A path can only be watched once; attempting to watch it more than once will -+// return an error. Paths that do not yet exist on the filesystem cannot be -+// added. A watch will be automatically removed if the path is deleted. -+// -+// A path will remain watched if it gets renamed to somewhere else on the same -+// filesystem, but the monitor will get removed if the path gets deleted and -+// re-created, or if it's moved to a different filesystem. -+// -+// Notifications on network filesystems (NFS, SMB, FUSE, etc.) or special -+// filesystems (/proc, /sys, etc.) generally don't work. -+// -+// # Watching directories -+// -+// All files in a directory are monitored, including new files that are created -+// after the watcher is started. Subdirectories are not watched (i.e. it's -+// non-recursive). -+// -+// # Watching files -+// -+// Watching individual files (rather than directories) is generally not -+// recommended as many tools update files atomically. Instead of "just" writing -+// to the file a temporary file will be written to first, and if successful the -+// temporary file is moved to to destination removing the original, or some -+// variant thereof. The watcher on the original file is now lost, as it no -+// longer exists. -+// -+// Instead, watch the parent directory and use Event.Name to filter out files -+// you're not interested in. There is an example of this in [cmd/fsnotify/file.go]. + // Add starts monitoring the path for changes. +@@ -148,6 +214,41 @@ + // Instead, watch the parent directory and use Event.Name to filter out files + // you're not interested in. There is an example of this in [cmd/fsnotify/file.go]. func (w *Watcher) Add(name string) error { + if w.isClosed() { + return errors.New("FEN watcher already closed") @@ -285,19 +155,15 @@ diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1. return nil } --// Remove stops watching the the named file or directory (non-recursively). -+// Remove stops monitoring the path for changes. -+// -+// Directories are always removed non-recursively. For example, if you added -+// /tmp/dir and /tmp/dir/subdir then you will need to remove both. -+// -+// Removing a path that has not yet been added returns [ErrNonExistentWatch]. +@@ -158,5 +259,328 @@ + // + // Removing a path that has not yet been added returns [ErrNonExistentWatch]. func (w *Watcher) Remove(name string) error { + if w.isClosed() { + return errors.New("FEN watcher already closed") + } + if !w.port.PathIsWatched(name) { -+ return fmt.Errorf("can't remove non-existent kevent watch for: %s", name) ++ return fmt.Errorf("%w: %s", ErrNonExistentWatch, name) + } + + // The user has expressed an intent. Immediately remove this name @@ -603,7 +469,7 @@ diff -wpruN '--exclude=*.orig' a~/_deps/pkg/mod/github.com/fsnotify/fsnotify@v1. + return w.port.DissociatePath(path) +} + -+// WatchList returns all paths added with Add() (and are not yet removed). ++// WatchList returns all paths added with [Add] (and are not yet removed). +func (w *Watcher) WatchList() []string { + w.mu.Lock() + defer w.mu.Unlock() diff --git a/build/mattermost/patches/illumos-target.patch b/build/mattermost/patches/illumos-target.patch new file mode 100644 index 000000000..28af0a242 --- /dev/null +++ b/build/mattermost/patches/illumos-target.patch @@ -0,0 +1,32 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/server/build/release.mk a/server/build/release.mk +--- a~/server/build/release.mk 1970-01-01 00:00:00 ++++ a/server/build/release.mk 1970-01-01 00:00:00 +@@ -1,5 +1,9 @@ + dist: | check-style test package + ++build-illumos: ++ @echo Build illumos amd64 ++ env GOOS=illumos GOARCH=amd64 $(GO) build -o $(GOBIN) $(GOFLAGS) -trimpath -tags production -ldflags '$(LDFLAGS)' ./... ++ + build-linux: build-linux-amd64 build-linux-arm64 + + build-linux-amd64: +@@ -138,18 +142,6 @@ endif + cp bin/manifest.txt $(DIST_PATH); \ + fi + +- @# Import Mattermost plugin public key +- gpg --import build/plugin-production-public-key.gpg +- +- @# Download prepackaged plugins +- mkdir -p tmpprepackaged +- @cd tmpprepackaged && for plugin_package in $(PLUGIN_PACKAGES) ; do \ +- for ARCH in "osx-amd64" "windows-amd64" "linux-amd64" ; do \ +- curl -f -O -L https://plugins-store.test.mattermost.com/release/$$plugin_package-$$ARCH.tar.gz; \ +- curl -f -O -L https://plugins-store.test.mattermost.com/release/$$plugin_package-$$ARCH.tar.gz.sig; \ +- done; \ +- done +- + package-general: + @# Create needed directories + mkdir -p $(DIST_PATH_GENERIC)/bin diff --git a/build/mattermost/patches/series b/build/mattermost/patches/series new file mode 100644 index 000000000..0a4a8f348 --- /dev/null +++ b/build/mattermost/patches/series @@ -0,0 +1,4 @@ +illumos-target.patch +utils_unix.go.patch +terminal.go.patch +backend_fen.go.patch diff --git a/build/mattermost/patches-mmctl/terminal.go.patch b/build/mattermost/patches/terminal.go.patch similarity index 81% rename from build/mattermost/patches-mmctl/terminal.go.patch rename to build/mattermost/patches/terminal.go.patch index 6a60afc15..40f3e89a0 100644 --- a/build/mattermost/patches-mmctl/terminal.go.patch +++ b/build/mattermost/patches/terminal.go.patch @@ -1,6 +1,6 @@ -diff -wpruN '--exclude=*.orig' a~/vendor/github.com/isacikgoz/prompt/term/terminal.go a/vendor/github.com/isacikgoz/prompt/term/terminal.go ---- a~/vendor/github.com/isacikgoz/prompt/term/terminal.go 1970-01-01 00:00:00 -+++ a/vendor/github.com/isacikgoz/prompt/term/terminal.go 1970-01-01 00:00:00 +diff -wpruN --no-dereference '--exclude=*.orig' a~/server/_deps/pkg/mod/github.com/isacikgoz/prompt@v0.1.0/term/terminal.go a/server/_deps/pkg/mod/github.com/isacikgoz/prompt@v0.1.0/term/terminal.go +--- a~/server/_deps/pkg/mod/github.com/isacikgoz/prompt@v0.1.0/term/terminal.go 1970-01-01 00:00:00 ++++ a/server/_deps/pkg/mod/github.com/isacikgoz/prompt@v0.1.0/term/terminal.go 1970-01-01 00:00:00 @@ -4,8 +4,7 @@ import ( "bufio" "bytes" diff --git a/build/mattermost/patches-mmctl/utils_unix.go.patch b/build/mattermost/patches/utils_unix.go.patch similarity index 51% rename from build/mattermost/patches-mmctl/utils_unix.go.patch rename to build/mattermost/patches/utils_unix.go.patch index 54cfdc9c7..565fe71f5 100644 --- a/build/mattermost/patches-mmctl/utils_unix.go.patch +++ b/build/mattermost/patches/utils_unix.go.patch @@ -1,6 +1,6 @@ -diff -wpruN '--exclude=*.orig' a~/commands/utils_unix.go a/commands/utils_unix.go ---- a~/commands/utils_unix.go 1970-01-01 00:00:00 -+++ a/commands/utils_unix.go 1970-01-01 00:00:00 +diff -wpruN --no-dereference '--exclude=*.orig' a~/server/cmd/mmctl/commands/utils_unix.go a/server/cmd/mmctl/commands/utils_unix.go +--- a~/server/cmd/mmctl/commands/utils_unix.go 1970-01-01 00:00:00 ++++ a/server/cmd/mmctl/commands/utils_unix.go 1970-01-01 00:00:00 @@ -1,8 +1,8 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. diff --git a/doc/packages.md b/doc/packages.md index dd5933506..70998cf05 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -8,7 +8,7 @@ | ooce/application/imagemagick | 7.1.1-20 | https://imagemagick.org/archive/ | [omniosorg](https://github.com/omniosorg) | ooce/application/links | 2.28 | http://links.twibright.com/download.php | [omniosorg](https://github.com/omniosorg) | ooce/application/listmonk | 2.5.1 | https://github.com/knadh/listmonk/releases | [omniosorg](https://github.com/omniosorg) -| ooce/application/mattermost | 7.5.2 | https://github.com/mattermost/mattermost-server/releases https://docs.mattermost.com/upgrade/version-archive.html#mattermost-team-edition | [omniosorg](https://github.com/omniosorg) +| ooce/application/mattermost | 8.1.7 | https://github.com/mattermost/mattermost-server/releases https://docs.mattermost.com/upgrade/version-archive.html#mattermost-team-edition | [omniosorg](https://github.com/omniosorg) | ooce/application/mc | 4.8.30 | http://ftp.midnight-commander.org/?C=N;O=D | [omniosorg](https://github.com/omniosorg) | ooce/application/munin | 2.0.69 | https://github.com/munin-monitoring/munin/releases | [omniosorg](https://github.com/omniosorg) | ooce/application/mutt | 2.2.12 | http://www.mutt.org/download.html | [omniosorg](https://github.com/omniosorg)