From nobody Sat Aug 03 08:36:11 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WbbdR6tnSz5SH4q; Sat, 03 Aug 2024 08:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WbbdR63hjz4kSj; Sat, 3 Aug 2024 08:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722674171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JSfQCzFXd8zvX3ufW6JsE07OtO0JoT93ZdBVxMTx+o=; b=B4HBPkU1YeBTevifY12p+VvU4KHbn9MqfBH4rEBDQFNUWo45C6MOIowd1xtpRKJqQY1C9P /YPmpqwzmWJgasN8l++X0YOpnhbyqgzq3ooZlsDDXbmNU5VoDwt7FvjlzvmpEGj/SHgAFS yZ4v6jUFT6wzkjN/j5YALA78THfOxtX6qvyOAAqMFe4yGLlfLvXmaJiPLrt8UlK4s1h+2l a6oUxBvvRkJoHuvDKGznVG7ugA2rLiyQpf126ZqGy3yMl1SrgCOe1UggKCEtUH+5v3UhLD ynvgK+t/IlYHjvcHV1VxSpGqAe0ZvYDE8635abUPFsu/ElmKjTIu+fMIsfM/Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722674171; a=rsa-sha256; cv=none; b=TpBa9aYhDhEdTo+caGjzMqBFt6zUwl/2Lhiuqhp5CwmHm6xMxCGplBBX3W2o2BNKQxn71N 6t4IZOsM436I7Pa+ZnyjIxPCo0erz120LpRN6gYPZNfzECxEMSB4MN+npPvCnBPd7XKwOR U8rRq9JGdARADH2EzCf6C53omVpcn+CFGXdVUkCkKVugHESAJO/S4nCqQ4MMqDMQLd7IcH uVtbPeiKw0HbNFDzouQwM1ZnbH+XsvvmkENZGFb1GHjhrqx+a6U5pzDNXtBM9tOJELFS8H 3E0HJKqIOUU85Wx4mC2qKXdCLIfjYEcnA8YzWyFDg8ZdaJyIFZx4L8uvidd9sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722674171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JSfQCzFXd8zvX3ufW6JsE07OtO0JoT93ZdBVxMTx+o=; b=abmhRRuVtHXV4bLEm5u6BSr0m7fzLT22l3IobFyprKny6YRMjn60DdKrdJlD815QBYLAz2 zn7Sb/6to81GSNC0LZPXcxZroTPTgCdJYkIr/CNiTAjY28Nx2dhw2NjuzP2livqpxbvW2F DE33RG3sjoWi/nzGevVi/59N/0D4e+I6b5tuKfBUmaBaOzFNnvgxnmqN54zebfWnGcrqi2 og2hocDgeabflx/sz685qDThecp1ODgWOoLu8mlWoAIFa0+n6zSHH6VJyseZ4HWCclPswg 666Bs0DDY1dFxsM6VyshvEJDHFLzFRgIwm6W55DafeAzQvisWwxZnMFSAaoctA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WbbdR5Z40z14TR; Sat, 3 Aug 2024 08:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4738aBQ8099279; Sat, 3 Aug 2024 08:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4738aBXL099276; Sat, 3 Aug 2024 08:36:11 GMT (envelope-from git) Date: Sat, 3 Aug 2024 08:36:11 GMT Message-Id: <202408030836.4738aBXL099276@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 48ddd4c1f6dc - main - mail/isync: Update to 1.5.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48ddd4c1f6dc083b219e34cc485feb6886f3fc73 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=48ddd4c1f6dc083b219e34cc485feb6886f3fc73 commit 48ddd4c1f6dc083b219e34cc485feb6886f3fc73 Author: Emanuel Haupt AuthorDate: 2024-08-03 08:36:04 +0000 Commit: Emanuel Haupt CommitDate: 2024-08-03 08:36:04 +0000 mail/isync: Update to 1.5.0 --- mail/isync/Makefile | 8 +++----- mail/isync/distinfo | 6 +++--- mail/isync/files/patch-src_drv__imap.c | 25 ------------------------- mail/isync/files/patch-src_socket.c | 18 ------------------ mail/isync/files/patch-src_socket.h | 10 ---------- 5 files changed, 6 insertions(+), 61 deletions(-) diff --git a/mail/isync/Makefile b/mail/isync/Makefile index b4d929ab1059..79c3b84c83ce 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -1,12 +1,11 @@ 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 @@ -18,10 +17,9 @@ 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" 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;