From 14cc6df5ddbe600cfa1d84453cdf7575cab71293 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 23 Nov 2022 14:34:43 +0530 Subject: [PATCH 01/27] update to nextcloud 24 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7e6f8d9..2b3faf97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:23.0.11-fpm AS nextcloud +FROM nextcloud:24.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.3" @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,11,1/23,0,11,6/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,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 -- GitLab From 5f241278507da14dfe05dcf0cc14c87a12bc4c4b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 23 Nov 2022 16:59:24 +0530 Subject: [PATCH 02/27] update to nextcloud 24 --- patches/005-autocomplete-user-leak-core.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 68d0f74e..edc12dfe 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -26,9 +26,9 @@ diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Co ) { if (strtolower($uid) === $lowerSearch) { diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php ---- lib/private/Collaboration/Collaborators/MailPlugin.php 2021-06-22 14:53:24.451402977 +0530 -+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php 2021-06-22 14:56:31.201379020 +0530 -@@ -37,6 +37,7 @@ +--- lib/private/Collaboration/Collaborators/MailPlugin.php 2022-11-23 15:20:44.460495300 +0530 ++++ lib/private/Collaboration/Collaborators/MailPlugin-new.php 2022-11-23 16:55:17.540495300 +0530 +@@ -36,6 +36,7 @@ use OCP\IConfig; use OCP\IGroupManager; use OCP\IUser; @@ -36,7 +36,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co use OCP\IUserSession; use OCP\Share\IShare; use OCP\Mail\IMailer; -@@ -75,13 +76,15 @@ +@@ -76,13 +77,15 @@ IGroupManager $groupManager, KnownUserService $knownUserService, IUserSession $userSession, @@ -51,9 +51,9 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co $this->userSession = $userSession; + $this->userManager = $userManager; $this->mailer = $mailer; - + $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes'; -@@ -218,27 +221,62 @@ +@@ -224,27 +227,63 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -67,6 +67,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - 'shareWith' => $emailAddress, - ], - ]; ++ + $isUserinInstance = $this->userManager->get($emailAddress); + if ($isUserinInstance === null) { + // /e/ user is not in ecloud -- GitLab From 88c4d79d4ebd2c4ee743e8622981bb626027b621 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 23 Nov 2022 18:33:39 +0530 Subject: [PATCH 03/27] patch fix --- patches/005-autocomplete-user-leak-core.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index edc12dfe..a50b4f79 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -12,19 +12,22 @@ 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 -@@ -186,8 +186,8 @@ +--- lib/private/Collaboration/Collaborators/UserPlugin.php 2022-11-23 17:19:20.220495300 +0530 ++++ lib/private/Collaboration/Collaborators/UserPlugin-new.php 2022-11-23 17:19:05.690495300 +0530 +@@ -186,9 +186,9 @@ if ( $this->shareeEnumerationFullMatch && $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || - strtolower($userDisplayName) === $lowerSearch || - ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || +- ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail ?? '') === $lowerSearch)) + // strtolower($userDisplayName) === $lowerSearch || + // ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || - ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail) === $lowerSearch)) ++ ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail) === $lowerSearch)) ) { if (strtolower($uid) === $lowerSearch) { + $foundUserById = true; + diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php --- lib/private/Collaboration/Collaborators/MailPlugin.php 2022-11-23 15:20:44.460495300 +0530 +++ lib/private/Collaboration/Collaborators/MailPlugin-new.php 2022-11-23 16:55:17.540495300 +0530 -- GitLab From 449a6762bc65ef44e953a5c23185b3e5a1f68ee6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 23 Nov 2022 19:43:43 +0530 Subject: [PATCH 04/27] patch fixes --- patches/014-add-mail-usage.patch | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/patches/014-add-mail-usage.patch b/patches/014-add-mail-usage.patch index 02836ee9..cd4cf4a0 100644 --- a/patches/014-add-mail-usage.patch +++ b/patches/014-add-mail-usage.patch @@ -1,23 +1,24 @@ ---- lib/private/legacy/OC_Helper.php 2022-05-17 19:34:56.340385500 +0530 -+++ lib/private/legacy/OC_Helper_new.php 2022-05-17 21:19:30.060385500 +0530 -@@ -532,6 +532,12 @@ - $quota = $sourceStorage->getQuota(); +--- lib/private/legacy/OC_Helper.php 2022-11-23 19:35:50.880495300 +0530 ++++ lib/private/legacy/OC_Helper-new.php 2022-11-23 19:40:09.970495300 +0530 +@@ -543,6 +543,12 @@ } - $free = $sourceStorage->free_space($internalPath); -+ $ownerId = $storage->getOwner($path); -+ $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0); -+ $free = max(0,$free - $mailQuotaUsage); -+ if($path === '/') { -+ $used = $used + $mailQuotaUsage; -+ } - if ($free >= 0) { - $total = $free + $used; - } else { -@@ -547,7 +553,6 @@ + try { + $free = $sourceStorage->free_space($rootInfo->getInternalPath()); ++ $ownerId = $storage->getOwner($path); ++ $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0); ++ $free = max(0,$free - $mailQuotaUsage); ++ if($path === '/') { ++ $used = $used + $mailQuotaUsage; ++ } + } catch (\Exception $e) { + if ($path === "") { + throw $e; +@@ -569,7 +575,7 @@ $relative = 0; } - $ownerId = $storage->getOwner($path); ++ $ownerDisplayName = ''; $owner = \OC::$server->getUserManager()->get($ownerId); if ($owner) { -- GitLab From 6aecbd1ce41864364ee7dfdda5364c60bf64f0d0 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 23 Nov 2022 20:24:25 +0530 Subject: [PATCH 05/27] sed command commented for now --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b3faf97..d0f1f606 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,7 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param -RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js +#RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php -- GitLab From 7086ae27c154e6cb217af448d166ed33874e58b5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 12:03:11 +0530 Subject: [PATCH 06/27] job id updated --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0f1f606..9799ea15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,18 +2,18 @@ FROM nextcloud:24.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.3" -ARG THEME_HELPER_JOB_ID="433795" +ARG THEME_HELPER_JOB_ID="439980" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="433031" +ARG EMAIL_RECOVERY_JOB_ID="439989" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="433303" -ARG ECLOUD_LAUNCHER_JOB_ID="432959" +ARG EA_JOB_ID="439998" +ARG ECLOUD_LAUNCHER_JOB_ID="440022" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -- GitLab From 92702ed9b392e610eba676bac91238047bc5f0d8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 13:58:48 +0530 Subject: [PATCH 07/27] sed added back --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9799ea15..b8cef3e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,7 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param -#RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' login.js +RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php -- GitLab From f9a4fe977b5da535746913aac655c881eea0c477 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 14:40:37 +0530 Subject: [PATCH 08/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8cef3e4..d467e290 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/24,0,7,1/24,0,7,1/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,2/' ${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 816904e976a28abfb6f5598d89f6d47ad9dd851e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 16:42:38 +0530 Subject: [PATCH 09/27] vsed fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d467e290..526b90a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/24,0,7,1/24,0,7,2/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,3/' ${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 @@ -144,7 +144,7 @@ RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showRe RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php # change notifications icon src -RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js +RUN sed -i 's/(0,zd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml -- GitLab From 52f1e865adb138b59c5c0c259dbe98bf0010dce1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 18:16:20 +0530 Subject: [PATCH 10/27] login js file change to custom-login --- patches/016-login-screen.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index 178fdf26..67cef3ce 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -4,7 +4,7 @@ -+ ++ -- GitLab From 8eaedc3b9528e6c1af0a5be64a1f7808fa750f2d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 24 Nov 2022 18:17:12 +0530 Subject: [PATCH 11/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 526b90a3..90dccc72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/24,0,7,1/24,0,7,3/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,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 44a9591dd4cd1f23dc4cb7d22d6cfa1f4ee18e86 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 25 Nov 2022 15:10:27 +0530 Subject: [PATCH 12/27] display name fix --- patches/015-email-mail-template.patch | 36 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index 72af74d7..646253b9 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -4,9 +4,23 @@ Subject: [PATCH] To implement custom email template design for calendar invite This patch is allowing to customize the email template design for invitation ---- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 -+++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-11 12:28:15.829119700 +0530 -@@ -252,7 +252,21 @@ +--- apps/dav-4/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 ++++ apps/dav-4/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-25 15:05:11.443768000 +0530 +@@ -237,6 +237,13 @@ + ]; + + $fromEMail = Util::getDefaultEmailAddress('invitations-noreply'); ++ //if sender name is empty sometimes in case of email client ++ if ($senderName === null || empty(trim($senderName))) { ++ $users = $this->userManager->getByEmail($sender); ++ if (count($users) === 1) { ++ $senderName = $users[0]->getDisplayName(); ++ } ++ } + $fromName = $l10n->t('%1$s via %2$s', [$senderName, $this->defaults->getName()]); + + $message = $this->mailer->createMessage() +@@ -252,7 +259,21 @@ $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); @@ -29,7 +43,7 @@ This patch is allowing to customize the email template design for invitation $this->addBulletList($template, $l10n, $vevent); // Only add response buttons to invitation requests: Fix Issue #11230 -@@ -516,6 +530,7 @@ +@@ -516,6 +537,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } @@ -37,7 +51,7 @@ This patch is allowing to customize the email template design for invitation /** * @param IEMailTemplate $template * @param IL10N $l10n -@@ -542,24 +557,86 @@ +@@ -542,24 +564,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -79,8 +93,7 @@ This patch is allowing to customize the email template design for invitation + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } - } -- $meetingWhen = $this->generateWhenString($l10n, $vevent); ++ } + if ($selectedEvent->SUMMARY) { + if (trim($selectedEvent->SUMMARY) == trim($parentevent->SUMMARY)) { + $template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'), @@ -89,7 +102,8 @@ This patch is allowing to customize the email template design for invitation + $template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); + } -+ } + } +- $meetingWhen = $this->generateWhenString($l10n, $vevent); + $meetingWhen = $this->generateWhenString($l10n, $selectedEvent); if ($meetingWhen) { - $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), @@ -135,7 +149,7 @@ This patch is allowing to customize the email template design for invitation $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -567,13 +644,16 @@ +@@ -567,13 +651,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } @@ -158,7 +172,7 @@ This patch is allowing to customize the email template design for invitation } } -@@ -662,7 +742,7 @@ +@@ -662,7 +749,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); @@ -167,7 +181,7 @@ This patch is allowing to customize the email template design for invitation $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, -@@ -670,18 +750,10 @@ +@@ -670,18 +757,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, -- GitLab From dfba44513cc7fa627a5b3915619b8a3f5346514e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 25 Nov 2022 15:13:47 +0530 Subject: [PATCH 13/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 90dccc72..3389ec50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/24,0,7,1/24,0,7,4/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,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 -- GitLab From 7b4e7750e455dc26c07bdb239690bf8a5e7a2abd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 18:48:31 +0530 Subject: [PATCH 14/27] job id update and version bump --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3389ec50..57a552a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,23 +2,23 @@ FROM nextcloud:24.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="23.0.3" -ARG THEME_HELPER_JOB_ID="439980" +ARG THEME_HELPER_JOB_ID="440278" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="439989" +ARG EMAIL_RECOVERY_JOB_ID="440270" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="439998" -ARG ECLOUD_LAUNCHER_JOB_ID="440022" +ARG EA_JOB_ID="440262" +ARG ECLOUD_LAUNCHER_JOB_ID="440254" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/24,0,7,1/24,0,7,5/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,6/' ${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 @@ -135,7 +135,8 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch -RUN rm -rf ${TMP_PATCH_DIR} +RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch +RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch # show reset pwd page with a query param RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js -- GitLab From 977f90056716de069f53784f5aa9cf19e60ff18c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 18:52:41 +0530 Subject: [PATCH 15/27] location added in significant patch --- patches/022-significantchange.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch index 8040a53c..86e33111 100644 --- a/patches/022-significantchange.patch +++ b/patches/022-significantchange.patch @@ -6,12 +6,13 @@ This patch is allowing to to send mail for summary and description change --- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 +++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 -@@ -75,6 +75,8 @@ +@@ -75,6 +75,9 @@ 'RDATE', 'EXDATE', 'STATUS', + 'SUMMARY', + 'DESCRIPTION', ++ 'LOCATION', ]; /** -- GitLab From b1581c8b1988cc485848a7cfd6d721e58fb4c4c8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 18:59:16 +0530 Subject: [PATCH 16/27] location added in significant patch --- patches/022-significantchange.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch index 86e33111..c9303b12 100644 --- a/patches/022-significantchange.patch +++ b/patches/022-significantchange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] To allow significant change to send mail for summary and descri This patch is allowing to to send mail for summary and description change --- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 -+++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 ++++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-28 18:57:50.315188000 +0530 @@ -75,6 +75,9 @@ 'RDATE', 'EXDATE', @@ -16,3 +16,4 @@ This patch is allowing to to send mail for summary and description change ]; /** + -- GitLab From 25fbb34e327b58c9fe9891cf720f29085f3ae0cd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 19:02:18 +0530 Subject: [PATCH 17/27] location added in significant patch --- patches/022-significantchange.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch index c9303b12..76917499 100644 --- a/patches/022-significantchange.patch +++ b/patches/022-significantchange.patch @@ -15,5 +15,4 @@ This patch is allowing to to send mail for summary and description change + 'LOCATION', ]; - /** - + /** \ No newline at end of file -- GitLab From 4c35a57a180b8ea431480010849b2a2fa57c075c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 19:06:52 +0530 Subject: [PATCH 18/27] patch fix --- patches/021-repeated-storage-dialog-fix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/021-repeated-storage-dialog-fix.patch b/patches/021-repeated-storage-dialog-fix.patch index 5efa2a85..bb13c49c 100644 --- a/patches/021-repeated-storage-dialog-fix.patch +++ b/patches/021-repeated-storage-dialog-fix.patch @@ -48,4 +48,4 @@ + } OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%).', {usedSpacePercent: usedSpacePercent}), - {type : 'error'} + {type : 'error'} \ No newline at end of file -- GitLab From 281ecba88047d48e9deaa0ea41c93ce44a529ed3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 19:15:51 +0530 Subject: [PATCH 19/27] patch fix --- patches/021-repeated-storage-dialog-fix.patch | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/patches/021-repeated-storage-dialog-fix.patch b/patches/021-repeated-storage-dialog-fix.patch index bb13c49c..a1e189b8 100644 --- a/patches/021-repeated-storage-dialog-fix.patch +++ b/patches/021-repeated-storage-dialog-fix.patch @@ -1,14 +1,9 @@ ---- apps/files/js/files.js 2022-10-18 14:02:43.814388800 +0530 -+++ apps/files/js/files-new.js 2022-10-18 14:04:54.504388800 +0530 -@@ -181,11 +181,23 @@ +--- apps/files/js/files.js 2022-11-28 19:10:48.625188000 +0530 ++++ apps/files/js/files-new.js 2022-11-28 19:12:41.425188000 +0530 +@@ -181,6 +181,18 @@ {type : 'error'} ); } else { -- OC.Notification.show(t('files', -- 'Your storage is full, files cannot be updated or synced anymore!'), -- {type: 'error'} -- ); -- } + var exist=0; + $('body').find('.toastify').each(function(i, obj) { + var toastmsg=$(obj).text(); @@ -21,14 +16,9 @@ + if(exist==1){ + return; + } -+ OC.Notification.show(t('files', -+ 'Your storage is full, files cannot be updated or synced anymore!'), -+ {type: 'error'} -+ ); -+ } - } else if (usedSpacePercent > 90) { - if (owner !== OC.getCurrentUser().uid) { - OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%).', + OC.Notification.show(t('files', + 'Your storage is full, files cannot be updated or synced anymore!'), + {type: 'error'} @@ -210,6 +222,19 @@ {type : 'error'} ); @@ -48,4 +38,4 @@ + } OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%).', {usedSpacePercent: usedSpacePercent}), - {type : 'error'} \ No newline at end of file + {type : 'error'} -- GitLab From 172535ca8488afb3c4f52a13c976618b7362775e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Nov 2022 19:21:50 +0530 Subject: [PATCH 20/27] patch fix --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 57a552a7..6b2e2e55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -135,7 +135,6 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch -RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch # show reset pwd page with a query param -- GitLab From 0b5d055f08135de365b2a5c6cc6cd8c439bbbe35 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 30 Nov 2022 09:50:58 +0530 Subject: [PATCH 21/27] oidc update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b2e2e55..ff43770b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG EA_JOB_ID="440262" ARG ECLOUD_LAUNCHER_JOB_ID="440254" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -ARG OIDC_LOGIN_VERSION="2.3.3" +ARG OIDC_LOGIN_VERSION="2.4.0" RUN sed -i 's/24,0,7,1/24,0,7,6/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / -- GitLab From 3b50c3b1d9523d0c37204d0706e29706f8f04c8f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 30 Nov 2022 09:55:01 +0530 Subject: [PATCH 22/27] update ldap write support 1.6.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff43770b..bb341b2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="440262" ARG ECLOUD_LAUNCHER_JOB_ID="440254" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" +ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" RUN sed -i 's/24,0,7,1/24,0,7,6/' ${BASE_DIR}/version.php -- GitLab From f03452f421b1d20950a4ae25e17fd82378133b0e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 30 Nov 2022 10:05:17 +0530 Subject: [PATCH 23/27] update ldap write support 1.6.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb341b2e..aedb15fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -97,7 +97,7 @@ RUN curl -fsSL -o ecloud-accounts.zip \ rm ecloud-accounts.zip; RUN curl -fsSL -o ldap_write_support.tar.gz \ - "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ + "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support-v${LDAP_WRITE_SUPPORT_VERSION}.tar.gz" && \ tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \ rm ldap_write_support.tar.gz -- GitLab From 52b40f2528b28edef5d822359a0b840e9189d4b6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 30 Nov 2022 10:38:56 +0530 Subject: [PATCH 24/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aedb15fc..c25671c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -RUN sed -i 's/24,0,7,1/24,0,7,6/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,7/' ${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 ce1941112fb270f5a7dd3e68e20695fe93e63854 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 1 Dec 2022 14:55:44 +0530 Subject: [PATCH 25/27] jobid updated --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c25671c0..08ab1f07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ FROM nextcloud:24.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="23.0.3" -ARG THEME_HELPER_JOB_ID="440278" +ARG THEME_VERSION="24.0.0" +ARG THEME_HELPER_JOB_ID="433795" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="440270" +ARG EMAIL_RECOVERY_JOB_ID="445958" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_JOB_ID="440262" -ARG ECLOUD_LAUNCHER_JOB_ID="440254" +ARG EA_JOB_ID="445966" +ARG ECLOUD_LAUNCHER_JOB_ID="445974" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -- GitLab From cea7e3655121d076243bd03e3703c449694fc740 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 1 Dec 2022 15:04:27 +0530 Subject: [PATCH 26/27] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 08ab1f07..09dc107d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" -RUN sed -i 's/24,0,7,1/24,0,7,7/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,8/' ${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 35d536af92b65d35127ee90510567ba81aade0f3 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Dec 2022 15:45:43 +0530 Subject: [PATCH 27/27] Re-add rm -rf tmp-patch-dir --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 09dc107d..951180ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -136,6 +136,7 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${ RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch +RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js -- GitLab