Attachment #156820 for bug #200237





OPTIONS_DEFINE=	DOVECOT DOCS
DOVECOT_DESC=	Use with dovecot2
OPTIONS_SUB=	yes

USES=		autoreconf tar:bzip2 pathfix
USE_OPENSSL=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}

USE_RC_SUBR=	imapproxyd


.include <bsd.port.options.mk>

DOVECOT_RUN_DEPENDS=	dovecot:${PORTSDIR}/mail/dovecot2
SUB_LIST+=	DOVECOT="dovecot"
RUN_DEPENDS+=	dovecot:${PORTSDIR}/mail/dovecot2
.else
SUB_LIST+=	DOVECOT=""
.endif

do-install:
.for i in ${SBIN}

Lines 1-6 Link Here

(-)mail/up-imapproxy/files/patch-configure.in (-4 / +22 lines)
1	--- configure.in.orig 2008-01-28 13:15:08.000000000 +0000	1	--- configure.in.orig 2010-07-25 08:19:30 UTC
2	+++ configure.in 2010-06-14 10:07:34.000000000 +0000	2	+++ configure.in
3	@@ -16,8 +16,3 @@	3	@@ -14,12 +14,7 @@ AC_CANONICAL_SYSTEM()
		4
		5
4	dnl Check for BSD sockets	6	dnl Check for BSD sockets
5	-AC_CHECK_FUNC(connect, ,	7	-AC_CHECK_FUNC(connect, ,
6	- AC_CHECK_LIB(nsl, gethostbyname, ,)	8	- AC_CHECK_LIB(nsl, gethostbyname, ,)
Lines 10-18 Link Here
10	-)	12	-)
11	+AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, , exit)])	13	+AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, , exit)])
12		14
13	@@ -131,3 +126,4 @@
14		15
		16	dnl Check for pthreads
		17	@@ -116,6 +111,9 @@ AC_CHECK_LIB(ssl, SSL_new, ,
		18	AC_WARN([OpenSSL library not found!!! STARTTLS will be disabled.]),
		19	-lcrypto)
		20
		21	+AC_CHECK_LIB(crypto, RAND_egd,
		22	+ AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd])
		23	+)
		24
		25	dnl Check for curses
		26	save_LIBS="$LIBS"
		27	@@ -129,7 +127,8 @@ fi
		28	LIBS="$save_LIBS"
		29	AC_SUBST(LIB_CURSES)
		30
15	-	31	-
16	+eval expanded_sysconfdir="\"$sysconfdir\""	32	+eval expanded_sysconfdir="\"$sysconfdir\""
17	+AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_FILE, "$expanded_sysconfdir/imapproxyd.conf", [default location of config file])	33	+AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_FILE, "$expanded_sysconfdir/imapproxyd.conf", [default location of config file])
18	AC_CONFIG_HEADER(config.h)	34	AC_CONFIG_HEADER(config.h)
		35
		36

Line 0 Link Here

(-)mail/up-imapproxy/files/patch-include_imapproxy.h (+10 lines)
	1	--- include/imapproxy.h.orig 2010-07-26 07:21:19 UTC
	2	+++ include/imapproxy.h
	3	@@ -161,6 +161,7 @@
	4
	5	#if HAVE_LIBSSL
	6	#include <openssl/ssl.h>
	7	+#include <openssl/md5.h>
	8	#include <openssl/rand.h>
	9	#include <limits.h>
	10	#endif




--- src/main.c.orig	2010-07-26 07:21:19 UTC
+++ src/main.c
@@ -472,7 +472,9 @@ int main( int argc, char *argv[] )
 	    ssl_thread_setup(fn);
 	    
             /* Need to seed PRNG, too! */
+#ifdef HAVE_RAND_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 ) )




--- src/threads.c.orig	2010-07-25 09:11:36 UTC
+++ src/threads.c
@@ -51,6 +51,9 @@
 
 #define OPENSSL_THREAD_DEFINES
 #include <openssl/opensslconf.h>
+#if defined(THREADS)
+#define OPENSSL_THREADS
+#endif
 #if defined(OPENSSL_THREADS)
 
 




--- include/imapproxy.h	Tue Apr 20 23:55:23 2004
+++ include/imapproxy.h	Sun Dec 10 11:28:42 2006
@@ -107,6 +107,7 @@
 
 #if HAVE_LIBSSL
 #include <openssl/ssl.h>
+#include <openssl/md5.h>
 #include <openssl/rand.h>
 #include <limits.h>
 #endif
--- config.h.in	Tue Apr 20 10:26:46 2004
+++ config.h.in	Sun Dec 10 11:27:13 2006
@@ -27,7 +27,7 @@
 #undef HAVE_LIBSOCKET
 
 /* Define to 1 if you have the `ssl' library (-lssl). */
-#undef HAVE_LIBSSL
+#define HAVE_LIBSSL 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
--- src/threads.c	2008-01-28 14:15:08.000000000 +0100
+++ src/threads.c	2008-02-25 13:50:40.000000000 +0100
@@ -51,7 +51,10 @@
 
 #define OPENSSL_THREAD_DEFINES
 #include <openssl/opensslconf.h>
-#if defined(OPENSSL_THREADS)
+#if defined(THREADS)
+#define OPENSSL_THREADS
+#endif
+#if defined(OPENSSL_THREADS)

 
 #include <stdio.h>

Return to bug 200237

Lines 16-25 Link Here

(-)mail/up-imapproxy/Makefile (-8 / +4 lines)
16		16
17	OPTIONS_DEFINE= DOVECOT DOCS	17	OPTIONS_DEFINE= DOVECOT DOCS
18	DOVECOT_DESC= Use with dovecot2	18	DOVECOT_DESC= Use with dovecot2
		19	OPTIONS_SUB= yes
19		20
20	USES= tar:bzip2 pathfix	21	USES= autoreconf tar:bzip2 pathfix
21	USE_OPENSSL= yes	22	USE_OPENSSL= yes
22	USE_AUTOTOOLS= autoheader	23	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE}	24	CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE}
24		25
25	USE_RC_SUBR= imapproxyd	26	USE_RC_SUBR= imapproxyd
Lines 31-42 Link Here
31		32
32	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
33		34
34	.if ${PORT_OPTIONS:MDOVECOT}	35	DOVECOT_RUN_DEPENDS= dovecot:${PORTSDIR}/mail/dovecot2
35	SUB_LIST+= DOVECOT="dovecot"
36	RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot2
37	.else
38	SUB_LIST+= DOVECOT=""
39	.endif
40		36
41	do-install:	37	do-install:
42	.for i in ${SBIN}	38	.for i in ${SBIN}

Line 0 Link Here

(-)mail/up-imapproxy/files/patch-src_main.c (+12 lines)
	1	--- src/main.c.orig 2010-07-26 07:21:19 UTC
	2	+++ src/main.c
	3	@@ -472,7 +472,9 @@ int main( int argc, char *argv[] )
	4	ssl_thread_setup(fn);
	5
	6	/* Need to seed PRNG, too! */
	7	+#ifdef HAVE_RAND_EGD
	8	if ( RAND_egd( ( RAND_file_name( f_randfile, sizeof( f_randfile ) ) == f_randfile ) ? f_randfile : "/.rnd" ) )
	9	+#endif
	10	{
	11	/* Not an EGD, so read and write it. */
	12	if ( RAND_load_file( f_randfile, -1 ) )

Line 0 Link Here

(-)mail/up-imapproxy/files/patch-src_threads.c (+12 lines)
	1	--- src/threads.c.orig 2010-07-25 09:11:36 UTC
	2	+++ src/threads.c
	3	@@ -51,6 +51,9 @@
	4
	5	#define OPENSSL_THREAD_DEFINES
	6	#include <openssl/opensslconf.h>
	7	+#if defined(THREADS)
	8	+#define OPENSSL_THREADS
	9	+#endif
	10	#if defined(OPENSSL_THREADS)
	11
	12

Lines 1-35 Link Here

(-)mail/up-imapproxy/files/patch-ssl (-35 lines)
1	--- include/imapproxy.h Tue Apr 20 23:55:23 2004
2	+++ include/imapproxy.h Sun Dec 10 11:28:42 2006
3	@@ -107,6 +107,7 @@
4
5	#if HAVE_LIBSSL
6	#include <openssl/ssl.h>
7	+#include <openssl/md5.h>
8	#include <openssl/rand.h>
9	#include <limits.h>
10	#endif
11	--- config.h.in Tue Apr 20 10:26:46 2004
12	+++ config.h.in Sun Dec 10 11:27:13 2006
13	@@ -27,7 +27,7 @@
14	#undef HAVE_LIBSOCKET
15
16	/* Define to 1 if you have the `ssl' library (-lssl). */
17	-#undef HAVE_LIBSSL
18	+#define HAVE_LIBSSL 1
19
20	/* Define to 1 if you have the <memory.h> header file. */
21	#undef HAVE_MEMORY_H
22	--- src/threads.c 2008-01-28 14:15:08.000000000 +0100
23	+++ src/threads.c 2008-02-25 13:50:40.000000000 +0100
24	@@ -51,7 +51,10 @@
25
26	#define OPENSSL_THREAD_DEFINES
27	#include <openssl/opensslconf.h>
28	-#if defined(OPENSSL_THREADS)
29	+#if defined(THREADS)
30	+#define OPENSSL_THREADS
31	+#endif
32	+#if defined(OPENSSL_THREADS)
33
34
35	#include <stdio.h>