git: ecedfa9f1aec - main - devel/fossil: update to 2.21, fix smtp submission

From: Pietro Cerutti <gahr_at_FreeBSD.org>
Date: Thu, 02 Mar 2023 07:11:05 UTC
The branch main has been updated by gahr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ecedfa9f1aec6c3045b6c564930f09eb11d523be

commit ecedfa9f1aec6c3045b6c564930f09eb11d523be
Author:     Pietro Cerutti <gahr@FreeBSD.org>
AuthorDate: 2023-03-02 07:08:20 +0000
Commit:     Pietro Cerutti <gahr@FreeBSD.org>
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 ){