gentoo auto-resync : 15:11:2022 - 12:52:47

5 files changed, 118 insertions, 4 deletions

diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 7ad31365a7ae..38e57d2161ab 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,4 +1,6 @@
+AUX isync-1.4.4-openssl3-eof.patch 2327 BLAKE2B 04a43877a924bc3e47af480918214fc6e22be6dd9960e597eee935f8060ec168ffbf1ad94c725ebfb862050c79eadc71b08ab11b5b8add4229ac6b1e6ccedf90 SHA512 ff530d4bedb4ae7ac415f04890b80620266565e3d3f192da6dad7411fa0cf3fafdbf3574d0aa79199dcf696435d2fe97bf974d98aa3d55ad3110a696985dc822
 DIST isync-1.4.4.tar.gz 340544 BLAKE2B fdf38b1066af10315b780897f1fe09c8f7d0b4d2202383a5f0ef24b98f11dff625bf178bbb0dc846460f661b18f923d2823bf79643d4d376b606b03980f22e18 SHA512 b769f474f2296764cabaae7e2b23e47c22714fca5919e9f1c916ed70b18c71c0bc9301fff0f64434f4f0ae28c9d16216e72556b48014ec94d1b7646de7183011
-EBUILD isync-1.4.4.ebuild 864 BLAKE2B 93f8cf4c04fa1751f8635b4b83752c09e7c5cfc83ff0a424e96b5075cb9f6a24ded98940453bab236322636c2b336798ddaeaeb32f026f7e514e3aa0c6201c76 SHA512 9e3936a502de77ed404f4d40422d670718ab5e21ddaba5b0d0c2f6613b1b613888ab47177ea8e80fe70e6cd07c253592befdc343dd0acf23528588688b839ea2
-EBUILD isync-9999.ebuild 868 BLAKE2B 5e5118b61f13a89574fbbc7372692695d3336222fc5736ee21eb203ae95e4dda229800a3d572abe704b151f0ec8d51ff36e23c3e2f666427f9a48777a1004d7c SHA512 d5718b3b271f51e6a6a02eec7bca79ac136ce67eec48e9e976e81c57bfd33d940aa3375c23cda0d0920e527a8e5e2e65a9abba9240f60d28c9685f3cf6332b4c
+EBUILD isync-1.4.4-r1.ebuild 922 BLAKE2B bfbce36c03f551bf98d5964db66124ca614f4ad798ae8a8b2d3b10a05baabbb16d6ac30f7107ab36eec29ab3b36aba0d4d87e18711ebb0525c37eae445345258 SHA512 ba8560d903d126c6ae2dddf070ec25a74aea8e5f5ce5927f56767d74602677869a7be7a3f3166a636b219a7818be88bc779c667e857d7db46849a5600c484ad9
+EBUILD isync-1.4.4.ebuild 864 BLAKE2B 42693f901dccd323052870244ba592cfc2db2ac86cb3dd2c9b1c04c4723bf39cb42e8175b42edaae25bad443fb29f7316c897df78d340aef0977222b9b50ca4b SHA512 dc727d2638e92392619e56411bde4faddf478b660c486d8e16a9b615c7d188942095906a09e14bd317bf4806ceae08eb78693c1b65c023b82db14235762094eb
+EBUILD isync-9999.ebuild 868 BLAKE2B 707855990ffe586bf8e38f7762f2313a22b2dc0aedcdde35d33051a00d7f4c3f9b6a57bf8a5552635e3ed36f6f547432d5dcec041029046e0153ff8a960bf384 SHA512 38242de2c18ea95c22ec872a3671c92a95f4cf8356a150c0c6e437edbfec6c7ca1dfcce35bc3295a7d102570c0a9107b0d180942df6593780e27869de23d1dc8
 MISC metadata.xml 377 BLAKE2B bf6ebe92478a45a3e364cdbf971f339468b87cb07f5206aa0db1e00d03bd1bfb920f1df1be8547d8d668e474de38d29ff9902e0411b816e7c7b190ba66bcb90f SHA512 030ed2e882dcc1b89eb2ecc330964636e9dc6fee7c90e64a34ffc0046f0b11a2df51d74d5869ee4728f0b6d41abe016983ce16aed6928a6a917a88fc9d68a407
diff --git a/net-mail/isync/files/isync-1.4.4-openssl3-eof.patch b/net-mail/isync/files/isync-1.4.4-openssl3-eof.patch
new file mode 100644
index 000000000000..482a11e6c50f
--- /dev/null
+++ b/net-mail/isync/files/isync-1.4.4-openssl3-eof.patch
@@ -0,0 +1,65 @@
+https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2jnr8hESp1PUW%2B6%40bulldog/#msg37731764
+https://sourceforge.net/p/isync/bugs/68/
+https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/
+
+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.
+--- 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 *******************/
+--- 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 )
+ {
+--- 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;
diff --git a/net-mail/isync/isync-1.4.4-r1.ebuild b/net-mail/isync/isync-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..2030c04369f8
--- /dev/null
+++ b/net-mail/isync/isync-1.4.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="https://isync.sourceforge.io/"
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="berkdb sasl ssl zlib"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4.2:= )
+	sasl?	( dev-libs/cyrus-sasl )
+	ssl?	( >=dev-libs/openssl-0.9.6:0= )
+	zlib?	( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl3-eof.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use berkdb || export ac_cv_berkdb4=no
+	econf \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_with zlib)
+}
diff --git a/net-mail/isync/isync-1.4.4.ebuild b/net-mail/isync/isync-1.4.4.ebuild
index 1aa6d569264a..df50151e8187 100644
--- a/net-mail/isync/isync-1.4.4.ebuild
+++ b/net-mail/isync/isync-1.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
+HOMEPAGE="https://isync.sourceforge.io/"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild
index e005efe792e4..5af1e39800aa 100644
--- a/net-mail/isync/isync-9999.ebuild
+++ b/net-mail/isync/isync-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
+HOMEPAGE="https://isync.sourceforge.io/"
 LICENSE="GPL-2"
 SLOT="0"