diff --git a/LICENSE b/LICENSE index cdf781b..26ea4ab 100644 --- a/LICENSE +++ b/LICENSE @@ -4,13 +4,13 @@ Upstream-Contact: opa334 Source: https://github.com/opa334/TrollStore Files: * -Copyright: 2023 Lars Fröder +Copyright: 2022-2023 Lars Fröder License: MIT Files: RootHelper/uicache.m Copyright: Copyright (c) 2019 CoolStar, Modified work Copyright (c) 2020-2022 Procursus Team - Modified work Copyright (c) 2022 Lars Fröder + Modified work Copyright (c) 2022-2023 Lars Fröder License: BSD-4-Clause License: BSD-4-Clause diff --git a/RootHelper/control b/RootHelper/control index 7d3e067..e670916 100644 --- a/RootHelper/control +++ b/RootHelper/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstoreroothelper Name: trollstoreroothelper -Version: 1.5.1 +Version: 2.0.0 Architecture: iphoneos-arm Description: An awesome tool of some sort!! Maintainer: opa334 diff --git a/TrollHelper/Makefile b/TrollHelper/Makefile index 778e257..fd45a66 100644 --- a/TrollHelper/Makefile +++ b/TrollHelper/Makefile @@ -20,6 +20,7 @@ TrollStorePersistenceHelper_CFLAGS = -fobjc-arc -I../Shared ifeq ($(LEGACY_CT_BUG),1) TrollStorePersistenceHelper_CODESIGN_FLAGS = -Sentitlements.plist -K../legacy.p12 +TrollStorePersistenceHelper_CFLAGS += -DLEGACY_CT_BUG=1 else TrollStorePersistenceHelper_CODESIGN_FLAGS = --entitlements entitlements.plist endif diff --git a/TrollHelper/Resources/Info.plist b/TrollHelper/Resources/Info.plist index fe281b3..2164f48 100644 --- a/TrollHelper/Resources/Info.plist +++ b/TrollHelper/Resources/Info.plist @@ -52,7 +52,7 @@ iPhoneOS CFBundleVersion - 1.5.1 + 2.0.0 LSRequiresIPhoneOS UIDeviceFamily diff --git a/TrollHelper/TSHRootViewController.m b/TrollHelper/TSHRootViewController.m index e56c244..2955970 100644 --- a/TrollHelper/TSHRootViewController.m +++ b/TrollHelper/TSHRootViewController.m @@ -37,10 +37,10 @@ { _specifiers = [NSMutableArray new]; - #ifdef EMBEDDED_ROOT_HELPER - NSString* credits = @"Powered by Fugu15 CoreTrust & installd bugs, thanks to @LinusHenze\n\n© 2023 Lars Fröder (opa334)"; + #ifdef LEGACY_CT_BUG + NSString* credits = @"Powered by Fugu15 CoreTrust & installd bugs, thanks to @LinusHenze\n\n© 2022-2023 Lars Fröder (opa334)"; #else - NSString* credits = @"Powered by Fugu15 CoreTrust bug, thanks to @LinusHenze\n\n© 2023 Lars Fröder (opa334)"; + NSString* credits = @"Powered by CVE-2023-41991, originally discovered by Google TAG, rediscovered via patchdiffing by @alfiecg_dev\n\n© 2022-2023 Lars Fröder (opa334)"; #endif PSSpecifier* infoGroupSpecifier = [PSSpecifier emptyGroupSpecifier]; diff --git a/TrollHelper/control b/TrollHelper/control index adce392..3beb079 100644 --- a/TrollHelper/control +++ b/TrollHelper/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstorehelper Name: TrollStore Helper -Version: 1.5.1 +Version: 2.0.0 Architecture: iphoneos-arm Description: Helper utility to install and manage TrollStore! Maintainer: opa334 diff --git a/TrollStore/Resources/Info.plist b/TrollStore/Resources/Info.plist index 354e6a8..f54470f 100644 --- a/TrollStore/Resources/Info.plist +++ b/TrollStore/Resources/Info.plist @@ -50,7 +50,7 @@ iPhoneOS CFBundleVersion - 1.5.1 + 2.0.0 LSRequiresIPhoneOS UIDeviceFamily diff --git a/TrollStore/TSSettingsListController.m b/TrollStore/TSSettingsListController.m index d4e3c66..8792a39 100644 --- a/TrollStore/TSSettingsListController.m +++ b/TrollStore/TSSettingsListController.m @@ -193,7 +193,7 @@ extern NSUserDefaults* trollStoreUserDefaults(void); [_specifiers addObject:installAlertConfigurationSpecifier]; PSSpecifier* otherGroupSpecifier = [PSSpecifier emptyGroupSpecifier]; - [otherGroupSpecifier setProperty:[NSString stringWithFormat:@"TrollStore %@\n\n© 2023 Lars Fröder (opa334)\n\nTrollStore is NOT for piracy!\n\nCredits:\n@LinusHenze: CoreTrust bug\n@zhuowei: CoreTrust bug writeup and cert\n@lunotech11, @SerenaKit, @tylinux: Various contributions\n@ProcursusTeam: uicache\n@cstar_ow: uicache", [self getTrollStoreVersion]] forKey:@"footerText"]; + [otherGroupSpecifier setProperty:[NSString stringWithFormat:@"TrollStore %@\n\n© 2022-2023 Lars Fröder (opa334)\n\nTrollStore is NOT for piracy!\n\nCredits:\nGoogle TAG, @alfiecg_dev: CoreTrust bug\n@lunotech11, @SerenaKit, @tylinux, @TheRealClarity: Various contributions\n@ProcursusTeam: uicache\n@cstar_ow: uicache", [self getTrollStoreVersion]] forKey:@"footerText"]; [_specifiers addObject:otherGroupSpecifier]; PSSpecifier* advancedLinkSpecifier = [PSSpecifier preferenceSpecifierNamed:@"Advanced" diff --git a/TrollStore/control b/TrollStore/control index ea6ff15..ab2a18d 100644 --- a/TrollStore/control +++ b/TrollStore/control @@ -1,6 +1,6 @@ Package: com.opa334.trollstore Name: TrollStore -Version: 1.5.1 +Version: 2.0.0 Architecture: iphoneos-arm Description: An awesome application! Maintainer: opa334