From nobody Wed Feb 1 03:27:24 2023 X-Original-To: dev-commits-src-all@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 4P66mY3H1Tz3btlX; Wed, 1 Feb 2023 03:27:25 +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 4P66mY26rwz4PWT; Wed, 1 Feb 2023 03:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222045; 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=PRSxiksauedbw4FEPtaLTTqLHVUfv7msOC/7aV9zqpw=; b=Q2Yp7oHJ1BaU4octGB/2xYzGq+L0OQcdHVXuP0fijMH62cv8QwoPLAtcJCte9kMwMUtva1 MB9WagLTYFPCerzt6aqn+553LD4meFRZ/k0VDeu7LJz81dt1hjOgmAH/PPz+UsxT+5e9vO pybI1ZzyWENzKRwOTfSvy7PfvKqTnANNL0X3PpD696xUUOg8gvxHdB+GQJzOR29Oh5wzs4 D6ghCAW5JM3gnZBHSbXF+xGzaM1UZTKVm7p8059SM/LaL/wAJHQa7GeD+AMzwLk3UTt7JG wQPwvl7YhDJ9V2ZjpLmkEWQf6W2/PEv6h+i8PwVu/iwTmyQ9nHB44BEk7j8mSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222045; 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=PRSxiksauedbw4FEPtaLTTqLHVUfv7msOC/7aV9zqpw=; b=sasWF1L0Atjkm/TC5PGWAMuGkDCKHcL2kfAoGWy0aZifSkL2ys1PPU2ZxYMONXY0zIb+Jc MemITsCLYm2sbfFdGvXrvhclrvNbBSU0JgY7/vMfNYvNBwpi9X8B7K/7zP7EkOmtBHByMy 5SDTXInr9B42taTBmuhAUPmQ7NpesM2Xa+3CTvkJxLtP8hcyoef49wEvytAXJ4pO0T7uBm soXjRKDLvNXXBIU9dAmsR9WFXc/ijfgqw/JyhkFep1Xes6px4hqyFEBxNMg9qFelBLfDFR spe+f3I+ZWRT9cAZOaN8T7DaxO6ceS2q+eMBRAnJqVOj6YI2Y27zo6rvSFUUSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222045; a=rsa-sha256; cv=none; b=ev3yDbCVmKO4gmCL/d65AQn/djCmL/efjUoHWQpRaACF74rWnfyGOhPqo8jx7I/7m96mm2 yH/pMG+pfVv4XFSoYwvwYhrvfxN6Bi+ptU13o3qzyWbYc8gNVbdGmoAGuMa4M+MZrBhEMM daGPd4setVi12SK+HSILUzq2FGY9vH35NBkNVgPXwpMinX6TlvULs4zgRRqhGje+3RXDgF XRZSmB/KfP956GL/4Mf8P3/5J+YDkOtwQRWdPEoqQsYddrHcBnAxrP2qWjOVPhxvLabiYt Gzt9Q9HEd/+8sK/eCTt2pP3Xj4olMTZTFyTIrBRZ5I98OYTREkBbabmymHrPzg== 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 4P66mY0ZVPz1DR5; Wed, 1 Feb 2023 03:27:25 +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 3113ROcw051277; Wed, 1 Feb 2023 03:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113ROQi051276; Wed, 1 Feb 2023 03:27:24 GMT (envelope-from git) Date: Wed, 1 Feb 2023 03:27:24 GMT Message-Id: <202302010327.3113ROQi051276@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: 1b51c714b007 - stable/12 - 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1b51c714b007cdaf22a58239010fb97e97377d26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=1b51c714b007cdaf22a58239010fb97e97377d26 commit 1b51c714b007cdaf22a58239010fb97e97377d26 Author: Gregory Neil Shapiro AuthorDate: 2023-01-15 21:25:39 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-02-01 03:20: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