diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-05-26 07:48:38 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-05-26 07:48:38 +0300 |
| commit | 01741750f8de322b0e01941c0438666f95b42c47 (patch) | |
| tree | 05bdc3468977cbba14791aceaafb7e3f37fab299 | |
| parent | 5ded2e512141a148a0d33fc3059564af74e95b62 (diff) | |
| parent | 4377381fd30eb9746d4775ebe149b41ce7c5e111 (diff) | |
| download | wekan-01741750f8de322b0e01941c0438666f95b42c47.tar.gz wekan-01741750f8de322b0e01941c0438666f95b42c47.tar.bz2 wekan-01741750f8de322b0e01941c0438666f95b42c47.zip | |
Merge branch 'kubiko-devel' into devel
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | snapcraft.yaml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a34fea44..4ef50703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ # Upcoming Wekan release +This release fixes the following bugs: + * [Remove binary version of bcrypt](https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac) because of [vulnerability](https://nodesecurity.io/advisories/612) that has [issue that is not fixed yet](https://github.com/kelektiv/node.bcrypt.js/issues/604) and and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606). - This may cause some slowdown. + This may cause some slowdown; +* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660). -Thanks to GitHub user xet7 for contributions. +Thanks to GitHub users kubiko and xet7 for their contributions. # v1.01 2018-05-23 Wekan release diff --git a/snapcraft.yaml b/snapcraft.yaml index d9250392..b2ed9b8c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -96,6 +96,8 @@ parts: - npm - curl - execstack + stage-packages: + - libfontconfig1 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules @@ -153,6 +155,8 @@ parts: execstack --clear-execstack $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs organize: README: README.wekan + prime: + - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp helpers: source: snap-src |