From nobody Thu Mar 02 07:11:05 2023 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 4PS2MF2qLzz3vxsD; Thu, 2 Mar 2023 07:11:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PS2MF2Kr7z3FbL; Thu, 2 Mar 2023 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677741065; 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=ncIMLYHPeO+u5R1TCk9KWEi+Wry5V92CwYLaqEwqR68=; b=ftOLpE2Zi5tts8+r7swu6y2suUrNqCa+zIJy+SBooqhR857X911xVcY5mq6d5nEpRx5HOV nt0O4JiX8wfjOvaih8ASPj5frqKC77MOyy68plqqhuoxIMkqOeagAsfLQODA3CrL7evkkM OYaahn128tiCvezunOEAbAiOcREyo3Audg3SP0lLwwQ9Y0IMLDrh82RsjLZ20EGyzG/2uf l+5Bg9lzZn2CfdovHWajtpqM9aVXD4CoHVqemMPNTKU2nXB7vtV8gA/JGoiJ+56zgu6i7W BUObYknRTnzHFHyOqWnwHmsBrfurgvIN8HtniE0ZBI4YZdKocpf9azG53Rpkwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677741065; 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=ncIMLYHPeO+u5R1TCk9KWEi+Wry5V92CwYLaqEwqR68=; b=ZARjFgVP7qm1VjVc0stLWyYBih4CdmVHpD2UHtyYVJkLsSupKJwYqQIURCAvFu++NB2zHj 1/H5tBbD9gMQux3E5c1pk2B8/tbMlBz2utZoCWIJaEyk4bmWClJrv0eBuAbsqxydExMK3u P1+7E4SY2P1/WjVnGo9h3RFL2C0lLbeASkJsrD+fB194dtKola5Uh1QfjHEBIEThAClSI4 1wYe7Z7WK7GjdwI3N6VRLcu0EXzZ+Sv8sLHtkqDR1puFSTMN0DlKNAdvgWAIiiBSXBXgU1 R9aGGEM7R12hapw4D8b+chSdGgmNjgT9gwatEResfl90BmLyPSqOIA6ypzNI9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677741065; a=rsa-sha256; cv=none; b=MaBEY0L3eUlmbL3tPgfOfJz3K2W2GckwQgcoTQdK0Vn4uAJ4XYQcBgw9cDODQ+RW8BKIxk If/0RHKkzpiOahsw2KgEeMfXsS7t/kDZY+gUpS7SiSRe5RPF6Yjsz40NIm0a5qFWHJBWXZ UlIE0sDwI7Br0bEbDNkTk4BYv+NQ9td/AC111J29mIHpmikH/OCtdPA6l2ayMulk3ueX3D ha72KdHONzzViyDT6cEFKJgIiW0DQZQvs3xagiotrkNRC/iPbhVtuaW973hXjlXBs3vZ0B ICi29+lSGBYfHlaa2rDEY/Xn9OaRPNZJqTWvrSunL97ruLJitn5JJKLiTTUf2Q== 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 4PS2MF1NVBz165r; Thu, 2 Mar 2023 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3227B5ux044405; Thu, 2 Mar 2023 07:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3227B509044404; Thu, 2 Mar 2023 07:11:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 07:11:05 GMT Message-Id: <202303020711.3227B509044404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: ecedfa9f1aec - main - devel/fossil: update to 2.21, fix smtp submission 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecedfa9f1aec6c3045b6c564930f09eb11d523be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecedfa9f1aec6c3045b6c564930f09eb11d523be commit ecedfa9f1aec6c3045b6c564930f09eb11d523be Author: Pietro Cerutti AuthorDate: 2023-03-02 07:08:20 +0000 Commit: Pietro Cerutti CommitDate: 2023-03-02 07:10:59 +0000 devel/fossil: update to 2.21, fix smtp submission Release notes: https://fossil-scm.org/home/doc/trunk/www/changes.wiki#v2_21 I have included a patch to fix smtp submission, from: https://fossil-scm.org/forum/forumpost/f183ab47a7beee47 --- devel/fossil/Makefile | 4 ++-- devel/fossil/distinfo | 6 +++--- devel/fossil/files/patch-smtp-ehlo | 39 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index 088eae8d682b..cdd2efdf72ad 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,7 +1,7 @@ PORTNAME= fossil -PORTVERSION= 2.20 +PORTVERSION= 2.21 DISTVERSIONPREFIX= src- -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= https://fossil-scm.org/home/tarball/version-${PORTVERSION}/ diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo index 3d0705625de5..3fb9f1b6a7d2 100644 --- a/devel/fossil/distinfo +++ b/devel/fossil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668673291 -SHA256 (fossil-src-2.20.tar.gz) = 0892ea4faa573701ca285a3d4a2d203e8abbb022affe3b1be35658845e8de721 -SIZE (fossil-src-2.20.tar.gz) = 6722255 +TIMESTAMP = 1677736990 +SHA256 (fossil-src-2.21.tar.gz) = 195faf0b20c101834a809979d0a9cdf04a0dcbae1fdabae792c9db900b73bda0 +SIZE (fossil-src-2.21.tar.gz) = 6703622 diff --git a/devel/fossil/files/patch-smtp-ehlo b/devel/fossil/files/patch-smtp-ehlo new file mode 100644 index 000000000000..eaf809fc494e --- /dev/null +++ b/devel/fossil/files/patch-smtp-ehlo @@ -0,0 +1,39 @@ +Index: src/alerts.c +================================================================== +--- src/alerts.c.orig 2023-02-25 19:23:39 UTC ++++ src/alerts.c +@@ -617,7 +617,7 @@ AlertSender *alert_sender_new(const char *zAltDest, u3 + if( zRelay ){ + u32 smtpFlags = SMTP_DIRECT; + if( mFlags & ALERT_TRACE ) smtpFlags |= SMTP_TRACE_STDOUT; +- p->pSmtp = smtp_session_new(p->zFrom, zRelay, smtpFlags); ++ p->pSmtp = smtp_session_new(smtp_domain_of_addr(p->zFrom), zRelay, smtpFlags); + smtp_client_startup(p->pSmtp); + } + } +--- src/smtp.c.orig 2023-02-25 19:23:39 UTC ++++ src/smtp.c +@@ -581,7 +581,7 @@ int smtp_send_msg( + ** The input is a base email address of the form "local@domain". + ** Return a pointer to just the "domain" part. + */ +-static const char *domainOfAddr(const char *z){ ++const char *smtp_domain_of_addr(const char *z){ + while( z[0] && z[0]!='@' ) z++; + if( z[0]==0 ) return 0; + return z+1; +@@ -625,12 +625,12 @@ void test_smtp_send(void){ + zFrom = g.argv[3]; + nTo = g.argc-4; + azTo = (const char**)g.argv+4; +- zFromDomain = domainOfAddr(zFrom); ++ zFromDomain = smtp_domain_of_addr(zFrom); + if( zRelay!=0 && zRelay[0]!= 0) { + smtpFlags |= SMTP_DIRECT; + zToDomain = zRelay; + }else{ +- zToDomain = domainOfAddr(azTo[0]); ++ zToDomain = smtp_domain_of_addr(azTo[0]); + } + p = smtp_session_new(zFromDomain, zToDomain, smtpFlags, smtpPort); + if( p->zErr ){