Date: Wed, 1 Feb 2023 03:27:28 GMT From: Gregory Neil Shapiro <gshapiro@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 46f35ff24f4b - stable/12 - Note upgrade to sendmail 8.17.1 Message-ID: <202302010327.3113RSLN051357@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=46f35ff24f4b0b17f2174bd66b039d146e32c794 commit 46f35ff24f4b0b17f2174bd66b039d146e32c794 Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org> AuthorDate: 2023-02-01 03:21:35 +0000 Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org> CommitDate: 2023-02-01 03:21:35 +0000 Note upgrade to sendmail 8.17.1 --- contrib/sendmail/FREEBSD-upgrade | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 86fb5ec554b3..d694b51ad454 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -1,6 +1,6 @@ $FreeBSD$ -sendmail 8.16.1 +sendmail 8.17.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following directories were renamed: @@ -9,26 +9,7 @@ For the import of sendmail, the following directories were renamed: Imported using the instructions at: -http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html - -Then merged using: - -% set FSVN=svn+ssh://repo.freebsd.org/base -% svn checkout $FSVN/head/contrib/sendmail head -% cd head -### Replace XXXXXX with import revision number in next command: -% svn merge -c rXXXXXX --accept=postpone '^/vendor/sendmail/dist' . -% svn resolve --accept working cf/cf/Build \ - cf/cf/generic-{bsd4.4,hpux{9,10},linux,mpeix,nextstep3.3,osf1,solaris,sunos4.1,ultrix4}.cf \ - devtools doc/op/op.ps editmap/editmap.0 mail.local/mail.local.0 mailstats/mailstats.0 \ - makemap/makemap.0 praliases/praliases.0 rmail/rmail.0 smrsh/smrsh.0 \ - src/{aliases,mailq,newaliases,sendmail}.0 vacation/vacation.0 -% svn propset -R svn:keywords FreeBSD=%H . -% svn propdel svn:keywords libmilter/docs/*.jpg -% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. -% svn status -% svn diff -% svn commit +https://docs.freebsd.org/en/articles/committers-guide/#git-primer After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf by making a minor @@ -102,4 +83,4 @@ infrastructure in FreeBSD: usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -23-July-2020 +31-January-2022
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302010327.3113RSLN051357>