dovecot: update to 2.3.21.

This commit is contained in:
Leah Neukirchen 2023-09-16 13:14:21 +02:00
parent 381d8f6b8e
commit 7905949ca5
4 changed files with 63 additions and 3 deletions

9
srcpkgs/dovecot/INSTALL Normal file
View File

@ -0,0 +1,9 @@
case "${ACTION}" in
post)
if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
exit 0
fi
echo "Creating self-signed certificate..."
usr/bin/dovecot-mkcert.sh
;;
esac

View File

@ -0,0 +1,6 @@
A self-signed certificate for SSL has been created automatically, but
this should be created again with proper settings in dovecot-openssl.cnf:
$ rm -f /etc/ssl/{certs,private}/dovecot.pem
$ [edit /etc/ssl/dovecot-openssl.cnf]
$ /usr/bin/dovecot-mkcert.sh

View File

@ -0,0 +1,45 @@
From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Wed, 11 May 2022 20:27:53 +0200
Author: Michal Hlavinka
Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1962035
Subject: Support openssl 3.0
---
src/lib-dcrypt/dcrypt-openssl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
index 1cbe352..5570d62 100644
--- a/src/lib-dcrypt/dcrypt-openssl.c
+++ b/src/lib-dcrypt/dcrypt-openssl.c
@@ -73,10 +73,30 @@
2<tab>key algo oid<tab>1<tab>symmetric algo name<tab>salt<tab>hash algo<tab>rounds<tab>E(RSA = i2d_PrivateKey, EC=Private Point)<tab>key id
**/
+#if OPENSSL_VERSION_MAJOR == 3
+static EC_KEY *EVP_PKEY_get0_EC_KEYv3(EVP_PKEY *key)
+{
+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
+ EVP_PKEY_set1_EC_KEY(key, eck);
+ EC_KEY_free(eck);
+ return eck;
+}
+
+static EC_KEY *EVP_PKEY_get1_EC_KEYv3(EVP_PKEY *key)
+{
+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
+ EVP_PKEY_set1_EC_KEY(key, eck);
+ return eck;
+}
+
+#define EVP_PKEY_get0_EC_KEY EVP_PKEY_get0_EC_KEYv3
+#define EVP_PKEY_get1_EC_KEY EVP_PKEY_get1_EC_KEYv3
+#else
#ifndef HAVE_EVP_PKEY_get0
#define EVP_PKEY_get0_EC_KEY(x) x->pkey.ec
#define EVP_PKEY_get0_RSA(x) x->pkey.rsa
#endif
+#endif
#ifndef HAVE_OBJ_LENGTH
#define OBJ_length(o) ((o)->length)

View File

@ -1,8 +1,8 @@
# Template file for 'dovecot' # Template file for 'dovecot'
# revbump dovecot-plugin-pigeonhole when updating dovecot! # revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot pkgname=dovecot
version=2.3.20 version=2.3.21
revision=3 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later" license="LGPL-2.1-or-later"
homepage="https://dovecot.org/" homepage="https://dovecot.org/"
distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz" distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
checksum=caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 checksum=05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d
keep_libtool_archives=yes keep_libtool_archives=yes
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then