Browse Source

added on minor threading change from latest, unfortunately doesnt make a difference, doing this commit before any drastic merges occur from newer code

Kevin Bradley 5 years ago
parent
commit
842fa1656d

+ 1 - 1
Meridian/Meridian/build_time

@@ -1 +1 @@
-Sun, 22 Jul 2018 23:21:57 -0700
+Tue, 07 Aug 2018 13:59:24 -0700

BIN
Meridian/meridian.xcodeproj/project.xcworkspace/xcuserdata/kevinbradley.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
Meridian/meridian.xcodeproj/xcuserdata/kevinbradley.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>amfid.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>jailbreakd.xcscheme</key>
 		<dict>
@@ -27,7 +27,7 @@
 		<key>pspawn_hook.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

BIN
Meridian/meridianTV/meridian-bootstrap.tar


BIN
Meridian/pspawn_hook/bin/pspawn_hook.dylib


+ 1 - 9
Meridian/pspawn_hook/pspawn_hook.m

@@ -72,7 +72,6 @@ char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
 
 const char* xpcproxy_blacklist[] = {
     "com.apple.diagnosticd",        // syslog
-    "com.apple.WebKit",             // O_o
     "MTLCompilerService",           // ?_?
     "OTAPKIAssetTool",              // h_h
     "cfprefsd",                     // o_o
@@ -235,12 +234,6 @@ void rebind_pspawns(void) {
     rebind_symbols(rebindings, 2);
 }
 
-void *thd_func(void *arg) {
-    DEBUGLOG("in a new thread!");
-    
-    rebind_pspawns();
-    return NULL;
-}
 
 __attribute__ ((constructor))
 static void ctor(void) {
@@ -266,8 +259,7 @@ static void ctor(void) {
         }
         DEBUGLOG("got jbd port: %x", jbd_port);
         
-        pthread_t thd;
-        pthread_create(&thd, NULL, thd_func, NULL);
+        rebind_pspawns();
         return;
     }