Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package isync for openSUSE:Factory checked in at 2023-02-28 12:49:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/isync (Old) and /work/SRC/openSUSE:Factory/.isync.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "isync" Tue Feb 28 12:49:39 2023 rev:11 rq:1068135 version:1.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/isync/isync.changes 2022-01-27 23:18:39.474277200 +0100 +++ /work/SRC/openSUSE:Factory/.isync.new.31432/isync.changes 2023-02-28 12:49:49.048897492 +0100 @@ -1,0 +2,8 @@ +Mon Feb 27 01:47:06 UTC 2023 - Yifan Jiang <yfjiang@suse.com> + +- Add patch work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch + * Some mail servers do not send a close notification + (SSL_shutdown()) before closing the TCP socket. This workaround + makes isync handles the situation more gracefully (boo#1208166). + +------------------------------------------------------------------- New: ---- work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ isync.spec ++++++ --- /var/tmp/diff_new_pack.DMALpX/_old 2023-02-28 12:49:49.740901291 +0100 +++ /var/tmp/diff_new_pack.DMALpX/_new 2023-02-28 12:49:49.744901313 +0100 @@ -1,7 +1,7 @@ # # spec file for package isync # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ # gpg2 --recv-keys 106457B8735659A4D40F56456F5447F95D001D85 # gpg2 --export --armour oswald.buddenhagen@gmx.de > isync.keyring Source2: %{name}.keyring +# PATCH-FIX-UPSTREAM work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch boo#1208166 yfjiang@suse.com -- handle the unexpected EOF error message at the end of ssl connection +Patch0: work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch BuildRequires: db-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(libsasl2) @@ -45,7 +47,7 @@ mailbox pair; multiple replicas of a mailbox can be maintained. %prep -%autosetup +%autosetup -p1 %build %configure ++++++ work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch ++++++ From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <ossi@users.sf.net> Date: Mon, 6 Jun 2022 11:55:37 +0200 Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL connections gmail apparently doesn't send a close notification (SSL_shutdown()) before closing the TCP socket. --- src/drv_imap.c | 7 +++++-- src/socket.c | 9 +++++++++ src/socket.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/drv_imap.c b/src/drv_imap.c index fb8d165..6286045 100644 --- a/src/drv_imap.c +++ b/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 @@ static void 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/src/socket.c b/src/socket.c index ac3c847..892cece 100644 --- a/src/socket.c +++ b/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/src/socket.h b/src/socket.h index 5b1edd0..af679aa 100644 --- a/src/socket.h +++ b/src/socket.h @@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); 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; -- 2.38.0