From a85f147c3c6594f146b10191ad9767bab1f2ea10 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Mon, 12 Jan 2026 19:55:37 +0100
Subject: [PATCH] add /var/lib/dovecot to tmpfiles for image mode (RHEL-139098)

fix building with latest openssl (RHEL-140619)
Resolves: RHEL-139098
---
 dovecot-2.3.6-opensslhmac.patch | 14 +++++++-------
 dovecot.spec                    |  6 +++++-
 dovecot.tmpfilesd               |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dovecot-2.3.6-opensslhmac.patch b/dovecot-2.3.6-opensslhmac.patch
index ba6453b..dfc72d3 100644
--- a/dovecot-2.3.6-opensslhmac.patch
+++ b/dovecot-2.3.6-opensslhmac.patch
@@ -388,16 +388,16 @@ diff -up dovecot-2.3.14/src/lib/hmac.c.opensslhmac dovecot-2.3.14/src/lib/hmac.c
  
  	/* salt and info can be NULL */
  	i_assert(salt != NULL || salt_len == 0);
-@@ -118,35 +192,30 @@ void hmac_hkdf(const struct hash_method
+@@ -118,35 +192,36 @@ void hmac_hkdf(const struct hash_method
  	i_assert(ikm != NULL && ikm_len > 0);
  	i_assert(okm_r != NULL && okm_len > 0);
  
--	/* but they still need valid pointer, reduces
--	   complains from static analysers */
--	if (salt == NULL)
--		salt = &uchar_nul;
--	if (info == NULL)
--		info = &uchar_nul;
+ 	/* but they still need valid pointer, reduces
+ 	   complains from static analysers */
+ 	if (salt == NULL)
+ 		salt = &uchar_nul;
+ 	if (info == NULL)
+ 		info = &uchar_nul;
 -
 -	/* extract */
 -	hmac_init(&key_mac, salt, salt_len, method);
diff --git a/dovecot.spec b/dovecot.spec
index db33f50..80a7e9a 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -6,7 +6,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.3.16
 %global prever %{nil}
-Release: 15%{?dist}
+Release: 16%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 
@@ -524,6 +524,10 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon Jan 12 2026 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.16-16
+- add /var/lib/dovecot to tmpfiles for image mode (RHEL-139098)
+- fix building with latest openssl (RHEL-140619)
+
 * Wed Feb 05 2025 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.16-15
 - fix sysusers config file name (RHEL-77322)
 
diff --git a/dovecot.tmpfilesd b/dovecot.tmpfilesd
index d96639a..e46a5ff 100644
--- a/dovecot.tmpfilesd
+++ b/dovecot.tmpfilesd
@@ -1,2 +1,3 @@
 d /run/dovecot 0755 root dovecot -
+d /var/lib/dovecot 0750 dovecot dovecot - -