From 20428bdd486f2a012a545ce49104c5da04549e87 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 24 May 2022 01:40:33 +0700 Subject: [PATCH 1/4] Upgrade to v0.64.1 --- conf/app.src | 4 ++-- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- sources/patches/app-01-branding.patch | 4 ++-- sources/patches/app-02-email.patch | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/app.src b/conf/app.src index 613cee9..c236046 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.63.0.tar.gz -SOURCE_SUM=ca2758a6461c7a159c073374a2480b77d2049625ff9ef87686f57557bd2f0bb4 +SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.1.tar.gz +SOURCE_SUM=7b26c6d16045f6bba895dfc5240495130d9fc192f8d88915afcffee9648d9ed5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 25a023f..45f603d 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,7 +1,7 @@ ### Not totally free licence Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind. -The Outline version shipped with this package (v0.63.0) will be released under Apache-2.0 licence [after April 15th 2026](https://github.com/outline/outline/blob/1a8f2c3bb08df1ac3fa9cea5a2a7491757b7cf28/LICENSE). +The Outline version shipped with this package (v0.64.1) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations diff --git a/manifest.json b/manifest.json index 2ba07f6..3c88325 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open, extensible, wiki for your team built using React and Node.js.", "fr": "Un wiki open source et évolutif pour votre équipe, conçu avec React et Node.js" }, - "version": "0.63.0~ynh3", + "version": "0.64.1~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch index 771fdd4..42c3cd7 100644 --- a/sources/patches/app-01-branding.patch +++ b/sources/patches/app-01-branding.patch @@ -1,8 +1,8 @@ diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 955a1fd5..ce385aa2 100644 +index 6a9d1265..452511f1 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -611,9 +611,6 @@ class DocumentScene extends React.Component { +@@ -625,9 +625,6 @@ class DocumentScene extends React.Component { diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index 313486b..ae8e4e9 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,12 +1,12 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 6fc9865a..69e5b8ac 100644 +index b13e29dd..bac5fc41 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -109,6 +109,7 @@ export class Mailer { - ciphers: process.env.SMTP_TLS_CIPHERS, - } - : undefined, -+ ignoreTLS:true +@@ -107,6 +107,7 @@ export class Mailer { + ciphers: env.SMTP_TLS_CIPHERS, + } + : undefined, ++ ignoreTLS:true }; } \ No newline at end of file From ec22b468f057ce28750a271bcd6953615c43a183 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 24 May 2022 09:59:31 +0700 Subject: [PATCH 2/4] Remove non used env variables --- conf/.env | 67 ------------------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/conf/.env b/conf/.env index 61cbf9e..c79cff1 100644 --- a/conf/.env +++ b/conf/.env @@ -21,10 +21,6 @@ REDIS_URL=redis://localhost:6379 URL=https://__DOMAIN__ PORT=__PORT__ -# See [documentation](docs/SERVICES.md) on running a separate collaboration -# server, for normal operation this does not need to be set. -COLLABORATION_URL= - # To support uploading of images for avatars and document attachments an # s3-compatible storage must be provided. AWS S3 is recommended for redundency # however if you want to keep all file storage local an alternative such as @@ -45,33 +41,6 @@ AWS_S3_ACL=private # –––––––––––––– AUTHENTICATION –––––––––––––– -# Third party signin credentials, at least ONE OF EITHER Google, Slack, -# or Microsoft is required for a working installation or you'll have no sign-in -# options. - -# To configure Slack auth, you'll need to create an Application at -# => https://api.slack.com/apps -# -# When configuring the Client ID, add a redirect URL under "OAuth & Permissions": -# https:///auth/slack.callback -SLACK_KEY= -SLACK_SECRET= - -# To configure Google auth, you'll need to create an OAuth Client ID at -# => https://console.cloud.google.com/apis/credentials -# -# When configuring the Client ID, add an Authorized redirect URI: -# https:///auth/google.callback -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= - -# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See -# the guide for details on setting up your Azure App: -# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4 -AZURE_CLIENT_ID= -AZURE_CLIENT_SECRET= -AZURE_RESOURCE_APP_ID= - # To configure generic OIDC auth, you'll need some kind of identity provider. # See documentation for whichever IdP you use to acquire the following info: # Redirect URI is https:///auth/oidc.callback @@ -94,24 +63,6 @@ OIDC_SCOPES="openid profile email" # –––––––––––––––– OPTIONAL –––––––––––––––– -# Base64 encoded private key and certificate for HTTPS termination. This is only -# required if you do not use an external reverse proxy. See documentation: -# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 -SSL_KEY= -SSL_CERT= - -# Base64 encoded private key and certificate for HTTPS termination. This is only -# required if you do not use an external reverse proxy. See documentation: -# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 -SSL_KEY= -SSL_CERT= - -# If using a Cloudfront/Cloudflare distribution or similar it can be set below. -# This will cause paths to javascript, stylesheets, and images to be updated to -# the hostname defined in CDN_URL. In your CDN configuration the origin server -# should be set to the same as URL. -CDN_URL= - # Auto-redirect to https in production. The default is true but you may set to # false if you can be sure that SSL is terminated at an external loadbalancer. FORCE_HTTPS=true @@ -132,24 +83,6 @@ MAXIMUM_IMPORT_SIZE=5120000 # requests and this ends up being duplicative DEBUG=cache,presenters,events,emails,mailer,utils,http,server,processors -# Comma separated list of domains to be allowed to signin to the wiki. If not -# set, all domains are allowed by default when using Google OAuth to signin -ALLOWED_DOMAINS= - -# For a complete Slack integration with search and posting to channels the -# following configs are also needed, some more details -# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a -# -SLACK_VERIFICATION_TOKEN=your_token -SLACK_APP_ID=A0XXXXXXX -SLACK_MESSAGE_ACTIONS=true - -# Optionally enable google analytics to track pageviews in the knowledge base -GOOGLE_ANALYTICS_ID= - -# Optionally enable Sentry (sentry.io) to track errors and performance -SENTRY_DSN= - # To support sending outgoing transactional emails such as "document updated" or # "you've been invited" you'll need to provide authentication for an SMTP server SMTP_HOST='localhost' From 55840a07ed536e7f02e3f129e34bd05541820269 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 24 May 2022 19:27:57 +0700 Subject: [PATCH 3/4] Update to v0.64.2 --- conf/app.src | 4 ++-- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index c236046..69f86b2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.1.tar.gz -SOURCE_SUM=7b26c6d16045f6bba895dfc5240495130d9fc192f8d88915afcffee9648d9ed5 +SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.2.tar.gz +SOURCE_SUM=a2d301aa0faafeffcf3caebc4c0b97e44c5d394c755f4ff87069aa2ce72ae461 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 45f603d..fc809d6 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,7 +1,7 @@ ### Not totally free licence Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind. -The Outline version shipped with this package (v0.64.1) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). +The Outline version shipped with this package (v0.64.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations diff --git a/manifest.json b/manifest.json index 3c88325..290fb71 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open, extensible, wiki for your team built using React and Node.js.", "fr": "Un wiki open source et évolutif pour votre équipe, conçu avec React et Node.js" }, - "version": "0.64.1~ynh1", + "version": "0.64.2~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", From a3185992a698231f6da3a30f1a0f8dfadcc897ff Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 25 May 2022 16:24:13 +0700 Subject: [PATCH 4/4] Update to v0.64.3 --- conf/app.src | 4 ++-- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 69f86b2..7041520 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.2.tar.gz -SOURCE_SUM=a2d301aa0faafeffcf3caebc4c0b97e44c5d394c755f4ff87069aa2ce72ae461 +SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.3.tar.gz +SOURCE_SUM=5fc5f9442114cdf1dfcc924e8e2d7cd6d756e634ca22bd17b366bffee4af4158 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index fc809d6..0264de6 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,7 +1,7 @@ ### Not totally free licence Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind. -The Outline version shipped with this package (v0.64.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). +The Outline version shipped with this package (v0.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations diff --git a/manifest.json b/manifest.json index 290fb71..e4049ab 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open, extensible, wiki for your team built using React and Node.js.", "fr": "Un wiki open source et évolutif pour votre équipe, conçu avec React et Node.js" }, - "version": "0.64.2~ynh1", + "version": "0.64.3~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1",