Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-HyperKitty for openSUSE:Factory checked in at 2024-07-19 15:29:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-HyperKitty (Old) and /work/SRC/openSUSE:Factory/.python-HyperKitty.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-HyperKitty" Fri Jul 19 15:29:01 2024 rev:29 rq:1188491 version:1.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/python-HyperKitty/python-HyperKitty.changes 2024-07-02 18:16:26.127387772 +0200 +++ /work/SRC/openSUSE:Factory/.python-HyperKitty.new.17339/python-HyperKitty.changes 2024-07-19 15:29:16.275807063 +0200 @@ -1,0 +2,6 @@ +Thu Jul 18 20:22:39 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net> + +- Add gl-mr635-empty_attachment.patch to resolve corrupted archive + downloads on mails with empty attachments + +------------------------------------------------------------------- New: ---- gl-mr635-empty_attachment.patch BETA DEBUG BEGIN: New: - Add gl-mr635-empty_attachment.patch to resolve corrupted archive downloads on mails with empty attachments BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-HyperKitty.spec ++++++ --- /var/tmp/diff_new_pack.Ispa5a/_old 2024-07-19 15:29:17.007836244 +0200 +++ /var/tmp/diff_new_pack.Ispa5a/_new 2024-07-19 15:29:17.007836244 +0200 @@ -94,6 +94,8 @@ Patch98: gl-mr300-add-opengraph-metadata.patch # PATCH-FIX-UPSTREAM gl-mr470-introduce-feed-filtering.patch gl#mailman/hyperkitty#470 Patch99: gl-mr470-introduce-feed-filtering.patch +# PATCH-FIX-UPSTREAM gl-mr635-empty_attachment.patch gl#mailman/hyperkitty#635 +Patch100: gl-mr635-empty_attachment.patch # BuildRequires: %{python_module Django >= %{django_min_version} with %python-Django < %{django_max_version}} BuildRequires: %{python_module Whoosh} ++++++ gl-mr635-empty_attachment.patch ++++++ From eb67c2fc470b88385f63435a826d73b32fc3c226 Mon Sep 17 00:00:00 2001 From: Mark Sapiro <mark@msapiro.net> Date: Mon, 15 Jul 2024 17:44:59 -0700 Subject: [PATCH] Return null bytes for empty attachment get_content. --- hyperkitty/models/email.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hyperkitty/models/email.py b/hyperkitty/models/email.py index 651694e5..12732a93 100644 --- a/hyperkitty/models/email.py +++ b/hyperkitty/models/email.py @@ -329,12 +329,12 @@ class Attachment(models.Model): if self.content is not None: return bytes(self.content) if folder is None: - return "" + return b'' filepath = os.path.join(folder, str(self.counter)) if not os.path.exists(filepath): logger.error("Could not find local attachment %s for email %s", self.counter, self.email.id) - return "" + return b'' with open(filepath, "rb") as f: content = f.read() return content -- GitLab