Date: Sat, 10 Jul 2021 13:46:24 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eddd21c47f38 - main - mail/sendmail-devel: Update to 8.17.0.3 Message-ID: <202107101346.16ADkO7t008427@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=eddd21c47f3832e970c7df4e223436152af4adf5 commit eddd21c47f3832e970c7df4e223436152af4adf5 Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2021-07-10 13:46:05 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2021-07-10 13:46:05 +0000 mail/sendmail-devel: Update to 8.17.0.3 --- mail/sendmail-devel/Makefile | 4 +- mail/sendmail-devel/distinfo | 6 +-- mail/sendmail-devel/files/patch-FreeBSD | 4 +- mail/sendmail-devel/files/patch-cfhead.m4 | 4 +- mail/sendmail-devel/files/patch-daemon.c | 4 +- mail/sendmail-devel/files/patch-mail.local.8 | 4 +- mail/sendmail-devel/files/patch-mail.local.c | 60 +++++++++++------------ mail/sendmail-devel/files/site.config.m4.smtputf8 | 4 +- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index 44b69e3cfaf7..ef4ed088e7b7 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail -PORTVERSION= 8.16.0.50 -PORTREVISION= 2 +PORTVERSION= 8.17.0.3 +PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} diff --git a/mail/sendmail-devel/distinfo b/mail/sendmail-devel/distinfo index e6cf78108afc..710698af77b7 100644 --- a/mail/sendmail-devel/distinfo +++ b/mail/sendmail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1593064226 -SHA256 (sendmail.8.16.0.50.tar.gz) = ea285d3852d8dc8e6fb2db3811d40110870a7d82bce44226686bf60b0b65c8ab -SIZE (sendmail.8.16.0.50.tar.gz) = 2238269 +TIMESTAMP = 1625165055 +SHA256 (sendmail.8.17.0.3.tar.gz) = 0b8cf894784fad367babca47a99e3a490882d4241258500bb827f0439e49749e +SIZE (sendmail.8.17.0.3.tar.gz) = 2279072 diff --git a/mail/sendmail-devel/files/patch-FreeBSD b/mail/sendmail-devel/files/patch-FreeBSD index 774593e6bc7a..291926f75d3d 100644 --- a/mail/sendmail-devel/files/patch-FreeBSD +++ b/mail/sendmail-devel/files/patch-FreeBSD @@ -1,6 +1,6 @@ ---- devtools/OS/FreeBSD.orig 2014-03-05 00:59:45 UTC +--- devtools/OS/FreeBSD.orig 2021-04-05 08:49:42 UTC +++ devtools/OS/FreeBSD -@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/ +@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/Site/site.conf define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX') define(`confLIBS', `-lutil') diff --git a/mail/sendmail-devel/files/patch-cfhead.m4 b/mail/sendmail-devel/files/patch-cfhead.m4 index 8eacc7528521..de9621c1640c 100644 --- a/mail/sendmail-devel/files/patch-cfhead.m4 +++ b/mail/sendmail-devel/files/patch-cfhead.m4 @@ -1,6 +1,6 @@ ---- cf/m4/cfhead.m4.orig 2019-02-15 10:30:19 UTC +--- cf/m4/cfhead.m4.orig 2021-06-07 19:03:56 UTC +++ cf/m4/cfhead.m4 -@@ -278,7 +278,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(au +@@ -284,7 +284,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(authenticated') define(`_REC_FULL_AUTH_', `$.$?{auth_type}(user=${auth_authen} $?{auth_author}author=${auth_author} $.mech=${auth_type}') define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)') define(`_REC_END_', `for $u; $|; diff --git a/mail/sendmail-devel/files/patch-daemon.c b/mail/sendmail-devel/files/patch-daemon.c index a0a223365692..e734caee8c77 100644 --- a/mail/sendmail-devel/files/patch-daemon.c +++ b/mail/sendmail-devel/files/patch-daemon.c @@ -1,6 +1,6 @@ ---- sendmail/daemon.c.orig 2015-02-28 00:50:03 UTC +--- sendmail/daemon.c.orig 2021-06-22 08:24:43 UTC +++ sendmail/daemon.c -@@ -754,6 +754,8 @@ getrequests(e) +@@ -775,6 +775,8 @@ getrequests(e) anynet_ntoa(&RealHostAddr)); } diff --git a/mail/sendmail-devel/files/patch-mail.local.8 b/mail/sendmail-devel/files/patch-mail.local.8 index f8cbe1618c06..422b593ef7b2 100644 --- a/mail/sendmail-devel/files/patch-mail.local.8 +++ b/mail/sendmail-devel/files/patch-mail.local.8 @@ -1,4 +1,4 @@ ---- mail.local/mail.local.8.orig 2014-03-05 00:59:45 UTC +--- mail.local/mail.local.8.orig 2021-04-05 08:49:42 UTC +++ mail.local/mail.local.8 @@ -16,9 +16,9 @@ mail.local \- store mail in a mailbox @@ -38,7 +38,7 @@ .TP .BI \-r " from" Specify the sender's name (for backward compatibility). -@@ -120,7 +132,7 @@ Used to set the appropriate time zone on +@@ -120,7 +132,7 @@ Used to set the appropriate time zone on the timestamp .SH FILES .PD 0.2v .TP 2.2i diff --git a/mail/sendmail-devel/files/patch-mail.local.c b/mail/sendmail-devel/files/patch-mail.local.c index dc0870d26581..3691f145e977 100644 --- a/mail/sendmail-devel/files/patch-mail.local.c +++ b/mail/sendmail-devel/files/patch-mail.local.c @@ -1,6 +1,6 @@ ---- mail.local/mail.local.c.orig 2020-04-30 11:52:48 UTC +--- mail.local/mail.local.c.orig 2021-06-22 08:24:43 UTC +++ mail.local/mail.local.c -@@ -153,6 +153,8 @@ int ExitVal = EX_OK; /* sysexits.h error value. */ +@@ -154,6 +154,8 @@ int ExitVal = EX_OK; /* sysexits.h error value. */ bool HoldErrs = false; /* Hold errors in ErrBuf */ bool LMTPMode = false; bool BounceQuota = false; /* permanent error when over quota */ @@ -9,23 +9,23 @@ bool CloseMBDB = false; char *HomeMailFile = NULL; /* store mail in homedir */ -@@ -234,12 +236,12 @@ main(argc, argv) - sm_exit(EX_CONFIG); - } +@@ -237,12 +239,12 @@ main(argc, argv) + + /* HACK: add U to all options - this should be only for USE_EAI */ #if HASHSPOOL -- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1) -+ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsH:p:n")) != -1) +- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:nUV")) != -1) ++ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lH:p:nUV")) != -1) #else /* HASHSPOOL */ - # if _FFR_SPOOL_PATH -- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lp:")) != -1) -+ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsp:")) != -1) - # else -- while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1) -+ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1) - # endif + # if _FFR_SPOOL_PATH +- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lp:UV")) != -1) ++ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lp:UV")) != -1) + # else +- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lUV")) != -1) ++ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lUV")) != -1) + # endif #endif /* HASHSPOOL */ { -@@ -249,6 +251,10 @@ main(argc, argv) +@@ -252,6 +254,10 @@ main(argc, argv) EightBitMime = false; break; @@ -36,9 +36,9 @@ case 'b': /* bounce mail when over quota. */ BounceQuota = true; break; -@@ -342,6 +348,10 @@ main(argc, argv) +@@ -361,6 +367,10 @@ main(argc, argv) + #endif break; - #endif /* HASHSPOOL || _FFR_SPOOL_PATH */ + case 's': + NoFsync = true; @@ -47,7 +47,7 @@ case '?': default: usage(); -@@ -351,7 +361,8 @@ main(argc, argv) +@@ -370,7 +380,8 @@ main(argc, argv) argv += optind; /* initialize biff structures */ @@ -57,7 +57,7 @@ err = sm_mbdb_initialize(mbdbname); if (err != EX_OK) -@@ -1273,6 +1284,7 @@ tryagain: +@@ -1300,6 +1311,7 @@ tryagain: /* Get the starting offset of the new message */ curoff = lseek(mbfd, (off_t) 0, SEEK_END); @@ -65,16 +65,16 @@ (void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n", name, (LONGLONG_T) curoff); -@@ -1335,7 +1347,7 @@ tryagain: +@@ -1362,7 +1374,7 @@ tryagain: } /* Flush to disk, don't wait for update. */ - if (fsync(mbfd) < 0) + if (!NoFsync && fsync(mbfd) < 0) { - mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno)); + mailerr("450 4.2.0", "Sync %s: %s", path, sm_errstring(errno)); err3: -@@ -1402,7 +1414,7 @@ err0: (void) setreuid(0, 0); +@@ -1433,7 +1445,7 @@ err0: /* Attempt to truncate back to pre-write size */ goto err3; } @@ -82,16 +82,16 @@ + else if (!NoBiff) notifybiff(biffmsg); - if (setreuid(0, 0) < 0) -@@ -1582,9 +1594,9 @@ usage() - { + if ( +@@ -1618,9 +1630,9 @@ usage() ExitVal = EX_USAGE; - # if _FFR_SPOOL_PATH + /* XXX add U to options for USE_EAI */ + #if _FFR_SPOOL_PATH - mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] [-p path] user ..."); -+ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] [-p path] user ..."); - # else ++ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-f from|-r from] [-h filename] [-p path] user ..."); + #else - mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ..."); -+ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ..."); - # endif ++ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-f from|-r from] [-h filename] user ..."); + #endif sm_exit(ExitVal); } diff --git a/mail/sendmail-devel/files/site.config.m4.smtputf8 b/mail/sendmail-devel/files/site.config.m4.smtputf8 index 0668f6dfb941..e4a517848db3 100644 --- a/mail/sendmail-devel/files/site.config.m4.smtputf8 +++ b/mail/sendmail-devel/files/site.config.m4.smtputf8 @@ -1,2 +1,2 @@ -APPENDDEF(`confLIBS', `-licui18n -licuuc -licudata') -APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_EAI') +APPENDDEF(`confLIBS', `-licuuc') +APPENDDEF(`confENVDEF',`-DUSE_EAI')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107101346.16ADkO7t008427>