Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2023 02:42:15 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: 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
Message-ID:  <202302010242.3112gFQk091657@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by gshapiro:

URL: https://cgit.FreeBSD.org/src/commit/?id=6e272a78de3630a92ac6eb7b3bcda4d30738655d

commit 6e272a78de3630a92ac6eb7b3bcda4d30738655d
Author:     Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:25:39 +0000
Commit:     Gregory Neil Shapiro <gshapiro@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302010242.3112gFQk091657>