diff --git a/patches/gpgol/0001-Handle-protected-headers-also-on-multipart-parts.patch b/patches/gpgol/0001-Handle-protected-headers-also-on-multipart-parts.patch deleted file mode 100755 index 93416fd7..00000000 --- a/patches/gpgol/0001-Handle-protected-headers-also-on-multipart-parts.patch +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh -patch -p1 -l -f $* < $0 -exit $? - -From 28b05072198e30bcb7531fe6afc0b95600abd16e Mon Sep 17 00:00:00 2001 -From: Andre Heinecke -Date: Tue, 5 Jan 2021 15:44:54 +0100 -Subject: [PATCH] Handle protected-headers also on multipart parts - -* src/mimedataprovider.cpp (t2body): Also check for -protected headers on multipart mails. ---- - src/mimedataprovider.cpp | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp -index f1aa3ba..fd7ff0e 100644 ---- a/src/mimedataprovider.cpp -+++ b/src/mimedataprovider.cpp -@@ -315,6 +315,26 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg) - charset = NULL; - } - -+ if (!strcmp (ctmain, "multipart") || !strcmp (ctmain, "text")) -+ { -+ s = rfc822parse_query_parameter (field, -+ "protected-headers", -1); -+ if (s) -+ { -+ log_data ("%s:%s: Found protected headers: '%s'", -+ SRCNAME, __func__, s); -+ if (!strncmp (s, "v", 1)) -+ { -+ provider->m_protected_headers_version = atoi (s + 1); -+ } -+ is_protected_headers = 1; -+ } -+ else -+ { -+ is_protected_headers = 0; -+ } -+ } -+ - if (!strcmp (ctmain, "multipart")) - { - /* We don't care about the top level multipart layer but wait -@@ -351,22 +371,6 @@ t2body (MimeDataProvider *provider, rfc822parse_t msg) - else if (!strcmp (ctmain, "text")) - { - is_text = !strcmp (ctsub, "html")? 2:1; -- s = rfc822parse_query_parameter (field, -- "protected-headers", -1); -- if (s) -- { -- log_data ("%s:%s: Found protected headers: '%s'", -- SRCNAME, __func__, s); -- if (!strncmp (s, "v", 1)) -- { -- provider->m_protected_headers_version = atoi (s + 1); -- } -- is_protected_headers = 1; -- } -- else -- { -- is_protected_headers = 0; -- } - } - else if (ctx->nesting_level == 1 && !provider->signature() - && !strcmp (ctmain, "application") --- -2.20.1