From 08b04e62d80cc71bd2c7a04d1a7f0702279f4ff4 Mon Sep 17 00:00:00 2001
From: Lightmann <lightmanns11@gmail.com>
Date: Sat, 24 Jun 2023 12:14:33 -0400
Subject: [PATCH 1/2] Switch to NoisyFlake oslog

---
 makefiles/oslog.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/makefiles/oslog.mk b/makefiles/oslog.mk
index d3242bb56a..57e6927bc0 100644
--- a/makefiles/oslog.mk
+++ b/makefiles/oslog.mk
@@ -5,12 +5,13 @@ endif
 ifeq (,$(findstring darwin,$(MEMO_TARGET)))
 
 SUBPROJECTS   += oslog
-OSLOG_VERSION := 0.0.1
+OSLOG_VERSION := 0.0.4.3
 DEB_OSLOG_V   ?= $(OSLOG_VERSION)
 
 oslog-setup: setup
-	$(call GITHUB_ARCHIVE,dlevi309,oslog,$(OSLOG_VERSION),v$(OSLOG_VERSION))
+	$(call GITHUB_ARCHIVE,NoisyFlake,oslog,$(OSLOG_VERSION),v$(OSLOG_VERSION))
 	$(call EXTRACT_TAR,oslog-$(OSLOG_VERSION).tar.gz,oslog-$(OSLOG_VERSION),oslog)
+	# Fixed in recent commit, but not released yet
 	sed -i '1s|^|#import <Foundation/Foundation.h>\n|' $(BUILD_WORK)/oslog/main.mm
 
 ifneq ($(wildcard $(BUILD_WORK)/oslog/.build_complete),)
@@ -18,8 +19,12 @@ oslog:
 	@echo "Using previously built oslog."
 else
 oslog: oslog-setup
+ifeq ($(wildcard $(BUILD_WORK)/oslog/README),)
 	mv $(BUILD_WORK)/oslog/README.md $(BUILD_WORK)/oslog/README
-	mv $(BUILD_WORK)/oslog/LICENSE.txt $(BUILD_WORK)/oslog/LICENSE
+endif
+ifeq ($(wildcard $(BUILD_WORK)/oslog/LICENSE),)
+	mv $(BUILD_WORK)/oslog/LICENSE.TXT $(BUILD_WORK)/oslog/LICENSE
+endif
 	mkdir -p $(BUILD_STAGE)/oslog/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin
 	$(CXX) $(CXXFLAGS) -fobjc-arc $(BUILD_WORK)/oslog/main.mm -o $(BUILD_STAGE)/oslog/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/oslog -framework Foundation
 	$(call AFTER_BUILD)

From 7053ea0682927c9816f9adacdea9adf71a369c2f Mon Sep 17 00:00:00 2001
From: Lightmann <lightmanns11@gmail.com>
Date: Thu, 29 Jun 2023 19:15:21 -0400
Subject: [PATCH 2/2] Update oslog.xml

---
 build_misc/entitlements/oslog.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build_misc/entitlements/oslog.xml b/build_misc/entitlements/oslog.xml
index c41f5f9634..29512451d0 100644
--- a/build_misc/entitlements/oslog.xml
+++ b/build_misc/entitlements/oslog.xml
@@ -2,21 +2,29 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.logd.admin</key>
-	<true/>
 	<key>com.apple.private.debug_port</key>
 	<true/>
+	<key>com.apple.private.iosurfaceinfo</key>
+	<true/>
 	<key>com.apple.private.logging.admin</key>
 	<true/>
 	<key>com.apple.private.logging.diagnostic</key>
 	<true/>
 	<key>com.apple.private.logging.stream</key>
 	<true/>
+	<key>com.apple.private.security.no-container</key>
+	<true/>
 	<key>com.apple.private.set-atm-diagnostic-flag</key>
 	<true/>
-	<key>com.apple.system-task-ports.safe</key>
+	<key>com.apple.security.iokit-user-client-class</key>
+	<array>
+		<string>IOSurfaceRootUserClient</string>
+	</array>
+	<key>com.apple.system-task-ports</key>
+	<true/>
+	<key>platform-application</key>
 	<true/>
 	<key>task_for_pid-allow</key>
 	<true/>
 </dict>
-</plist>
+</plist>
\ No newline at end of file