diff mbox series

[meta-oe,10/20] imapfilter: upgrade 2.8.5 -> 2.8.6

Message ID 20261103183640.919438-10-ankur.tyagi85@gmail.com
State Under Review
Headers show
Series [meta-multimedia,1/20] libopenmpt: upgrade 0.8.9 -> 0.8.10 | expand

Commit Message

Ankur Tyagi Nov. 3, 2026, 6:36 p.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch that is part of the upstream version.

Changelog:
- Support building with OpenSSL 4.0.0 and later.
- Bug fix; UTF-7 encoding mailbox conversion problems.

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...NG-accessors-for-opaque-ASN1_INTEGER.patch | 45 -------------------
 ...mapfilter_2.8.5.bb => imapfilter_2.8.6.bb} |  4 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 meta-oe/recipes-support/imapfilter/imapfilter/0001-Use-ASN1_STRING-accessors-for-opaque-ASN1_INTEGER.patch
 rename meta-oe/recipes-support/imapfilter/{imapfilter_2.8.5.bb => imapfilter_2.8.6.bb} (80%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/imapfilter/imapfilter/0001-Use-ASN1_STRING-accessors-for-opaque-ASN1_INTEGER.patch b/meta-oe/recipes-support/imapfilter/imapfilter/0001-Use-ASN1_STRING-accessors-for-opaque-ASN1_INTEGER.patch
deleted file mode 100644
index 4342de42c9..0000000000
--- a/meta-oe/recipes-support/imapfilter/imapfilter/0001-Use-ASN1_STRING-accessors-for-opaque-ASN1_INTEGER.patch
+++ /dev/null
@@ -1,45 +0,0 @@ 
-From d0e1b29ee5ae0e6e91944fd5c04b943fc810e13c Mon Sep 17 00:00:00 2001
-From: Ravi Kant Sharma <ravi.kant.sharma@canonical.com>
-Date: Mon, 3 Aug 2026 23:02:04 +0200
-Subject: [PATCH] Use ASN1_STRING accessors for opaque ASN1_INTEGER
-
-OpenSSL 4.0 made ASN1_INTEGER opaque. Replace direct struct member
-access (->length, ->type, ->data) with ASN1_STRING_length(),
-ASN1_STRING_type(), ASN1_STRING_get0_data().
-Upstream-Status: Submitted [https://github.com/lefcha/imapfilter/pull/317]
-Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
----
- src/cert.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/cert.c b/src/cert.c
-index a6f614a..b188dd0 100644
---- a/src/cert.c
-+++ b/src/cert.c
-@@ -186,21 +186,21 @@ get_serial(X509 *cert)
- 	serial = X509_get_serialNumber(cert);
- 	buf = xmalloc(LINE_MAX);
- 	*buf = '\0';
--	if (serial->length <= (int)sizeof(long)) {
-+	if (ASN1_STRING_length(serial) <= (int)sizeof(long)) {
- 		num = ASN1_INTEGER_get(serial);
--		if (serial->type == V_ASN1_NEG_INTEGER) {
-+		if (ASN1_STRING_type(serial) == V_ASN1_NEG_INTEGER) {
- 			snprintf(buf, LINE_MAX, "-%lX", -num);
- 		} else {
- 			snprintf(buf, LINE_MAX, "%lX", num);
- 		}
- 	} else {
--		if (serial->type == V_ASN1_NEG_INTEGER) {
-+		if (ASN1_STRING_type(serial) == V_ASN1_NEG_INTEGER) {
- 			snprintf(buf, LINE_MAX, "-");
- 		}
--		for (i = 0; i < serial->length; i++) {
-+		for (i = 0; i < ASN1_STRING_length(serial); i++) {
- 			len = strlen(buf);
- 			snprintf(buf + len, LINE_MAX - len, "%02X",
--			    serial->data[i]);
-+			    ASN1_STRING_get0_data(serial)[i]);
- 		}
- 	}
- 	return buf;
diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.5.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.6.bb
similarity index 80%
rename from meta-oe/recipes-support/imapfilter/imapfilter_2.8.5.bb
rename to meta-oe/recipes-support/imapfilter/imapfilter_2.8.6.bb
index 3e449523ca..6485316a23 100644
--- a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.5.bb
+++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.6.bb
@@ -2,11 +2,9 @@  SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e8d74e78283c6319317d3cb15eded4"
 
-# v2.7.6
-SRCREV = "23b693f7f7cad8b459beb5cf748078f9cc0e5dc8"
+SRCREV = "e9a00548a6d56030b99ffde2985c4af32cb8aff7"
 SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master;tag=v${PV} \
            file://ldflags.patch \
-           file://0001-Use-ASN1_STRING-accessors-for-opaque-ASN1_INTEGER.patch \
 "
 
 DEPENDS = "openssl lua libpcre2"