From 253ee5bed6bf65f39b2bb9a53a5060915075bcb3 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 24 Aug 2022 17:07:04 +0530 Subject: [PATCH 1/8] 22.2.10 --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0aedb16a..5b63d18c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,23 @@ -FROM nextcloud:22.2.9-fpm AS nextcloud +FROM nextcloud:22.2.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.3" -ARG THEME_HELPER_VERSION="1.3.2" -ARG NEWS_VERSION="18.1.0" +ARG THEME_HELPER_VERSION="1.3.3" +ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" -ARG NOTES_VERSION="4.3.1" +ARG NOTES_VERSION="4.5.0" ARG CONTACTS_JOB_ID="329486" ARG CALENDAR_JOB_ID="344794" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="313915" +ARG EMAIL_RECOVERY_JOB_ID="314819" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.0" ARG ECLOUD_LAUNCHER_JOB_ID="345049" -ARG GOOGLE_INTEGRATION_VERSION="1.0.6" +ARG GOOGLE_INTEGRATION_VERSION="1.0.7" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,9,1/22,2,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,10,1/22,2,10,1/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images @@ -62,8 +62,8 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ RUN curl -fsSL -o email-recovery.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \ unzip email-recovery.zip && \ - cd dist && tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm email-recovery.tar.gz; + mv dist/email-recovery ${BASE_DIR}/custom_apps/ && \ + rm email-recovery.zip; RUN curl -fsSL -o rainloop.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \ -- GitLab From 7a1a0e7e5767b679af589e83ebedbcb2d9024e02 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 24 Aug 2022 17:34:03 +0530 Subject: [PATCH 2/8] comment out second display name too in patch --- patches/005-autocomplete-user-leak-core.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 26cbf334..68d0f74e 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -14,13 +14,15 @@ this filtering works in conjunction with the autocomplete feature disabled in ne diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Collaboration/Collaborators/UserPlugin-new.php --- lib/private/Collaboration/Collaborators/UserPlugin.php 2021-01-25 15:56:05.000000000 +0100 +++ lib/private/Collaboration/Collaborators/UserPlugin-new.php 2021-02-16 14:56:26.778152834 +0100 -@@ -114,7 +114,7 @@ - $uid = (string) $uid; +@@ -186,8 +186,8 @@ if ( + $this->shareeEnumerationFullMatch && $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || - strtolower($userDisplayName) === $lowerSearch || -+// strtolower($userDisplayName) === $lowerSearch || - strtolower($userEmail) === $lowerSearch) +- ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || ++ // strtolower($userDisplayName) === $lowerSearch || ++ // ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || + ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail) === $lowerSearch)) ) { if (strtolower($uid) === $lowerSearch) { diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php -- GitLab From 4c502e81a47ca0b42281b2c6d604ec879bc01394 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 25 Aug 2022 18:06:36 +0530 Subject: [PATCH 3/8] More version updates --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b63d18c..cbc9e5c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM nextcloud:22.2.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.3" -ARG THEME_HELPER_VERSION="1.3.3" +ARG THEME_HELPER_VERSION="1.4.0" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.0" -ARG CONTACTS_JOB_ID="329486" -ARG CALENDAR_JOB_ID="344794" +ARG CONTACTS_JOB_ID="372144" +ARG CALENDAR_JOB_ID="372097" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="314819" ARG RAINLOOP_VERSION="7.2.5" -- GitLab From b61452dff516f067b466dbfa6aee550dfe1f9029 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 26 Aug 2022 18:49:14 +0530 Subject: [PATCH 4/8] update theme version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cbc9e5c3..294ee918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:22.2.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.3" +ARG THEME_VERSION="22.1.4" ARG THEME_HELPER_VERSION="1.4.0" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" -- GitLab From 0e701da17921cd96a0e0c280ffee3e6c8eae7ef2 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 30 Aug 2022 14:58:16 +0530 Subject: [PATCH 5/8] 1.0.8 data migration --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 294ee918..ae199df3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,10 @@ ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.1.0" ARG ECLOUD_LAUNCHER_JOB_ID="345049" -ARG GOOGLE_INTEGRATION_VERSION="1.0.7" +ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,10,1/22,2,10,1/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,10,1/22,2,10,4/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 30c3e028b8a9cb3fe787ff9f3ee454e87ef6e84d Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 30 Aug 2022 16:25:32 +0530 Subject: [PATCH 6/8] Fix sed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae199df3..34ae8d72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,10,1/22,2,10,4/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,10,2/22,2,10,4/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 101703ae55e581ac269ed9e21cf15dfc3ab3bd47 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 30 Aug 2022 17:30:34 +0530 Subject: [PATCH 7/8] 1.4.1 theme helper and settings-hint sed for 2fa --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34ae8d72..586024fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:22.2.10-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.4" -ARG THEME_HELPER_VERSION="1.4.0" +ARG THEME_HELPER_VERSION="1.4.1" ARG NEWS_VERSION="18.1.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.5.0" @@ -158,5 +158,9 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # Replace "Get your own free account" NC link with /e/ Account link in public pages RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php + +# Set default class of hidden to settings-hint +RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php + ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] -- GitLab From 575e0a5ed6815bb9c0a879bfb90294a846358e7d Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Sep 2022 15:15:21 +0530 Subject: [PATCH 8/8] 22,2,10,5 --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 586024fe..7fe695e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,10,2/22,2,10,4/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,10,2/22,2,10,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images @@ -158,9 +158,12 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # Replace "Get your own free account" NC link with /e/ Account link in public pages RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php - # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php +# Seds to fix displayname save regression +RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js +RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js + ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] -- GitLab