From nobody Sun Jan 15 21:27:37 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 4Nw7Xp2xZYz2shGZ; Sun, 15 Jan 2023 21:27:38 +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 4Nw7Xn705mz43d8; Sun, 15 Jan 2023 21:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673818058; 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=unVLvNeg2gkUlGS5GhL53lFsR+IywCEHdWhK5368LYs=; b=j7IkHk7YLT3YVt0rzgMCksSp5jCC1dxm+DIpqQRwSiiaB+SLNHRiP7YFaA5x67xEN9Bl0T 0A0w0Lx9pWLQB79zVeOsaAg/dH5rKcsAszldTHIvj/rRubs1abrhT+JoHDkHInbdbyc2Q6 wnxar3yy5CLjiW74yaGtaKSSlqSAbL/IQ8EUgFXSaEZHBTn0o6MgapblfT12s3YRbzFRtb zIj2pwNIa7R33c34D4inu5ctOOkQ47X45T2s1NGhld1GNM2L0ByT2ePL0JpH7z2cIA9C59 MaNZltPz1iDwox+/TPyaqf8tKxZDkZAzRLSpSh1nH0vjMERz97PL8hGV/Ty+rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673818058; 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=unVLvNeg2gkUlGS5GhL53lFsR+IywCEHdWhK5368LYs=; b=goaFUoE2dhJQnI2SrvZw0zGRPnn7tFXgOCT3YkhQWbtlhRvWbUMdtTqF2pIRbLQwzvM+d/ XaSkV7YGLsv8MMiyJdKrjKStWrtePjAIPAyrI9RIYJpSAnUk1Qj++UqOPTg/KgXDpEZClk ZGdtuTFcJ0efxqxCOkzQNQrKBhRRYe2D2FtAVKU6bLuTj4MT8VuNiHaFbvs3PrX+yv7Yvk GdhaYYAlUBu0aIP9AzVQhPtXqEkes9ebAIi4/Fm7A4gvtNp48h0aVSwD9qzzLMYi0F/RML PULTal8LYsxAtQfMvP6OiB114fAToHkhNw/CjWTPVrJWgyWhT+g2JCbQVBknsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673818058; a=rsa-sha256; cv=none; b=JmDFKqmSqU15IbPKGjzk8QVGu6uPAl2cuX3BPR5JLEgoihjw5zo3B38EZyrFPpn/CBmvDd pT3cifdgaZi7oWnmyvrk5v+D3fWIiMg/q8CtQtB+TNBHEmIZM7QR2qEBnNRvmHqiLmBRP8 Y+UdqNb50Bca9uZqb70GitmGYG7vr59Vp2dxQBKLwrz4xuYpJl3pEJtAVTb8u+iE9Rf51p WuFRSL7NIW4g9pgUI/9kby9pQ3F32y1cVF794N6Lj1p4XZGfLNlS8oqFIvW0Ze9GvOU1wY O33UmEtVA2i4MiTakz9gg9t78B/QyETrh1+oj/ydRP80EYUZKvCxd5/nZ6giWw== 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 4Nw7Xn61VWzhd0; Sun, 15 Jan 2023 21:27:37 +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 30FLRbI0074546; Sun, 15 Jan 2023 21:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FLRb5b074545; Sun, 15 Jan 2023 21:27:37 GMT (envelope-from git) Date: Sun, 15 Jan 2023 21:27:37 GMT Message-Id: <202301152127.30FLRb5b074545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: f97a19ecb985 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f97a19ecb98541455c6c940f4bab2dc7dc425468 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=f97a19ecb98541455c6c940f4bab2dc7dc425468 commit f97a19ecb98541455c6c940f4bab2dc7dc425468 Author: Gregory Neil Shapiro AuthorDate: 2023-01-15 21:25:39 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-01-15 21:25:39 +0000 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 --- 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