From f157dd419e4f3ce68f585b0b624792ff341e3ed5 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 29 Jan 2025 15:55:17 +0100 Subject: [PATCH] [CE/SP] Hotfix 5.3.1 (#23008) * [CE/SP] Hotfix 5.3.1 * Added mongoose upgrade for services/templates * Fix mongodb transitive dependency * cleaned npm cache and /tmp GitOrigin-RevId: 139cf7776ba053c3763613cc3a6cdea4dfd3db44 --- server-ce/hotfix/5.3.1/Dockerfile | 14 ++++++++++++ server-ce/hotfix/5.3.1/pr_22950.patch | 33 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 server-ce/hotfix/5.3.1/Dockerfile create mode 100644 server-ce/hotfix/5.3.1/pr_22950.patch diff --git a/server-ce/hotfix/5.3.1/Dockerfile b/server-ce/hotfix/5.3.1/Dockerfile new file mode 100644 index 0000000000..ec0bef5444 --- /dev/null +++ b/server-ce/hotfix/5.3.1/Dockerfile @@ -0,0 +1,14 @@ +FROM sharelatex/sharelatex:5.3.0 + +# Update copyright year +COPY pr_22950.patch . +RUN patch -p0 < pr_22950.patch && rm pr_22950.patch + + +# Update Mongoose +RUN npm install mongoose@^8.9.5 --save -w services/web \ + && npm install mongodb@6.12.0 --save \ + -w services/chat -w services/contacts -w services/docstore \ + -w services/history-v1 -w libraries/mongo-utils \ + && npm install mongodb@6.12.0 --save \ + && rm -rf /root/.cache /root/.npm $(find /tmp/ -mindepth 1 -maxdepth 1) diff --git a/server-ce/hotfix/5.3.1/pr_22950.patch b/server-ce/hotfix/5.3.1/pr_22950.patch new file mode 100644 index 0000000000..cd066f9456 --- /dev/null +++ b/server-ce/hotfix/5.3.1/pr_22950.patch @@ -0,0 +1,33 @@ +--- services/web/app/views/layout/thin-footer-bootstrap-5.pug ++++ services/web/app/views/layout/thin-footer-bootstrap-5.pug +@@ -7,7 +7,7 @@ footer.site-footer + if !settings.nav.hide_powered_by + li + //- year of Server Pro release, static +- | © 2024 ++ | © 2025 + | + a(href='https://www.overleaf.com/for/enterprises') Powered by Overleaf + +--- services/web/app/views/layout/thin-footer.pug ++++ services/web/app/views/layout/thin-footer.pug +@@ -9,7 +9,7 @@ footer.site-footer + else if !settings.nav.hide_powered_by + li + //- year of Server Pro release, static +- | © 2024 ++ | © 2025 + | + a(href='https://www.overleaf.com/for/enterprises') Powered by Overleaf + +--- services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx ++++ services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx +@@ -60,7 +60,7 @@ function ThinFooter({ + {showPoweredBy ? ( + <> +
  • +- {/* year of Server Pro release, static */}© 2024{' '} ++ {/* year of Server Pro release, static */}© 2025{' '} + + Powered by Overleaf +