Attachment 197714 Details for Bug 231776 – isync_openssl111 patch

[patch] isync_openssl111 patch

isync_openssl111.diff (text/plain), 1.43 KB, created by Sascha Holzleiter on 2018-10-02 14:36:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Holzleiter

Created: 2018-10-02 14:36:57 UTC

Size: 1.43 KB

patch

obsolete

>diff -Nur isync.orig/files/patch-src_socket.c isync/files/patch-src_socket.c
>--- isync.orig/files/patch-src_socket.c	2018-03-15 18:11:30.069387000 +0100
>+++ isync/files/patch-src_socket.c	2018-10-02 16:23:56.655017000 +0200
>@@ -1,4 +1,4 @@
>---- src/socket.c.orig	2017-08-13 23:04:40 UTC
>+--- src/socket.c.orig	2017-10-01 08:42:35 UTC
> +++ src/socket.c
> @@ -40,7 +40,7 @@
>  # include <openssl/ssl.h>
>@@ -9,3 +9,12 @@
>  #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
>  #  define X509_STORE_get0_objects(o) ((o)->objs)
>  # endif
>+@@ -270,6 +270,8 @@ socket_start_tls( conn_t *conn, void (*c
>+ 
>+ 	init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn );
>+ 	conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext );
>++	if (ssl_return( "set server name", conn, SSL_set_tlsext_host_name( conn->ssl, conn->conf->host ) ) < 0)
>++		return;
>+ 	SSL_set_fd( conn->ssl, conn->fd );
>+ 	SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
>+ 	socket_expect_read( conn, 1 );
>diff -Nur isync.orig/Makefile isync/Makefile
>--- isync.orig/Makefile	2018-09-27 13:05:19.192970000 +0200
>+++ isync/Makefile	2018-10-02 16:23:56.655169000 +0200
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	isync
> PORTVERSION=	1.3.0
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	SF
> 
>@@ -24,6 +25,8 @@
> CONFIGURE_ARGS=	--with-sasl=${LOCALBASE} \
> 		--with-ssl=${OPENSSLLIB:H}
> 
>+MAKE_ARGS+=	SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
>+
> CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
> LDFLAGS+=	-L${BDB_LIB_DIR}
>

Actions: View | Diff

Attachments on bug 231776: 197714