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
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Feb 2023 03:27:24 UTC
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b51c714b007cdaf22a58239010fb97e97377d26
commit 1b51c714b007cdaf22a58239010fb97e97377d26
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 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