From 23d8559104110158e7d847a3eab0d4fb0817f699 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 4 Sep 2024 13:32:23 +0530 Subject: [PATCH 1/4] fixed event --- Dockerfile | 3 +++ patches/028-default-task-calendar.patch | 2 +- patches/038-generic-event-fix.patch | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 patches/038-generic-event-fix.patch diff --git a/Dockerfile b/Dockerfile index da0380c9..65e2ed86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -233,6 +233,9 @@ RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-de RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch +#fixed regression in generic event type for nextcloud 28.0.9 +RUN patch -u ${BASE_DIR}/apps/dav/lib/AppInfo/Application.php -i ${TMP_PATCH_DIR}/038-generic-event-fix.patch + RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/028-default-task-calendar.patch b/patches/028-default-task-calendar.patch index 58ff13f0..15832a2c 100644 --- a/patches/028-default-task-calendar.patch +++ b/patches/028-default-task-calendar.patch @@ -6,7 +6,7 @@ This patch creates a default task VTODO calender on first login --- apps/dav/lib/HookManager.php 2023-09-27 15:22:49 +++ apps/dav/lib/HookManager-new.php 2023-09-27 15:24:15 -@@ -176,8 +176,13 @@ +@@ -170,8 +170,13 @@ try { $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [ '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME, diff --git a/patches/038-generic-event-fix.patch b/patches/038-generic-event-fix.patch new file mode 100644 index 00000000..d679cfa9 --- /dev/null +++ b/patches/038-generic-event-fix.patch @@ -0,0 +1,16 @@ +From: Avinash Gusain +Date: Wed, 04 Sept 2024 18:50:00 +0530 +Subject: [PATCH] Fixed Generic event + +This patch basically fix a regression caused in 28.0.9 by changing the correct event type + +--- apps/dav/lib/AppInfo/Application.php 2024-09-04 13:08:44 ++++ apps/dav/lib/AppInfo/Application-new.php 2024-09-04 13:09:40 +@@ -110,7 +110,7 @@ + use OCP\User\Events\OutOfOfficeScheduledEvent; + use Psr\Container\ContainerInterface; + use Psr\Log\LoggerInterface; +-use Symfony\Component\EventDispatcher\GenericEvent; ++use OCP\EventDispatcher\GenericEvent; + use Throwable; + use function is_null; \ No newline at end of file -- GitLab From fc3f429bdfc46fcc95cd248bae4b85929efc257b Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Sep 2024 16:21:39 +0530 Subject: [PATCH 2/4] Updated job IDs and app versions with final release versions --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65e2ed86..fd659bad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ FROM nextcloud:28.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="998222" +ARG THEME_HELPER_JOB_ID="1004002" ARG NOTES_VERSION="4.10.1" ARG CONTACTS_JOB_ID="881946" ARG CALENDAR_JOB_ID="991372" -ARG EMAIL_RECOVERY_JOB_ID="997842" -ARG EA_JOB_ID="991394" +ARG EMAIL_RECOVERY_JOB_ID="1004020" +ARG EA_JOB_ID="1004028" ARG LAUNCHER_JOB_ID="991418" ARG GOOGLE_INTEGRATION_VERSION="2.2.0" -ARG DASHBOARD_JOB_ID="991426" +ARG DASHBOARD_JOB_ID="1004045" ARG SNAPPY_VERSION="2.37.2" -ARG SNAPPY_THEME_VERSION="4.0.0" +ARG SNAPPY_THEME_VERSION="4.0.1" ARG USER_MIGRATION_JOB_ID="991454" ARG MEMORIES_VERSION="7.3.1" ARG DROP_ACCOUNT_VERSION="2.5.0" @@ -210,7 +210,7 @@ RUN sed -i 's|.replace("{linkclose}","")|.replace("{linkclose}","").repl From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="28.0.1" +ARG THEME_VERSION="28.0.2" ARG LDAP_WRITE_SUPPORT_VERSION="1.10.0" ARG IS_SELFHOST=false -- GitLab From 8db2e651a4c76fb03c60adbe0eee7a19625f7036 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 4 Sep 2024 16:24:15 +0530 Subject: [PATCH 3/4] Bump version to 28.0.9.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd659bad..c763bb9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="991454" ARG MEMORIES_VERSION="7.3.1" ARG DROP_ACCOUNT_VERSION="2.5.0" -RUN sed -i 's/28,0,9,1/28,0,9,4/' ${BASE_DIR}/version.php +RUN sed -i 's/28,0,9,1/28,0,9,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 7e06406cf33ca1ab82bcb8abe17c8d6b294237e2 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 4 Sep 2024 20:03:58 +0530 Subject: [PATCH 4/4] EA job id updated to build-vedor --- Dockerfile | 2 +- patches/013-revert-token-password-update.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c763bb9e..945a018d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.10.1" ARG CONTACTS_JOB_ID="881946" ARG CALENDAR_JOB_ID="991372" ARG EMAIL_RECOVERY_JOB_ID="1004020" -ARG EA_JOB_ID="1004028" +ARG EA_JOB_ID="1004029" ARG LAUNCHER_JOB_ID="991418" ARG GOOGLE_INTEGRATION_VERSION="2.2.0" ARG DASHBOARD_JOB_ID="1004045" diff --git a/patches/013-revert-token-password-update.patch b/patches/013-revert-token-password-update.patch index dd8278b1..e63ccfc6 100644 --- a/patches/013-revert-token-password-update.patch +++ b/patches/013-revert-token-password-update.patch @@ -7,15 +7,15 @@ This patch reverts to only update when there are expired tokens. --- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530 +++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530 -@@ -509,6 +509,11 @@ +@@ -517,6 +517,11 @@ } public function updatePasswords(string $uid, string $password) { ++ if (!$this->mapper->hasExpiredTokens($uid)) { ++ //Nothing to do here ++ return; ++ } + -+ if (!$this->mapper->hasExpiredTokens($uid)) { -+ // Nothing to do here -+ return; -+ } // prevent setting an empty pw as result of pw-less-login if ($password === '' || !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) { return; -- GitLab