Skip to content
Snippets Groups Projects
Commit 9a617a5f authored by George Nachman's avatar George Nachman
Browse files

Revert "Prepare versioning for 3.1." 

It didn't work because sparkle uses its own version comparator to detect downgrade attacks.

This reverts commit 512c5b4a.
parent e449874d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
iTerm2.xcodeproj/project.pbxproj
+ 0
− 33
View file @ 9a617a5f
@@ -1632,11 +1632,6 @@
A685D9FA1E5B6E100091C3A7 /* PseudoTerminal+TouchBar.h in Headers */ = {isa = PBXBuildFile; fileRef = A685D9F81E5B6E100091C3A7 /* PseudoTerminal+TouchBar.h */; };
A685D9FB1E5B6E100091C3A7 /* PseudoTerminal+TouchBar.m in Sources */ = {isa = PBXBuildFile; fileRef = A685D9F91E5B6E100091C3A7 /* PseudoTerminal+TouchBar.m */; };
A685D9FD1E5B6EFC0091C3A7 /* PseudoTerminal+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A685D9FC1E5B6EFC0091C3A7 /* PseudoTerminal+Private.h */; };
A685DA001E5B87FF0091C3A7 /* iTermVersionComparator.h in Headers */ = {isa = PBXBuildFile; fileRef = A685D9FE1E5B87FF0091C3A7 /* iTermVersionComparator.h */; };
A685DA011E5B87FF0091C3A7 /* iTermVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = A685D9FF1E5B87FF0091C3A7 /* iTermVersionComparator.m */; };
A685DA031E5B8A280091C3A7 /* iTermVersionComparatorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A685DA021E5B8A280091C3A7 /* iTermVersionComparatorTest.m */; };
A685DA041E5B8AA30091C3A7 /* iTermVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = A685D9FF1E5B87FF0091C3A7 /* iTermVersionComparator.m */; };
A685DA061E5B8B0D0091C3A7 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; fileRef = A685DA051E5B8B0D0091C3A7 /* Sparkle */; };
A686A1151C86A6CB0024C2DE /* NewOutputForDarkTheme.png in Resources */ = {isa = PBXBuildFile; fileRef = A686A1131C86A6CB0024C2DE /* NewOutputForDarkTheme.png */; };
A686A1161C86A6CB0024C2DE /* NewOutputForDarkTheme@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A686A1141C86A6CB0024C2DE /* NewOutputForDarkTheme@2x.png */; };
A686A1171C86A6DD0024C2DE /* NewOutputForDarkTheme.png in Resources */ = {isa = PBXBuildFile; fileRef = A686A1131C86A6CB0024C2DE /* NewOutputForDarkTheme.png */; };
@@ -3426,10 +3421,6 @@
A685D9F81E5B6E100091C3A7 /* PseudoTerminal+TouchBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PseudoTerminal+TouchBar.h"; sourceTree = "<group>"; };
A685D9F91E5B6E100091C3A7 /* PseudoTerminal+TouchBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PseudoTerminal+TouchBar.m"; sourceTree = "<group>"; };
A685D9FC1E5B6EFC0091C3A7 /* PseudoTerminal+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PseudoTerminal+Private.h"; sourceTree = "<group>"; };
A685D9FE1E5B87FF0091C3A7 /* iTermVersionComparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermVersionComparator.h; sourceTree = "<group>"; };
A685D9FF1E5B87FF0091C3A7 /* iTermVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermVersionComparator.m; sourceTree = "<group>"; };
A685DA021E5B8A280091C3A7 /* iTermVersionComparatorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermVersionComparatorTest.m; sourceTree = "<group>"; };
A685DA051E5B8B0D0091C3A7 /* Sparkle */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = Sparkle; path = ThirdParty/Sparkle.framework/Versions/A/Sparkle; sourceTree = "<group>"; };
A686A1131C86A6CB0024C2DE /* NewOutputForDarkTheme.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NewOutputForDarkTheme.png; path = images/NewOutputForDarkTheme.png; sourceTree = "<group>"; };
A686A1141C86A6CB0024C2DE /* NewOutputForDarkTheme@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "NewOutputForDarkTheme@2x.png"; path = "images/NewOutputForDarkTheme@2x.png"; sourceTree = "<group>"; };
A686A11B1C86AA930024C2DE /* DeadForDarkTheme.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DeadForDarkTheme.png; path = images/DeadForDarkTheme.png; sourceTree = "<group>"; };
@@ -4080,7 +4071,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A685DA061E5B8B0D0091C3A7 /* Sparkle in Frameworks */,
A667196B1DCE3970000CE608 /* libiTerm2SharedARC.a in Frameworks */,
A667F3881B48671B00705186 /* libiTerm2Shared.a in Frameworks */,
A6C7642B1B45CBA800E3C992 /* libSSKeychain.a in Frameworks */,
@@ -5041,7 +5031,6 @@
1DD39AD5180B8118004E56D5 /* Frameworks */ = {
isa = PBXGroup;
children = (
A685DA051E5B8B0D0091C3A7 /* Sparkle */,
A656AE4B1DBBE1CE00CE8448 /* libaprutil-1.tbd */,
A6184F881BAB3ED70088EF3C /* ColorPicker.framework */,
1D94EAC712D641D3008225A9 /* AddressBook.framework */,
@@ -5674,8 +5663,6 @@
A673BFDD1E16C54500FA2386 /* iTermKeyLabels.m */,
A6C120781E39C3A4004021BB /* iTermBuriedSessions.h */,
A6C120791E39C3A4004021BB /* iTermBuriedSessions.m */,
A685D9FE1E5B87FF0091C3A7 /* iTermVersionComparator.h */,
A685D9FF1E5B87FF0091C3A7 /* iTermVersionComparator.m */,
);
name = Helpers;
sourceTree = "<group>";
@@ -5768,7 +5755,6 @@
A6C7641D1B45CB2800E3C992 /* iTerm2XCTests */ = {
isa = PBXGroup;
children = (
A685DA021E5B8A280091C3A7 /* iTermVersionComparatorTest.m */,
C6675EB91C4FE95E0041173B /* Utilities */,
A6D22B431BC9D368004084E0 /* iTermShellHistoryTest.m */,
A6BDB0401B45E8BA00F511E6 /* iTermEquivalenceClassSetTest.m */,
@@ -6863,7 +6849,6 @@
A66444BA1DEEA534000AC615 /* iTermDisclosableView.h in Headers */,
A66DB8421CA24E8800233E88 /* iTermAutoMasterParser.h in Headers */,
A685D9DA1E5A24AA0091C3A7 /* PTYSession.h in Headers */,
A685DA001E5B87FF0091C3A7 /* iTermVersionComparator.h in Headers */,
A6CEBFBB1DCE7E09009F4FD2 /* Api.pbobjc.h in Headers */,
A6CEC1151DCE8146009F4FD2 /* GPBArray_PackagePrivate.h in Headers */,
A6CEC0781DCE80C9009F4FD2 /* FieldMask.pbobjc.h in Headers */,
@@ -8598,7 +8583,6 @@
A6C762F91B45C52B00E3C992 /* iTermExposeView.m in Sources */,
A6C762E51B45C52B00E3C992 /* TextViewWrapper.m in Sources */,
A6C762F41B45C52B00E3C992 /* FakeWindow.m in Sources */,
A685DA011E5B87FF0091C3A7 /* iTermVersionComparator.m in Sources */,
A6C7632B1B45C52B00E3C992 /* SmartMatch.m in Sources */,
A6C763CB1B45C52B00E3C992 /* VT100TmuxParser.m in Sources */,
A6C763641B45C52B00E3C992 /* AppearancePreferencesViewController.m in Sources */,
@@ -8823,12 +8807,10 @@
A6BDB0421B45E8BA00F511E6 /* iTermEquivalenceClassSetTest.m in Sources */,
A6BDB04E1B45EC8A00F511E6 /* PTYSessionTest.m in Sources */,
A6BDB04C1B45EC3A00F511E6 /* iTermNSStringCategoryTest.m in Sources */,
A685DA031E5B8A280091C3A7 /* iTermVersionComparatorTest.m in Sources */,
A6BDB0501B45FBCB00F511E6 /* PTYTextViewTest.m in Sources */,
A667F3871B48615900705186 /* iTermToolbeltTest.m in Sources */,
A67778B71CFF40AC00DEED78 /* iTermNSArrayCategoryTest.m in Sources */,
C6675EBC1C4FE96B0041173B /* iTermSelectorSwizzler.m in Sources */,
A685DA041E5B8AA30091C3A7 /* iTermVersionComparator.m in Sources */,
A6BDB0461B45EAE700F511E6 /* VT100GridTest.m in Sources */,
A6BDB0441B45E8EE00F511E6 /* VT100ScreenTest.m in Sources */,
A6BDB0B51B45FE7700F511E6 /* iTermSemanticHistoryTest.m in Sources */,
@@ -9984,7 +9966,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -10008,10 +9989,6 @@
);
INFOPLIST_FILE = iTerm2XCTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty/Sparkle.framework/Versions/A",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -10051,7 +10028,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
@@ -10067,10 +10043,6 @@
);
INFOPLIST_FILE = iTerm2XCTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty/Sparkle.framework/Versions/A",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.iterm2.$(PRODUCT_NAME:rfc1034identifier)";
@@ -10109,7 +10081,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
@@ -10125,10 +10096,6 @@
);
INFOPLIST_FILE = iTerm2XCTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty/Sparkle.framework/Versions/A",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.iterm2.$(PRODUCT_NAME:rfc1034identifier)";
iTerm2XCTests/iTermVersionComparatorTest.m deleted 100644 → 0
+ 0
− 74
View file @ e449874d
//
// iTermVersionComparatorTest.m
// iTerm2
//
// Created by George Nachman on 2/20/17.
//
//
#import <XCTest/XCTest.h>
#import "iTermVersionComparator.h"
@interface iTermVersionComparatorTest : XCTestCase
@end
@implementation iTermVersionComparatorTest
- (void)testNonBetas {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.3" toVersion:@"1.2.4"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testNonBetasDifferentNumberOfParts {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.3.99" toVersion:@"1.2.4"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testNonBetasDifferentMajor {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"2.2.3.99" toVersion:@"1.2.4"];
XCTAssertEqual(NSOrderedDescending, actual);
}
- (void)testNonBetasChangeOnlyInExtraPart {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"3.0.0" toVersion:@"3.0.0.1"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testUpgradeFromBetaToRelease {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.3.beta" toVersion:@"1.2.0"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testUpgradeFromBetaToReleaseReversedOrder {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.0" toVersion:@"1.2.3.beta"];
XCTAssertEqual(NSOrderedDescending, actual);
}
- (void)testUpgradeFromBetaToReleaseSameExceptForBetaSuffix {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.0.beta" toVersion:@"1.2.0"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testUpgradeFromBetaToBeta {
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.3.beta" toVersion:@"1.2.4.beta"];
XCTAssertEqual(NSOrderedAscending, actual);
}
- (void)testUpgradeFromBetaToBetaReversedOrder {
// Reverse the order and make sure it becomes descending
iTermVersionComparator *c = [[[iTermVersionComparator alloc] init] autorelease];
NSComparisonResult actual = [c compareVersion:@"1.2.4.beta" toVersion:@"1.2.3.beta"];
XCTAssertEqual(NSOrderedDescending, actual);
}
@end
sources/iTermApplicationDelegate.m
+ 2
− 9
View file @ 9a617a5f
@@ -67,7 +67,6 @@
#import "iTermTipController.h"
#import "iTermTipWindowController.h"
#import "iTermToolbeltView.h"
#import "iTermVersionComparator.h"
#import "iTermWarning.h"
#import "NSApplication+iTerm.h"
#import "NSArray+iTerm.h"
@@ -130,7 +129,8 @@ static NSString *const kAPINextConfirmationDate = @"next confirmation";
static NSString *const kAPIAccessLocalizedName = @"app name";
static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
 
@interface iTermApplicationDelegate () <iTermAPIServerDelegate, iTermPasswordManagerDelegate, SUUpdaterDelegate>
@interface iTermApplicationDelegate () <iTermAPIServerDelegate, iTermPasswordManagerDelegate>
 
@property(nonatomic, readwrite) BOOL workspaceSessionActive;
 
@@ -961,7 +961,6 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
 
launchTime_ = [[NSDate date] retain];
_workspaceSessionActive = YES;
[[SUUpdater sharedUpdater] setDelegate:self];
}
 
return self;
@@ -2415,12 +2414,6 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
handler(response);
}
 
#pragma mark - SUUpdaterDelegate
- (id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater {
return [[[iTermVersionComparator alloc] init] autorelease];
}
@end
 
@implementation iTermApplicationDelegate (MoreActions)
sources/iTermVersionComparator.h deleted 100644 → 0
+ 0
− 13
View file @ e449874d
//
// iTermVersionComparator.h
// iTerm2
//
// Created by George Nachman on 2/20/17.
//
//
#import <Sparkle/Sparkle.h>
@interface iTermVersionComparator : SUStandardVersionComparator
@end
sources/iTermVersionComparator.m deleted 100644 → 0
+ 0
− 82
View file @ e449874d
//
// iTermVersionComparator.m
// iTerm2
//
// Created by George Nachman on 2/20/17.
//
//
#import "iTermVersionComparator.h"
#import "DebugLogging.h"
@implementation iTermVersionComparator
- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB {
ELog(@"Sparkle: Compare %@ and %@", versionA, versionB);
NSString *betaSuffix = @".beta";
if ([versionA hasSuffix:betaSuffix] && ![versionB hasSuffix:betaSuffix]) {
ELog(@"Stripping beta suffix from %@", versionA);
// a = wa.xa.ya.beta
// b = wb.xb.yb
// Compare only wa.xa and wb.xb. We want this to hold:
// 3.1.0 > 3.1.999.beta
// 3.0.0 < 3.1.0.beta.
versionA = [self iterm_firstTwoPartsOfVersion:versionA];
versionB = [self iterm_firstTwoPartsOfVersion:versionB];
NSComparisonResult result = [super compareVersion:versionA toVersion:versionB];
if (result == NSOrderedSame) {
result = NSOrderedAscending;
}
[self iterm_logComparisonBetweenVersion:versionA andVersion:versionB withResult:result];
return result;
} else if ([versionB hasSuffix:betaSuffix] && ![versionA hasSuffix:betaSuffix]) {
// Don't duplicate the logic above when A is non-beta and B is beta. Recurse and invert.
ELog(@"Sparkle: Inverting comparison between %@ and %@", versionA, versionB);
NSComparisonResult result = [self iterm_invertResult:[self compareVersion:versionB toVersion:versionA]];
[self iterm_logComparisonBetweenVersion:versionA andVersion:versionB withResult:result];
return result;
} else {
// Normal case.
NSComparisonResult result = [super compareVersion:versionA toVersion:versionB];
[self iterm_logComparisonBetweenVersion:versionA andVersion:versionB withResult:result];
return result;
}
}
- (void)iterm_logComparisonBetweenVersion:(NSString *)versionA andVersion:(NSString *)versionB withResult:(NSComparisonResult)result {
switch (result) {
case NSOrderedAscending:
ELog(@"Sparkle: %@ < %@", versionA, versionB);
break;
case NSOrderedDescending:
ELog(@"Sparkle: %@ > %@", versionA, versionB);
break;
case NSOrderedSame:
ELog(@"Sparkle: %@ = %@", versionA, versionB);
break;
}
}
- (NSComparisonResult)iterm_invertResult:(NSComparisonResult)result {
switch (result) {
case NSOrderedAscending:
return NSOrderedDescending;
case NSOrderedSame:
return result;
case NSOrderedDescending:
return NSOrderedAscending;
}
return result;
}
- (NSString *)iterm_firstTwoPartsOfVersion:(NSString *)version {
NSArray *parts = [version componentsSeparatedByString:@"."];
if (parts.count > 2) {
parts = [parts subarrayWithRange:NSMakeRange(0, 2)];
}
return [parts componentsJoinedByString:@"."];
}
@end
tools/release_beta.sh
+ 3
− 2
View file @ 9a617a5f
@@ -74,11 +74,12 @@ function Build {
popd
}
 
echo "$1".beta > version.txt
echo "$1" > version.txt
echo Set version to
cat version.txt
 
VERSION=$(cat version.txt)
COMPACTDATE=$(date +"%Y%m%d")
VERSION=$(cat version.txt | sed -e "s/%(extra)s/$COMPACTDATE/")
SVNDIR=~/iterm2-website
ORIG_DIR=`pwd`
 
version.txt
+ 1
− 1
View file @ 9a617a5f
3.1.%(extra)s
3.1.%(extra)s-beta
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment