dev/core#5569 Replace our hack on zeta components with upstream patch

CRM/Mailing/MailStore.php

@@ -166,7 +166,7 @@ public function fetchNext($count = 1) {
     $mails = [];
     $parser = new ezcMailParser();
     //set property text attachment as file CRM-5408
-    $parser->options->parseTextAttachmentsAsFiles = TRUE;
+    $parser->options->parseMultipartMixedTextAttachmentsAsFiles = TRUE;
 
     foreach ($set->getMessageNumbers() as $nr) {
       if ($this->_debug) {

CRM/Mailing/MailStore/Localdir.php

@@ -103,7 +103,7 @@ public function fetchNext($count = 0) {
       $set = new ezcMailFileSet([$file]);
       $parser = new ezcMailParser();
       // set property text attachment as file CRM-5408
-      $parser->options->parseTextAttachmentsAsFiles = TRUE;
+      $parser->options->parseMultipartMixedTextAttachmentsAsFiles = TRUE;
 
       $mail = $parser->parseMail($set);
 

CRM/Mailing/MailStore/Maildir.php

@@ -80,7 +80,7 @@ public function fetchNext($count = 0) {
     $mails = [];
     $parser = new ezcMailParser();
     // set property text attachment as file CRM-5408
-    $parser->options->parseTextAttachmentsAsFiles = TRUE;
+    $parser->options->parseMultipartMixedTextAttachmentsAsFiles = TRUE;
 
     foreach (['cur', 'new'] as $subdir) {
       $dir = $this->_dir . DIRECTORY_SEPARATOR . $subdir;

composer.json

@@ -69,7 +69,7 @@
     "tecnickcom/tcpdf" : "6.7.*",
     "totten/ca-config": "~23.07",
     "zetacomponents/base": "1.9.*",
-    "zetacomponents/mail": "~1.9.4",
+    "zetacomponents/mail": "~1.9",
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^1.2",
     "pear/validate_finance_creditcard": "0.7.0",
@@ -295,8 +295,8 @@
         "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch"
       },
       "zetacomponents/mail": {
-        "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch",
-        "CiviCRM Custom patch to fix a php8.1 issue found in CiviCRM unit tests": "https://raw.githubusercontent.com/civicrm/civicrm-core/5506f4ce5d46799857b4f4ddf34069e7541e9cc5/tools/scripts/composer/zetacomponents-php-81-civicrm-custom.patch"
+        "Patch one in https://github.com/zetacomponents/Mail/pull/96/commits": "https://github.com/zetacomponents/Mail/commit/fc981b489d68e65890f26f19efa3fc523e517002.patch",
+        "Patch two in https://github.com/zetacomponents/Mail/pull/96/commits" : "https://github.com/zetacomponents/Mail/commit/bebae735aae2c1030d6fb564d322c1480a51a86d.patch"
       }
     },
     "compile-includes": ["ext/greenwich/composer.compile.json"],