[rpms/imapfilter] rawhide: Update to 2.8.5 + patch to build against OpenSSL4+

[Filipe Rosset <rosset.filipe@gmail.com>]

            A new commit has been pushed.

            Repo   : rpms/imapfilter
            Branch : rawhide
            Commit : 614091ca81ee008572ba7830c8b493c03eb79c88
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-17T21:33:20-03:00
            Stats  : +37/-5 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/imapfilter/c/614091ca81ee008572ba7830c8b493c03eb79c88?branch=rawhide

            Log:
            Update to 2.8.5 + patch to build against OpenSSL4+

Resolves: rhbz#2445540
Resolves: rhbz#2504135

---
diff --git a/.gitignore b/.gitignore
index 303a074..260d2c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ imapfilter-2.0.11.tar.bz2
 /imapfilter-2.8.1.tar.gz
 /imapfilter-2.8.2.tar.gz
 /imapfilter-2.8.3.tar.gz
+/imapfilter-2.8.5.tar.gz

diff --git a/imapfilter-openssl4.patch b/imapfilter-openssl4.patch
new file mode 100644
index 0000000..3d81fd5
--- /dev/null
+++ b/imapfilter-openssl4.patch
@@ -0,0 +1,29 @@
+--- cert.c.orig	2026-08-17 21:20:52.503727520 -0300
++++ imapfilter-2.8.5/src/cert.c	2026-08-17 21:00:09.419834701 -0300
+@@ -186,21 +186,21 @@
+ 	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/imapfilter.spec b/imapfilter.spec
index 6bab0d5..c4a67c3 100644
--- a/imapfilter.spec
+++ b/imapfilter.spec
@@ -1,5 +1,5 @@
 Name:           imapfilter
-Version:        2.8.3
+Version:        2.8.5
 Release:        %autorelease
 Summary:        A flexible client side mail filtering utility for IMAP servers
 
@@ -12,6 +12,8 @@ URL:            %forgeurl
 Source:         %forgesource
 # Fix paths for MANDIR, SSLCAFILE and keep existing CFLAGS
 Patch0:         imapfilter-makefile-fix.patch
+# Fix build with OpenSSL4+ (opaque ASN1_INTEGER structures)
+Patch1:         imapfilter-openssl4.patch
 
 BuildRequires:  gcc, make
 BuildRequires:  openssl-devel
@@ -34,12 +36,12 @@ protocol are supported.
 
 %build
 # imapfilter does not have any autotools based ./configure - just a plain Makefile
-CFLAGS=$RPM_OPT_FLAGS make PREFIX=%{_prefix} %{?_smp_mflags}
+%set_build_flags
+%make_build PREFIX=%{_prefix}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
+%make_install PREFIX=%{_prefix}
 
 
 %files

diff --git a/sources b/sources
index 27109a1..f15473f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (imapfilter-2.8.3.tar.gz) = e7827958acc3a04b66a3a17545b67f64f635329b576a5e8443898bb3869cd6f19df52ad85281a09e578b1c15f2346c2ab85bf688ee702bf6c8d0a74fe6a20a10
+SHA512 (imapfilter-2.8.5.tar.gz) = 683de17c3f795c11c7a02fcf899523352aae062c8e55376a2a53aa0f0e6e330a4b199e433005e58eaf1778abfa23bdfc9ba15c0e055540e9524c568b6f8b4347