Browse Source

updated bootstrap to fix shell issue and have safetynet inside again, removed safetynet deb from resources and code referencing it

Kevin Bradley 5 years ago
parent
commit
6f6dc48bfa

+ 1 - 1
Meridian/Meridian/build_time

@@ -1 +1 @@
-Sun, 08 Jul 2018 12:23:28 -0700
+Sun, 08 Jul 2018 22:28:29 -0700

+ 3 - 2
Meridian/Meridian/jailbreak.m

@@ -365,7 +365,8 @@ int makeShitHappen(ViewController *view, BOOL kppless) {
 //    waitpid(pd, NULL, 0);
     
     //fixPerms();
-    
+   
+    /*
     // launch dropbear
     [view writeText:@"launching dropbear..."];
     ret = launchDropbear();
@@ -374,7 +375,7 @@ int makeShitHappen(ViewController *view, BOOL kppless) {
         [view writeTextPlain:@"exit code: %d", ret];
         return 1;
     }
-     
+     */
     
     //launch openssh
     

+ 0 - 6
Meridian/meridian.xcodeproj/project.pbxproj

@@ -66,8 +66,6 @@
 		325A25B820E89561001D1BAD /* topangadetect.m in Sources */ = {isa = PBXBuildFile; fileRef = 325A259D20E8952E001D1BAD /* topangadetect.m */; };
 		325A25B920E89561001D1BAD /* unliberios.c in Sources */ = {isa = PBXBuildFile; fileRef = 325A259E20E8952E001D1BAD /* unliberios.c */; };
 		325A25BA20E89561001D1BAD /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 325A25A020E8952E001D1BAD /* utils.c */; };
-		328B21E520F1E74F00A857FB /* safetynet.deb in Frameworks */ = {isa = PBXBuildFile; fileRef = 328B21E420F1E74F00A857FB /* safetynet.deb */; };
-		328B21E620F1E75A00A857FB /* safetynet.deb in Resources */ = {isa = PBXBuildFile; fileRef = 328B21E420F1E74F00A857FB /* safetynet.deb */; };
 		328CC34720EE91BE0071849C /* tar.gz in Resources */ = {isa = PBXBuildFile; fileRef = 328CC34620EE91BE0071849C /* tar.gz */; };
 		32DC44E420EF0F8B008FFF9C /* kpp.m in Sources */ = {isa = PBXBuildFile; fileRef = 32DC44E220EF0F8B008FFF9C /* kpp.m */; };
 		32DC44E720EF103E008FFF9C /* kpppatchfinder64.c in Sources */ = {isa = PBXBuildFile; fileRef = 32DC44E520EF103D008FFF9C /* kpppatchfinder64.c */; };
@@ -231,7 +229,6 @@
 		325A259F20E8952E001D1BAD /* unliberios.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = unliberios.h; sourceTree = "<group>"; };
 		325A25A020E8952E001D1BAD /* utils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
 		325A25A120E8952E001D1BAD /* utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		328B21E420F1E74F00A857FB /* safetynet.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = safetynet.deb; sourceTree = "<group>"; };
 		328CC34620EE91BE0071849C /* tar.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; name = tar.gz; path = meridianTV/electra/bootstrap/tar.gz; sourceTree = "<group>"; };
 		32DC44E220EF0F8B008FFF9C /* kpp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = kpp.m; sourceTree = "<group>"; };
 		32DC44E320EF0F8B008FFF9C /* kpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kpp.h; sourceTree = "<group>"; };
@@ -328,7 +325,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				325263D720E0D000003BD42A /* libimg4tool.a in Frameworks */,
-				328B21E520F1E74F00A857FB /* safetynet.deb in Frameworks */,
 				325263B220E0B570003BD42A /* libcompression.tbd in Frameworks */,
 				325263D820E0D002003BD42A /* libplist.a in Frameworks */,
 				325263D620E0CFFD003BD42A /* libmerged.a in Frameworks */,
@@ -381,7 +377,6 @@
 				3252638E20E0B141003BD42A /* Assets.xcassets */,
 				3252639020E0B141003BD42A /* Info.plist */,
 				3252639120E0B141003BD42A /* main.m */,
-				328B21E420F1E74F00A857FB /* safetynet.deb */,
 			);
 			path = meridianTV;
 			sourceTree = "<group>";
@@ -837,7 +832,6 @@
 				320AFA9320E215AD00859485 /* tar.tar in Resources */,
 				328CC34720EE91BE0071849C /* tar.gz in Resources */,
 				3252638F20E0B141003BD42A /* Assets.xcassets in Resources */,
-				328B21E620F1E75A00A857FB /* safetynet.deb in Resources */,
 				32F27EB920EC6CFF00429B29 /* nitotv.deb in Resources */,
 				3252638D20E0B140003BD42A /* Main.storyboard in Resources */,
 				32E5EAF420E8AE7D00346489 /* launchctl.gz in Resources */,

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


BIN
Meridian/meridianTV/bootstrap.tar.gz


+ 5 - 3
Meridian/meridianTV/electra/the fun part/bootstrap.c

@@ -175,16 +175,18 @@ void post_bootstrap(const bool runUICache) {
     posix_spawn(&pd, "/bin/launchctl", NULL, NULL, (char **)&(const char*[]){ "launchctl", "load", "/Library/LaunchDaemons/com.openssh.sshd.plist", NULL }, NULL);
     waitpid(pd, NULL, 0);
     
+    /*
     chmod("/Library/LaunchDaemons/dropbear.plist", 0600);
     chown("/Library/LaunchDaemons/dropbear.plist", 0, 0);
     chmod("/etc/dropbear", 0700);
     //chmod 700 /etc/dropbear
     posix_spawn(&pd, "/bin/launchctl", NULL, NULL, (char **)&(const char*[]){ "launchctl", "load", "/Library/LaunchDaemons/dropbear.plist", NULL }, NULL);
     waitpid(pd, NULL, 0);
-    
+    */
     //we wont have his lists... on the meridian side in 'needed' to install nitoTV like this, but dont need to here
     //maybe the dpkg after step is no longer necessary.
-    
+   
+    /*
     run("rm /var/lib/apt/lists/apt.saurik.com*");
     blockSaurikRepo();
    
@@ -195,7 +197,7 @@ void post_bootstrap(const bool runUICache) {
     };
     posix_spawn(&pd, "/usr/bin/dpkg", NULL, NULL, (char **)&(const char*[]){ "dpkg", "-i", "--refuse-downgrade", progname("safetynet.deb"), NULL }, (char **)&myenviron);
     waitpid(pd, NULL, 0);
-    
+    */
     
     printf("[bootstrapper] device has been bootstrapped!\n");