Attachment 156820 Details for Bug 200237 – svn diff for mail/up-imapproxy

[patch] svn diff for mail/up-imapproxy

patch-mail_up-imapproxy (text/plain), 5.96 KB, created by Bernard Spil on 2015-05-16 10:22:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-05-16 10:22:55 UTC

Size: 5.96 KB

patch

obsolete

>Index: mail/up-imapproxy/Makefile
>===================================================================
>--- mail/up-imapproxy/Makefile	(revision 386508)
>+++ mail/up-imapproxy/Makefile	(working copy)
>@@ -16,10 +16,11 @@
> 
> OPTIONS_DEFINE=	DOVECOT DOCS
> DOVECOT_DESC=	Use with dovecot2
>+OPTIONS_SUB=	yes
> 
>-USES=		tar:bzip2 pathfix
>+USES=		autoreconf tar:bzip2 pathfix
> USE_OPENSSL=	yes
>-USE_AUTOTOOLS=	autoheader
>+GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}
> 
> USE_RC_SUBR=	imapproxyd
>@@ -31,12 +32,7 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MDOVECOT}
>-SUB_LIST+=	DOVECOT="dovecot"
>-RUN_DEPENDS+=	dovecot:${PORTSDIR}/mail/dovecot2
>-.else
>-SUB_LIST+=	DOVECOT=""
>-.endif
>+DOVECOT_RUN_DEPENDS=	dovecot:${PORTSDIR}/mail/dovecot2
> 
> do-install:
> .for i in ${SBIN}
>Index: mail/up-imapproxy/files/patch-configure.in
>===================================================================
>--- mail/up-imapproxy/files/patch-configure.in	(revision 386508)
>+++ mail/up-imapproxy/files/patch-configure.in	(working copy)
>@@ -1,6 +1,8 @@
>---- configure.in.orig	2008-01-28 13:15:08.000000000 +0000
>-+++ configure.in	2010-06-14 10:07:34.000000000 +0000
>-@@ -16,8 +16,3 @@
>+--- configure.in.orig	2010-07-25 08:19:30 UTC
>++++ configure.in
>+@@ -14,12 +14,7 @@ AC_CANONICAL_SYSTEM()
>+ 
>+ 
>  dnl Check for BSD sockets
> -AC_CHECK_FUNC(connect, ,
> -	AC_CHECK_LIB(nsl, gethostbyname, ,)
>@@ -10,9 +12,25 @@
> -)
> +AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, , exit)])
>  
>-@@ -131,3 +126,4 @@
>  
>+ dnl Check for pthreads
>+@@ -116,6 +111,9 @@ AC_CHECK_LIB(ssl, SSL_new, ,
>+ 	AC_WARN([OpenSSL library not found!!!  STARTTLS will be disabled.]),
>+ 	-lcrypto)
>+ 
>++AC_CHECK_LIB(crypto, RAND_egd, 
>++	AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd])
>++)
>+ 
>+ dnl Check for curses
>+ save_LIBS="$LIBS"
>+@@ -129,7 +127,8 @@ fi
>+ LIBS="$save_LIBS"
>+ AC_SUBST(LIB_CURSES)
>+ 
> -
> +eval expanded_sysconfdir="\"$sysconfdir\""
> +AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_FILE, "$expanded_sysconfdir/imapproxyd.conf", [default location of config file])
>  AC_CONFIG_HEADER(config.h)
>+ 
>+ 
>Index: mail/up-imapproxy/files/patch-include_imapproxy.h
>===================================================================
>--- mail/up-imapproxy/files/patch-include_imapproxy.h	(revision 0)
>+++ mail/up-imapproxy/files/patch-include_imapproxy.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- include/imapproxy.h.orig	2010-07-26 07:21:19 UTC
>++++ include/imapproxy.h
>+@@ -161,6 +161,7 @@
>+ 
>+ #if HAVE_LIBSSL
>+ #include <openssl/ssl.h>
>++#include <openssl/md5.h>
>+ #include <openssl/rand.h>
>+ #include <limits.h>
>+ #endif
>
>Property changes on: mail/up-imapproxy/files/patch-include_imapproxy.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/up-imapproxy/files/patch-src_main.c
>===================================================================
>--- mail/up-imapproxy/files/patch-src_main.c	(revision 0)
>+++ mail/up-imapproxy/files/patch-src_main.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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 ) )
>
>Property changes on: mail/up-imapproxy/files/patch-src_main.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/up-imapproxy/files/patch-src_threads.c
>===================================================================
>--- mail/up-imapproxy/files/patch-src_threads.c	(revision 0)
>+++ mail/up-imapproxy/files/patch-src_threads.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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)
>+ 
>+ 
>
>Property changes on: mail/up-imapproxy/files/patch-src_threads.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: mail/up-imapproxy/files/patch-ssl
>===================================================================
>--- mail/up-imapproxy/files/patch-ssl	(revision 386508)
>+++ mail/up-imapproxy/files/patch-ssl	(working copy)
>@@ -1,35 +0,0 @@
>---- 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>

Actions: View | Diff

Attachments on bug 200237: 156820 | 156821 | 167018