From nobody Wed Feb 1 03:27:28 2023 X-Original-To: dev-commits-src-branches@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 4P66md1gttz3btln; Wed, 1 Feb 2023 03:27:29 +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 4P66mc5Z99z4PQ9; Wed, 1 Feb 2023 03:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222048; 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=r56twDlLG3K/+bU4DgxdBxzvmMMbmzrkFaKSTnNZBiU=; b=RwAd+f0OEiVZzZWjzE5h2O1yBfAGLZQZCS/L8mpvRv0ItB3tmK7DguOnHnttME2fDAOKR0 QBSXmApHey/QOebdxVT3ZKZx1RG0byUe0GW/NT2ckFyQnyNFNJCc0P/r/QcJTtwjucATN8 itpwYq8LqaYraWWLhHFfOywKD4TwZqAfqtmWG9MkCqU0vx+Ai26VFx2nreGpDejrGLUf+3 dfj+Xv8JN/tOnU7fcCMPoRW4bDMjOWDiBlkqUfovn1+0VVS4H/YvT9cTy2bQes86PQpJkY viC0G2oRlEiNbX1hR2BPaeG/d2FVLup1NjF0AOBHtKkB6m9rXiBfMmM9SuRxaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222048; 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=r56twDlLG3K/+bU4DgxdBxzvmMMbmzrkFaKSTnNZBiU=; b=UquBQs45boUHqVDCZZb7D43wwJDylGTZADXWYTZJYf7WdsvEgS3gCyXWHuP8+mYCwrc04g uMYns/DUaE0z1avelngsYDbCAD+GCigEDJJOApnU8dFjkH2adTEUmghKOGnB/raPdqw1wP HJO2VGw1+h3g/D3+H7CZIFmhX7PFAyvRY33L3jb8uy5J8RJWTVEQ3AfLtNKAXFUqniP9ee 688PXo+F4IMi6XJKLvokZItFu6WtrBAQnUyq1qtvuDZmyyz8YN7wuMxdIYjZfw5HioN4zp +ayC/FVlex/U0rHE+Ym+rUcrWoKiCnfISFhTKUQhkEabxXkitV/93hYOs3jDNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222048; a=rsa-sha256; cv=none; b=Sw6hYKuEDTi60pnI3oDR5GcxuklyZFJC56WNKAmeFAG273b5bg6JY2NGHbpREiRiXElEjb +/NdBMED17FFnl9AAI9ufct062Gtk1mYVvyksL1cxUeGxf4u0CZFWkZPmB9PHxUgw72rrJ +RSkyIgL4029mtDw9a2QaENaR6XP7gn37GJt16UYWgUdW0X/rDBkZXUJKYneBcUWHMSlvN qkwo2kfNzxcIPrr0CCUKH/5MfawTX8hV17xoTLQERVMy5/18syiEjzuIjwYAI/fXOMgiYH F4oBI5p1X7kJjmmvVZu4RnYtV3F9YZ1x8sEvSm70eAO0N6yRQL0AbKD6nC5e8g== 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 4P66mc3JlLz1DCB; Wed, 1 Feb 2023 03:27:28 +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 3113RS2o051358; Wed, 1 Feb 2023 03:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RSLN051357; Wed, 1 Feb 2023 03:27:28 GMT (envelope-from git) Date: Wed, 1 Feb 2023 03:27:28 GMT Message-Id: <202302010327.3113RSLN051357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 46f35ff24f4b - stable/12 - Note upgrade to sendmail 8.17.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 46f35ff24f4b0b17f2174bd66b039d146e32c794 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=46f35ff24f4b0b17f2174bd66b039d146e32c794 commit 46f35ff24f4b0b17f2174bd66b039d146e32c794 Author: Gregory Neil Shapiro AuthorDate: 2023-02-01 03:21:35 +0000 Commit: Gregory Neil Shapiro 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