From 082998b71ebabdf8f560d96738bfe7ec0d2801f2 Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 7 Jul 2021 18:03:05 +0530 Subject: [PATCH] Removed unused patch; renamed patch 008 to 007 --- Dockerfile | 3 +-- .../007-files-trashbin-parent-wrapper.patch | 19 ------------------- ...tice.patch => 007-remove-dev-notice.patch} | 0 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 patches/007-files-trashbin-parent-wrapper.patch rename patches/{008-remove-dev-notice.patch => 007-remove-dev-notice.patch} (100%) diff --git a/Dockerfile b/Dockerfile index 7f54b4c7..3b0a17bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,8 +82,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch -# RUN patch -u ${BASE_DIR}/apps/files_trashbin/lib/Storage.php -i ${TMP_PATCH_DIR}/007-files-trashbin-parent-wrapper.patch -RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/008-remove-dev-notice.patch +RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/007-files-trashbin-parent-wrapper.patch b/patches/007-files-trashbin-parent-wrapper.patch deleted file mode 100644 index daeb728d..00000000 --- a/patches/007-files-trashbin-parent-wrapper.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Akhil -Date: Tue, 29 Jun 2021 14:10:00 +0530 -Subject: [PATCH] Use parent wrapper to properly handle moves on the same source/target storage - -This patch adds changes described at https://github.com/nextcloud/server/pull/27016/files for NC 20.0.10 -Resolves encryption issues when deleting files after upgrade to NC 20.0.10 - -diff --git ./apps/files_trashbin/lib/Storage.php ./apps/files_trashbin/lib/Storage-new.php ---- ./apps/files_trashbin/lib/Storage.php 2021-06-29 14:03:36.547345625 +0530 -+++ ./apps/files_trashbin/lib/Storage-new.php 2021-06-29 14:06:32.135969869 +0530 -@@ -237,7 +237,7 @@ - /** @var Storage $sourceStorage */ - $sourceStorage->disableTrash(); - } -- $result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); -+ $result = parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); - if ($sourceIsTrashbin) { - /** @var Storage $sourceStorage */ - $sourceStorage->enableTrash(); diff --git a/patches/008-remove-dev-notice.patch b/patches/007-remove-dev-notice.patch similarity index 100% rename from patches/008-remove-dev-notice.patch rename to patches/007-remove-dev-notice.patch -- GitLab