Index: branches/2018Q4/mail/isync/Makefile =================================================================== --- branches/2018Q4/mail/isync/Makefile (revision 482205) +++ branches/2018Q4/mail/isync/Makefile (revision 482206) @@ -1,36 +1,41 @@ # Created by: eivind # $FreeBSD$ PORTNAME= isync PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF MAINTAINER= ehaupt@FreeBSD.org COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags LICENSE= GPLv2 BROKEN_mips= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions BROKEN_mips64= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions BROKEN_powerpc64= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 USES= alias bdb cpe perl5 ssl USE_PERL5= build -CPE_VENDOR= oswald_buddenhagen + GNU_CONFIGURE= yes +CPE_VENDOR= oswald_buddenhagen + 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} post-patch: @${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \ ${WRKSRC}/src/Makefile.in ${WRKSRC}/src/compat/Makefile.in @${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include Index: branches/2018Q4/mail/isync/files/patch-src_socket.c =================================================================== --- branches/2018Q4/mail/isync/files/patch-src_socket.c (revision 482205) +++ branches/2018Q4/mail/isync/files/patch-src_socket.c (revision 482206) @@ -1,11 +1,20 @@ ---- 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 # include # include -# if OPENSSL_VERSION_NUMBER < 0x10100000L +# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) # 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 ); Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 482205) +++ branches/2018Q4 (revision 482206) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r482205