From 633394ef8719b55c1726e05f02f78cd857fbd3ad Mon Sep 17 00:00:00 2001
From: Rick Mark <rick.mark@coinbase.com>
Date: Wed, 17 Mar 2021 22:51:43 -0700
Subject: [PATCH] Remove unneeded dependencies on macOS

---
 configure.ac | 13 ++-----------
 random.c     |  8 ++++----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 14c95e8126..a841a64d09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -949,7 +949,6 @@ AS_CASE(["$target_os"],
 [rhapsody*], [	],
 [darwin*], [
 		ORIG_LIBS="$LIBS"
-		RUBY_PREPEND_OPTION(LIBS, -lobjc)
 		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
 		AC_CACHE_CHECK([whether syscall(2) is deprecated], rb_cv_syscall_deprecated,
 		    [RUBY_WERROR_FLAG([
@@ -3631,16 +3630,8 @@ AS_CASE(["$target_os"],
 	],
     [darwin*], [
 	RUBY_APPEND_OPTION(CFLAGS, -pipe)
-	AC_COMPILE_IFELSE([
-	    AC_LANG_BOOL_COMPILE_TRY([@%:@include <AvailabilityMacros.h>],
-		[MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7])],
-	    [dnl
-		RUBY_APPEND_OPTION(XLDFLAGS, [-framework Security])
-		RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Security])
-	    ]dnl
-	)
-	RUBY_APPEND_OPTION(XLDFLAGS, [-framework Foundation])
-	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Foundation])
+    RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation])
+    RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation])
 	],
     [osf*], [
 	AS_IF([test "$GCC" != "yes" ], [
diff --git a/random.c b/random.c
index d68eade0c4..d7915912f6 100644
--- a/random.c
+++ b/random.c
@@ -494,15 +494,15 @@ fill_random_bytes_urandom(void *seed, size_t size)
 #endif
 
 #if 0
-#elif defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-#include <Security/SecRandom.h>
+#elif defined MAC_OS_X_VERSION_10_10 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
+#include <CommonCrypto/CommonRandom.h>
 
 static int
 fill_random_bytes_syscall(void *seed, size_t size, int unused)
 {
-    int status = SecRandomCopyBytes(kSecRandomDefault, size, seed);
+    CCRNGStatus status = CCRandomGenerateBytes(seed, size);
 
-    if (status != errSecSuccess) {
+    if (status != kCCSuccess) {
 # if 0
         CFStringRef s = SecCopyErrorMessageString(status, NULL);
         const char *m = s ? CFStringGetCStringPtr(s, kCFStringEncodingUTF8) : NULL;
-- 
2.31.0