diff options
| author | IgnatzHome <ignatz@maschath.de> | 2018-06-14 19:42:09 +0200 |
|---|---|---|
| committer | IgnatzHome <ignatz@maschath.de> | 2018-06-14 19:42:09 +0200 |
| commit | a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e (patch) | |
| tree | 6e30c7ebc0106518ec5ea76bcb57d294cc9f48f1 /snapcraft.yaml | |
| parent | 991e74bfc287d840951b7c707b7ff2a2f26e5001 (diff) | |
| parent | fcf262cc9807c1e87e638ce6b0c6151ae2114f60 (diff) | |
| download | wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.tar.gz wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.tar.bz2 wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.zip | |
Merge branch 'feature-custom-fields' of https://github.com/feuerball11/wekan into feature-custom-fields
Diffstat (limited to 'snapcraft.yaml')
| -rw-r--r-- | snapcraft.yaml | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index 088e1524..d1b89a67 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,7 +65,7 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.19.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.20.tgz plugin: dump stage-packages: [libssl1.0.0] filesets: @@ -83,7 +83,7 @@ parts: plugin: nodejs node-engine: 8.11.1 node-packages: - - npm@5.5.1 + - npm - node-gyp - node-pre-gyp - fibers@2.0.0 @@ -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 @@ -109,7 +111,7 @@ parts: # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d - echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d node" >> node-SHASUMS256.txt.asc + echo "5f2703af5f7bd48e85fc8ed32d61de7c7cf81c53d0dcd73f6c218ed87e950fae node" >> node-SHASUMS256.txt.asc curl https://releases.wekan.team/node -o node # Verify Fibers patched node authenticity echo "Fibers 100% CPU issue patched node authenticity:" @@ -138,13 +140,18 @@ parts: meteor npm install --allow-superuser meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt - rm -rf node_modules/bcrypt - meteor npm install --save bcrypt + #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. + #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac + #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c + #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt + #rm -rf node_modules/bcrypt + #meteor npm install --save bcrypt + # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. + #cd ../../../../ # Change to directory .build/bundle/programs/server - cd ../../../../ + cd .build/bundle/programs/server npm install - meteor npm install --save bcrypt + #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ @@ -153,6 +160,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 |