mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

mail/postfix: Fix runtime issues with LibreSSL

Browse Source 
- Add LibreSSL checks to <> 1.1.0 OpenSSL checks
  - Bump portrevision

PR:		212223
Submitted by:	Markus Kohlmeier <rootservice@gmail.com>
Reported by:	Markus Kohlmeier <rootservice@gmail.com>
Approved by:	ohauer (via PR)
MFH:		2016Q3
This commit is contained in:
Bernard Spil 2016-08-29 19:23:49 +00:00
parent aceac7bdec
commit 2a819e64d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=421091
6 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/postfix/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= postfix
PORTVERSION= 3.1.2
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
http://de.postfix.org/ftpmirror/ \

22
mail/postfix/files/patch-src_posttls-finger_posttls-finger.c Normal file
View File

@ -0,0 +1,22 @@
--- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC
+++ src/posttls-finger/posttls-finger.c
@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
return (0);
}
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(USE_TLS) && \
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
/* ssl_cleanup - free memory allocated in the OpenSSL library */
@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[])
cleanup(&state);
/* OpenSSL 1.1.0 and later (de)initialization is implicit */
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(USE_TLS) && \
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
ssl_cleanup();
#endif

20
mail/postfix/files/patch-src_tls_tls__client.c Normal file
View File

@ -0,0 +1,20 @@
--- src/tls/tls_client.c.orig 2016-08-27 20:27:50 UTC
+++ src/tls/tls_client.c
@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL
*/
tls_check_version();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* Initialize the OpenSSL library by the book! To start with, we must
@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* According to the OpenSSL documentation, temporary RSA key is needed

11
mail/postfix/files/patch-src_tls_tls__dane.c Normal file
View File

@ -0,0 +1,11 @@
--- src/tls/tls_dane.c.orig 2016-08-27 20:27:50 UTC
+++ src/tls/tls_dane.c
@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf
tls_param_init();
tls_check_version();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESS_VERSION_NUMBER)
SSL_load_error_strings();
SSL_library_init();
#endif

20
mail/postfix/files/patch-src_tls_tls__rsa.c Normal file
View File

@ -0,0 +1,20 @@
--- src/tls/tls_rsa.c.orig 2016-01-03 14:49:51 UTC
+++ src/tls/tls_rsa.c
@@ -57,7 +57,7 @@
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
@@ -109,7 +109,7 @@ int main(int unused_argc, char *cons
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
RSA *rsa;
msg_vstream_init(argv[0], VSTREAM_ERR);

29
mail/postfix/files/patch-src_tls_tls__server.c Normal file
View File

@ -0,0 +1,29 @@
--- src/tls/tls_server.c.orig 2016-08-27 20:27:50 UTC
+++ src/tls/tls_server.c
@@ -174,7 +174,7 @@ static const char server_session_id_cont
#endif /* OPENSSL_VERSION_NUMBER */
/* OpenSSL 1.1.0 bitrot */
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
typedef const unsigned char *session_id_t;
#else
@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL
*/
tls_check_version();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* Initialize the OpenSSL library by the book! To start with, we must
@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL
/*
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* According to OpenSSL documentation, a temporary RSA key is needed when