diff --git a/mail/isync/Makefile b/mail/isync/Makefile index b4d929ab1059..79c3b84c83ce 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -1,34 +1,32 @@ PORTNAME= isync -DISTVERSION= 1.4.4 -PORTREVISION= 3 +DISTVERSION= 1.5.0 CATEGORIES= mail MASTER_SITES= SF MAINTAINER= ehaupt@FreeBSD.org COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags -WWW= http://isync.sourceforge.net/ +WWW= https://isync.sourceforge.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 USES= alias compiler:c11 cpe perl5 ssl CPE_VENDOR= isync_project USE_PERL5= build GNU_CONFIGURE= yes - -CONFIGURE_ENV+= ac_cv_berkdb4=no CONFIGURE_ARGS= --with-sasl=${LOCALBASE} \ --with-ssl=${OPENSSLLIB:H} +CONFIGURE_ENV+= ac_cv_berkdb4=no MAKE_ARGS+= SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" post-patch: @${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|-Wformat-signedness||g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include diff --git a/mail/isync/distinfo b/mail/isync/distinfo index e27791263fe6..a6fd9e4327cc 100644 --- a/mail/isync/distinfo +++ b/mail/isync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638697372 -SHA256 (isync-1.4.4.tar.gz) = 7c3273894f22e98330a330051e9d942fd9ffbc02b91952c2f1896a5c37e700ff -SIZE (isync-1.4.4.tar.gz) = 340544 +TIMESTAMP = 1722673442 +SHA256 (isync-1.5.0.tar.gz) = a0c81e109387bf279da161453103399e77946afecf5c51f9413c5e773557f78d +SIZE (isync-1.5.0.tar.gz) = 412925 diff --git a/mail/isync/files/patch-src_drv__imap.c b/mail/isync/files/patch-src_drv__imap.c deleted file mode 100644 index bd3e044136a8..000000000000 --- a/mail/isync/files/patch-src_drv__imap.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/drv_imap.c.orig 2021-12-03 10:56:16 UTC -+++ src/drv_imap.c -@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) - error( "IMAP error: unexpected BYE response: %s\n", cmd ); - /* We just wait for the server to close the connection now. */ - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); - } else { - /* We still need to wait for the LOGOUT's tagged OK. */ - } -@@ -1882,10 +1883,12 @@ imap_cleanup_p2( imap_store_t *ctx, - imap_cleanup_p2( imap_store_t *ctx, - imap_cmd_t *cmd ATTR_UNUSED, int response ) - { -- if (response == RESP_NO) -+ if (response == RESP_NO) { - imap_cancel_store( &ctx->gen ); -- else if (response == RESP_OK) -+ } else if (response == RESP_OK) { - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); -+ } - } - - /******************* imap_open_store *******************/ diff --git a/mail/isync/files/patch-src_socket.c b/mail/isync/files/patch-src_socket.c deleted file mode 100644 index 61b4a1872c87..000000000000 --- a/mail/isync/files/patch-src_socket.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/socket.c.orig 2021-12-03 10:56:16 UTC -+++ src/socket.c -@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) - conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); - } - -+void -+socket_expect_eof( conn_t *sock ) -+{ -+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL -+ if (sock->ssl) -+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); -+#endif -+} -+ - int - socket_read( conn_t *conn, char *buf, uint len ) - { diff --git a/mail/isync/files/patch-src_socket.h b/mail/isync/files/patch-src_socket.h deleted file mode 100644 index 986b52657e8e..000000000000 --- a/mail/isync/files/patch-src_socket.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/socket.h.orig 2021-12-03 10:56:16 UTC -+++ src/socket.h -@@ -142,6 +142,7 @@ void socket_expect_activity( conn_t *sock, int expect - void socket_start_deflate( conn_t *conn ); - void socket_close( conn_t *sock ); - void socket_expect_activity( conn_t *sock, int expect ); -+void socket_expect_eof( conn_t *sock ); - int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ - char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ - typedef enum { KeepOwn = 0, GiveOwn } ownership_t;