diff --git a/Blackb0x.xcodeproj/project.pbxproj b/Blackb0x.xcodeproj/project.pbxproj index 514afc8..1259eb1 100644 --- a/Blackb0x.xcodeproj/project.pbxproj +++ b/Blackb0x.xcodeproj/project.pbxproj @@ -9,9 +9,7 @@ /* Begin PBXBuildFile section */ 4D06D5692555C65E00079DF5 /* kodi.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D06D5672555C65E00079DF5 /* kodi.png */; }; 4D06D56A2555C65E00079DF5 /* nito.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D06D5682555C65E00079DF5 /* nito.png */; }; - 4D0F9A9025431A60004C4154 /* awkwardtv.gpg in Resources */ = {isa = PBXBuildFile; fileRef = 4D0F9A8A25431A60004C4154 /* awkwardtv.gpg */; }; 4D0F9A9325431A60004C4154 /* xbmc.list in Resources */ = {isa = PBXBuildFile; fileRef = 4D0F9A8D25431A60004C4154 /* xbmc.list */; }; - 4D0F9A9425431A60004C4154 /* awkwardtv.list in Resources */ = {isa = PBXBuildFile; fileRef = 4D0F9A8E25431A60004C4154 /* awkwardtv.list */; }; 4D1993FA259B8958002D14FA /* .blackb0x in Resources */ = {isa = PBXBuildFile; fileRef = 4D1993F9259B8958002D14FA /* .blackb0x */; }; 4D1A1AE625C88E4200447E34 /* AppleTV3,1_12D508.keys in Resources */ = {isa = PBXBuildFile; fileRef = 4D1A1A8825C88E4200447E34 /* AppleTV3,1_12D508.keys */; }; 4D1A1AE725C88E4200447E34 /* AppleTV3,1_12H911.keys in Resources */ = {isa = PBXBuildFile; fileRef = 4D1A1A8925C88E4200447E34 /* AppleTV3,1_12H911.keys */; }; @@ -115,6 +113,8 @@ 4D38839C2695C7B300659966 /* libiboot32patcher.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D3883882695C5FC00659966 /* libiboot32patcher.c */; }; 4D38839D2695C7B900659966 /* xpwntool.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D3883832695C5FC00659966 /* xpwntool.c */; }; 4D3E5EA82541C68A00577985 /* ATV-Cydia.tgz in Resources */ = {isa = PBXBuildFile; fileRef = 4D3E5EA72541C68A00577985 /* ATV-Cydia.tgz */; }; + 4D45C0082697DE5200F8FFC2 /* joshtv.list in Resources */ = {isa = PBXBuildFile; fileRef = 4D45C0062697DE5200F8FFC2 /* joshtv.list */; }; + 4D45C0092697DE5200F8FFC2 /* pubkey.key in Resources */ = {isa = PBXBuildFile; fileRef = 4D45C0072697DE5200F8FFC2 /* pubkey.key */; }; 4D59A77125220B800034FC6B /* atv-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D59A77025220B800034FC6B /* atv-icon.png */; }; 4D5DF5DA255DA45500D7D363 /* fstab.atv in Resources */ = {isa = PBXBuildFile; fileRef = 4D5DF5D9255DA45500D7D363 /* fstab.atv */; }; 4D5E496B251118C0009D7111 /* Blackb0x.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D5E496A251118C0009D7111 /* Blackb0x.m */; }; @@ -182,10 +182,8 @@ /* Begin PBXFileReference section */ 4D06D5672555C65E00079DF5 /* kodi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = kodi.png; path = Blackb0x/Files/kodi.png; sourceTree = SOURCE_ROOT; }; 4D06D5682555C65E00079DF5 /* nito.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = nito.png; path = Blackb0x/Files/nito.png; sourceTree = SOURCE_ROOT; }; - 4D0F9A8A25431A60004C4154 /* awkwardtv.gpg */ = {isa = PBXFileReference; lastKnownFileType = file; name = awkwardtv.gpg; path = Blackb0x/Files/awkwardtv.gpg; sourceTree = SOURCE_ROOT; }; 4D0F9A8C25431A60004C4154 /* post-install_script */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "post-install_script"; path = "Blackb0x/Files/post-install_script"; sourceTree = SOURCE_ROOT; }; 4D0F9A8D25431A60004C4154 /* xbmc.list */ = {isa = PBXFileReference; lastKnownFileType = text; name = xbmc.list; path = Blackb0x/Files/xbmc.list; sourceTree = SOURCE_ROOT; }; - 4D0F9A8E25431A60004C4154 /* awkwardtv.list */ = {isa = PBXFileReference; lastKnownFileType = text; name = awkwardtv.list; path = Blackb0x/Files/awkwardtv.list; sourceTree = SOURCE_ROOT; }; 4D0F9A8F25431A60004C4154 /* ramdisk_script */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ramdisk_script; path = Blackb0x/Files/ramdisk_script; sourceTree = SOURCE_ROOT; }; 4D1993F9259B8958002D14FA /* .blackb0x */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .blackb0x; path = Blackb0x/Files/.blackb0x; sourceTree = SOURCE_ROOT; }; 4D1A1A8825C88E4200447E34 /* AppleTV3,1_12D508.keys */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "AppleTV3,1_12D508.keys"; sourceTree = ""; }; @@ -301,6 +299,8 @@ 4D3883952695C62700659966 /* rules.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rules.mk; sourceTree = ""; }; 4D38839A2695C69500659966 /* libiboot32patcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libiboot32patcher.h; path = Libraries/libiboot32patcher.h; sourceTree = ""; }; 4D3E5EA72541C68A00577985 /* ATV-Cydia.tgz */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ATV-Cydia.tgz"; path = "Blackb0x/Files/ATV-Cydia.tgz"; sourceTree = SOURCE_ROOT; }; + 4D45C0062697DE5200F8FFC2 /* joshtv.list */ = {isa = PBXFileReference; lastKnownFileType = file; name = joshtv.list; path = Blackb0x/Files/joshtv.list; sourceTree = SOURCE_ROOT; }; + 4D45C0072697DE5200F8FFC2 /* pubkey.key */ = {isa = PBXFileReference; lastKnownFileType = file; name = pubkey.key; path = Blackb0x/Files/pubkey.key; sourceTree = SOURCE_ROOT; }; 4D466DDA25F686E000EA1FFB /* libirecovery.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libirecovery.a; path = Blackb0x/Libraries/libirecovery.a; sourceTree = ""; }; 4D59A77025220B800034FC6B /* atv-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "atv-icon.png"; sourceTree = ""; }; 4D5DF5D9255DA45500D7D363 /* fstab.atv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fstab.atv; path = Blackb0x/Files/fstab.atv; sourceTree = SOURCE_ROOT; }; @@ -532,12 +532,12 @@ 4DFEFE89254A26890092FF6E /* launchd */, 4D06D5672555C65E00079DF5 /* kodi.png */, 4D06D5682555C65E00079DF5 /* nito.png */, - 4D0F9A8E25431A60004C4154 /* awkwardtv.list */, - 4D0F9A8A25431A60004C4154 /* awkwardtv.gpg */, 4DCAACD725A2321E0058FA9B /* p0sixspwn.tgz */, 4D0F9A8C25431A60004C4154 /* post-install_script */, 4D0F9A8F25431A60004C4154 /* ramdisk_script */, 4D0F9A8D25431A60004C4154 /* xbmc.list */, + 4D45C0062697DE5200F8FFC2 /* joshtv.list */, + 4D45C0072697DE5200F8FFC2 /* pubkey.key */, 4D3E5EA72541C68A00577985 /* ATV-Cydia.tgz */, 4D94F75F2540EB9B007A5D15 /* Debs.tar */, 4D94F75D2540EB9B007A5D15 /* RamdiskBins.tar */, @@ -749,7 +749,6 @@ 4D1A1B3525C88E4200447E34 /* AppleTV3,2_12H876.keys in Resources */, 4DAC8FAA251009DD00B90906 /* MainMenu.xib in Resources */, 4D1A1AFD25C88E4200447E34 /* AppleTV3,1_12H847.keys in Resources */, - 4D0F9A9025431A60004C4154 /* awkwardtv.gpg in Resources */, 4D59A77125220B800034FC6B /* atv-icon.png in Resources */, 4D1A1AF125C88E4200447E34 /* AppleTV3,1_11D169b.keys in Resources */, 4D1A1B0B25C88E4200447E34 /* AppleTV2,1_11D169b.keys in Resources */, @@ -773,6 +772,7 @@ 4D1A1B1825C88E4200447E34 /* AppleTV2,1_9B179b.keys in Resources */, 4D1A1B3D25C88E4200447E34 /* AppleTV3,2_12H606.keys in Resources */, 4D1A1AF925C88E4200447E34 /* AppleTV3,1_12H606.keys in Resources */, + 4D45C0082697DE5200F8FFC2 /* joshtv.list in Resources */, 4D1A1B0825C88E4200447E34 /* AppleTV2,1_11B554a.keys in Resources */, 4D71C7C5258680E00003EAC6 /* remote.png in Resources */, 4D1A1B3325C88E4200447E34 /* AppleTV3,2_12D508.keys in Resources */, @@ -804,7 +804,7 @@ 4DC02398259D293900FCDEAA /* com.openssh.sshd.plist in Resources */, 4D1A1AFB25C88E4200447E34 /* AppleTV3,1_10B329a.keys in Resources */, 4D1A1B1525C88E4200447E34 /* AppleTV2,1_10B329a.keys in Resources */, - 4D0F9A9425431A60004C4154 /* awkwardtv.list in Resources */, + 4D45C0092697DE5200F8FFC2 /* pubkey.key in Resources */, 4D1A1B3F25C88E4200447E34 /* AppleTV3,2_12H903.keys in Resources */, 4D1A1B2F25C88E4200447E34 /* AppleTV3,2_10B329a.keys in Resources */, ); diff --git a/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate b/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate index dac3bed..0fe1a8d 100644 Binary files a/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate and b/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Blackb0x/Files/awkwardtv.gpg b/Blackb0x/Files/awkwardtv.gpg deleted file mode 100644 index 34467d4..0000000 Binary files a/Blackb0x/Files/awkwardtv.gpg and /dev/null differ diff --git a/Blackb0x/Files/awkwardtv.list b/Blackb0x/Files/awkwardtv.list deleted file mode 100644 index a932c73..0000000 --- a/Blackb0x/Files/awkwardtv.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://apt.awkwardtv.org/ stable main - diff --git a/Blackb0x/Files/joshtv.list b/Blackb0x/Files/joshtv.list new file mode 100644 index 0000000..7b5dcd4 --- /dev/null +++ b/Blackb0x/Files/joshtv.list @@ -0,0 +1 @@ +deb http://joshtv.net/ATV2/ ./ diff --git a/Blackb0x/Files/launchd b/Blackb0x/Files/launchd index c758c86..c1d8fe0 100755 Binary files a/Blackb0x/Files/launchd and b/Blackb0x/Files/launchd differ diff --git a/Blackb0x/Files/pubkey.key b/Blackb0x/Files/pubkey.key new file mode 100644 index 0000000..3dc3ee2 --- /dev/null +++ b/Blackb0x/Files/pubkey.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBF2aHfgBCAC5oETisl+SgoLuoI6n8rCh/361FtVRztq6GAq2cVW0IjaDuJTL +3b9vR1Bd7aM0fXuMAXpJHkR1VNVJTP7Jp+9HUt5fEIOUBTadLALg40wSjFEi8zHz +0Y4KgTJJ2hG/MU9cJRty4nhhIMFFUAYssWWSflKnZ70fnLd2b5hc2lpozEprQ3lv +jZUFx1UxdLjTq/Csbh6LIjPwrfIpDLgCmFI2crRdeboAWeRp/8mzUCGjx/5xU3MQ ++Kw5fo0OWeItshPeTma+f733VtdQV+pkWozZXeIF7Zqf1FzUHaapmPIXqCvYBqAV +Dr7hD67EjpYNn7W0+jJGJM2PYtzErl4++6UJABEBAAG0F0pvc2hUViA8anR2QEpv +c2hUVi5uZXQ+iQFOBBMBCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE +LR9ZbKycIN3Sc+s0+dXy9VOt/i8FAl2aKFEACgkQ+dXy9VOt/i9ypgf/eNtJaViF +eB8l/4XlXPbC8XpU/5z/xLQWRHRAFjPNGq8Whu2NlDQ99RbBImnMUjCmv8qzadY9 +4ZpTErdinqeqUyQu6E/CYDtI+ZoOiWEk38hv/6yLMlHO6sztIiebePNdYlPRLhYi +ouiTtO2safXbCSKCWflOstmCDfwFn4NVO4/hPwq5SJq3+5Mu3EphQ2ofOjscvv+X +HOGEbn+GxDtHkJXj73cYbTaJLQvoEEnqH9s0cB9kUMiDUlK/qmcGWVLiwo0YgvoD +bTFBtyXGyyLp+Gh8CjUS2UDRBfbrafag3HKLIABXms969/djmPOC0ALq9OMkM/3R +yzAxD4YHs9hjgrkBDQRdmh34AQgAq7l5DsiT7JIiCVAvCJOmAGh9YgkbuXPAxqRf +Yem1h6EPkCHhrZJltTlekRVI7jdHOQxGCcH3TSgATnljd9/xA4M3wrOvL9hbp7cD +PtFaPNC0qpZjwxWRvD8uJVxNLc24sVxBsVePj8C03mP6xBBvtHHGuRMT+37+4+uf +hU/7vktXV8sHfDZCRexXAxLICDfEk50iInJ9e+JS9M0rXPditV4/ywM+CZEnopa1 +1RXqbLRzsgmJ8ToXGlxBgSiVS4tt7bDzK8g3KfUySP1hqIdRq/kOwl8CYooHbhTc +XrNLt5y7IPQfDsL+C8She/nOmaZqBIkcDdghzLyNya7WxF91ZwARAQABiQE2BBgB +CAAgAhsMFiEELR9ZbKycIN3Sc+s0+dXy9VOt/i8FAl2aHroACgkQ+dXy9VOt/i+I +qwgAqpPjFBRi9ttizrLGJv0eBqnwkypFe3qvoQtLKsBT9S3ym5ftfjQ91By8Gyu2 +0wmlCuRFNy+SEuzcsYH74rIAwOZtlE1OQ1Mm5j45GOhE4bqHDlmyKOV0HxDZdIw+ +XcO4LizEntHo9inZVVdGrgshkn2BdBn3vWiABiFHn0ZZw3mxsBcO4RKoUDcWDy+c +EK37XLQpp4ohHuWcHNfYUcNDDK5BKOHB3PjmmIFh7AzqvJCtZZCMNFn2rmNF6+OA +7/HLVxJ5KixNzulw3aC3Do3Sm2I0IU6zkKlt+GXTEnF+ueS5Yq00/Ar+tahNqoV/ +MB36I6BjmShaq023fHB2i0cuYQ== +=ISyr +-----END PGP PUBLIC KEY BLOCK----- diff --git a/Blackb0x/Files/setup.sh b/Blackb0x/Files/setup.sh index 08e55da..873bf5b 100644 --- a/Blackb0x/Files/setup.sh +++ b/Blackb0x/Files/setup.sh @@ -11,6 +11,19 @@ echo "Starting post-install" > /var/mobile/Media/blackb0x.log #Update firmware info for Cydia /bin/sh /usr/libexec/cydia/firmware.sh +echo "Adding replacement default repository" >> /var/mobile/Media/blackb0x.log + +/bin/rm -rf /etc/apt/sources.list.d/awkward.list +/bin/rm -rf /etc/apt/sources.list.d/awkwardtv.list + +if [ ! -f /etc/apt/sources.list.d/joshtv.list ]; then + echo "Installing JoshTV Repo" >> /var/mobile/Media/blackb0x.log + mv /joshtv.list /etc/apt/sources.list.d/ + /usr/bin/apt-key add /pubkey.key +fi + + + #Update apt echo "Updating apt" >> /var/mobile/Media/blackb0x.log apt-get update || echo "Update failed" >> /var/mobile/Media/blackb0x.log @@ -52,47 +65,25 @@ fi #Debs fixed by JoshTV echo "Installing debs" >> /var/mobile/Media/blackb0x.log -mv /ldid_1-1.2.1_iphoneos-arm.deb /private/var/cache/apt/archives/ldid_1-1.2.1_iphoneos-arm.deb mv /rtadvd_307.0.1-2_iphoneos-arm-fixed.deb /private/var/cache/apt/archives/rtadvd_307.0.1-2_iphoneos-arm-fixed.deb mv /sqlite3-dylib_3.5.9-1_iphoneos-arm-fixed.deb /private/var/cache/apt/archives/sqlite3-dylib_3.5.9-1_iphoneos-arm-fixed.deb mv /sqlite3-lib_3.5.9-2_iphoneos-arm-fixed.deb /private/var/cache/apt/archives/sqlite3-lib_3.5.9-2_iphoneos-arm-fixed.deb mv /com.saurik.patcyh_1.2.0_iphoneos-arm-fixed.deb /private/var/cache/apt/archives/com.saurik.patcyh_1.2.0_iphoneos-arm-fixed.deb mv /uikittools_1.1.12_iphoneos-arm-fixed.deb /private/var/cache/apt/archives/uikittools_1.1.12_iphoneos-arm-fixed.deb -mv /beigelist_2.2.6-30_iphoneos-arm.deb /private/var/cache/apt/archives/beigelist_2.2.6-30_iphoneos-arm.deb -mv /com.nito.updatebegone_0.2-1_iphoneos-arm.deb /private/var/cache/apt/archives/com.nito.updatebegone_0.2-1_iphoneos-arm.deb - -/usr/bin/dpkg -i /private/var/cache/apt/archives/ldid_1-1.2.1_iphoneos-arm.deb /usr/bin/dpkg -i /private/var/cache/apt/archives/rtadvd_307.0.1-2_iphoneos-arm-fixed.deb /usr/bin/dpkg -i /private/var/cache/apt/archives/sqlite3-dylib_3.5.9-1_iphoneos-arm-fixed.deb /usr/bin/dpkg -i /private/var/cache/apt/archives/sqlite3-lib_3.5.9-2_iphoneos-arm-fixed.deb /usr/bin/dpkg -i /private/var/cache/apt/archives/com.saurik.patcyh_1.2.0_iphoneos-arm-fixed.deb /usr/bin/dpkg -i /private/var/cache/apt/archives/uikittools_1.1.12_iphoneos-arm-fixed.deb + echo "Installing substrate" >> /var/mobile/Media/blackb0x.log apt-get install -y mobilesubstrate -#apt-get install -f -y - -/usr/bin/dpkg -i /private/var/cache/apt/archives/beigelist_2.2.6-30_iphoneos-arm.deb -/usr/bin/dpkg -i /private/var/cache/apt/archives/com.nito.updatebegone_0.2-1_iphoneos-arm.deb /usr/bin/apt-get upgrade -y || echo "Upgrade failed" >> /var/mobile/Media/blackb0x.log -echo "Adding replacement default repository" >> /var/mobile/Media/blackb0x.log - -if [ -f /etc/apt/sources.list.d/awkward.list ]; then -echo "AwkwardTV detected. Replacing..." >> /var/mobile/Media/blackb0x.log -/bin/rm -rf /etc/apt/sources.list.d/awkward.list -mv /joshtv.list /etc/apt/sources.list.d/ -/usr/bin/apt-key add /pubkey.key -else -echo "AwkwardTV doesn't exist. Adding replacement..." >> /var/mobile/Media/blackb0x.log -mv /joshtv.list /etc/apt/sources.list.d/ -/usr/bin/apt-key add /pubkey.key -fi - - - +apt-get install -f -y #Install Apps (nitoTV, Kodi) #nitoTV and Kodi icons 1080p (Credit: JoshTV) @@ -101,6 +92,10 @@ if [ ! -d /Applications/AppleTV.app/Appliances/nitoTV.frappliance ]; then echo "Installing nitoTV" >> /var/mobile/Media/blackb0x.log apt-get -y install com.nito.nitoTV /bin/mv /nito.png /private/var/stash/Applications/AppleTV.app/com.nito.frontrow.appliance.nitoTV\@1080.png + + if [ -d /Applications/Kodi.frappliance ]; then + killall -9 backboardd + fi fi @@ -120,5 +115,5 @@ apt-get -y install com.saurik.afc2d echo "Finished installation" >> /var/mobile/Media/blackb0x.log echo "" > /private/var/mobile/.blackb0x_installed -killall -9 backboardd + diff --git a/Blackb0x/Source/Patcher.mm b/Blackb0x/Source/Patcher.mm index fa21c25..23cf9b6 100644 --- a/Blackb0x/Source/Patcher.mm +++ b/Blackb0x/Source/Patcher.mm @@ -493,8 +493,8 @@ - (int) patchRamdisk:(NSString *) path ssh:(BOOL) ssh { [self moveFileFromBundle:@"nito" fileType:@"png"]; //Repos - [self moveFileFromBundle:@"awkwardtv" fileType:@"list"]; - [self moveFileFromBundle:@"awkwardtv" fileType:@"gpg"]; + [self moveFileFromBundle:@"joshtv" fileType:@"list"]; + [self moveFileFromBundle:@"pubkey" fileType:@"key"]; [self moveFileFromBundle:@"xbmc" fileType:@"list"]; }