Browse Source

Merge pull request #7341 from neheb/dove

dovecot: Fix compilation for OpenSSL without deprecated APIs
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
01b584c2d8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
  1. +1
    -1
      mail/dovecot/Makefile
  2. +26
    -0
      mail/dovecot/patches/100-openssl-deprecated.patch

+ 1
- 1
mail/dovecot/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot PKG_NAME:=dovecot
PKG_VERSION:=2.3.2.1 PKG_VERSION:=2.3.2.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.dovecot.org/releases/2.3 PKG_SOURCE_URL:=https://www.dovecot.org/releases/2.3


+ 26
- 0
mail/dovecot/patches/100-openssl-deprecated.patch View File

@ -0,0 +1,26 @@
diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
index c2dbd30..201ab40 100644
--- a/src/lib-dcrypt/dcrypt-openssl.c
+++ b/src/lib-dcrypt/dcrypt-openssl.c
@@ -20,6 +20,7 @@
#include <openssl/engine.h>
#include <openssl/hmac.h>
#include <openssl/objects.h>
+#include <openssl/bn.h>
#include "dcrypt.h"
#include "dcrypt-private.h"
diff --git a/src/lib-ssl-iostream/iostream-openssl-context.c b/src/lib-ssl-iostream/iostream-openssl-context.c
index e3c902e..ad6a9c1 100644
--- a/src/lib-ssl-iostream/iostream-openssl-context.c
+++ b/src/lib-ssl-iostream/iostream-openssl-context.c
@@ -6,6 +6,9 @@
#include "dovecot-openssl-common.h"
#include <openssl/crypto.h>
+#include <openssl/rsa.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/ssl.h>

Loading…
Cancel
Save