CVS commit: pkgsrc/mail/isync

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat May 13 08:49:27 UTC 2023

Modified Files:
        pkgsrc/mail/isync: Makefile distinfo
Added Files:
        pkgsrc/mail/isync/patches: patch-src_drv__imap.c patch-src_socket.c
            patch-src_socket.h

Log Message:
isync: Fix runtime error with OpenSSL 3.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mail/isync/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/isync/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/mail/isync/patches/patch-src_drv__imap.c
cvs rdiff -u -r0 -r1.8 pkgsrc/mail/isync/patches/patch-src_socket.c
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/isync/patches/patch-src_socket.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/isync/Makefile
diff -u pkgsrc/mail/isync/Makefile:1.55 pkgsrc/mail/isync/Makefile:1.56
--- pkgsrc/mail/isync/Makefile:1.55     Tue Jun 28 11:34:21 2022
+++ pkgsrc/mail/isync/Makefile  Sat May 13 08:49:27 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2022/06/28 11:34:21 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2023/05/13 08:49:27 ryoon Exp $
 
 DISTNAME=      isync-1.4.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
 

Index: pkgsrc/mail/isync/distinfo
diff -u pkgsrc/mail/isync/distinfo:1.25 pkgsrc/mail/isync/distinfo:1.26
--- pkgsrc/mail/isync/distinfo:1.25     Fri Dec  3 11:42:39 2021
+++ pkgsrc/mail/isync/distinfo  Sat May 13 08:49:27 2023
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.25 2021/12/03 11:42:39 wiz Exp $
+$NetBSD: distinfo,v 1.26 2023/05/13 08:49:27 ryoon Exp $
 
 BLAKE2s (isync-1.4.4.tar.gz) = 50e873ff3d213b137b125ad0b8aca5774ee921867fb8c5481ffec5e5f45f51ca
 SHA512 (isync-1.4.4.tar.gz) = b769f474f2296764cabaae7e2b23e47c22714fca5919e9f1c916ed70b18c71c0bc9301fff0f64434f4f0ae28c9d16216e72556b48014ec94d1b7646de7183011
 Size (isync-1.4.4.tar.gz) = 340544 bytes
 SHA1 (patch-ae) = a3bdbdd05e32474bf76f8110561bdcea9b72b0c3
 SHA1 (patch-src_Makefile.in) = b989a7627dbb7c989dd26c3e20beeceb000a7a47
+SHA1 (patch-src_drv__imap.c) = cf838ac77a3c1e50311e2e00d78028c50689a0b3
+SHA1 (patch-src_socket.c) = 0397c9f41a4140d674761bd9fd1f57239120b6e1
+SHA1 (patch-src_socket.h) = d52684ebe95f085d11f8f30d442f06691b1d8315

Added files:

Index: pkgsrc/mail/isync/patches/patch-src_drv__imap.c
diff -u /dev/null pkgsrc/mail/isync/patches/patch-src_drv__imap.c:1.4
--- /dev/null   Sat May 13 08:49:27 2023
+++ pkgsrc/mail/isync/patches/patch-src_drv__imap.c     Sat May 13 08:49:27 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_drv__imap.c,v 1.4 2023/05/13 08:49:27 ryoon Exp $
+
+Fix non-critical runtime error with OpenSSL 3.
+From: Upstream b6c36624f04cd388873785c0631df3f2f9ac4bf0
+
+--- src/drv_imap.c.orig        2021-12-03 10:56:16.000000000 +0000
++++ 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 *******************/

Index: pkgsrc/mail/isync/patches/patch-src_socket.c
diff -u /dev/null pkgsrc/mail/isync/patches/patch-src_socket.c:1.8
--- /dev/null   Sat May 13 08:49:27 2023
+++ pkgsrc/mail/isync/patches/patch-src_socket.c        Sat May 13 08:49:27 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_socket.c,v 1.8 2023/05/13 08:49:27 ryoon Exp $
+
+Fix non-critical runtime error with OpenSSL 3.
+From: Upstream b6c36624f04cd388873785c0631df3f2f9ac4bf0
+
+--- src/socket.c.orig  2021-12-03 10:56:16.000000000 +0000
++++ src/socket.c
+@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, in
+               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 )
+ {

Index: pkgsrc/mail/isync/patches/patch-src_socket.h
diff -u /dev/null pkgsrc/mail/isync/patches/patch-src_socket.h:1.1
--- /dev/null   Sat May 13 08:49:27 2023
+++ pkgsrc/mail/isync/patches/patch-src_socket.h        Sat May 13 08:49:27 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_socket.h,v 1.1 2023/05/13 08:49:27 ryoon Exp $
+
+Fix non-critical runtime error with OpenSSL 3.
+From: Upstream b6c36624f04cd388873785c0631df3f2f9ac4bf0
+
+--- src/socket.h.orig  2021-12-03 10:56:16.000000000 +0000
++++ src/socket.h
+@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void
+ 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;