1.1 changes

Meridian/Meridian/build_time

@@ -1 +1 @@
-Sat, 07 Jul 2018 18:17:15 -0700
+Sun, 08 Jul 2018 12:23:28 -0700

Meridian/Meridian/jailbreak.m

@@ -598,15 +598,20 @@ int extractBootstrap(int *exitCode) {
     posix_spawn(&pd, "/bin/bash", NULL, NULL, (char **)&(const char*[]){ "bash", "/usr/libexec/nito/firmware.sh", NULL }, NULL);
     waitpid(pd, NULL, 0);
     
+    
     char *myenviron[] = {
         "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games",
         "PS1=\\h:\\w \\u\\$ ",
         NULL
     };
-    
+   
+    /*
    
     posix_spawn(&pd, "/usr/bin/dpkg", NULL, NULL, (char **)&(const char*[]){ "dpkg", "-i", "--refuse-downgrade", progname("nitotv.deb"), NULL }, (char **)&myenviron);
     waitpid(pd, NULL, 0);
+  */
+    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);
     
   
     return 0;

Meridian/meridian.xcodeproj/project.pbxproj

@@ -7,11 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		320AFA8D20E215AD00859485 /* cydia-base.tar in Resources */ = {isa = PBXBuildFile; fileRef = B57A06E6202CEDF500ACDB9D /* cydia-base.tar */; };
-		320AFA8E20E215AD00859485 /* dpkgdb-base.tar in Resources */ = {isa = PBXBuildFile; fileRef = B537019A202EB4BF004E5E5C /* dpkgdb-base.tar */; };
-		320AFA8F20E215AD00859485 /* installer-base.tar in Resources */ = {isa = PBXBuildFile; fileRef = B5370198202EABFF004E5E5C /* installer-base.tar */; };
-		320AFA9120E215AD00859485 /* optional-base.tar in Resources */ = {isa = PBXBuildFile; fileRef = B57A06E7202CEDF500ACDB9D /* optional-base.tar */; };
-		320AFA9220E215AD00859485 /* system-base.tar in Resources */ = {isa = PBXBuildFile; fileRef = B57A06E8202CEDF500ACDB9D /* system-base.tar */; };
 		320AFA9320E215AD00859485 /* tar.tar in Resources */ = {isa = PBXBuildFile; fileRef = B57A06EE202CF4F300ACDB9D /* tar.tar */; };
 		320AFA9420E215C100859485 /* build_time in Resources */ = {isa = PBXBuildFile; fileRef = B5B9E03A2060280400FEA273 /* build_time */; };
 		320AFA9720E21D0A00859485 /* UIColor+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 320AFA9520E21D0A00859485 /* UIColor+Additions.m */; };
@@ -71,6 +66,8 @@
 		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 */; };
@@ -234,6 +231,7 @@
 		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>"; };
@@ -330,6 +328,7 @@
 			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 */,
@@ -382,6 +381,7 @@
 				3252638E20E0B141003BD42A /* Assets.xcassets */,
 				3252639020E0B141003BD42A /* Info.plist */,
 				3252639120E0B141003BD42A /* main.m */,
+				328B21E420F1E74F00A857FB /* safetynet.deb */,
 			);
 			path = meridianTV;
 			sourceTree = "<group>";
@@ -829,19 +829,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				32E5EAF320E8AE7B00346489 /* ent.plist in Resources */,
-				320AFA8F20E215AD00859485 /* installer-base.tar in Resources */,
 				320AFA9C20E3514D00859485 /* bootstrap.tar.gz in Resources */,
 				32E5EAF520E8AE8000346489 /* rm.gz in Resources */,
-				320AFA9220E215AD00859485 /* system-base.tar in Resources */,
 				3249301C20E41D5400E99767 /* jailbreakd.plist in Resources */,
 				32E5EAF620E8CEC400346489 /* bgTemp.jpg in Resources */,
 				320AFA9420E215C100859485 /* build_time in Resources */,
-				320AFA8E20E215AD00859485 /* dpkgdb-base.tar in Resources */,
 				320AFA9320E215AD00859485 /* tar.tar in Resources */,
-				320AFA9120E215AD00859485 /* optional-base.tar in Resources */,
 				328CC34720EE91BE0071849C /* tar.gz in Resources */,
-				320AFA8D20E215AD00859485 /* cydia-base.tar 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 */,

Meridian/meridianTV/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Meridian/meridianTV/ViewController.m

@@ -56,7 +56,7 @@ typedef NS_ENUM(NSInteger, BSInstallType) {
 @property (strong, nonatomic) UILabel *versionLabel;
 @end
 
-NSString *Version = @"backr00m: Beta 1";
+NSString *Version = @"backr00m: 1.1";
 NSOperatingSystemVersion osVersion;
 
 id thisClass;
@@ -154,11 +154,13 @@ bool jailbreak_has_run = false;
     
     _respringReady = FALSE;
     
+    [self writeTextPlain:@">"];
+    
     self.installMode = BSInstallTypeUnsupported;
     if (SYSTEM_VERSION_EQUAL_TO(@"10.2.2")){
         self.installMode = BSInstallTypeMeridian;
         [self writeTextPlain:@"> 10.2.2 detected, using Meridian based jailbreak. Thanks PsychoTea!"];
-    } else if (SYSTEM_VERSION_GREATER_THAN(@"11.0") && SYSTEM_VERSION_LESS_THAN(@"11.2") ){
+    } else if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0") && SYSTEM_VERSION_LESS_THAN(@"11.2") ){
         self.installMode = BSInstallTypeElectra;
         [self writeTextPlain:@"> 11.x detected, using Electra based jailbreak. Thanks Electra Team!"];
     }
@@ -284,6 +286,8 @@ bool jailbreak_has_run = false;
                                                        error:nil];
     [self.versionLabel setText:[NSString stringWithFormat:@"%@: %@", Version, buildDate]];
     
+
+    
     jailbreak_has_run = check_for_jailbreak();
     
     //[self doUpdateCheck];
@@ -293,6 +297,8 @@ bool jailbreak_has_run = false;
     
     [self writeTextPlain:[NSString stringWithFormat:@"> %@", Version]];
     
+    [self writeTextPlain:@"> Includes software / explots by Ian Beer, CoolStar, Jaywalker, nitoTV, nullpixel, PsychoTea, pwn20wnd, Siguza and tihmstar" ];
+    
     if (self.installMode == BSInstallTypeUnsupported) {
         
         [self writeTextPlain:@"> backr00m does not work on versions of iOS other than iOS 10.2.2, 11.0 and 11.1."];

Meridian/meridianTV/electra/the fun part/bootstrap.c

@@ -184,7 +184,7 @@ void post_bootstrap(const bool runUICache) {
     
     //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();
    
@@ -193,9 +193,9 @@ void post_bootstrap(const bool runUICache) {
         "PS1=\\h:\\w \\u\\$ ",
         NULL
     };
-    posix_spawn(&pd, "/usr/bin/dpkg", NULL, NULL, (char **)&(const char*[]){ "dpkg", "-i", "--refuse-downgrade", progname("nitotv.deb"), NULL }, (char **)&myenviron);
+    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");