Date: Sat, 10 Sep 2016 20:23:46 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421741 - in head/mail/prayer: . files Message-ID: <201609102023.u8AKNkeG006739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Sep 10 20:23:46 2016 New Revision: 421741 URL: https://svnweb.freebsd.org/changeset/ports/421741 Log: mail/prayer: Configure for any SSL base and support LibreSSL Approved by: SSL blanket Added: head/mail/prayer/files/patch-lib_ssl.c (contents, props changed) Modified: head/mail/prayer/Makefile Modified: head/mail/prayer/Makefile ============================================================================== --- head/mail/prayer/Makefile Sat Sep 10 20:19:04 2016 (r421740) +++ head/mail/prayer/Makefile Sat Sep 10 20:23:46 2016 (r421741) @@ -71,7 +71,9 @@ MAKE_ARGS+= TIDY_ENABLE=false .if ${PORT_OPTIONS:MSSL} MAKE_ARGS+= CCLIENT_SSL_ENABLE=true \ - SSL_ENABLE=true + SSL_ENABLE=true \ + INCLUDES=-I${OPENSSLINC} \ + LDFLAGS="${LDFLAGS} -L${OPENSSLLIB}" .else MAKE_ARGS+= CCLIENT_SSL_ENABLE=false \ SSL_ENABLE=false Added: head/mail/prayer/files/patch-lib_ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/prayer/files/patch-lib_ssl.c Sat Sep 10 20:23:46 2016 (r421741) @@ -0,0 +1,27 @@ +--- lib/ssl.c.orig 2012-06-30 14:30:08 UTC ++++ lib/ssl.c +@@ -78,6 +78,7 @@ static void os_initialize_prng(struct ss + int totbytes = 0; + int bytes; + ++#ifndef OPENSSL_NO_EGD + if (ssl_config->egd_socket) { + if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) { + log_fatal("EGD Socket %s failed", ssl_config->egd_socket); +@@ -88,6 +89,7 @@ static void os_initialize_prng(struct ss + goto SEEDED; /* ditto */ + } + } ++#endif + + /* Try the good-old default /dev/urandom, if available */ + totbytes += add_rand_file("/dev/urandom"); +@@ -387,7 +389,7 @@ void ssl_context_init(struct ssl_config + SSL_load_error_strings(); + + /* Set up client context: only used by accountd */ +- client_ctx = SSL_CTX_new(SSLv3_client_method()); ++ client_ctx = SSL_CTX_new(SSLv23_client_method()); + SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_BOTH); + SSL_CTX_set_info_callback(client_ctx, info_callback); + #ifdef SSL_MODE_AUTO_RETRY
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609102023.u8AKNkeG006739>