Mac OS X -> macOS

diff --git a/INSTALL.configure b/INSTALL.configure
index 81fd332cef8812df383d283d3f16cad10ff10f42..a1b253cfeac348eeb91bdaf55c08129f77368013 100644 (file)
--- a/INSTALL.configure
+++ b/INSTALL.configure
@@ -124,7 +124,7 @@ architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
-   On MacOS X 10.5 and later systems, you can create libraries and
+   On macOS 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
 "universal" binaries--by specifying multiple `-arch' options to the
 compiler but only a single `-arch' option to the preprocessor.  Like

diff --git a/configure.ac b/configure.ac
index be36a6b6eaf5ddb51748dd3fbd0a43d82f2089a6..83a6dd3aa8605a77c2ccb21cc49895ec3fc613ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3239,7 +3239,7 @@ if test ${with_pam-"no"} != "no"; then
     found_pam_lib=no
     AC_CHECK_LIB(pam, pam_start, [found_pam_lib=yes], [], [$lt_cv_dlopen_libs])
     #
-    # Some PAM implementations (MacOS X for example) put the PAM headers
+    # Some PAM implementations (macOS for example) put the PAM headers
     # in /usr/include/pam instead of /usr/include/security...
     #
     found_pam_hdrs=no

diff --git a/doc/sudo_plugin.cat b/doc/sudo_plugin.cat
index 48f7bd3caa14fc9805cb3adff4f3c084743e6b25..0bb30f2ec460d3f2e6f82e07232ba9226f0d5d95 100644 (file)
--- a/doc/sudo_plugin.cat
+++ b/doc/sudo_plugin.cat
@@ -493,8 +493,8 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                        support the automatic restarting of system calls.
                        Unfortunately, not all operating systems do this by
                        default, and even those that do may have bugs.  For
-                       example, Mac OS X fails to restart the t\btc\bcg\bge\bet\bta\bat\btt\btr\br() and
-                       t\btc\bcs\bse\bet\bta\bat\btt\btr\br() system calls (this is a bug in Mac OS X).
+                       example, macOS fails to restart the t\btc\bcg\bge\bet\bta\bat\btt\btr\br() and
+                       t\btc\bcs\bse\bet\bta\bat\btt\btr\br() system calls (this is a bug in macOS).
                        Furthermore, because this behavior depends on the
                        command stopping with the SIGTTIN or SIGTTOU signals,
                        programs that catch these signals and suspend
@@ -1592,4 +1592,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.20                    February 16, 2017                   Sudo 1.8.20
+Sudo 1.8.21                      June 2, 2017                      Sudo 1.8.21

diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in
index 7f40ff0df9369ea4dd463b8e9d65108d4ed65f29..4e169fcccba6e1ba27e2365c40cd26b2b82c4d05 100644 (file)
--- a/doc/sudo_plugin.man.in
+++ b/doc/sudo_plugin.man.in
@@ -16,7 +16,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH "SUDO_PLUGIN" "5" "February 16, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDO_PLUGIN" "5" "June 2, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -866,11 +866,11 @@ For this to work seamlessly, the operating system must support the
 automatic restarting of system calls.
 Unfortunately, not all operating systems do this by default,
 and even those that do may have bugs.
-For example, Mac OS X fails to restart the
+For example, macOS fails to restart the
 \fBtcgetattr\fR()
 and
 \fBtcsetattr\fR()
-system calls (this is a bug in Mac OS X).
+system calls (this is a bug in macOS).
 Furthermore, because this behavior depends on the command stopping with the
 \fRSIGTTIN\fR
 or

diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in
index 16c15b1fbde14b73e991b9a6c7e76f377f1ca268..285ca6e556e1d9ac97ad734f8777c98f383eee9c 100644 (file)
--- a/doc/sudo_plugin.mdoc.in
+++ b/doc/sudo_plugin.mdoc.in
@@ -14,7 +14,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2017
+.Dd June 2, 2017
 .Dt SUDO_PLUGIN @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -768,11 +768,11 @@ For this to work seamlessly, the operating system must support the
 automatic restarting of system calls.
 Unfortunately, not all operating systems do this by default,
 and even those that do may have bugs.
-For example, Mac OS X fails to restart the
+For example, macOS fails to restart the
 .Fn tcgetattr
 and
 .Fn tcsetattr
-system calls (this is a bug in Mac OS X).
+system calls (this is a bug in macOS).
 Furthermore, because this behavior depends on the command stopping with the
 .Dv SIGTTIN
 or

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index a2f04de40767f51e71c8d08393699e35528cf3cf..990b33e7dacd4d9479946562f67413fd32209b65 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -985,8 +985,8 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        support the automatic restarting of system calls.
                        Unfortunately, not all operating systems do this by
                        default, and even those that do may have bugs.  For
-                       example, Mac OS X fails to restart the t\btc\bcg\bge\bet\bta\bat\btt\btr\br() and
-                       t\btc\bcs\bse\bet\bta\bat\btt\btr\br() system calls (this is a bug in Mac OS X).
+                       example, macOS fails to restart the t\btc\bcg\bge\bet\bta\bat\btt\btr\br() and
+                       t\btc\bcs\bse\bet\bta\bat\btt\btr\br() system calls (this is a bug in macOS).
                        Furthermore, because this behavior depends on the
                        command stopping with the SIGTTIN or SIGTTOU signals,
                        programs that catch these signals and suspend
@@ -1095,8 +1095,8 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        a command may only be run after the audit event is
                        successfully written.  This flag is only effective on
                        systems for which s\bsu\bud\bdo\boe\ber\brs\bs supports audit logging,
-                       including FreeBSD, Linux, Mac OS X and Solaris.  This
-                       flag is _\bo_\bn by default.
+                       including FreeBSD, Linux, macOS and Solaris.  This flag
+                       is _\bo_\bn by default.
 
      ignore_dot        If set, s\bsu\bud\bdo\bo will ignore "." or "" (both denoting
                        current directory) in the PATH environment variable;
@@ -2610,7 +2610,7 @@ S\bSE\bEC\bCU\bUR\bRI\bIT\bTY\bY N\bNO\bOT\bTE\bES\bS
                affected.
 
                The _\bn_\bo_\be_\bx_\be_\bc feature is known to work on SunOS, Solaris, *BSD,
-               Linux, IRIX, Tru64 UNIX, MacOS X, HP-UX 11.x and AIX 5.3 and
+               Linux, IRIX, Tru64 UNIX, macOS, HP-UX 11.x and AIX 5.3 and
                above.  It should be supported on most operating systems that
                support the LD_PRELOAD environment variable.  Check your
                operating system's manual pages for the dynamic linker (usually
@@ -2817,4 +2817,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.20                      May 10, 2017                      Sudo 1.8.20
+Sudo 1.8.21                      June 2, 2017                      Sudo 1.8.21

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 97d71c60d96e7903f1872cff41343f81d41a2eb8..3f097f2eeed76d7ce829fcbb062ecbb8b3fb12ac 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "SUDOERS" "5" "May 10, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "June 2, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -2090,11 +2090,11 @@ For this to work seamlessly, the operating system must support the
 automatic restarting of system calls.
 Unfortunately, not all operating systems do this by default,
 and even those that do may have bugs.
-For example, Mac OS X fails to restart the
+For example, macOS fails to restart the
 \fBtcgetattr\fR()
 and
 \fBtcsetattr\fR()
-system calls (this is a bug in Mac OS X).
+system calls (this is a bug in macOS).
 Furthermore, because this behavior depends on the command stopping with the
 \fRSIGTTIN\fR
 or
@@ -2319,7 +2319,7 @@ If disabled, a command may only be run after the audit event is successfully
 written.
 This flag is only effective on systems for which
 \fBsudoers\fR
-supports audit logging, including FreeBSD, Linux, Mac OS X and Solaris.
+supports audit logging, including FreeBSD, Linux, macOS and Solaris.
 This flag is
 \fIon\fR
 by default.
@@ -5202,7 +5202,7 @@ running under binary emulation are not affected.
 The
 \fInoexec\fR
 feature is known to work on SunOS, Solaris, *BSD,
-Linux, IRIX, Tru64 UNIX, MacOS X, HP-UX 11.x and AIX 5.3 and above.
+Linux, IRIX, Tru64 UNIX, macOS, HP-UX 11.x and AIX 5.3 and above.
 It should be supported on most operating systems that support the
 \fRLD_PRELOAD\fR
 environment variable.

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 8dbd4db81a0be2b319f088760133a07489054641..d3245e2eb70da98b30602df184f30d328ab57821 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd May 10, 2017
+.Dd June 2, 2017
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -1957,11 +1957,11 @@ For this to work seamlessly, the operating system must support the
 automatic restarting of system calls.
 Unfortunately, not all operating systems do this by default,
 and even those that do may have bugs.
-For example, Mac OS X fails to restart the
+For example, macOS fails to restart the
 .Fn tcgetattr
 and
 .Fn tcsetattr
-system calls (this is a bug in Mac OS X).
+system calls (this is a bug in macOS).
 Furthermore, because this behavior depends on the command stopping with the
 .Dv SIGTTIN
 or
@@ -2179,7 +2179,7 @@ If disabled, a command may only be run after the audit event is successfully
 written.
 This flag is only effective on systems for which
 .Nm
-supports audit logging, including FreeBSD, Linux, Mac OS X and Solaris.
+supports audit logging, including FreeBSD, Linux, macOS and Solaris.
 This flag is
 .Em on
 by default.
@@ -4809,7 +4809,7 @@ running under binary emulation are not affected.
 The
 .Em noexec
 feature is known to work on SunOS, Solaris, *BSD,
-Linux, IRIX, Tru64 UNIX, MacOS X, HP-UX 11.x and AIX 5.3 and above.
+Linux, IRIX, Tru64 UNIX, macOS, HP-UX 11.x and AIX 5.3 and above.
 It should be supported on most operating systems that support the
 .Ev LD_PRELOAD
 environment variable.

diff --git a/mkpkg b/mkpkg
index 43ca7f15a66992caf096a3291b72fe2c9ecc227b..9a6535e31daacf481e7b359e7a75bb288dbc011e 100755 (executable)
--- a/mkpkg
+++ b/mkpkg
@@ -97,7 +97,7 @@ if make --version 2>&1 | grep GNU >/dev/null; then
     NJOBS=0
     case "`uname`" in
        Darwin)
-           # Mac OS X
+           # macOS
            NJOBS=`sysctl -n hw.ncpu`
            ;;
        Linux)

diff --git a/sudo.pp b/sudo.pp
index bd08d101c2d64b822fe46e8603e2333d3e3824d7..d56c92f15bbc977257b1c5833fed47d8977b50c3 100644 (file)
--- a/sudo.pp
+++ b/sudo.pp
@@ -40,7 +40,7 @@ still allow people to get their work done."
 %endif
 
 %if [macos]
-       # System Integrity Protection on Mac OS X won't allow us to write
+       # System Integrity Protection on macOS won't allow us to write
        # directly to /etc or /var.  We must install in /private instead.
        case "$sudoersdir" in
        /etc|/etc/*)