Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02645454 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Added snappymail patch and other patch fixes

parent 19de1ce3

Dockerfile

+8 −8
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ARG EA_JOB_ID="1317005" 
ARG LAUNCHER_JOB_ID="1330025"

ARG GOOGLE_INTEGRATION_VERSION="3.2.0"

ARG DASHBOARD_JOB_ID="1353063"

ARG SNAPPY_VERSION="2.37.2"

ARG SNAPPY_VERSION="2.38.2"

ARG SNAPPY_THEME_VERSION="4.0.5"

ARG USER_MIGRATION_JOB_ID="1313296"

ARG MEMORIES_VERSION="7.5.2"
@@ -78,10 +78,10 @@ RUN curl -fsSL -o ecloud-dashboard.zip \ 
  mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \

  rm ecloud-dashboard.zip;



#RUN curl -fsSL -o snappymail.tar.gz \

#  "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \

#  tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \

#  rm snappymail.tar.gz;

RUN curl -fsSL -o snappymail.tar.gz \

  "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \

  tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \

  rm snappymail.tar.gz;



RUN curl -fsSL -o user_migration.zip \

  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \
@@ -146,13 +146,13 @@ RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/009-help-links.patch 
RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch

RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch

#RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch

RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.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 cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch

#RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch

RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch

RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch

# UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039

#RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch
@@ -229,7 +229,7 @@ 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



RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch

RUN rm -rf ${TMP_PATCH_DIR}

custom_entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ if version_greater "$image_version" "$installed_version"; then 
    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    #rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

patches/014-add-mail-usage.patch

+12 −10
Original line number Diff line number Diff line 
--- lib/private/legacy/OC_Helper.php	2025-05-25 16:00:00.880495300 +0530

+++ lib/private/legacy/OC_Helper-new.php	2025-05-25 16:02:00.970495300 +0530

@@ -512,6 +512,12 @@

@@ -512,6 +512,13 @@

 		}

 		try {

 			$free = $sourceStorage->free_space($rootInfo->getInternalPath());
@@ -10,13 +10,15 @@ 
+            if ($path === '/') {

+                $used = $used + $mailQuotaUsage;

+            }

+

 			if (is_bool($free)) {

 				$free = 0.0;

 			}

@@ -547,7 +553,6 @@

@@ -547,7 +554,6 @@

 		 */

 		$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);

 

-		$ownerId = $storage->getOwner($path);

 		$hasOwnerId = $ownerId !== false && $ownerId !== null;

 		$ownerDisplayName = '';

 

 		if ($isRemoteShare === false && $ownerId !== false) {
 
 No newline at end of file

patches/031-theme-custom-app-translations.patch

+3 −2
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ 
 			if ($found) {

 				return;

patches/037-snappymail-contact.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
--- ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php	2024-03-28 01:02:39

+++ ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts-new.php	2024-04-15 16:36:23

@@ -227,7 +227,11 @@

 		if (!empty($sData)) {

 			$aData = \json_decode($sData, true);

 			if ($aData) {

-				if ($aData['Password']) {

+				// as remote-sync is didsabled for us (murena workspace), we ignore all remote sync password setup

+				$aData['Password'] = '';

+				$aData['PasswordHMAC'] = null;

+				$aData['Mode'] = 0;

+				/* if ($aData['Password']) {

 					$oMainAccount = $this->getMainAccountFromToken();

 					// Verify oAccount password hasn't changed so that Password can be decrypted

 					if ($aData['PasswordHMAC'] !== \hash_hmac('sha1', $aData['Password'], $oMainAccount->CryptKey())) {

@@ -243,7 +247,7 @@

 				}

 				if (!isset($aData['Mode'])) {

 					$aData['Mode'] = empty($aData['Enable']) ? 0 : 1;

-				}

+				} */

 				return $aData;

 			}
 
 No newline at end of file