From nobody Wed Feb 01 02:42:15 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 4P65mR4sfpz3bnZ0; Wed, 1 Feb 2023 02:42:15 +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 4P65mR3Yhhz4H2R; Wed, 1 Feb 2023 02:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675219335; 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=+euM6PPAuk3usMrF9BfoGnqAX5IonJN9E/lAnUXflN0=; b=GlpcMwUMkmCkG8UmpKUfI+OF8d2ZiDMuMwsM4Yx8yXt7I7AxvZbUoz9MHBw/Fhan0eS0IL Qm8CGAQ0ZuNZbVcZVO2DiSEiLapF8499tibcgB5RyygkPdDx8DI9UpGFSoNUaO1jyRnvL9 B9+KOUqmO8gOW/KZxEa/Y4pObXUIWq+5XStLrTva8znblKW7dtI+Dfx3/HFyT8NjYccDWB Ex7DBVNzHjNMzdjSXerfV8Nhd6/M67OUg23a9aA7E7rNNbhls6Hg28evckLZR/FrTJ2xZj X2HH1N6feaf/bAS5n+WDjjKd+JV57ecSW2i3tfm8wgpI6hOik5rTWZIdvhMLdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675219335; 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=+euM6PPAuk3usMrF9BfoGnqAX5IonJN9E/lAnUXflN0=; b=tBiNyTCHRs7KyzhsJ+KW/Rn5Rgvdr1SvaGhiOY2D0IJQiVsSnhM2hOR2l9g13Vcoq9aXGG QTDu3ih5Gg7LBzPvGsvFRK6hko5E0qR6eoXiqDok5GFwW6NXNUGvQ32wtrs7unMxVCFuGR l85H27sVbmv7vJeP95AvcbieTjbacrjhWGsaQ6cx2r79ywVLtk20okHaBoUw11A7ZtEQWv 82F02iET1W5kRCuTWptxEJ9R5BZewwlNNWVvDEYgqOwQtrotPMrKk86PHQ6ORGIyNypZCk fMZgJY4OmibxVhuwrJb4DmhLhjtwNXXjVPdIpjRoFPqg3oCiANCyrlFn7Z0EEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219335; a=rsa-sha256; cv=none; b=wwQfqw5nW8Dez50O4d7jv0DIfR1rbU44cLAhYPWLBkbLGAl6nsiXpgO0Scnz8QEZukq3Mu maBVtD0PNug7QhedJu2/x/AKgX786ljogOcMOKfYqG9s6GrvbUJKDiyrbOcfVY6EA2f/cx obeEkMrIfmuo99KkH1edj92yZewMATzR9hSR04TG0GFGNKPoBx0lCqvTFj9CcHjXPGbN+F cNwSBRRyHraWnJ0Vvt757TlRfgXXJ3n2Lqzwl1CW55T1M330sbuKHx8fgqXeripoC8oNPy rfmPdd+o54XZCxbINUt2TnzALC/6Tpef5sEcSbkk1XWqoAKGTpssEW5VZh9TGQ== 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 4P65mR2gCVz1CPh; Wed, 1 Feb 2023 02:42:15 +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 3112gFJr091658; Wed, 1 Feb 2023 02:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gFQk091657; Wed, 1 Feb 2023 02:42:15 GMT (envelope-from git) Date: Wed, 1 Feb 2023 02:42:15 GMT Message-Id: <202302010242.3112gFQk091657@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: 6e272a78de36 - stable/13 - MFC: sendmail 8.17.1 included this fix, though in a different location so removing the FreeBSD local code in favor of the vendor branch version 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/13 X-Git-Reftype: branch X-Git-Commit: 6e272a78de3630a92ac6eb7b3bcda4d30738655d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=6e272a78de3630a92ac6eb7b3bcda4d30738655d commit 6e272a78de3630a92ac6eb7b3bcda4d30738655d Author: Gregory Neil Shapiro AuthorDate: 2023-01-15 21:25:39 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-02-01 02:32:25 +0000 MFC: sendmail 8.17.1 included this fix, though in a different location so removing the FreeBSD local code in favor of the vendor branch version (cherry picked from commit f97a19ecb98541455c6c940f4bab2dc7dc425468) --- contrib/sendmail/include/sm/os/sm_os_freebsd.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/sendmail/include/sm/os/sm_os_freebsd.h b/contrib/sendmail/include/sm/os/sm_os_freebsd.h index fb00760a4301..db7dbf2b61cd 100644 --- a/contrib/sendmail/include/sm/os/sm_os_freebsd.h +++ b/contrib/sendmail/include/sm/os/sm_os_freebsd.h @@ -37,11 +37,7 @@ # define SM_CONF_SHM 1 #endif #ifndef SM_CONF_SEM -# if __FreeBSD_version >= 1200059 -# define SM_CONF_SEM 2 /* union semun is no longer declared by default */ -# else -# define SM_CONF_SEM 1 -# endif +# define SM_CONF_SEM 1 #endif #ifndef SM_CONF_MSG # define SM_CONF_MSG 1