diff --git a/Dockerfile b/Dockerfile index 8a5ab1c7469678ef96191e904e17fe00fd79356a..921da877e20b73eccc170513684c02b425a732ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1168093" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/29,0,16,1/29,0,16,1/' ${BASE_DIR}/version.php +RUN sed -i 's/29,0,16,1/29,0,16,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 @@ -213,7 +213,7 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="29.0.16-beta" -ARG LDAP_WRITE_SUPPORT_VERSION="1.11.0" +ARG LDAP_WRITE_SUPPORT_VERSION="1.11.1" ARG IS_SELFHOST=false RUN curl -fsSL -o ldap_write_support.tar.gz \ @@ -232,7 +232,6 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i $ RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch -# 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 diff --git a/patches/029-restrict-user-to-change-primary-email.patch b/patches/029-restrict-user-to-change-primary-email.patch deleted file mode 100644 index f2e215da49b69e9662f736b1ed638cfd1ba8ca51..0000000000000000000000000000000000000000 --- a/patches/029-restrict-user-to-change-primary-email.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./apps/provisioning_api/lib/Controller/UsersController.php 2023-10-03 07:14:02 -+++ ./apps/provisioning_api/lib/Controller/UsersController-new.php 2023-10-11 05:34:04 -@@ -613,10 +613,7 @@ - ) { - $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME; - } -- $permittedFields[] = IAccountManager::PROPERTY_EMAIL; - } -- -- $permittedFields[] = IAccountManager::COLLECTION_EMAIL; - $permittedFields[] = IAccountManager::PROPERTY_PHONE; - $permittedFields[] = IAccountManager::PROPERTY_ADDRESS; - $permittedFields[] = IAccountManager::PROPERTY_WEBSITE; -@@ -756,14 +753,9 @@ - $permittedFields[] = self::USER_FIELD_DISPLAYNAME; - $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME; - } -- $permittedFields[] = IAccountManager::PROPERTY_EMAIL; - } - - $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX; -- $permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX; -- -- $permittedFields[] = IAccountManager::COLLECTION_EMAIL; -- - $permittedFields[] = self::USER_FIELD_PASSWORD; - $permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL; - if (