diff --git a/Makefile b/Makefile index 7b5ac542dad4..f0ad54f8fe5e 100644 --- a/Makefile +++ b/Makefile @@ -316,9 +316,8 @@ endif ifeq ("$(OS)","darwin") # Set the minimum version for macOS builds for Go, Rust and Xcode builds. -# Note the minimum version for Apple silicon (ARM64) is 11.0 and will be automatically -# clamped to the value for builds of that architecture -MINIMUM_SUPPORTED_MACOS_VERSION = 10.15 +# (as of Go 1.23 we require macOS 11) +MINIMUM_SUPPORTED_MACOS_VERSION = 11.0 MACOSX_VERSION_MIN_FLAG = -mmacosx-version-min=$(MINIMUM_SUPPORTED_MACOS_VERSION) # Go diff --git a/build.assets/build-fido2-macos.sh b/build.assets/build-fido2-macos.sh index a74d5a9b1019..6291b0abdf4b 100755 --- a/build.assets/build-fido2-macos.sh +++ b/build.assets/build-fido2-macos.sh @@ -11,7 +11,7 @@ # Written mainly for macOS builders. set -eu -readonly MACOS_VERSION_MIN=10.15 +readonly MACOS_VERSION_MIN=11.0 # Cross-architecture building # Set C_ARCH to $(uname -m) if unset, and validate supported architecture diff --git a/build.assets/macos/tctl/tctl.app/Contents/Info.plist b/build.assets/macos/tctl/tctl.app/Contents/Info.plist index bfb71f81bd53..8efa60cb751f 100644 --- a/build.assets/macos/tctl/tctl.app/Contents/Info.plist +++ b/build.assets/macos/tctl/tctl.app/Contents/Info.plist @@ -43,7 +43,7 @@ DTXcodeBuild 13C100 LSMinimumSystemVersion - 10.15.0 + 11.0.0 NSHumanReadableCopyright NSMainStoryboardFile diff --git a/build.assets/macos/tctldev/tctl.app/Contents/Info.plist b/build.assets/macos/tctldev/tctl.app/Contents/Info.plist index c9bd3e9c1812..62628f2618d7 100644 --- a/build.assets/macos/tctldev/tctl.app/Contents/Info.plist +++ b/build.assets/macos/tctldev/tctl.app/Contents/Info.plist @@ -41,7 +41,7 @@ DTXcodeBuild 13C100 LSMinimumSystemVersion - 10.15.0 + 11.0.0 NSHumanReadableCopyright NSMainStoryboardFile diff --git a/build.assets/macos/tsh/tsh.app/Contents/Info.plist b/build.assets/macos/tsh/tsh.app/Contents/Info.plist index ae95535403cb..97ae953de635 100644 --- a/build.assets/macos/tsh/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tsh/tsh.app/Contents/Info.plist @@ -43,7 +43,7 @@ DTXcodeBuild 13C100 LSMinimumSystemVersion - 10.15.0 + 11.0.0 NSHumanReadableCopyright NSMainStoryboardFile diff --git a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist index 5417165e676c..f8ed424da183 100644 --- a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist @@ -41,7 +41,7 @@ DTXcodeBuild 13C100 LSMinimumSystemVersion - 10.15.0 + 11.0.0 NSHumanReadableCopyright NSMainStoryboardFile diff --git a/docs/pages/admin-guides/access-controls/guides/passwordless.mdx b/docs/pages/admin-guides/access-controls/guides/passwordless.mdx index ee373a1215fd..1ece97815ff4 100644 --- a/docs/pages/admin-guides/access-controls/guides/passwordless.mdx +++ b/docs/pages/admin-guides/access-controls/guides/passwordless.mdx @@ -224,8 +224,7 @@ necessary udev rules. If you are having trouble with Touch ID, make sure that you are using the latest standalone version of `tsh`. [Download the macOS tsh installer](../../../installation.mdx). -Touch ID support requires Macs with a Touch ID sensor and Secure Enclave. It also -requires macOS >= 10.15 (macOS Catalina). +Touch ID support requires Macs with a Touch ID sensor and Secure Enclave. You can run the `tsh touchid diag` command to verify requirements. A capable device and `tsh` binary should show an output similar to the one below: diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index b052d91acd26..04bf75264595 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -34,7 +34,7 @@ running Teleport on UNIX variants other than Linux \[1]. | Operating System | `teleport` Daemon | `tctl` Admin Tool | `tsh` and Teleport Connect User Clients [2] | Web UI (via the browser) | `tbot` Daemon | | - | - | - | - | - | - | | Linux v2.6.23+ (RHEL/CentOS 7+, Amazon Linux 2+, Amazon Linux 2023+, Ubuntu 16.04+, Debian 9+, SLES 12 SP 5+, and SLES 15 SP 5+) \[3] | yes | yes | yes | yes | yes | -| macOS v10.15+ (Catalina)| yes | yes | yes | yes | yes | +| macOS 11+ (Big Sur)| yes | yes | yes | yes | yes | | Windows 10+ (rev. 1607) \[4] | no | yes | yes | yes | no | \[1] *Teleport is written in Go and many of these system requirements are due to the requirements @@ -854,4 +854,3 @@ infrastructure. Get started with: - [Application Access](enroll-resources/application-access/introduction.mdx) - [Desktop Access](enroll-resources/desktop-access/introduction.mdx) - [Machine ID](enroll-resources/machine-id/introduction.mdx) - diff --git a/e b/e index 00e171b167c5..5023849437ef 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 00e171b167c5fbb967ae3243eda3079542bbfec3 +Subproject commit 5023849437efc896368000075405b75c11d98d15 diff --git a/lib/auth/touchid/api_darwin.go b/lib/auth/touchid/api_darwin.go index 7990a03c9b78..a7ac71653a86 100644 --- a/lib/auth/touchid/api_darwin.go +++ b/lib/auth/touchid/api_darwin.go @@ -21,7 +21,7 @@ package touchid -// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=10.15 +// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=11.0 // #cgo LDFLAGS: -framework CoreFoundation -framework Foundation -framework LocalAuthentication -framework Security // #include // #include "authenticate.h" diff --git a/lib/devicetrust/native/device_darwin.go b/lib/devicetrust/native/device_darwin.go index d64fd43da2b8..9167b567aec9 100644 --- a/lib/devicetrust/native/device_darwin.go +++ b/lib/devicetrust/native/device_darwin.go @@ -18,7 +18,7 @@ package native -// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=10.15 +// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=11.0 // #cgo LDFLAGS: -framework CoreFoundation -framework Foundation -framework IOKit -framework Security // #include // #include diff --git a/lib/vnet/daemon/common_darwin.go b/lib/vnet/daemon/common_darwin.go index 1daae730aa9a..b3f50add2b3c 100644 --- a/lib/vnet/daemon/common_darwin.go +++ b/lib/vnet/daemon/common_darwin.go @@ -19,7 +19,7 @@ package daemon -// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=10.15 +// #cgo CFLAGS: -Wall -xobjective-c -fblocks -fobjc-arc -mmacosx-version-min=11.0 // #cgo LDFLAGS: -framework Foundation -framework ServiceManagement // #include "common_darwin.h" import "C" diff --git a/lib/web/scripts/node-join/README.md b/lib/web/scripts/node-join/README.md index d3c4f020b810..4f06563fa1a3 100644 --- a/lib/web/scripts/node-join/README.md +++ b/lib/web/scripts/node-join/README.md @@ -45,7 +45,7 @@ Things it doesn't do (yet): - Architectures - x86_64 - aarch64 - - MacOS 10.15+ + - macOS 11.0+ - uses `.tar.gz` tarball package ## Arguments