svn commit: r417964 - in head/mail/up-imapproxy: . files

[Bernard Spil]

Author: brnrd
Date: Sun Jul  3 10:01:53 2016
New Revision: 417964
URL: https://svnweb.freebsd.org/changeset/ports/417964

Log:
  mail/up-imapproxy: Fix build without EGD methods
  
    - Use OPENSSL_NO_EGD define to fix build
    - Replace USE_OPENSSL with new USES= ssl
  
  PR:		200237

Added:
  head/mail/up-imapproxy/files/patch-src_main.c   (contents, props changed)
Modified:
  head/mail/up-imapproxy/Makefile

Modified: head/mail/up-imapproxy/Makefile
==============================================================================
--- head/mail/up-imapproxy/Makefile	Sun Jul  3 09:55:19 2016	(r417963)
+++ head/mail/up-imapproxy/Makefile	Sun Jul  3 10:01:53 2016	(r417964)
@@ -18,8 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 OPTIONS_DEFINE=	DOVECOT DOCS
 DOVECOT_DESC=	Use with dovecot2
 
-USES=		autoreconf tar:bzip2 ncurses pathfix
-USE_OPENSSL=	yes
+USES=		autoreconf tar:bzip2 ncurses pathfix ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}
 

Added: head/mail/up-imapproxy/files/patch-src_main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/up-imapproxy/files/patch-src_main.c	Sun Jul  3 10:01:53 2016	(r417964)
@@ -0,0 +1,12 @@
+--- src/main.c.orig	2016-01-29 18:11:40 UTC
++++ src/main.c
+@@ -473,7 +473,9 @@ int main( int argc, char *argv[] )
+ 	    ssl_thread_setup(fn);
+ 	    
+             /* Need to seed PRNG, too! */
++#ifndef OPENSSL_NO_EGD
+             if ( RAND_egd( ( RAND_file_name( f_randfile, sizeof( f_randfile ) ) == f_randfile ) ? f_randfile : "/.rnd" ) ) 
++#endif
+ 	    {
+                 /* Not an EGD, so read and write it. */
+                 if ( RAND_load_file( f_randfile, -1 ) )