mirror of
https://github.com/sparkle-project/Sparkle
synced 2026-11-22 04:30:47 +00:00
Compare commits
91
Commits
2.6.1
...
arm64-runners
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7a67e1028 | ||
|
|
782e2bf5d7 | ||
|
|
97bea2fcd4 | ||
|
|
b4a1b46fe1 | ||
|
|
8702e2dd11 | ||
|
|
d491aafeb7 | ||
|
|
2cfb1e6fe2 | ||
|
|
0c0317c09a | ||
|
|
43b3b03886 | ||
|
|
21e34394d0 | ||
|
|
e67dcb0fd2 | ||
|
|
5f9ee13796 | ||
|
|
eadcc179d0 | ||
|
|
f3dc1a4b9c | ||
|
|
4274e096fe | ||
|
|
341c8b2c17 | ||
|
|
8e30a08291 | ||
|
|
fea50c33c8 | ||
|
|
afc4179c0d | ||
|
|
f3cd2b9ff9 | ||
|
|
3b39b400e1 | ||
|
|
1dec7ddce9 | ||
|
|
3e3d573d08 | ||
|
|
057702e757 | ||
|
|
997778dd2d | ||
|
|
16819179a0 | ||
|
|
0ca3004e98 | ||
|
|
edacb83e50 | ||
|
|
62a1908333 | ||
|
|
19ff91d93d | ||
|
|
587aa028e6 | ||
|
|
f9a3d95ce0 | ||
|
|
4ad4255672 | ||
|
|
92c78f3c27 | ||
|
|
73695f6913 | ||
|
|
e13e63c85e | ||
|
|
9902f2fb05 | ||
|
|
1ca60d5ab6 | ||
|
|
597825d111 | ||
|
|
2c95fa406a | ||
|
|
8fcdac1e6c | ||
|
|
d04faabe7d | ||
|
|
ebf75782f8 | ||
|
|
14ba9efc51 | ||
|
|
f3dc125d8c | ||
|
|
544c642483 | ||
|
|
ad3c8b5dc7 | ||
|
|
ef9bc6ef58 | ||
|
|
6848a88abc | ||
|
|
8de8db001e | ||
|
|
8f8842214b | ||
|
|
661540d088 | ||
|
|
a5c26b5cdf | ||
|
|
8f86cad4a2 | ||
|
|
8bc4976a2c | ||
|
|
ed987512f6 | ||
|
|
04ad482d59 | ||
|
|
fa4eaa977c | ||
|
|
e9726ff718 | ||
|
|
0ef1ee0220 | ||
|
|
6aa15e9933 | ||
|
|
b8986f608a | ||
|
|
a4badefff2 | ||
|
|
3a9734538a | ||
|
|
1b6565ded5 | ||
|
|
dd9374356b | ||
|
|
97a8f5a6ba | ||
|
|
3f93bf0150 | ||
|
|
007e9aee61 | ||
|
|
37d1fee019 | ||
|
|
2a48c17b03 | ||
|
|
cd6c61d47f | ||
|
|
3c180effcb | ||
|
|
0ad8d83066 | ||
|
|
b456fd4049 | ||
|
|
5af89de393 | ||
|
|
3a87581af2 | ||
|
|
6e2366255b | ||
|
|
c648665724 | ||
|
|
27cf3b3650 | ||
|
|
444a537365 | ||
|
|
61054c7a9a | ||
|
|
2247105ff3 | ||
|
|
f904466d35 | ||
|
|
9d6e8c24b5 | ||
|
|
dd76d0063d | ||
|
|
be8247efbd | ||
|
|
41847a58cd | ||
|
|
f948fafe16 | ||
|
|
946c583910 | ||
|
|
026cf54a76 |
No files matched your search
+16
-12
@@ -10,18 +10,18 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode: ['xcode14.3.1', 'xcode15.2']
|
||||
xcode: ['xcode26', 'xcode16.4']
|
||||
include:
|
||||
- xcode: 'xcode15.2'
|
||||
xcode-path: '/Applications/Xcode_15.2.app/Contents/Developer'
|
||||
- xcode: 'xcode16.4'
|
||||
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
|
||||
upload-dist: true
|
||||
run-analyzer: true
|
||||
macos: 'macos-13'
|
||||
- xcode: 'xcode14.3.1'
|
||||
xcode-path: '/Applications/Xcode_14.3.1.app/Contents/Developer'
|
||||
macos: 'macos-15-arm64'
|
||||
- xcode: 'xcode26'
|
||||
xcode-path: '/Applications/Xcode_26.0.app'
|
||||
upload-dist: false
|
||||
run-analyzer: false
|
||||
macos: 'macos-13'
|
||||
macos: 'macos-15-arm64'
|
||||
|
||||
name: Build and Test Sparkle
|
||||
runs-on: ${{ matrix.macos }}
|
||||
@@ -69,17 +69,21 @@ jobs:
|
||||
env:
|
||||
DEVELOPER_DIR: ${{ matrix.xcode-path }}
|
||||
run: |
|
||||
if grep -q "warning:" analyze_output.txt; then
|
||||
echo '::set-output name=analyzestatus::0'
|
||||
if grep "warning:" analyze_output.txt | grep -q -v "dependency scan of"; then
|
||||
echo "analyzestatus=0" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo '::set-output name=analyzestatus::1'
|
||||
echo "analyzestatus=1" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Extract Analyzed Warnings
|
||||
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
|
||||
id: warnings
|
||||
run: |
|
||||
echo ::set-output name=content::$(cat analyze_output.txt)
|
||||
{
|
||||
echo 'content<<EOF'
|
||||
cat analyze_output.txt
|
||||
echo 'EOF'
|
||||
} >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Post Analyzed Warnings
|
||||
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
|
||||
@@ -104,4 +108,4 @@ jobs:
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Sparkle-distribution-${{ matrix.xcode }}.tar.xz
|
||||
path: build/Build/Products/Release/sparkle-dist.tar.xz
|
||||
path: build/Build/Products/Release/sparkle_dist.tar.xz
|
||||
@@ -2,7 +2,7 @@ name: "Create Draft Release"
|
||||
|
||||
env:
|
||||
BUILDDIR: "build"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_16.4.app/Contents/Developer"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
@@ -29,7 +29,7 @@ concurrency:
|
||||
jobs:
|
||||
release:
|
||||
name: "Publish binaries for release"
|
||||
runs-on: macos-13
|
||||
runs-on: macos-15-arm64
|
||||
|
||||
steps:
|
||||
- name: "Checkout sources"
|
||||
@@ -86,7 +86,7 @@ jobs:
|
||||
run: git push
|
||||
|
||||
- name: "Draft a release"
|
||||
uses: softprops/action-gh-release@v1
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
draft: true
|
||||
prerelease: ${{ env.PRERELEASE_VERSION }}
|
||||
|
||||
+62
-14
@@ -28,6 +28,7 @@
|
||||
#import "SPUInstallationType.h"
|
||||
#import "SPULocalCacheDirectory.h"
|
||||
#import "SPUVerifierInformation.h"
|
||||
#import "SUConstants.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -176,10 +177,10 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
id<SUUnarchiverProtocol> unarchiver = [SUUnarchiver unarchiverForPath:archivePath extractionDirectory:_extractionDirectory updatingHostBundlePath:_host.bundlePath decryptionPassword:_decryptionPassword expectingInstallationType:_installationType];
|
||||
|
||||
NSError *unarchiverError = nil;
|
||||
NSError *prevalidationError = nil;
|
||||
BOOL success = NO;
|
||||
if (!unarchiver) {
|
||||
unarchiverError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"No valid unarchiver was found for %@", archivePath] }];
|
||||
prevalidationError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"No valid unarchiver was found for %@", archivePath] }];
|
||||
|
||||
success = NO;
|
||||
} else {
|
||||
@@ -192,20 +193,38 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
}
|
||||
|
||||
_updateValidator = [[SUUpdateValidator alloc] initWithDownloadPath:archivePath signatures:_signatures host:_host verifierInformation:_verifierInformation];
|
||||
|
||||
// Delta & package updates will require validation before extraction
|
||||
// Normal application updates are a bit more lenient allowing developers to change one of apple dev ID or EdDSA keys
|
||||
BOOL needsPrevalidation = [[unarchiver class] mustValidateBeforeExtraction] || ![_installationType isEqualToString:SPUInstallationTypeApplication];
|
||||
|
||||
if (needsPrevalidation) {
|
||||
success = [_updateValidator validateDownloadPathWithError:&unarchiverError];
|
||||
|
||||
// More uncommon archives types (.aar, .yaa) need SUVerifyUpdateBeforeExtraction
|
||||
BOOL verifyBeforeExtraction = [_host boolForInfoDictionaryKey:SUVerifyUpdateBeforeExtractionKey];
|
||||
if (!verifyBeforeExtraction && unarchiver.needsVerifyBeforeExtractionKey) {
|
||||
prevalidationError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Extracting %@ archives require setting %@ to YES in the old app. Please visit https://sparkle-project.org/documentation/customization/ for more information.", archivePath.pathExtension, SUVerifyUpdateBeforeExtractionKey] }];
|
||||
|
||||
success = NO;
|
||||
} else {
|
||||
success = YES;
|
||||
// Delta, package updates, and apps with SUVerifyUpdateBeforeExtraction will require validation before extraction
|
||||
// Otherwise normal application updates are a bit more lenient allowing developers to change one of apple dev ID or EdDSA keys after extraction
|
||||
BOOL archiveTypeMustValidateBeforeExtraction = [[unarchiver class] mustValidateBeforeExtraction];
|
||||
BOOL needsPrevalidation = verifyBeforeExtraction || archiveTypeMustValidateBeforeExtraction || ![_installationType isEqualToString:SPUInstallationTypeApplication];
|
||||
|
||||
if (needsPrevalidation) {
|
||||
// EdDSA signing is required, so host must have public keys
|
||||
if (![_updateValidator validateHostHasPublicKeys:&prevalidationError]) {
|
||||
success = NO;
|
||||
} else {
|
||||
// Falling back on code signing for prevalidation requires SUVerifyUpdateBeforeExtraction
|
||||
// and that update is a regular app update, and not a delta update
|
||||
BOOL fallbackOnCodeSigning = (verifyBeforeExtraction && !archiveTypeMustValidateBeforeExtraction && [_installationType isEqualToString:SPUInstallationTypeApplication]);
|
||||
|
||||
success = [_updateValidator validateDownloadPathWithFallbackOnCodeSigning:fallbackOnCodeSigning error:&prevalidationError];
|
||||
}
|
||||
} else {
|
||||
success = YES;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
[self unarchiverDidFailWithError:unarchiverError];
|
||||
[self unarchiverDidFailWithError:prevalidationError];
|
||||
} else {
|
||||
[unarchiver
|
||||
unarchiveWithCompletionBlock:^(NSError * _Nullable error) {
|
||||
@@ -236,7 +255,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
[self->_communicator handleMessageWithIdentifier:SPUExtractedArchiveWithProgress data:data];
|
||||
}
|
||||
}];
|
||||
} waitForCleanup:NO];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -415,13 +434,41 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
SULog(SULogLevelError, @"Error: bookmark data for update download is stale.. but still continuing.");
|
||||
}
|
||||
|
||||
NSString *downloadName = downloadURL.lastPathComponent;
|
||||
if (downloadName == nil) {
|
||||
NSString *originalDownloadName = downloadURL.lastPathComponent;
|
||||
if (originalDownloadName == nil) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to retrieve download name from download URL" }]];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Randomize the download name if possible
|
||||
// This adds better security if there are any vulnerabilities in extracting/executing archives
|
||||
// which allow writing in unexpected locations. For zip/tar/dmg archives we may also extract them before
|
||||
// performing signing validation (due to key rotation).
|
||||
NSString *downloadName;
|
||||
NSString *randomizedUUIDString = [[NSUUID UUID] UUIDString];
|
||||
if (randomizedUUIDString != nil) {
|
||||
// Find the real path extension of the download name
|
||||
// We cannot use -[NSString pathExtension] because it may not give us the full path extension
|
||||
// E.g. for "foo.tar.xz" we need "tar.xz", not "xz"
|
||||
NSString *downloadPathExtension;
|
||||
NSRange pathExtensionDelimiterRange = [originalDownloadName rangeOfString:@"."];
|
||||
if (pathExtensionDelimiterRange.location == NSNotFound) {
|
||||
downloadPathExtension = @"";
|
||||
} else {
|
||||
downloadPathExtension = [originalDownloadName substringFromIndex:pathExtensionDelimiterRange.location + 1];
|
||||
}
|
||||
|
||||
NSString *randomizedDownloadName = [randomizedUUIDString stringByAppendingPathExtension:downloadPathExtension];
|
||||
if (randomizedDownloadName != nil) {
|
||||
downloadName = randomizedDownloadName;
|
||||
} else {
|
||||
downloadName = originalDownloadName;
|
||||
}
|
||||
} else {
|
||||
downloadName = originalDownloadName;
|
||||
}
|
||||
|
||||
// Move the download archive to somewhere where probably only we will be touching it
|
||||
// This prevents eg: if a bug exists in the updater that removes files we are trying to install
|
||||
// When this tool is ran as root, we are moving it into a directory that only root will have access to
|
||||
@@ -471,6 +518,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
self->_signatures = installationData.signatures;
|
||||
self->_updateDirectoryPath = cacheInstallationPath;
|
||||
self->_extractionDirectory = extractionDirectory;
|
||||
self->_decryptionPassword = installationData.decryptionPassword;
|
||||
self->_host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
self->_verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:installationData.expectedVersion expectedContentLength:installationData.expectedContentLength];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#import "SPUDeltaArchiveProtocol.h"
|
||||
#import "SPUSparkleDeltaArchive.h"
|
||||
#import "SPUXarDeltaArchive.h"
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
#import "SUBinaryDeltaCommon.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -80,8 +80,8 @@ id<SPUDeltaArchiveProtocol> SPUDeltaArchiveReadPatchAndHeader(NSString *patchFil
|
||||
|
||||
@implementation SPUDeltaArchiveHeader
|
||||
{
|
||||
unsigned char _beforeTreeHash[CC_SHA1_DIGEST_LENGTH];
|
||||
unsigned char _afterTreeHash[CC_SHA1_DIGEST_LENGTH];
|
||||
unsigned char _beforeTreeHash[BINARY_DELTA_HASH_LENGTH];
|
||||
unsigned char _afterTreeHash[BINARY_DELTA_HASH_LENGTH];
|
||||
}
|
||||
|
||||
@synthesize compression = _compression;
|
||||
@@ -89,8 +89,9 @@ id<SPUDeltaArchiveProtocol> SPUDeltaArchiveReadPatchAndHeader(NSString *patchFil
|
||||
@synthesize fileSystemCompression = _fileSystemCompression;
|
||||
@synthesize majorVersion = _majorVersion;
|
||||
@synthesize minorVersion = _minorVersion;
|
||||
@synthesize bundleCreationDate = _bundleCreationDate;
|
||||
|
||||
- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash
|
||||
- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash bundleCreationDate:(nullable NSDate *)bundleCreationDate
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil)
|
||||
@@ -104,6 +105,8 @@ id<SPUDeltaArchiveProtocol> SPUDeltaArchiveReadPatchAndHeader(NSString *patchFil
|
||||
|
||||
memcpy(_beforeTreeHash, beforeTreeHash, sizeof(_beforeTreeHash));
|
||||
memcpy(_afterTreeHash, afterTreeHash, sizeof(_afterTreeHash));
|
||||
|
||||
_bundleCreationDate = bundleCreationDate;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ typedef NS_ENUM(uint8_t, SPUDeltaItemCommands) {
|
||||
// Represents header for our archive
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SPUDeltaArchiveHeader : NSObject
|
||||
|
||||
- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash;
|
||||
- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash bundleCreationDate:(nullable NSDate *)bundleCreationDate;
|
||||
|
||||
@property (nonatomic, readonly) SPUDeltaCompressionMode compression;
|
||||
@property (nonatomic, readonly) uint8_t compressionLevel;
|
||||
@@ -35,6 +35,7 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUDeltaArchiveHeader : NSObject
|
||||
@property (nonatomic, readonly) uint16_t minorVersion;
|
||||
@property (nonatomic, readonly) unsigned char *beforeTreeHash;
|
||||
@property (nonatomic, readonly) unsigned char *afterTreeHash;
|
||||
@property (nonatomic, readonly, nullable) NSDate *bundleCreationDate;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -216,7 +216,7 @@ typedef struct
|
||||
}
|
||||
}
|
||||
|
||||
static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMode compressionMode)
|
||||
static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode compressionMode)
|
||||
{
|
||||
switch (compressionMode) {
|
||||
case SPUDeltaCompressionModeLZMA:
|
||||
@@ -310,7 +310,7 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
case SPUDeltaCompressionModeLZFSE:
|
||||
case SPUDeltaCompressionModeLZ4:
|
||||
case SPUDeltaCompressionModeZLIB: {
|
||||
if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_DECODE, _compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
|
||||
if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_DECODE, compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open compression stream for reading" }];
|
||||
return nil;
|
||||
}
|
||||
@@ -338,17 +338,29 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
return nil;
|
||||
}
|
||||
|
||||
unsigned char beforeTreeHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char beforeTreeHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (![self _readBuffer:beforeTreeHash length:sizeof(beforeTreeHash)]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
unsigned char afterTreeHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char afterTreeHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (![self _readBuffer:afterTreeHash length:sizeof(afterTreeHash)]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
return [[SPUDeltaArchiveHeader alloc] initWithCompression:compression compressionLevel:metadata.compressionLevel fileSystemCompression:metadata.fileSystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeTreeHash afterTreeHash:afterTreeHash];
|
||||
NSDate *bundleCreationDate;
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
double bundleCreationTimeInterval = 0;
|
||||
if (![self _readBuffer:&bundleCreationTimeInterval length:sizeof(bundleCreationTimeInterval)]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
bundleCreationDate = (bundleCreationTimeInterval != 0.0) ? [NSDate dateWithTimeIntervalSinceReferenceDate:bundleCreationTimeInterval] : nil;
|
||||
} else {
|
||||
bundleCreationDate = nil;
|
||||
}
|
||||
|
||||
return [[SPUDeltaArchiveHeader alloc] initWithCompression:compression compressionLevel:metadata.compressionLevel fileSystemCompression:metadata.fileSystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeTreeHash afterTreeHash:afterTreeHash bundleCreationDate:bundleCreationDate];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)_readRelativeFilePaths SPU_OBJC_DIRECT
|
||||
@@ -832,7 +844,7 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
case SPUDeltaCompressionModeLZFSE:
|
||||
case SPUDeltaCompressionModeLZ4:
|
||||
case SPUDeltaCompressionModeZLIB: {
|
||||
if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_ENCODE, _compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
|
||||
if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_ENCODE, compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open compression stream for writing" }];
|
||||
|
||||
return;
|
||||
@@ -853,8 +865,16 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
uint16_t minorVersion = header.minorVersion;
|
||||
[self _writeBuffer:&minorVersion length:sizeof(minorVersion)];
|
||||
|
||||
[self _writeBuffer:header.beforeTreeHash length:CC_SHA1_DIGEST_LENGTH];
|
||||
[self _writeBuffer:header.afterTreeHash length:CC_SHA1_DIGEST_LENGTH];
|
||||
[self _writeBuffer:header.beforeTreeHash length:BINARY_DELTA_HASH_LENGTH];
|
||||
[self _writeBuffer:header.afterTreeHash length:BINARY_DELTA_HASH_LENGTH];
|
||||
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
NSDate *bundleCreationDate = header.bundleCreationDate;
|
||||
|
||||
// If bundleCreationDate == nil, we will write out a 0 time interval
|
||||
double timeInterval = bundleCreationDate.timeIntervalSinceReferenceDate;
|
||||
[self _writeBuffer:&timeInterval length:sizeof(timeInterval)];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)addItem:(SPUDeltaArchiveItem *)item
|
||||
@@ -883,7 +903,7 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
|
||||
// Clone commands reference relative file paths in this table but sometimes there may not
|
||||
// be an entry if extraction for an original item was skipped. Fill out any missing file path entries.
|
||||
// For example, if A.app has Contents/A and B.app has Contents/A and Contents/A and Contents/B,
|
||||
// For example, if A.app has Contents/A and B.app has Contents/A and Contents/B,
|
||||
// where A and B's contents are the same and A is the same in both apps, normally we would not record Contents/A because its extraction was skipped. However now B is a clone of A so we need a record for A.
|
||||
NSMutableArray<NSString *> *newClonedPathEntries = [NSMutableArray array];
|
||||
for (SPUDeltaArchiveItem *item in writableItems) {
|
||||
@@ -1121,7 +1141,7 @@ static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMod
|
||||
} else if (S_ISLNK(extractMode)) {
|
||||
off_t fileSize = itemFileInfo.st_size;
|
||||
if (fileSize > UINT16_MAX) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Link path has a destination that is too long: %llu bytes", fileSize] }];
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Link path has a destination that is too long: %lld bytes", fileSize] }];
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -159,15 +159,15 @@ extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
|
||||
}
|
||||
}
|
||||
|
||||
unsigned char rawExpectedBeforeHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char rawExpectedBeforeHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
getRawHashFromDisplayHash(rawExpectedBeforeHash, expectedBeforeHash);
|
||||
|
||||
unsigned char rawExpectedAfterHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char rawExpectedAfterHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
getRawHashFromDisplayHash(rawExpectedAfterHash, expectedAfterHash);
|
||||
|
||||
// I wasn't able to figure out how to retrieve the compression options from xar,
|
||||
// so we will use default flags to indicate the info isn't available
|
||||
return [[SPUDeltaArchiveHeader alloc] initWithCompression:SPUDeltaCompressionModeDefault compressionLevel:0 fileSystemCompression:false majorVersion:majorDiffVersion minorVersion:minorDiffVersion beforeTreeHash:rawExpectedBeforeHash afterTreeHash:rawExpectedAfterHash];
|
||||
return [[SPUDeltaArchiveHeader alloc] initWithCompression:SPUDeltaCompressionModeDefault compressionLevel:0 fileSystemCompression:false majorVersion:majorDiffVersion minorVersion:minorDiffVersion beforeTreeHash:rawExpectedBeforeHash afterTreeHash:rawExpectedAfterHash bundleCreationDate:nil];
|
||||
}
|
||||
|
||||
- (void)writeHeader:(SPUDeltaArchiveHeader *)header
|
||||
@@ -228,7 +228,7 @@ extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
|
||||
xar_subdoc_prop_set(attributes, AFTER_TREE_SHA1_KEY, [displayHashFromRawHash(header.afterTreeHash) UTF8String]);
|
||||
}
|
||||
|
||||
static xar_file_t _xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTable, xar_t x, NSString *relativePath, NSString *filePath)
|
||||
static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTable, xar_t x, NSString *relativePath, NSString *filePath)
|
||||
{
|
||||
NSArray<NSString *> *rootRelativePathComponents = relativePath.pathComponents;
|
||||
// Relative path must at least have starting "/" component and one more path component
|
||||
@@ -285,7 +285,7 @@ static xar_file_t _xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTa
|
||||
SPUDeltaItemCommands commands = item.commands;
|
||||
uint16_t mode = item.mode;
|
||||
|
||||
xar_file_t newFile = _xarAddFile(_fileTable, _x, relativeFilePath, filePath);
|
||||
xar_file_t newFile = xarAddFile(_fileTable, _x, relativeFilePath, filePath);
|
||||
if (newFile == NULL) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_ADD_FAILURE userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to add xar file entry: %@", relativeFilePath] }];
|
||||
return;
|
||||
|
||||
@@ -92,7 +92,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
|
||||
progressCallback(1/7.0);
|
||||
|
||||
unsigned char beforeHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char beforeHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (!getRawHashOfTreeWithVersion(beforeHash, source, majorDiffVersion)) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
@@ -102,8 +102,8 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (memcmp(beforeHash, expectedBeforeHash, CC_SHA1_DIGEST_LENGTH) != 0) {
|
||||
|
||||
if (memcmp(beforeHash, expectedBeforeHash, BINARY_DELTA_HASH_LENGTH) != 0) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
@@ -141,7 +141,9 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
|
||||
progressCallback(3/7.0);
|
||||
|
||||
if (!copyTree(source, destination)) {
|
||||
NSFileManager *fileManager = [[NSFileManager alloc] init];
|
||||
|
||||
if (!copyTree(fileManager, source, destination)) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
@@ -150,13 +152,22 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
// Preserve file creation date only for the root item if the date is recorded
|
||||
// (requires major version 4 or later)
|
||||
NSDate *bundleCreationDate = header.bundleCreationDate;
|
||||
if (bundleCreationDate != nil) {
|
||||
NSError *setFileCreationDateError = nil;
|
||||
if (![fileManager setAttributes:@{NSFileCreationDate: bundleCreationDate} ofItemAtPath:destination error:&setFileCreationDateError]) {
|
||||
fprintf(stderr, "\nWarning: failed to set file creation date: %s", setFileCreationDateError.localizedDescription.UTF8String);
|
||||
}
|
||||
}
|
||||
|
||||
progressCallback(4/7.0);
|
||||
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\nPatching...");
|
||||
}
|
||||
NSFileManager *fileManager = [[NSFileManager alloc] init];
|
||||
|
||||
// Ensure error is cleared out in advance
|
||||
if (error != NULL) {
|
||||
@@ -378,7 +389,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n👮 %s %s (0%o)", VERBOSE_MODIFIED, [relativePath fileSystemRepresentation], mode & PERMISSION_FLAGS);
|
||||
fprintf(stderr, "\n👮 %s %s (0%o)", VERBOSE_MODIFIED, [relativePath fileSystemRepresentation], (unsigned int)(mode & PERMISSION_FLAGS));
|
||||
}
|
||||
}
|
||||
}];
|
||||
@@ -449,7 +460,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
fprintf(stderr, "\nVerifying destination...");
|
||||
}
|
||||
|
||||
unsigned char afterHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char afterHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (!getRawHashOfTreeWithVersion(afterHash, finalDestination, majorDiffVersion)) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
@@ -460,8 +471,8 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
removeTree(finalDestination);
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (memcmp(afterHash, expectedAfterHash, CC_SHA1_DIGEST_LENGTH) != 0) {
|
||||
|
||||
if (memcmp(afterHash, expectedAfterHash, BINARY_DELTA_HASH_LENGTH) != 0) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#define VERBOSE_MODIFIED "Modified" // file's metadata is modified
|
||||
#define VERBOSE_CLONED "Cloned" // file is cloned in content from a differently named file
|
||||
|
||||
#define MAJOR_VERSION_IS_AT_LEAST(actualMajor, expectedMajor) (actualMajor >= expectedMajor)
|
||||
|
||||
// Relative path of custom icon data that may be set on a bundle via a resource fork
|
||||
#define CUSTOM_ICON_PATH @"/Icon\r"
|
||||
|
||||
@@ -44,7 +42,8 @@ typedef NS_ENUM(uint16_t, SUBinaryDeltaMajorVersion)
|
||||
// Note: support for creating or applying version 1 deltas have been removed
|
||||
SUBinaryDeltaMajorVersion1 = 1,
|
||||
SUBinaryDeltaMajorVersion2 = 2,
|
||||
SUBinaryDeltaMajorVersion3 = 3
|
||||
SUBinaryDeltaMajorVersion3 = 3,
|
||||
SUBinaryDeltaMajorVersion4 = 4,
|
||||
};
|
||||
|
||||
extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionDefault;
|
||||
@@ -52,23 +51,27 @@ extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionLatest;
|
||||
extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirst;
|
||||
extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirstSupported;
|
||||
|
||||
// Additional compression methods for version 3 patches that we have for debugging are zlib, bzip2, none
|
||||
#define COMPRESSION_METHOD_ARGUMENT_DESCRIPTION @"The compression method to use for generating delta updates. Supported methods for version 3 delta files are 'lzma' (best compression, slowest), 'lzfse' (good compression, fast), 'lz4' (worse compression, fastest), and 'default'. Note that version 2 delta files only support 'bzip2', and 'default' so other methods will be ignored if version 2 files are being generated. The 'default' compression for version 3 delta files is currently lzma."
|
||||
// Additional compression methods for version 3 or 4 patches that we have for debugging are zlib, bzip2, none
|
||||
#define COMPRESSION_METHOD_ARGUMENT_DESCRIPTION @"The compression method to use for generating delta updates. Supported methods for version 3 delta files are 'lzma' (best compression, slowest), 'lzfse' (good compression, fast), 'lz4' (worse compression, fastest), and 'default'. Note that version 2 delta files only support 'bzip2', and 'default' so other methods will be ignored if version 2 files are being generated. The 'default' compression for version 3 or 4 delta files is currently lzma."
|
||||
|
||||
//#define COMPRESSION_LEVEL_ARGUMENT_DESCRIPTION @"The compression level to use for generating delta updates. This only applies if the compression method used is bzip2 which accepts values from 1 - 9. A special value of 0 will use the default compression level."
|
||||
|
||||
// This is the same as CC_SHA1_DIGEST_LENGTH
|
||||
// Major versions >= 4 use a crc32 hash (using a subset of these bytes) while older versions use a sha1 hash
|
||||
#define BINARY_DELTA_HASH_LENGTH 20
|
||||
|
||||
SPUDeltaCompressionMode deltaCompressionModeFromDescription(NSString *description, BOOL *requestValid);
|
||||
NSString *deltaCompressionStringFromMode(SPUDeltaCompressionMode mode);
|
||||
|
||||
extern int compareFiles(const FTSENT **a, const FTSENT **b);
|
||||
BOOL getRawHashOfTreeWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion);
|
||||
BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary);
|
||||
BOOL getRawHashOfTreeWithVersion(void *hashBuffer, NSString *path, uint16_t majorVersion);
|
||||
BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path, uint16_t majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary);
|
||||
NSString *displayHashFromRawHash(const unsigned char *hash);
|
||||
void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash);
|
||||
extern NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion);
|
||||
extern NSString *hashOfTree(NSString *path);
|
||||
extern BOOL removeTree(NSString *path);
|
||||
extern BOOL copyTree(NSString *source, NSString *dest);
|
||||
extern BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest);
|
||||
extern BOOL modifyPermissions(NSString *path, mode_t desiredPermissions);
|
||||
extern NSString *pathRelativeToDirectory(NSString *directory, NSString *path);
|
||||
NSString *temporaryFilename(NSString *base);
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
//
|
||||
|
||||
#include "SUBinaryDeltaCommon.h"
|
||||
#import "SUFileManager.h"
|
||||
#include <CommonCrypto/CommonDigest.h>
|
||||
#include <zlib.h> // for crc32()
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
// Note: the framework bundle version must be bumped, and generate_appcast must be updated to compare it,
|
||||
// when we add/change new major versions and defaults. Unit tests need to be updated to use new versions too.
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionDefault = SUBinaryDeltaMajorVersion3;
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionLatest = SUBinaryDeltaMajorVersion3;
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionDefault = SUBinaryDeltaMajorVersion4;
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionLatest = SUBinaryDeltaMajorVersion4;
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirst = SUBinaryDeltaMajorVersion1;
|
||||
SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirstSupported = SUBinaryDeltaMajorVersion2;
|
||||
|
||||
@@ -113,9 +113,11 @@ uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersio
|
||||
case SUBinaryDeltaMajorVersion1:
|
||||
return 2;
|
||||
case SUBinaryDeltaMajorVersion2:
|
||||
return 4;
|
||||
return 5;
|
||||
case SUBinaryDeltaMajorVersion3:
|
||||
return 1;
|
||||
return 3;
|
||||
case SUBinaryDeltaMajorVersion4:
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -157,7 +159,7 @@ NSString *temporaryDirectory(NSString *base)
|
||||
return stringWithFileSystemRepresentation(templateResult);
|
||||
}
|
||||
|
||||
static void _hashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
|
||||
static void sha1HashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
|
||||
{
|
||||
assert(bufferLength >= 0 && bufferLength <= UINT32_MAX);
|
||||
CC_SHA1_CTX hashContext;
|
||||
@@ -166,7 +168,59 @@ static void _hashOfBuffer(unsigned char *hash, const char *buffer, ssize_t buffe
|
||||
CC_SHA1_Final(hash, &hashContext);
|
||||
}
|
||||
|
||||
static BOOL _hashOfFileContents(unsigned char *hash, FTSENT *ent, void *tempBuffer, size_t tempBufferSize)
|
||||
static BOOL crc32HashOfFileContents(uLong *outChecksum, FTSENT *ent, void *tempBuffer, size_t tempBufferSize)
|
||||
{
|
||||
uLong checksum = *outChecksum;
|
||||
|
||||
if (ent->fts_info == FTS_SL) {
|
||||
char linkDestination[MAXPATHLEN + 1];
|
||||
ssize_t linkDestinationLength = readlink(ent->fts_path, linkDestination, MAXPATHLEN);
|
||||
if (linkDestinationLength < 0) {
|
||||
perror("readlink");
|
||||
return NO;
|
||||
}
|
||||
|
||||
checksum = crc32(checksum, (const void *)linkDestination, (unsigned int)linkDestinationLength);
|
||||
} else if (ent->fts_info == FTS_F) {
|
||||
ssize_t fileSize = ent->fts_statp->st_size;
|
||||
|
||||
uint64_t encodedFileSize = (uint64_t)fileSize;
|
||||
checksum = crc32(checksum, (const void *)&encodedFileSize, sizeof(encodedFileSize));
|
||||
|
||||
if (fileSize > 0) {
|
||||
FILE *file = fopen(ent->fts_path, "rb");
|
||||
if (file == NULL) {
|
||||
perror("fopen");
|
||||
return NO;
|
||||
}
|
||||
|
||||
size_t bytesLeft = (size_t)fileSize;
|
||||
while (bytesLeft > 0) {
|
||||
size_t bytesToConsume = (bytesLeft >= tempBufferSize) ? tempBufferSize : bytesLeft;
|
||||
|
||||
if (fread(tempBuffer, bytesToConsume, 1, file) < 1) {
|
||||
perror("fread");
|
||||
fclose(file);
|
||||
return NO;
|
||||
}
|
||||
|
||||
checksum = crc32(checksum, tempBuffer, (uInt)bytesToConsume);
|
||||
|
||||
bytesLeft -= bytesToConsume;
|
||||
}
|
||||
|
||||
fclose(file);
|
||||
}
|
||||
} else {
|
||||
return NO;
|
||||
}
|
||||
|
||||
*outChecksum = checksum;
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
static BOOL sha1HashOfFileContents(unsigned char *hash, FTSENT *ent, void *tempBuffer, size_t tempBufferSize)
|
||||
{
|
||||
if (ent->fts_info == FTS_SL) {
|
||||
char linkDestination[MAXPATHLEN + 1];
|
||||
@@ -176,11 +230,11 @@ static BOOL _hashOfFileContents(unsigned char *hash, FTSENT *ent, void *tempBuff
|
||||
return NO;
|
||||
}
|
||||
|
||||
_hashOfBuffer(hash, linkDestination, linkDestinationLength);
|
||||
sha1HashOfBuffer(hash, linkDestination, linkDestinationLength);
|
||||
} else if (ent->fts_info == FTS_F) {
|
||||
ssize_t fileSize = ent->fts_statp->st_size;
|
||||
if (fileSize <= 0) {
|
||||
_hashOfBuffer(hash, NULL, 0);
|
||||
sha1HashOfBuffer(hash, NULL, 0);
|
||||
} else {
|
||||
FILE *file = fopen(ent->fts_path, "rb");
|
||||
if (file == NULL) {
|
||||
@@ -217,12 +271,12 @@ static BOOL _hashOfFileContents(unsigned char *hash, FTSENT *ent, void *tempBuff
|
||||
return YES;
|
||||
}
|
||||
|
||||
BOOL getRawHashOfTreeWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion)
|
||||
BOOL getRawHashOfTreeWithVersion(void *hashBuffer, NSString *path, uint16_t majorVersion)
|
||||
{
|
||||
return getRawHashOfTreeAndFileTablesWithVersion(hashBuffer, path, majorVersion, nil, nil);
|
||||
}
|
||||
|
||||
BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t __unused majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary)
|
||||
BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path, uint16_t majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary)
|
||||
{
|
||||
char pathBuffer[PATH_MAX] = { 0 };
|
||||
if (![path getFileSystemRepresentation:pathBuffer maxLength:sizeof(pathBuffer)]) {
|
||||
@@ -245,7 +299,12 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSStrin
|
||||
}
|
||||
|
||||
CC_SHA1_CTX hashContext;
|
||||
CC_SHA1_Init(&hashContext);
|
||||
const uLong initialCrc32Value = crc32(0L, Z_NULL, 0);
|
||||
uLong crc32ChecksumValue = initialCrc32Value;
|
||||
|
||||
if (majorVersion < SUBinaryDeltaMajorVersion4) {
|
||||
CC_SHA1_Init(&hashContext);
|
||||
}
|
||||
|
||||
// Ensure the path uses filesystem-specific Unicode normalization #1017
|
||||
NSString *normalizedPath = stringWithFileSystemRepresentation(pathBuffer);
|
||||
@@ -262,32 +321,67 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSStrin
|
||||
continue;
|
||||
}
|
||||
|
||||
unsigned char fileHash[CC_SHA1_DIGEST_LENGTH];
|
||||
if (!_hashOfFileContents(fileHash, ent, tempBuffer, tempBufferSize)) {
|
||||
fts_close(fts);
|
||||
free(tempBuffer);
|
||||
return NO;
|
||||
NSData *fileHashKey;
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
if (ent->fts_info == FTS_D) {
|
||||
// No need to hash any further values for directories
|
||||
// We hash relative file path and file type later
|
||||
fileHashKey = nil;
|
||||
} else {
|
||||
uLong fileContentsChecksum = initialCrc32Value;
|
||||
if (!crc32HashOfFileContents(&fileContentsChecksum, ent, tempBuffer, tempBufferSize)) {
|
||||
fts_close(fts);
|
||||
free(tempBuffer);
|
||||
return NO;
|
||||
}
|
||||
|
||||
uint64_t encodedFileContentsChecksum = fileContentsChecksum;
|
||||
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&encodedFileContentsChecksum, sizeof(encodedFileContentsChecksum));
|
||||
|
||||
if (ent->fts_info == FTS_F) {
|
||||
fileHashKey = [NSData dataWithBytes:&encodedFileContentsChecksum length:sizeof(encodedFileContentsChecksum)];
|
||||
} else {
|
||||
fileHashKey = nil;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
unsigned char fileHash[CC_SHA1_DIGEST_LENGTH];
|
||||
if (!sha1HashOfFileContents(fileHash, ent, tempBuffer, tempBufferSize)) {
|
||||
fts_close(fts);
|
||||
free(tempBuffer);
|
||||
return NO;
|
||||
}
|
||||
CC_SHA1_Update(&hashContext, fileHash, sizeof(fileHash));
|
||||
|
||||
if (ent->fts_info == FTS_F) {
|
||||
fileHashKey = [NSData dataWithBytes:fileHash length:sizeof(fileHash)];
|
||||
} else {
|
||||
fileHashKey = nil;
|
||||
}
|
||||
}
|
||||
CC_SHA1_Update(&hashContext, fileHash, sizeof(fileHash));
|
||||
|
||||
// For file hash tables we only track regular files
|
||||
if (ent->fts_info == FTS_F) {
|
||||
NSData *hashKey = [NSData dataWithBytes:fileHash length:sizeof(fileHash)];
|
||||
|
||||
if (fileHashKey != nil) {
|
||||
if (hashToFileKeyDictionary != nil) {
|
||||
if (hashToFileKeyDictionary[hashKey] == nil) {
|
||||
hashToFileKeyDictionary[hashKey] = [NSMutableArray array];
|
||||
if (hashToFileKeyDictionary[fileHashKey] == nil) {
|
||||
hashToFileKeyDictionary[fileHashKey] = [NSMutableArray array];
|
||||
}
|
||||
[hashToFileKeyDictionary[hashKey] addObject:relativePath];
|
||||
[hashToFileKeyDictionary[fileHashKey] addObject:relativePath];
|
||||
}
|
||||
|
||||
if (fileKeyToHashDictionary != nil) {
|
||||
fileKeyToHashDictionary[relativePath] = hashKey;
|
||||
fileKeyToHashDictionary[relativePath] = fileHashKey;
|
||||
}
|
||||
}
|
||||
|
||||
const char *relativePathBytes = [relativePath fileSystemRepresentation];
|
||||
CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes));
|
||||
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)relativePathBytes, (uInt)strlen(relativePathBytes));
|
||||
} else {
|
||||
CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes));
|
||||
}
|
||||
|
||||
uint16_t mode = ent->fts_statp->st_mode;
|
||||
uint16_t type = ent->fts_info;
|
||||
@@ -298,15 +392,26 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSStrin
|
||||
// hardcoding a value helps avoid differences between filesystems.
|
||||
uint16_t hashedPermissions = (ent->fts_info == FTS_SL) ? VALID_SYMBOLIC_LINK_PERMISSIONS : permissions;
|
||||
|
||||
CC_SHA1_Update(&hashContext, &type, sizeof(type));
|
||||
CC_SHA1_Update(&hashContext, &hashedPermissions, sizeof(hashedPermissions));
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&type, sizeof(type));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&hashedPermissions, sizeof(hashedPermissions));
|
||||
} else {
|
||||
CC_SHA1_Update(&hashContext, &type, sizeof(type));
|
||||
CC_SHA1_Update(&hashContext, &hashedPermissions, sizeof(hashedPermissions));
|
||||
}
|
||||
}
|
||||
|
||||
free(tempBuffer);
|
||||
|
||||
fts_close(fts);
|
||||
|
||||
CC_SHA1_Final(hashBuffer, &hashContext);
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
uint64_t encodedCrc32ChecksumValue = crc32ChecksumValue;
|
||||
memset(hashBuffer, 0, BINARY_DELTA_HASH_LENGTH);
|
||||
memcpy(hashBuffer, &encodedCrc32ChecksumValue, sizeof(encodedCrc32ChecksumValue));
|
||||
} else {
|
||||
CC_SHA1_Final(hashBuffer, &hashContext);
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
@@ -318,7 +423,7 @@ void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash)
|
||||
return;
|
||||
}
|
||||
|
||||
for (size_t blockIndex = 0; blockIndex < CC_SHA1_DIGEST_LENGTH; blockIndex++) {
|
||||
for (size_t blockIndex = 0; blockIndex < BINARY_DELTA_HASH_LENGTH; blockIndex++) {
|
||||
const char *currentBlock = hexString + blockIndex * 2;
|
||||
char convertedBlock[3] = {currentBlock[0], currentBlock[1], '\0'};
|
||||
hash[blockIndex] = (unsigned char)strtol(convertedBlock, NULL, 16);
|
||||
@@ -327,8 +432,8 @@ void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash)
|
||||
|
||||
NSString *displayHashFromRawHash(const unsigned char *hash)
|
||||
{
|
||||
char hexHash[CC_SHA1_DIGEST_LENGTH * 2 + 1] = {0};
|
||||
for (size_t i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) {
|
||||
char hexHash[BINARY_DELTA_HASH_LENGTH * 2 + 1] = {0};
|
||||
for (size_t i = 0; i < BINARY_DELTA_HASH_LENGTH; i++) {
|
||||
snprintf(hexHash + i * 2, 3, "%02x", hash[i]);
|
||||
}
|
||||
return @(hexHash);
|
||||
@@ -336,7 +441,7 @@ NSString *displayHashFromRawHash(const unsigned char *hash)
|
||||
|
||||
NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion)
|
||||
{
|
||||
unsigned char hash[CC_SHA1_DIGEST_LENGTH];
|
||||
unsigned char hash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (!getRawHashOfTreeWithVersion(hash, path, majorVersion)) {
|
||||
return nil;
|
||||
}
|
||||
@@ -358,10 +463,9 @@ BOOL removeTree(NSString *path)
|
||||
return [fileManager removeItemAtPath:path error:nil];
|
||||
}
|
||||
|
||||
BOOL copyTree(NSString *source, NSString *dest)
|
||||
BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest)
|
||||
{
|
||||
// SUFileManager will be more reliable for copying items especially across network mounts
|
||||
return [[[SUFileManager alloc] init] copyItemAtURL:[NSURL fileURLWithPath:source] toURL:[NSURL fileURLWithPath:dest] error:NULL];
|
||||
return [fileManager copyItemAtURL:[NSURL fileURLWithPath:source] toURL:[NSURL fileURLWithPath:dest] error:NULL];
|
||||
}
|
||||
|
||||
BOOL modifyPermissions(NSString *path, mode_t desiredPermissions)
|
||||
|
||||
@@ -345,7 +345,12 @@ static NSString *cloneableRelativePath(NSDictionary<NSString *, NSData *> *after
|
||||
if (oldCloneInfo == nil) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// The old file must have the same type as the new one
|
||||
if ([(NSNumber *)oldCloneInfo[INFO_TYPE_KEY] unsignedShortValue] != FTS_F) {
|
||||
continue;
|
||||
}
|
||||
|
||||
NSNumber *newPermissions = newInfo[INFO_PERMISSIONS_KEY];
|
||||
if (outNewPermissions != NULL) {
|
||||
*outNewPermissions = newPermissions;
|
||||
@@ -477,7 +482,7 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path)] }];
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", (unsigned int)VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path)] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
@@ -506,9 +511,9 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
fts_close(fts);
|
||||
|
||||
// This dictionary will help us keep track of clones
|
||||
NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *beforeHashToFileKeyDictionary = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? [NSMutableDictionary dictionary] : nil;
|
||||
NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *beforeHashToFileKeyDictionary = (majorVersion >= SUBinaryDeltaMajorVersion3) ? [NSMutableDictionary dictionary] : nil;
|
||||
|
||||
unsigned char beforeHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char beforeHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (!getRawHashOfTreeAndFileTablesWithVersion(beforeHash, source, majorVersion, beforeHashToFileKeyDictionary, nil)) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
@@ -591,7 +596,7 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path)] }];
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", (unsigned int)VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path)] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
@@ -644,7 +649,7 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
// If we find any executable files that are using file system compression, that is sufficient
|
||||
// for recording that the applier should re-apply file system compression.
|
||||
// We check for executable files because they are likely candidates to be compressed.
|
||||
if (!foundFilesystemCompression && MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) && ent->fts_info == FTS_F && (ent->fts_statp->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0 && (ent->fts_statp->st_flags & UF_COMPRESSED) != 0) {
|
||||
if (!foundFilesystemCompression && (majorVersion >= SUBinaryDeltaMajorVersion3) && ent->fts_info == FTS_F && (ent->fts_statp->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0 && (ent->fts_statp->st_flags & UF_COMPRESSED) != 0) {
|
||||
foundFilesystemCompression = true;
|
||||
|
||||
if (verbose) {
|
||||
@@ -684,9 +689,9 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
fts_close(fts);
|
||||
|
||||
// This dictionary will help us keep track of clones
|
||||
NSMutableDictionary<NSString *, NSData *> *afterFileKeyToHashDictionary = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? [NSMutableDictionary dictionary] : nil;
|
||||
NSMutableDictionary<NSString *, NSData *> *afterFileKeyToHashDictionary = (majorVersion >= SUBinaryDeltaMajorVersion3) ? [NSMutableDictionary dictionary] : nil;
|
||||
|
||||
unsigned char afterHash[CC_SHA1_DIGEST_LENGTH] = {0};
|
||||
unsigned char afterHash[BINARY_DELTA_HASH_LENGTH] = {0};
|
||||
if (!getRawHashOfTreeAndFileTablesWithVersion(afterHash, destination, majorVersion, nil, afterFileKeyToHashDictionary)) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\n");
|
||||
@@ -723,7 +728,23 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
#endif
|
||||
}
|
||||
|
||||
SPUDeltaArchiveHeader *header = [[SPUDeltaArchiveHeader alloc] initWithCompression:compression compressionLevel:compressionLevel fileSystemCompression:foundFilesystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeHash afterTreeHash:afterHash];
|
||||
// Record creation date of root bundle item
|
||||
NSDate *bundleCreationDate;
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
NSError *fileAttributesError = nil;
|
||||
NSDictionary<NSFileAttributeKey, id> *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:destination error:&fileAttributesError];
|
||||
|
||||
if (fileAttributes != nil) {
|
||||
bundleCreationDate = fileAttributes[NSFileCreationDate];
|
||||
} else {
|
||||
bundleCreationDate = nil;
|
||||
fprintf(stderr, "\nWarning: unable to retrieve file creation date of new bundle: %s", fileAttributesError.localizedDescription.UTF8String);
|
||||
}
|
||||
} else {
|
||||
bundleCreationDate = nil;
|
||||
}
|
||||
|
||||
SPUDeltaArchiveHeader *header = [[SPUDeltaArchiveHeader alloc] initWithCompression:compression compressionLevel:compressionLevel fileSystemCompression:foundFilesystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeHash afterTreeHash:afterHash bundleCreationDate:bundleCreationDate];
|
||||
|
||||
[archive writeHeader:header];
|
||||
if (archive.error != nil) {
|
||||
@@ -753,7 +774,7 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
// Using a couple of heuristics we track if files have been moved to other locations within the app bundle
|
||||
NSMutableDictionary<NSString *, NSString *> *frameworkVersionsSubstitutes = [NSMutableDictionary dictionary];
|
||||
NSMutableDictionary<NSString *, NSString *> *fileSubstitutes = [NSMutableDictionary dictionary];
|
||||
if (MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3)) {
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion3) {
|
||||
// Heuristic #1: track if an old framework version was removed and a new framework version was added
|
||||
// Keep track of these prefixes in a dictionary
|
||||
// Eg: /Contents/Frameworks/Foo.framework/Versions/B/ (new) -> /Contents/Frameworks/Foo.framework/Versions/A/ (old)
|
||||
@@ -871,7 +892,7 @@ BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchF
|
||||
NSNumber *newPermissions = nil;
|
||||
BOOL clonePermissionsChanged = NO;
|
||||
BOOL clonedBinaryDiff = NO;
|
||||
NSString *clonedRelativePath = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? cloneableRelativePath(afterFileKeyToHashDictionary, beforeHashToFileKeyDictionary, frameworkVersionsSubstitutes, fileSubstitutes, originalTreeState, newInfo, key, &newPermissions, &clonePermissionsChanged, &clonedBinaryDiff) : nil;
|
||||
NSString *clonedRelativePath = (majorVersion >= SUBinaryDeltaMajorVersion3) ? cloneableRelativePath(afterFileKeyToHashDictionary, beforeHashToFileKeyDictionary, frameworkVersionsSubstitutes, fileSubstitutes, originalTreeState, newInfo, key, &newPermissions, &clonePermissionsChanged, &clonedBinaryDiff) : nil;
|
||||
if (clonedRelativePath != nil) {
|
||||
if (clonedBinaryDiff) {
|
||||
NSDictionary *cloneInfo = originalTreeState[clonedRelativePath];
|
||||
|
||||
@@ -83,7 +83,12 @@ SPU_OBJC_DIRECT
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
|
||||
- (BOOL)needsVerifyBeforeExtractionKey
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock waitForCleanup:(BOOL)__unused waitForCleanup
|
||||
{
|
||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||
@autoreleasepool {
|
||||
|
||||
@@ -14,8 +14,12 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#define SUCodeSigningVerifierDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUCodeSigningVerifierDefinitionAttribute __attribute__((objc_runtime_name("SUTestCodeSigningVerifier")))
|
||||
#endif
|
||||
|
||||
SUCodeSigningVerifierDefinitionAttribute
|
||||
@interface SUCodeSigningVerifier : NSObject
|
||||
|
||||
+ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)newBundleURL andMatchesSignatureAtBundleURL:(NSURL *)oldBundleURL error:(NSError **)error;
|
||||
@@ -25,6 +29,8 @@ SPU_OBJC_DIRECT_MEMBERS
|
||||
// Same as above except does not check for nested code. This method should be used by the framework.
|
||||
+ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundleURL error:(NSError *__autoreleasing *)error;
|
||||
|
||||
+ (BOOL)codeSignatureIsValidAtDownloadURL:(NSURL *)downloadURL andMatchesDeveloperIDTeamFromOldBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error;
|
||||
|
||||
+ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundleURL;
|
||||
|
||||
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url;
|
||||
|
||||
@@ -26,12 +26,17 @@
|
||||
CFErrorRef cfError = NULL;
|
||||
|
||||
result = SecStaticCodeCreateWithPath((__bridge CFURLRef)oldBundleURL, kSecCSDefaultFlags, &oldCode);
|
||||
if (result == errSecCSUnsigned) {
|
||||
if (result != noErr) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Bundle is not code signed: %@", newBundleURL] }];
|
||||
NSString *errorMessage =
|
||||
(result == errSecCSUnsigned) ?
|
||||
[NSString stringWithFormat:@"Bundle is not code signed: %@", oldBundleURL.path] :
|
||||
[NSString stringWithFormat:@"Failed to get static code (%d): %@", result, oldBundleURL.path];
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: errorMessage }];
|
||||
}
|
||||
|
||||
return NO;
|
||||
goto finally;
|
||||
}
|
||||
|
||||
result = SecCodeCopyDesignatedRequirement(oldCode, kSecCSDefaultFlags, &requirement);
|
||||
@@ -63,7 +68,7 @@
|
||||
// See https://github.com/sparkle-project/Sparkle/issues/376#issuecomment-48824267 and https://developer.apple.com/library/mac/technotes/tn2206
|
||||
// Additionally, there are several reasons to stay away from deep verification and to prefer EdDSA signing the download archive instead.
|
||||
// See https://github.com/sparkle-project/Sparkle/pull/523#commitcomment-17549302 and https://github.com/sparkle-project/Sparkle/issues/543
|
||||
SecCSFlags flags = (SecCSFlags) (kSecCSDefaultFlags | kSecCSCheckAllArchitectures);
|
||||
SecCSFlags flags = kSecCSCheckAllArchitectures;
|
||||
result = SecStaticCodeCheckValidityWithErrors(staticCode, flags, requirement, &cfError);
|
||||
|
||||
if (result != errSecSuccess) {
|
||||
@@ -149,7 +154,7 @@ finally:
|
||||
}
|
||||
|
||||
// See in -codeSignatureIsValidAtBundleURL:andMatchesSignatureAtBundleURL:error: for why kSecCSCheckNestedCode is not always passed
|
||||
SecCSFlags flags = (SecCSFlags) (kSecCSDefaultFlags | kSecCSCheckAllArchitectures);
|
||||
SecCSFlags flags = kSecCSCheckAllArchitectures;
|
||||
if (checkNestedCode) {
|
||||
flags |= kSecCSCheckNestedCode;
|
||||
}
|
||||
@@ -258,15 +263,8 @@ static id valueOrNSNull(id value) {
|
||||
return (result == 0);
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url
|
||||
static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef staticCode)
|
||||
{
|
||||
SecStaticCodeRef staticCode = NULL;
|
||||
OSStatus staticCodeResult = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &staticCode);
|
||||
if (staticCodeResult != noErr) {
|
||||
SULog(SULogLevelError, @"Failed to get static code for retrieving team identifier: %d", staticCodeResult);
|
||||
return nil;
|
||||
}
|
||||
|
||||
CFDictionaryRef cfSigningInformation = NULL;
|
||||
OSStatus copySigningInfoCode = SecCodeCopySigningInformation(staticCode, kSecCSSigningInformation,
|
||||
&cfSigningInformation);
|
||||
@@ -282,4 +280,145 @@ static id valueOrNSNull(id value) {
|
||||
return signingInformation[(NSString *)kSecCodeInfoTeamIdentifier];
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url
|
||||
{
|
||||
SecStaticCodeRef staticCode = NULL;
|
||||
OSStatus staticCodeResult = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &staticCode);
|
||||
if (staticCodeResult != noErr) {
|
||||
SULog(SULogLevelError, @"Failed to get static code for retrieving team identifier: %d", staticCodeResult);
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *teamIdentifier = SUTeamIdentifierFromStaticCode(staticCode);
|
||||
|
||||
if (staticCode != NULL) {
|
||||
CFRelease(staticCode);
|
||||
}
|
||||
|
||||
return teamIdentifier;
|
||||
}
|
||||
|
||||
+ (BOOL)codeSignatureIsValidAtDownloadURL:(NSURL *)downloadURL andMatchesDeveloperIDTeamFromOldBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
NSString *teamIdentifier = nil;
|
||||
NSString *requirementString = nil;
|
||||
SecRequirementRef requirement = NULL;
|
||||
SecStaticCodeRef oldStaticCode = NULL;
|
||||
SecStaticCodeRef downloadStaticCode = NULL;
|
||||
OSStatus result;
|
||||
|
||||
NSError *resultError = nil;
|
||||
|
||||
NSString *commonErrorMessage = @"The download archive cannot be validated with Apple Developer ID code signing as fallback (after (Ed)DSA verification has failed)";
|
||||
|
||||
result = SecStaticCodeCreateWithPath((__bridge CFURLRef)oldBundleURL, kSecCSDefaultFlags, &oldStaticCode);
|
||||
if (result != errSecSuccess) {
|
||||
NSString *errorMessage =
|
||||
(result == errSecCSUnsigned) ?
|
||||
[NSString stringWithFormat:@"%@. The original app is not code signed: %@", commonErrorMessage, oldBundleURL.path] :
|
||||
[NSString stringWithFormat:@"%@. The static code could not be retrieved from the original app (%d): %@", commonErrorMessage, result, oldBundleURL.path];
|
||||
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: errorMessage }];
|
||||
|
||||
goto finally;
|
||||
}
|
||||
|
||||
teamIdentifier = SUTeamIdentifierFromStaticCode(oldStaticCode);
|
||||
if (teamIdentifier == nil) {
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"%@. The team identifier could not be retrieved from the original app: %@", commonErrorMessage, oldBundleURL.path] }];
|
||||
|
||||
goto finally;
|
||||
}
|
||||
|
||||
// Create a designated requirement with developer ID signing with this team ID
|
||||
// Validate it against code signing check of this archive
|
||||
// CertificateIssuedByApple = anchor apple generic
|
||||
// IssuerIsDeveloperID = certificate 1[field.1.2.840.113635.100.6.2.6]
|
||||
// LeafIsDeveloperIDApp = certificate leaf[field.1.2.840.113635.100.6.1.13]
|
||||
// DeveloperIDTeamID = certificate leaf[subject.OU]
|
||||
// https://developer.apple.com/documentation/technotes/tn3127-inside-code-signing-requirements#Xcode-designated-requirement-for-Developer-ID-code
|
||||
requirementString = [NSString stringWithFormat:@"anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13] and certificate leaf[subject.OU] = %@", teamIdentifier];
|
||||
|
||||
result = SecRequirementCreateWithString((__bridge CFStringRef)requirementString, kSecCSDefaultFlags, &requirement);
|
||||
if (result != errSecSuccess) {
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"%@. The designated requirement string with a Developer ID requirement with team identifier '%@' could not be created with error %d", commonErrorMessage, teamIdentifier, result] }];
|
||||
|
||||
goto finally;
|
||||
}
|
||||
|
||||
result = SecStaticCodeCreateWithPath((__bridge CFURLRef)downloadURL, kSecCSDefaultFlags, &downloadStaticCode);
|
||||
if (result != errSecSuccess) {
|
||||
NSString *message = [NSString stringWithFormat:@"%@. The static code could not be retrieved from the download archive with error %d. The download archive may not be Apple code signed.", commonErrorMessage, result];
|
||||
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
|
||||
goto finally;
|
||||
}
|
||||
|
||||
SecCSFlags flags = (SecCSFlags)kSecCSDefaultFlags;
|
||||
CFErrorRef cfError = NULL;
|
||||
result = SecStaticCodeCheckValidityWithErrors(downloadStaticCode, flags, requirement, &cfError);
|
||||
if (result != errSecSuccess) {
|
||||
NSError *underlyingError;
|
||||
if (cfError != NULL) {
|
||||
NSError *tmpError = CFBridgingRelease(cfError);
|
||||
underlyingError = tmpError;
|
||||
} else {
|
||||
underlyingError = nil;
|
||||
}
|
||||
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
if (underlyingError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = underlyingError;
|
||||
}
|
||||
|
||||
if (result == errSecCSUnsigned) {
|
||||
NSString *message = [NSString stringWithFormat:@"%@. The download archive is not Apple code signed.", commonErrorMessage];
|
||||
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
userInfo[NSLocalizedDescriptionKey] = message;
|
||||
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:[userInfo copy]];
|
||||
} else if (result == errSecCSReqFailed) {
|
||||
NSString *initialMessage = [NSString stringWithFormat:@"%@. The Apple code signature of new downloaded archive is either not Developer ID code signed, or doesn't have a Team ID that matches the old app version (%@). Please ensure that the archive and app are signed using the same Developer ID certificate.", commonErrorMessage, teamIdentifier];
|
||||
|
||||
NSDictionary *oldInfo = [self logSigningInfoForCode:oldStaticCode label:@"old info"];
|
||||
NSDictionary *newInfo = [self logSigningInfoForCode:downloadStaticCode label:@"new info"];
|
||||
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"%@ old info: %@. new info: %@", initialMessage, oldInfo, newInfo];
|
||||
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:[userInfo copy]];
|
||||
} else {
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"%@. The downloaded archive code signing signature failed to validate with an unknown error (%d).", commonErrorMessage, result];
|
||||
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
goto finally;
|
||||
}
|
||||
|
||||
finally:
|
||||
|
||||
if (oldStaticCode != NULL) {
|
||||
CFRelease(oldStaticCode);
|
||||
}
|
||||
|
||||
if (requirement != NULL) {
|
||||
CFRelease(requirement);
|
||||
}
|
||||
|
||||
if (downloadStaticCode != NULL) {
|
||||
CFRelease(downloadStaticCode);
|
||||
}
|
||||
|
||||
if (resultError != nil && error != NULL) {
|
||||
*error = resultError;
|
||||
}
|
||||
|
||||
return (resultError == nil);
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -6,8 +6,6 @@
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_DMG_SUPPORT
|
||||
|
||||
#ifndef SUDISKIMAGEUNARCHIVER_H
|
||||
#define SUDISKIMAGEUNARCHIVER_H
|
||||
|
||||
@@ -27,5 +25,3 @@ SPU_OBJC_DIRECT_MEMBERS @interface SUDiskImageUnarchiver : NSObject <SUUnarchive
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -6,20 +6,26 @@
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_DMG_SUPPORT
|
||||
|
||||
#import "SUDiskImageUnarchiver.h"
|
||||
#import "SUUnarchiverNotifier.h"
|
||||
#import "SULog.h"
|
||||
#import "SUErrors.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@interface SUDiskImageUnarchiver () <NSFileManagerDelegate>
|
||||
@end
|
||||
|
||||
@implementation SUDiskImageUnarchiver
|
||||
{
|
||||
NSString *_archivePath;
|
||||
NSString *_decryptionPassword;
|
||||
NSString *_extractionDirectory;
|
||||
|
||||
SUUnarchiverNotifier *_notifier;
|
||||
double _currentExtractionProgress;
|
||||
double _fileProgressIncrement;
|
||||
}
|
||||
|
||||
+ (BOOL)canUnarchivePath:(NSString *)path
|
||||
@@ -43,16 +49,40 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
|
||||
- (BOOL)needsVerifyBeforeExtractionKey
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock waitForCleanup:(BOOL)waitForCleanup
|
||||
{
|
||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||
SUUnarchiverNotifier *notifier = [[SUUnarchiverNotifier alloc] initWithCompletionBlock:completionBlock progressBlock:progressBlock];
|
||||
[self extractDMGWithNotifier:notifier];
|
||||
[self extractDMGWithNotifier:notifier waitForCleanup:waitForCleanup];
|
||||
});
|
||||
}
|
||||
|
||||
static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *itemPath)
|
||||
{
|
||||
NSUInteger fileCount = 0;
|
||||
NSDirectoryEnumerator *dirEnum = [fileManager enumeratorAtPath:itemPath];
|
||||
for (NSString * __unused currentFile in dirEnum) {
|
||||
fileCount++;
|
||||
}
|
||||
|
||||
return fileCount;
|
||||
}
|
||||
|
||||
- (BOOL)fileManager:(NSFileManager *)fileManager shouldCopyItemAtURL:(NSURL *)srcURL toURL:(NSURL *)dstURL
|
||||
{
|
||||
_currentExtractionProgress += _fileProgressIncrement;
|
||||
[_notifier notifyProgress:_currentExtractionProgress];
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
// Called on a non-main thread.
|
||||
- (void)extractDMGWithNotifier:(SUUnarchiverNotifier *)notifier SPU_OBJC_DIRECT
|
||||
- (void)extractDMGWithNotifier:(SUUnarchiverNotifier *)notifier waitForCleanup:(BOOL)waitForCleanup SPU_OBJC_DIRECT
|
||||
{
|
||||
@autoreleasepool {
|
||||
BOOL mountedSuccessfully = NO;
|
||||
@@ -62,34 +92,47 @@
|
||||
NSFileManager *manager;
|
||||
NSError *error = nil;
|
||||
NSArray *contents = nil;
|
||||
do
|
||||
{
|
||||
do {
|
||||
NSString *uuidString = [[NSUUID UUID] UUIDString];
|
||||
mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString];
|
||||
}
|
||||
}
|
||||
// Note: this check does not follow symbolic links, which is what we want
|
||||
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
|
||||
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
|
||||
|
||||
NSData *promptData = [NSData dataWithBytes:"yes\n" length:4];
|
||||
NSMutableData *inputData = [NSMutableData data];
|
||||
|
||||
NSMutableArray *arguments = [@[@"attach", _archivePath, @"-mountpoint", mountPoint, /*@"-noverify",*/ @"-nobrowse", @"-noautoopen"] mutableCopy];
|
||||
|
||||
if (_decryptionPassword) {
|
||||
NSMutableData *passwordData = [[_decryptionPassword dataUsingEncoding:NSUTF8StringEncoding] mutableCopy];
|
||||
// Prepare stdin data for passwords and license agreements
|
||||
{
|
||||
// If no password is supplied, we will still be asked a password.
|
||||
// In that case we respond with an empty password.
|
||||
NSData *decryptionPasswordData = [_decryptionPassword dataUsingEncoding:NSUTF8StringEncoding];
|
||||
if (decryptionPasswordData != nil) {
|
||||
[inputData appendData:decryptionPasswordData];
|
||||
}
|
||||
|
||||
// From the hdiutil docs:
|
||||
// read a null-terminated passphrase from standard input
|
||||
//
|
||||
// Add the null terminator, then the newline
|
||||
[passwordData appendData:[NSData dataWithBytes:"\0" length:1]];
|
||||
[passwordData appendData:promptData];
|
||||
promptData = passwordData;
|
||||
// Add the null terminator
|
||||
[inputData appendBytes:"\0" length:1];
|
||||
|
||||
[arguments addObject:@"-stdinpass"];
|
||||
// Append prompt data for license agreements
|
||||
[inputData appendBytes:"yes\n" length:4];
|
||||
}
|
||||
|
||||
// Finder doesn't verify disk images anymore beyond the code signing signature (if available)
|
||||
// Opt out of the old CRC checksum checks
|
||||
// Also always pass -stdinpass so we gracefully handle password protected disk images even if we aren't expecting them
|
||||
NSArray *arguments = @[@"attach", _archivePath, @"-mountpoint", mountPoint, @"-noverify", @"-nobrowse", @"-noautoopen", @"-stdinpass"];
|
||||
|
||||
NSData *output = nil;
|
||||
NSInteger taskResult = -1;
|
||||
|
||||
NSURL *mountPointURL = [NSURL fileURLWithPath:mountPoint isDirectory:YES];
|
||||
NSURL *extractionDirectoryURL = [NSURL fileURLWithPath:_extractionDirectory isDirectory:YES];
|
||||
NSMutableArray<NSString *> *itemsToExtract = [NSMutableArray array];
|
||||
NSUInteger totalFileExtractionCount = 0;
|
||||
|
||||
{
|
||||
NSTask *task = [[NSTask alloc] init];
|
||||
task.launchPath = @"/usr/bin/hdiutil";
|
||||
@@ -120,12 +163,8 @@
|
||||
goto reportError;
|
||||
}
|
||||
|
||||
[notifier notifyProgress:0.125];
|
||||
|
||||
[inputPipe.fileHandleForWriting writeData:promptData];
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
if (![inputPipe.fileHandleForWriting writeData:promptData error:&error]) {
|
||||
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
|
||||
goto reportError;
|
||||
}
|
||||
}
|
||||
@@ -133,7 +172,7 @@
|
||||
else
|
||||
{
|
||||
@try {
|
||||
[inputPipe.fileHandleForWriting writeData:promptData];
|
||||
[inputPipe.fileHandleForWriting writeData:inputData];
|
||||
} @catch (NSException *) {
|
||||
goto reportError;
|
||||
}
|
||||
@@ -148,54 +187,110 @@
|
||||
taskResult = task.terminationStatus;
|
||||
}
|
||||
|
||||
[notifier notifyProgress:0.5];
|
||||
|
||||
if (taskResult != 0)
|
||||
{
|
||||
if (taskResult != 0) {
|
||||
NSString *resultStr = output ? [[NSString alloc] initWithData:output encoding:NSUTF8StringEncoding] : nil;
|
||||
SULog(SULogLevelError, @"hdiutil failed with code: %ld data: <<%@>>", (long)taskResult, resultStr);
|
||||
|
||||
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed due to hdiutil returning %ld status: %@", (long)taskResult, resultStr]}];
|
||||
|
||||
goto reportError;
|
||||
}
|
||||
|
||||
mountedSuccessfully = YES;
|
||||
|
||||
// Mounting can take some time, so increment progress
|
||||
_currentExtractionProgress = 0.1;
|
||||
[notifier notifyProgress:_currentExtractionProgress];
|
||||
|
||||
// Now that we've mounted it, we need to copy out its contents.
|
||||
manager = [[NSFileManager alloc] init];
|
||||
contents = [manager contentsOfDirectoryAtPath:mountPoint error:&error];
|
||||
if (contents == nil)
|
||||
{
|
||||
if (contents == nil) {
|
||||
SULog(SULogLevelError, @"Couldn't enumerate contents of archive mounted at %@: %@", mountPoint, error);
|
||||
goto reportError;
|
||||
}
|
||||
|
||||
double itemsCopied = 0;
|
||||
double totalItems = (double)[contents count];
|
||||
|
||||
for (NSString *item in contents)
|
||||
{
|
||||
NSString *fromPath = [mountPoint stringByAppendingPathComponent:item];
|
||||
NSString *toPath = [_extractionDirectory stringByAppendingPathComponent:item];
|
||||
|
||||
// Sparkle can support installing pkg files, app bundles, and other bundle types for plug-ins
|
||||
// We must not filter any of those out
|
||||
for (NSString *item in contents) {
|
||||
NSURL *fromPathURL = [mountPointURL URLByAppendingPathComponent:item];
|
||||
|
||||
itemsCopied += 1.0;
|
||||
[notifier notifyProgress:0.5 + itemsCopied/(totalItems*2.0)];
|
||||
NSString *lastPathComponent = fromPathURL.lastPathComponent;
|
||||
|
||||
// We skip any files in the DMG which are not readable but include the item in the progress
|
||||
if (![manager isReadableFileAtPath:fromPath]) {
|
||||
// Ignore hidden files
|
||||
if ([lastPathComponent hasPrefix:@"."]) {
|
||||
continue;
|
||||
}
|
||||
|
||||
SULog(SULogLevelDefault, @"copyItemAtPath:%@ toPath:%@", fromPath, toPath);
|
||||
|
||||
if (![manager copyItemAtPath:fromPath toPath:toPath error:&error])
|
||||
{
|
||||
|
||||
// Ignore aliases
|
||||
NSNumber *aliasFlag = nil;
|
||||
if ([fromPathURL getResourceValue:&aliasFlag forKey:NSURLIsAliasFileKey error:NULL] && aliasFlag.boolValue) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Ignore symbolic links
|
||||
NSNumber *symbolicFlag = nil;
|
||||
if ([fromPathURL getResourceValue:&symbolicFlag forKey:NSURLIsSymbolicLinkKey error:NULL] && symbolicFlag.boolValue) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Ensure file is readable
|
||||
NSNumber *isReadableFlag = nil;
|
||||
if ([fromPathURL getResourceValue:&isReadableFlag forKey:NSURLIsReadableKey error:NULL] && !isReadableFlag.boolValue) {
|
||||
continue;
|
||||
}
|
||||
|
||||
NSNumber *isDirectoryFlag = nil;
|
||||
if (![fromPathURL getResourceValue:&isDirectoryFlag forKey:NSURLIsDirectoryKey error:NULL]) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BOOL isDirectory = isDirectoryFlag.boolValue;
|
||||
NSString *pathExtension = fromPathURL.pathExtension;
|
||||
|
||||
if (isDirectory) {
|
||||
// Skip directory types that aren't bundles or regular directories
|
||||
if ([pathExtension isEqualToString:@"rtfd"]) {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
// The only non-directory files we care about are (m)pkg files
|
||||
if (![pathExtension isEqualToString:@"pkg"] && ![pathExtension isEqualToString:@"mpkg"]) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (isDirectory) {
|
||||
totalFileExtractionCount += fileCountForDirectory(manager, fromPathURL.path);
|
||||
} else {
|
||||
totalFileExtractionCount++;
|
||||
}
|
||||
|
||||
[itemsToExtract addObject:item];
|
||||
}
|
||||
|
||||
_fileProgressIncrement = (0.99 - _currentExtractionProgress) / totalFileExtractionCount;
|
||||
_notifier = notifier;
|
||||
|
||||
// Copy all items we want to extract and notify of progress
|
||||
manager.delegate = self;
|
||||
for (NSString *item in itemsToExtract) {
|
||||
NSURL *fromURL = [mountPointURL URLByAppendingPathComponent:item];
|
||||
NSURL *toURL = [extractionDirectoryURL URLByAppendingPathComponent:item];
|
||||
|
||||
if (![manager copyItemAtURL:fromURL toURL:toURL error:&error]) {
|
||||
SULog(SULogLevelError, @"Failed to copy '%@' to '%@' with error: %@", fromURL.path, toURL.path, error);
|
||||
goto reportError;
|
||||
}
|
||||
}
|
||||
|
||||
[notifier notifySuccess];
|
||||
[notifier notifyProgress:1.0];
|
||||
|
||||
BOOL success = YES;
|
||||
goto finally;
|
||||
|
||||
reportError:
|
||||
[notifier notifyFailureWithError:error];
|
||||
success = NO;
|
||||
|
||||
finally:
|
||||
if (mountedSuccessfully) {
|
||||
@@ -209,15 +304,21 @@
|
||||
if (![task launchAndReturnError:&launchCleanupError]) {
|
||||
SULog(SULogLevelError, @"Failed to unmount %@", mountPoint);
|
||||
SULog(SULogLevelError, @"Error: %@", launchCleanupError);
|
||||
} else if (waitForCleanup) {
|
||||
[task waitUntilExit];
|
||||
}
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Can't mount DMG %@", _archivePath);
|
||||
}
|
||||
|
||||
if (success) {
|
||||
[notifier notifySuccess];
|
||||
} else {
|
||||
[notifier notifyFailureWithError:error];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], _archivePath]; }
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -44,7 +44,12 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
|
||||
- (BOOL)needsVerifyBeforeExtractionKey
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock waitForCleanup:(BOOL)__unused waitForCleanup
|
||||
{
|
||||
SUUnarchiverNotifier *notifier = [[SUUnarchiverNotifier alloc] initWithCompletionBlock:completionBlock progressBlock:progressBlock];
|
||||
|
||||
|
||||
+200
-61
@@ -20,16 +20,17 @@
|
||||
NSString *_extractionDirectory;
|
||||
}
|
||||
|
||||
static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPath(NSString *path)
|
||||
// pipingData == NO is only supported for zip archives
|
||||
static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString *path, BOOL pipingData, NSString * __autoreleasing *outCommand)
|
||||
{
|
||||
NSArray <NSString *> *extractTGZ = @[@"/usr/bin/tar", @"-zxC"];
|
||||
NSArray <NSString *> *extractTBZ = @[@"/usr/bin/tar", @"-jxC"];
|
||||
NSArray <NSString *> *extractTXZ = extractTGZ;
|
||||
|
||||
// Note: keep this list in sync with generate_appcast's unarchiveUpdates()
|
||||
NSDictionary <NSString *, NSArray<NSString *> *> *extractCommandDictionary =
|
||||
@{
|
||||
@".zip" : @[@"/usr/bin/ditto", @"-x",@"-k",@"-"],
|
||||
NSMutableDictionary <NSString *, NSArray<NSString *> *> *extractCommandDictionary =
|
||||
[@{
|
||||
@".zip" : (pipingData ? @[@"/usr/bin/ditto", @"-x", @"-k", @"-"] : @[@"/usr/bin/ditto", @"-x", @"-k", path]),
|
||||
@".tar" : @[@"/usr/bin/tar", @"-xC"],
|
||||
@".tar.gz" : extractTGZ,
|
||||
@".tgz" : extractTGZ,
|
||||
@@ -37,14 +38,39 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
@".tbz" : extractTBZ,
|
||||
@".tar.xz" : extractTXZ,
|
||||
@".txz" : extractTXZ,
|
||||
@".tar.lzma" : extractTXZ
|
||||
};
|
||||
@".tar.lzma" : extractTXZ,
|
||||
} mutableCopy];
|
||||
|
||||
// At least the latest versions of 10.15 understand how to extract aar files
|
||||
// Versions before 10.15 do not understand extracting newly created aar files
|
||||
// Note encrypted aea files are supported in macOS 12 onwards, if we ever want to support those one day
|
||||
if (@available(macOS 10.15.7, *)) {
|
||||
NSString *appleArchiveCommand;
|
||||
if (@available(macOS 11, *)) {
|
||||
appleArchiveCommand = @"/usr/bin/aa";
|
||||
} else {
|
||||
// In 10.15 the utility was named yaa, which was later renamed to aar
|
||||
appleArchiveCommand = @"/usr/bin/yaa";
|
||||
}
|
||||
|
||||
NSArray <NSString *> *extractAppleArchive = @[appleArchiveCommand, @"extract", @"-d"];
|
||||
|
||||
[extractCommandDictionary addEntriesFromDictionary:@{
|
||||
@".aar" : extractAppleArchive,
|
||||
@".yaa" : extractAppleArchive,
|
||||
}];
|
||||
}
|
||||
|
||||
NSString *lastPathComponent = [path lastPathComponent];
|
||||
for (NSString *currentType in extractCommandDictionary)
|
||||
{
|
||||
if ([lastPathComponent hasSuffix:currentType]) {
|
||||
return [extractCommandDictionary objectForKey:currentType];
|
||||
NSArray<NSString *> *commandAndArguments = [extractCommandDictionary objectForKey:currentType];
|
||||
if (outCommand != NULL) {
|
||||
*outCommand = commandAndArguments.firstObject;
|
||||
}
|
||||
|
||||
return [commandAndArguments subarrayWithRange:NSMakeRange(1, commandAndArguments.count - 1)];
|
||||
}
|
||||
}
|
||||
return nil;
|
||||
@@ -52,7 +78,7 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
|
||||
+ (BOOL)canUnarchivePath:(NSString *)path
|
||||
{
|
||||
return _commandAndArgumentsConformingToTypeOfPath(path) != nil;
|
||||
return argumentsConformingToTypeOfPath(path, YES, NULL) != nil;
|
||||
}
|
||||
|
||||
+ (BOOL)mustValidateBeforeExtraction
|
||||
@@ -70,60 +96,143 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
|
||||
- (BOOL)needsVerifyBeforeExtractionKey
|
||||
{
|
||||
NSArray <NSString *> *commandAndArguments = _commandAndArgumentsConformingToTypeOfPath(_archivePath);
|
||||
assert(commandAndArguments != nil);
|
||||
|
||||
NSString *command = commandAndArguments.firstObject;
|
||||
return ([_archivePath hasSuffix:@".aar"] || [_archivePath hasSuffix:@".yaa"]);
|
||||
}
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock waitForCleanup:(BOOL)__unused waitForCleanup
|
||||
{
|
||||
NSString *command = nil;
|
||||
NSArray<NSString *> *arguments = argumentsConformingToTypeOfPath(_archivePath, YES, &command);
|
||||
assert(arguments != nil);
|
||||
assert(command != nil);
|
||||
|
||||
NSArray <NSString *> *arguments = [commandAndArguments subarrayWithRange:NSMakeRange(1, commandAndArguments.count - 1)];
|
||||
|
||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||
SUUnarchiverNotifier *notifier = [[SUUnarchiverNotifier alloc] initWithCompletionBlock:completionBlock progressBlock:progressBlock];
|
||||
[self extractArchivePipingDataToCommand:command arguments:arguments notifier:notifier];
|
||||
@autoreleasepool {
|
||||
SUUnarchiverNotifier *notifier = [[SUUnarchiverNotifier alloc] initWithCompletionBlock:completionBlock progressBlock:progressBlock];
|
||||
NSError *extractError = nil;
|
||||
if ([self extractArchivePipingData:YES command:command arguments:arguments notifier:notifier error:&extractError]) {
|
||||
[notifier notifySuccess];
|
||||
} else {
|
||||
// If we fail due to an IO PIPE write failure for zip files,
|
||||
// we may re-attempt extracting the archive without piping archive data
|
||||
// (and without fine grained progress reporting).
|
||||
// This is to workaround a bug in ditto which causes extraction to fail when piping data for
|
||||
// some types of constructed zip files.
|
||||
// Note this bug is fixed on macOS 15+, so this workaround is not needed there.
|
||||
// https://github.com/sparkle-project/Sparkle/issues/2544
|
||||
BOOL useNonPipingWorkaround;
|
||||
if (@available(macOS 15, *)) {
|
||||
useNonPipingWorkaround = NO;
|
||||
} else {
|
||||
NSError *underlyingError = extractError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
useNonPipingWorkaround = [self->_archivePath.pathExtension isEqualToString:@"zip"] && ([extractError.domain isEqualToString:SUSparkleErrorDomain] && extractError.code == SUUnarchivingError && [underlyingError.domain isEqualToString:NSPOSIXErrorDomain] && underlyingError.code == EPIPE);
|
||||
}
|
||||
|
||||
if (!useNonPipingWorkaround) {
|
||||
[notifier notifyFailureWithError:extractError];
|
||||
} else {
|
||||
// Re-create the extraction directory, then try extracting without piping
|
||||
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
|
||||
NSURL *extractionDirectoryURL = [NSURL fileURLWithPath:self->_extractionDirectory isDirectory:YES];
|
||||
|
||||
NSError *removeError = nil;
|
||||
if (![fileManager removeItemAtURL:extractionDirectoryURL error:&removeError]) {
|
||||
SULog(SULogLevelError, @"Failed to remove extraction directory path for non-piping workaround with error: %@", removeError);
|
||||
|
||||
[notifier notifyFailureWithError:extractError];
|
||||
} else {
|
||||
NSError *createError = nil;
|
||||
if (![fileManager createDirectoryAtPath:self->_extractionDirectory withIntermediateDirectories:NO attributes:nil error:&createError]) {
|
||||
SULog(SULogLevelError, @"Failed to create new extraction directory path for non-piping workaround with error: %@", createError);
|
||||
|
||||
[notifier notifyFailureWithError:extractError];
|
||||
} else {
|
||||
// The ditto command will be the same so no need to fetch it again
|
||||
NSArray<NSString *> *nonPipingArguments = argumentsConformingToTypeOfPath(self->_archivePath, NO, NULL);
|
||||
assert(nonPipingArguments != nil);
|
||||
|
||||
NSError *nonPipingExtractError = nil;
|
||||
if ([self extractArchivePipingData:NO command:command arguments:nonPipingArguments notifier:notifier error:&nonPipingExtractError]) {
|
||||
[notifier notifySuccess];
|
||||
} else {
|
||||
[notifier notifyFailureWithError:nonPipingExtractError];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// This method abstracts the types that use a command line tool piping data from stdin.
|
||||
- (void)extractArchivePipingDataToCommand:(NSString *)command arguments:(NSArray*)args notifier:(SUUnarchiverNotifier *)notifier SPU_OBJC_DIRECT
|
||||
- (BOOL)extractArchivePipingData:(BOOL)pipingData command:(NSString *)command arguments:(NSArray*)args notifier:(SUUnarchiverNotifier *)notifier error:(NSError * __autoreleasing *)outError SPU_OBJC_DIRECT
|
||||
{
|
||||
// *** GETS CALLED ON NON-MAIN THREAD!!!
|
||||
@autoreleasepool {
|
||||
NSString *destination = _extractionDirectory;
|
||||
|
||||
NSString *destination = _extractionDirectory;
|
||||
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
|
||||
if (pipingData) {
|
||||
SULog(SULogLevelDefault, @"Extracting using '%@' '%@' < '%@' '%@'", command, [args componentsJoinedByString:@"' '"], _archivePath, destination);
|
||||
|
||||
// Get the file size.
|
||||
NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:_archivePath error:nil];
|
||||
NSUInteger expectedLength = [(NSNumber *)[attributes objectForKey:NSFileSize] unsignedIntegerValue];
|
||||
} else {
|
||||
SULog(SULogLevelDefault, @"Extracting using '%@' '%@' '%@'", command, [args componentsJoinedByString:@"' '"], destination);
|
||||
}
|
||||
|
||||
// Get expected file size for piping the archive
|
||||
NSUInteger expectedLength;
|
||||
if (pipingData) {
|
||||
NSDictionary *attributes = [fileManager attributesOfItemAtPath:_archivePath error:nil];
|
||||
expectedLength = [(NSNumber *)[attributes objectForKey:NSFileSize] unsignedIntegerValue];
|
||||
|
||||
if (expectedLength == 0) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed, archive '%@' is empty", _archivePath]}];
|
||||
|
||||
[notifier notifyFailureWithError:error];
|
||||
return;
|
||||
if (outError != NULL) {
|
||||
*outError = error;
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
} else {
|
||||
expectedLength = 0;
|
||||
}
|
||||
|
||||
NSTask *task = [[NSTask alloc] init];
|
||||
|
||||
NSPipe *pipe;
|
||||
if (pipingData) {
|
||||
pipe = [NSPipe pipe];
|
||||
[task setStandardInput:pipe];
|
||||
} else {
|
||||
pipe = nil;
|
||||
}
|
||||
|
||||
[task setStandardError:[NSFileHandle fileHandleWithStandardError]];
|
||||
[task setStandardOutput:[NSFileHandle fileHandleWithStandardOutput]];
|
||||
[task setLaunchPath:command];
|
||||
[task setArguments:[args arrayByAddingObject:destination]];
|
||||
|
||||
NSError *launchError = nil;
|
||||
if (![task launchAndReturnError:&launchError]) {
|
||||
if (outError != NULL) {
|
||||
*outError = launchError;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
NSError *underlyingOutError = nil;
|
||||
NSUInteger bytesWritten = 0;
|
||||
|
||||
if (pipingData) {
|
||||
NSFileHandle *archiveInput = [NSFileHandle fileHandleForReadingAtPath:_archivePath];
|
||||
|
||||
NSPipe *pipe = [NSPipe pipe];
|
||||
NSTask *task = [[NSTask alloc] init];
|
||||
[task setStandardInput:pipe];
|
||||
[task setStandardError:[NSFileHandle fileHandleWithStandardError]];
|
||||
[task setStandardOutput:[NSFileHandle fileHandleWithStandardOutput]];
|
||||
[task setLaunchPath:command];
|
||||
[task setArguments:[args arrayByAddingObject:destination]];
|
||||
|
||||
NSError *launchError = nil;
|
||||
if (![task launchAndReturnError:&launchError]) {
|
||||
[notifier notifyFailureWithError:launchError];
|
||||
return;
|
||||
}
|
||||
|
||||
NSFileHandle *archiveOutput = [pipe fileHandleForWriting];
|
||||
NSUInteger bytesWritten = 0;
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
BOOL hasIOErrorMethods;
|
||||
@@ -155,6 +264,7 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
#pragma clang diagnostic pop
|
||||
if (data == nil) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
|
||||
underlyingOutError = readError;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,6 +280,14 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
[archiveOutput writeData:data];
|
||||
} @catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with exception reason %@", exception.reason);
|
||||
|
||||
if ([exception.name isEqualToString:NSFileHandleOperationException]) {
|
||||
NSError *underlyingFileHandleError = exception.userInfo[@"NSFileHandleOperationExceptionUnderlyingError"];
|
||||
NSError *underlyingPOSIXError = underlyingFileHandleError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -181,6 +299,10 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
if (![archiveOutput writeData:data error:&writeError]) {
|
||||
#pragma clang diagnostic pop
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
|
||||
|
||||
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -216,25 +338,42 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
[archiveInput closeFile];
|
||||
}
|
||||
#endif
|
||||
|
||||
[task waitUntilExit];
|
||||
|
||||
if ([task terminationStatus] != 0) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed, command '%@' returned %d", command, [task terminationStatus]]}];
|
||||
|
||||
[notifier notifyFailureWithError:error];
|
||||
return;
|
||||
}
|
||||
|
||||
if (bytesWritten != expectedLength) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed, command '%@' got only %ld of %ld bytes", command, (long)bytesWritten, (long)expectedLength]}];
|
||||
|
||||
[notifier notifyFailureWithError:error];
|
||||
return;
|
||||
}
|
||||
|
||||
[notifier notifySuccess];
|
||||
}
|
||||
|
||||
[task waitUntilExit];
|
||||
|
||||
if ([task terminationStatus] != 0) {
|
||||
NSMutableDictionary *userInfo = [@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed, command '%@' returned %d", command, [task terminationStatus]]} mutableCopy];
|
||||
|
||||
if (underlyingOutError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = underlyingOutError;
|
||||
}
|
||||
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:[userInfo copy]];
|
||||
|
||||
if (outError != NULL) {
|
||||
*outError = error;
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (!pipingData) {
|
||||
[notifier notifyProgress:1.0];
|
||||
} else if (bytesWritten != expectedLength) {
|
||||
// Don't set underlying error in this case
|
||||
// This may fail due to a write PIPE error but we don't currently support extracting archives that have
|
||||
// extraneous data leftover because these may be corrupt.
|
||||
// We don't want to later workaround extraction by not piping the data.
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed, command '%@' got only %ld of %ld bytes", command, (long)bytesWritten, (long)expectedLength]}];
|
||||
|
||||
if (outError != NULL) {
|
||||
*outError = error;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], _archivePath]; }
|
||||
|
||||
@@ -344,26 +344,42 @@
|
||||
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
|
||||
BOOL updateHasCustomUpdateSecurityPolicy = NO;
|
||||
if (@available(macOS 13.0, *)) {
|
||||
// If the new update is notarized / developer ID code signed and Autoupdate is not signed with the same Team ID as the new update,
|
||||
// then we may run into Privacy & Security prompt issues from the OS
|
||||
// which think we are modifying the update (but we're not)
|
||||
// To avoid these, we skip the gatekeeper scan and skip performing an atomic swap during install
|
||||
// If the update has a custom update security policy, the same team ID policy may not apply,
|
||||
// so in that case we will also skip performing an atomic swap
|
||||
|
||||
NSURL *mainExecutableURL = NSBundle.mainBundle.executableURL;
|
||||
if (mainExecutableURL == nil) {
|
||||
// This shouldn't happen
|
||||
_canPerformSafeAtomicSwap = NO;
|
||||
} else {
|
||||
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:mainExecutableURL];
|
||||
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
|
||||
|
||||
// If the new update is code signed and Autoupdate is not signed with the same Team ID as the new update,
|
||||
// then we may run into Privacy & Security prompt issues from the OS
|
||||
// To avoid these, we skip the gatekeeper scan and skip performing an atomic swap during install
|
||||
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
|
||||
updateHasCustomUpdateSecurityPolicy = updateHost.hasUpdateSecurityPolicy;
|
||||
if (updateHasCustomUpdateSecurityPolicy) {
|
||||
// We don't handle working around a custom update security policy
|
||||
_canPerformSafeAtomicSwap = NO;
|
||||
} else {
|
||||
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:mainExecutableURL];
|
||||
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
|
||||
|
||||
// If bundleTeamIdentifier is nil, then the update isn't code signed so atomic swap is okay
|
||||
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
_canPerformSafeAtomicSwap = YES;
|
||||
}
|
||||
|
||||
if (!_canPerformSafeAtomicSwap) {
|
||||
SULog(SULogLevelDefault, @"Skipping atomic rename/swap and gatekeeper scan because Autoupdate is not signed with same identity as the new update %@", bundle.bundleURL.lastPathComponent);
|
||||
if (updateHasCustomUpdateSecurityPolicy) {
|
||||
SULog(SULogLevelDefault, @"Skipping atomic rename/swap and gatekeeper scan because new update %@ has a custom NSUpdateSecurityPolicy", bundle.bundleURL.lastPathComponent);
|
||||
} else {
|
||||
SULog(SULogLevelDefault, @"Skipping atomic rename/swap and gatekeeper scan because Autoupdate is not signed with same identity as the new update %@", bundle.bundleURL.lastPathComponent);
|
||||
}
|
||||
}
|
||||
|
||||
_newAndOldBundlesOnSameVolume = [fileManager itemAtURL:bundle.bundleURL isOnSameVolumeItemAsURL:_host.bundle.bundleURL];
|
||||
|
||||
@@ -23,11 +23,9 @@
|
||||
if ([SUPipedUnarchiver canUnarchivePath:path]) {
|
||||
return [[SUPipedUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory];
|
||||
}
|
||||
#if SPARKLE_BUILD_DMG_SUPPORT
|
||||
else if ([SUDiskImageUnarchiver canUnarchivePath:path]) {
|
||||
return [[SUDiskImageUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory decryptionPassword:decryptionPassword];
|
||||
}
|
||||
#endif
|
||||
else if ([SUBinaryDeltaUnarchiver canUnarchivePath:path]) {
|
||||
assert(hostPath != nil);
|
||||
NSString *nonNullHostPath = hostPath;
|
||||
|
||||
@@ -14,7 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
+ (BOOL)mustValidateBeforeExtraction;
|
||||
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock;
|
||||
- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock waitForCleanup:(BOOL)waitForCleanup;
|
||||
|
||||
@property (nonatomic, readonly) BOOL needsVerifyBeforeExtractionKey;
|
||||
|
||||
- (NSString *)description;
|
||||
|
||||
|
||||
@@ -1,3 +1,63 @@
|
||||
# 2.7.1
|
||||
|
||||
* Fix typo in NN localisation (#2694) (Sjur N Moshagen)
|
||||
* Fix compiler warnings for Xcode 16.3 (#2709) (Zorg)
|
||||
* Fix Sparkle not building when SPARKLE_COPY_LOCALIZATIONS=0 (#2707) (Zorg)
|
||||
* Fix release notes constraints when compiled with macOS 26 SDK (#2730) (Zorg)
|
||||
* Fix reserved identifier warnings for Xcode 26 (#2729) (Zorg)
|
||||
|
||||
# 2.7.0
|
||||
|
||||
* Unarchiver / validation improvements (Zorg)
|
||||
* Remove old checksum verification checks for dmg archives to improve extraction speed (#2568) (Zorg)
|
||||
* Skip extracting auxiliary files and improve extraction progress for disk images (#2569) (Zorg)
|
||||
* Improve robustness around extracting dmg's with passwords (#2627, #2571) (Zorg)
|
||||
* Randomize the download archive name the installer extracts/executes (#2584) (Zorg)
|
||||
* Retry extracting zip file without piping if extraction fails to workaround bug prior to macOS 15 (#2616) (Zorg)
|
||||
* Add opt-in SUVerifyUpdateBeforeExtraction option to force verification of updates before extraction (#2667) (Zorg)
|
||||
* Add support for extracting Apple Archives (.aar files; requires SUVerifyUpdateBeforeExtraction, macOS 10.15+) (#2586, #2588, #2590) (Zorg)
|
||||
* Don't allow removal of signing keys more strictly (#2647) (Zorg)
|
||||
* Remove SPARKLE_BUILD_DMG_SUPPORT option (#2690) (Zorg)
|
||||
* Add new BinaryDelta format (version 4) (Zorg)
|
||||
* Preserve bundle creation date when creating and applying delta updates (#2583) (Zorg)
|
||||
* Use faster crc32 hashes for binary delta version 4 (#2638) (Zorg)
|
||||
* Make binary delta version 4 the default (#2668) (Zorg)
|
||||
* Language / layout improvements
|
||||
* Fix recovery error suggestion not shown when app is translocated or on read-only mount (#2689) (Zorg)
|
||||
* Fix typo in Dutch localisation (#2642) (Eitot)
|
||||
* Add baseline alignment to status text in SUStatus dialog (#2587) (Eitot)
|
||||
* Make horizontal hugging priority required for status text field (#2614) (Zorg)
|
||||
* Adjust the layout of anonymous system profile info to align better with the rest of the panel's UI (#2564) (Daniel Jalkut)
|
||||
* Fix typo in Dutch localisation (#2642) (Eitot)
|
||||
* Internationalize system profile display keys (#2577) (Zorg)
|
||||
* Update hebrew locale and add right-to-left characters (#2573, #2576, #2578, #2579) (Shlomo)
|
||||
* Update localisations for Dutch and German (#2582) (Eitot)
|
||||
* Add unlocalized strings in Japanese (#2589) (1024jp)
|
||||
* Fix typo in LICENSE (#2648) (fujisoft)
|
||||
* Deprecate custom version comparators (#2639) (Zorg)
|
||||
* Skip preflight update check in sparkle-cli if user is root (#2645) (Zorg)
|
||||
* Avoid assert/crash when app is moved before update alert shows (#2658) (Zorg)
|
||||
* Use default NSURLRequest timeoutInterval for the downloader (currently 60s) (#2673) (Zorg)
|
||||
* Fix process substitution failing to work for providing the private key as file argument (#2615) (Zorg)
|
||||
* Improve unable decode private key error messages in generate_appcast (#2675) (Zorg)
|
||||
* Clarify that default channel must be in allowed channels set in API documentation (#2676) (Zorg)
|
||||
* Call update permission prompt delegate method only when needed (#2622) (Zorg)
|
||||
* Resolve duplicate class definitions from BinaryDelta, Sparkle Test App, and unit tests (#2570, #2629) (Zorg)
|
||||
|
||||
# 2.6.4
|
||||
|
||||
* Fix app modification prompt from appearing when downloaded update overrides NSUpdateSecurityPolicy (#2593)
|
||||
|
||||
# 2.6.3
|
||||
|
||||
* Guard update timer update check against sessionInProgress to fix rare crash when checking for updates (#2561)
|
||||
* Remove extra writeData: call when unarchiving disk images (#2562)
|
||||
* Ignore crashes due to SIGPIPE in generate_appcast when failing to extract zip files (#2563)
|
||||
|
||||
# 2.6.2
|
||||
|
||||
* Create and use temp extraction directory in generate_appcast again (#2555) (Zorg)
|
||||
|
||||
# 2.6.1
|
||||
|
||||
* Extract archives in a separate directory from the input archive (#2550) (Zorg)
|
||||
@@ -253,6 +313,15 @@ Please visit [Sparkle's website](http://sparkle-project.org) for more informatio
|
||||
|
||||
If you are migrating from earlier beta versions of Sparkle 2 and use sandboxing, please re-familiarize yourself with the [Sandboxing guide](https://sparkle-project.org/documentation/sandboxing/). Some of the XPC Services are now optional and integration with XPC Services and code signing have been simplified. The SPUUserDriver protocol for custom user interfaces has been greatly simplified too.
|
||||
|
||||
# 1.27.3
|
||||
|
||||
* Create and use temp extraction directory in generate_appcast again (#2556) (Zorg)
|
||||
|
||||
# 1.27.2
|
||||
|
||||
* Extract archives in a separate directory from the input archive (#2552) (Zorg)
|
||||
* Fix incorrect xz log warning in make release (#2044) (trss)
|
||||
|
||||
# 1.27.1
|
||||
|
||||
* Use px instead of pt when specifying font size to fix default font size in WebView from #1962 (regressed in 1.25.0 with WKWebView adoption) (Daniel Jalkut)
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz"}
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz"}
|
||||
@@ -33,10 +33,6 @@ SPARKLE_BUILD_BZIP2_DELTA_SUPPORT = 1
|
||||
// If this is disabled, this requires an update to OTHER_SWIFT_FLAGS_COMMON below
|
||||
SPARKLE_BUILD_PACKAGE_SUPPORT = 1
|
||||
|
||||
// Set to 0 to not build support for extracting updates from disk images (dmgs)
|
||||
// If this is disabled, this requires an update to OTHER_SWIFT_FLAGS_COMMON below
|
||||
SPARKLE_BUILD_DMG_SUPPORT = 1
|
||||
|
||||
// Set to 0 to only build all non-UI bits (which means client uses a custom SPUUserDriver)
|
||||
SPARKLE_BUILD_UI_BITS = 1
|
||||
|
||||
@@ -47,8 +43,7 @@ SPARKLE_COPY_LOCALIZATIONS = 1
|
||||
// If SPARKLE_BUILD_LEGACY_DELTA_SUPPORT is set to 0, remove -DSPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
// If GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT is set to 0, remove -DGENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT
|
||||
// If SPARKLE_BUILD_PACKAGE_SUPPORT is set to 0, remove -DSPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
// If SPARKLE_BUILD_DMG_SUPPORT is set to 0, remove -DSPARKLE_BUILD_DMG_SUPPORT
|
||||
OTHER_SWIFT_FLAGS_COMMON = -DSPARKLE_BUILD_LEGACY_DSA_SUPPORT -DGENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT -DSPARKLE_BUILD_PACKAGE_SUPPORT -DSPARKLE_BUILD_DMG_SUPPORT
|
||||
OTHER_SWIFT_FLAGS_COMMON = -DSPARKLE_BUILD_LEGACY_DSA_SUPPORT -DGENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT -DSPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
// Minimum supported macOS version
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.13
|
||||
@@ -98,13 +93,13 @@ SPARKLE_ICON_NAME = AppIcon
|
||||
// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_MAJOR = 2
|
||||
SPARKLE_VERSION_MINOR = 6
|
||||
SPARKLE_VERSION_MINOR = 7
|
||||
SPARKLE_VERSION_PATCH = 1
|
||||
|
||||
// This should be in SemVer format or empty, ie. "-beta.1"
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_SUFFIX =
|
||||
CURRENT_PROJECT_VERSION = 2037
|
||||
CURRENT_PROJECT_VERSION = 2045
|
||||
|
||||
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
@@ -114,7 +109,7 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES
|
||||
PRODUCT_NAME = ${TARGET_NAME}
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier}
|
||||
|
||||
GCC_PREPROCESSOR_DEFINITIONS_COMMON = SPU_OBJC_DIRECT=__attribute__((objc_direct)) SPU_OBJC_DIRECT_MEMBERS=__attribute__((objc_direct_members)) SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME=$(SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME) SPARKLE_BUILD_UI_BITS=$(SPARKLE_BUILD_UI_BITS) SPARKLE_COPY_LOCALIZATIONS=$(SPARKLE_COPY_LOCALIZATIONS) SPARKLE_BUILD_LEGACY_SUUPDATER=$(SPARKLE_BUILD_LEGACY_SUUPDATER) SPARKLE_BUILD_PACKAGE_SUPPORT=$(SPARKLE_BUILD_PACKAGE_SUPPORT) SPARKLE_BUILD_DMG_SUPPORT=$(SPARKLE_BUILD_DMG_SUPPORT) SPARKLE_BUILD_LEGACY_DELTA_SUPPORT=$(SPARKLE_BUILD_LEGACY_DELTA_SUPPORT) SPARKLE_BUILD_BZIP2_DELTA_SUPPORT=$(SPARKLE_BUILD_BZIP2_DELTA_SUPPORT) SPARKLE_BUILD_LEGACY_DSA_SUPPORT=$(SPARKLE_BUILD_LEGACY_DSA_SUPPORT) GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT=$(GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT) SPARKLE_BUNDLE_IDENTIFIER=\"$(SPARKLE_BUNDLE_IDENTIFIER)\" CURRENT_PROJECT_VERSION=\"$(CURRENT_PROJECT_VERSION)\" MARKETING_VERSION=\"$(MARKETING_VERSION)\" SPARKLE_RELAUNCH_TOOL_NAME=\"$(SPARKLE_RELAUNCH_TOOL_NAME)\" SPARKLE_INSTALLER_PROGRESS_TOOL_NAME=\"$(SPARKLE_INSTALLER_PROGRESS_TOOL_NAME)\" SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID=\"$(SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID)\" SPARKLE_ICON_NAME=\"$(SPARKLE_ICON_NAME)\" INSTALLER_LAUNCHER_NAME=\"${INSTALLER_LAUNCHER_NAME}\" INSTALLER_LAUNCHER_BUNDLE_ID=\"${INSTALLER_LAUNCHER_BUNDLE_ID}\" INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_LAUNCHER_XPC_SERVICE) INSTALLER_CONNECTION_NAME=\"${INSTALLER_CONNECTION_NAME}\" INSTALLER_CONNECTION_BUNDLE_ID=\"${INSTALLER_CONNECTION_BUNDLE_ID}\" INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_CONNECTION_XPC_SERVICE) INSTALLER_STATUS_NAME=\"${INSTALLER_STATUS_NAME}\" INSTALLER_STATUS_BUNDLE_ID=\"${INSTALLER_STATUS_BUNDLE_ID}\" INSTALLER_STATUS_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_STATUS_XPC_SERVICE) DOWNLOADER_NAME=\"${DOWNLOADER_NAME}\" DOWNLOADER_BUNDLE_ID=\"${DOWNLOADER_BUNDLE_ID}\" DOWNLOADER_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_DOWNLOADER_XPC_SERVICE)
|
||||
GCC_PREPROCESSOR_DEFINITIONS_COMMON = SPU_OBJC_DIRECT=__attribute__((objc_direct)) SPU_OBJC_DIRECT_MEMBERS=__attribute__((objc_direct_members)) SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME=$(SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME) SPARKLE_BUILD_UI_BITS=$(SPARKLE_BUILD_UI_BITS) SPARKLE_COPY_LOCALIZATIONS=$(SPARKLE_COPY_LOCALIZATIONS) SPARKLE_BUILD_LEGACY_SUUPDATER=$(SPARKLE_BUILD_LEGACY_SUUPDATER) SPARKLE_BUILD_PACKAGE_SUPPORT=$(SPARKLE_BUILD_PACKAGE_SUPPORT) SPARKLE_BUILD_LEGACY_DELTA_SUPPORT=$(SPARKLE_BUILD_LEGACY_DELTA_SUPPORT) SPARKLE_BUILD_BZIP2_DELTA_SUPPORT=$(SPARKLE_BUILD_BZIP2_DELTA_SUPPORT) SPARKLE_BUILD_LEGACY_DSA_SUPPORT=$(SPARKLE_BUILD_LEGACY_DSA_SUPPORT) GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT=$(GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT) SPARKLE_BUNDLE_IDENTIFIER=\"$(SPARKLE_BUNDLE_IDENTIFIER)\" CURRENT_PROJECT_VERSION=\"$(CURRENT_PROJECT_VERSION)\" MARKETING_VERSION=\"$(MARKETING_VERSION)\" SPARKLE_RELAUNCH_TOOL_NAME=\"$(SPARKLE_RELAUNCH_TOOL_NAME)\" SPARKLE_INSTALLER_PROGRESS_TOOL_NAME=\"$(SPARKLE_INSTALLER_PROGRESS_TOOL_NAME)\" SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID=\"$(SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID)\" SPARKLE_ICON_NAME=\"$(SPARKLE_ICON_NAME)\" INSTALLER_LAUNCHER_NAME=\"${INSTALLER_LAUNCHER_NAME}\" INSTALLER_LAUNCHER_BUNDLE_ID=\"${INSTALLER_LAUNCHER_BUNDLE_ID}\" INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_LAUNCHER_XPC_SERVICE) INSTALLER_CONNECTION_NAME=\"${INSTALLER_CONNECTION_NAME}\" INSTALLER_CONNECTION_BUNDLE_ID=\"${INSTALLER_CONNECTION_BUNDLE_ID}\" INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_CONNECTION_XPC_SERVICE) INSTALLER_STATUS_NAME=\"${INSTALLER_STATUS_NAME}\" INSTALLER_STATUS_BUNDLE_ID=\"${INSTALLER_STATUS_BUNDLE_ID}\" INSTALLER_STATUS_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_INSTALLER_STATUS_XPC_SERVICE) DOWNLOADER_NAME=\"${DOWNLOADER_NAME}\" DOWNLOADER_BUNDLE_ID=\"${DOWNLOADER_BUNDLE_ID}\" DOWNLOADER_XPC_SERVICE_EMBEDDED=$(SPARKLE_EMBED_DOWNLOADER_XPC_SERVICE)
|
||||
|
||||
CODE_SIGN_IDENTITY = -
|
||||
SDKROOT = macosx
|
||||
@@ -169,4 +164,4 @@ GCC_WARN_UNUSED_PARAMETER = YES
|
||||
GCC_WARN_UNUSED_VARIABLE = YES
|
||||
|
||||
// Turn on all warnings, then disable a few which are almost impossible to avoid
|
||||
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Werror=undef
|
||||
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
|
||||
@@ -18,8 +18,12 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BUILDING_SPARKLE=1
|
||||
SKIP_INSTALL = YES
|
||||
DEFINES_MODULE = YES
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${SPARKLE_BUNDLE_IDENTIFIER}
|
||||
STRINGS_FILE_OUTPUT_ENCODING = binary
|
||||
|
||||
// As long as we don't ourselves depend upon any Frameworks that are incompatible
|
||||
// with Application Extensions, then we should allow frameworks that require
|
||||
// compatibility to be able to link with us.
|
||||
APPLICATION_EXTENSION_API_ONLY = YES
|
||||
|
||||
ENABLE_MODULE_VERIFIER = YES
|
||||
MODULEMAP_PRIVATE_FILE = Sparkle/Sparkle.private.modulemap
|
||||
@@ -84,7 +84,7 @@ if [ "$ACTION" = "" ] ; then
|
||||
find . \! -type d | rev | sort | rev | tar --no-xattrs -cJvf "../Sparkle-$MARKETING_VERSION.tar.xz" --files-from=-
|
||||
|
||||
# Copy archived distribution for CI
|
||||
cp -f "../Sparkle-$MARKETING_VERSION.tar.xz" "../sparkle-dist.tar.xz"
|
||||
cp -f "../Sparkle-$MARKETING_VERSION.tar.xz" "../sparkle_dist.tar.xz"
|
||||
|
||||
# Extract archive for testing binary validity
|
||||
tar -xf "../Sparkle-$MARKETING_VERSION.tar.xz" -C "/tmp/sparkle-extract"
|
||||
|
||||
@@ -11,17 +11,24 @@
|
||||
#import "SUFileManager.h"
|
||||
#import "SULog.h"
|
||||
#import "SPUMessageTypes.h"
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SPULocalCacheDirectory.h"
|
||||
#import "SPUInstallationType.h"
|
||||
#import "SUHost.h"
|
||||
#import <ImageIO/ImageIO.h>
|
||||
#import <ServiceManagement/ServiceManagement.h>
|
||||
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
|
||||
#import <SystemConfiguration/SystemConfiguration.h>
|
||||
|
||||
// We only fetch bundle icon for Installer Launcher XPC Service
|
||||
#if defined(BUILDING_SPARKLE_SOURCES_EXTERNALLY) && BUILDING_SPARKLE_SOURCES_EXTERNALLY
|
||||
#define FETCH_BUNDLE_ICON_FOR_AUTH 1
|
||||
#else
|
||||
#define FETCH_BUNDLE_ICON_FOR_AUTH 0
|
||||
#endif
|
||||
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
#import <AppKit/AppKit.h>
|
||||
#else
|
||||
#include "AppKitPrevention.h"
|
||||
#endif
|
||||
|
||||
@implementation SUInstallerLauncher
|
||||
|
||||
@@ -106,10 +113,8 @@
|
||||
return (submittedJob == true);
|
||||
}
|
||||
|
||||
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory authorizationPrompt:(NSString *)authorizationPrompt inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
|
||||
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory authorizationPrompt:(NSString *)authorizationPrompt inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
|
||||
{
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
|
||||
// No need to release the quarantine for this utility
|
||||
// In fact, we shouldn't because the tool may be located at a path we should not be writing too.
|
||||
|
||||
@@ -164,81 +169,68 @@
|
||||
AuthorizationRights rights = { .count = 1, .items = &right };
|
||||
|
||||
AuthorizationFlags flags = (AuthorizationFlags)(kAuthorizationFlagExtendRights | kAuthorizationFlagInteractionAllowed);
|
||||
|
||||
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
|
||||
AuthorizationEnvironment authorizationEnvironment = {.count = 0, .items = NULL};
|
||||
|
||||
// Find a 32x32 image representation of the icon, and write out a PNG version of it to a temporary location
|
||||
// Then use the icon (if one is available) for the authorization prompt
|
||||
// NSImage is not used because it relies on AppKit
|
||||
NSURL *tempIconDestinationURL = nil;
|
||||
NSURL *iconURL = [SUBundleIcon iconURLForHost:[[SUHost alloc] initWithBundle:hostBundle]];
|
||||
if (iconURL != nil) {
|
||||
CGImageSourceRef imageSource = CGImageSourceCreateWithURL((CFURLRef)iconURL, (CFDictionaryRef)@{});
|
||||
if (imageSource != NULL) {
|
||||
size_t imageCount = CGImageSourceGetCount(imageSource);
|
||||
for (size_t imageIndex = 0; imageIndex < imageCount; imageIndex++) {
|
||||
CFDictionaryRef cfProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, imageIndex, (CFDictionaryRef)@{});
|
||||
NSDictionary *properties = CFBridgingRelease(cfProperties);
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
NSString *tempIconDestinationPath = nil;
|
||||
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
|
||||
char iconPathBuffer[] = "/tmp/XXXXXX.png";
|
||||
|
||||
// If an icon bundle path is specified, write out a representation of the icon's data to a temporary file.
|
||||
// Then use that image data for the authorization prompt
|
||||
if (iconBundlePath != nil) {
|
||||
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:iconBundlePath];
|
||||
|
||||
// Creating a bitmap representation at a specific size is much cheaper than asking for icon's TIFFRepresentation
|
||||
// On older OS's we must create a 32x32 image otherwise it won't be scaled correctly in the dialog
|
||||
// On newer OS's we can use a slightly higher resolution image
|
||||
NSInteger imageDimensions;
|
||||
if (@available(macOS 10.15, *)) {
|
||||
imageDimensions = 64;
|
||||
} else {
|
||||
imageDimensions = 32;
|
||||
}
|
||||
|
||||
NSBitmapImageRep *iconBitmapRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:imageDimensions pixelsHigh:imageDimensions bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
|
||||
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
|
||||
NSGraphicsContext.currentContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:iconBitmapRep];
|
||||
[icon drawInRect:NSMakeRect(0, 0, imageDimensions, imageDimensions)];
|
||||
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
|
||||
NSData *pngData = [iconBitmapRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
|
||||
|
||||
if (pngData != nil) {
|
||||
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
|
||||
// a) no spaces in the path (SU/NSFileManager fails here)
|
||||
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here) only apply to older systems (eg: macOS 10.8)
|
||||
// The file also needs to be placed in a system readable place such as /tmp
|
||||
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
|
||||
int tempIconFile = mkstemps(iconPathBuffer, strlen(".png"));
|
||||
if (tempIconFile == -1) {
|
||||
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
|
||||
} else {
|
||||
close(tempIconFile);
|
||||
|
||||
NSNumber *pixelWidth = properties[(const NSString *)kCGImagePropertyPixelWidth];
|
||||
NSNumber *pixelHeight = properties[(const NSString *)kCGImagePropertyPixelHeight];
|
||||
tempIconDestinationPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:iconPathBuffer length:strlen(iconPathBuffer)];
|
||||
|
||||
// If we don't find a 32x32 image representation, then we don't provide an icon
|
||||
// Don't try to make up with it by eg: converting an image representation to this size
|
||||
// The app developer should be providing the icon representation.
|
||||
// The authorization API may not take other size dimensions.
|
||||
NSNumber *targetDimension = @32;
|
||||
if ([pixelWidth isKindOfClass:[NSNumber class]] && [pixelHeight isKindOfClass:[NSNumber class]] && [pixelWidth isEqualToNumber:targetDimension] && [pixelHeight isEqualToNumber:targetDimension]) {
|
||||
|
||||
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
|
||||
// a) no spaces in the path (SU/NSFileManager fails here)
|
||||
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here)
|
||||
// These limitations only apply to older systems (eg: macOS 10.8)
|
||||
// The file also needs to be placed in a system readable place such as /tmp
|
||||
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
|
||||
char pathBuffer[] = "/tmp/XXXXXX.png";
|
||||
int tempIconFile = mkstemps(pathBuffer, strlen(".png"));
|
||||
if (tempIconFile == -1) {
|
||||
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
|
||||
if (tempIconDestinationPath != nil) {
|
||||
if (![pngData writeToFile:tempIconDestinationPath atomically:NO]) {
|
||||
SULog(SULogLevelError, @"Failed to write icon image data to %@", tempIconDestinationPath);
|
||||
} else {
|
||||
close(tempIconFile);
|
||||
iconAuthorizationItem.valueLength = strlen(iconPathBuffer);
|
||||
iconAuthorizationItem.value = iconPathBuffer;
|
||||
|
||||
NSString *path = [[NSString alloc] initWithUTF8String:pathBuffer];
|
||||
tempIconDestinationURL = [NSURL fileURLWithPath:path];
|
||||
|
||||
CGImageDestinationRef imageDestination = NULL;
|
||||
if (@available(macOS 11, *)) {
|
||||
CFStringRef uti = (__bridge CFStringRef)[UTTypePNG identifier];
|
||||
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, uti, 1, NULL);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
|
||||
else
|
||||
{
|
||||
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, kUTTypePNG, 1, NULL);
|
||||
}
|
||||
#endif
|
||||
if (imageDestination != NULL) {
|
||||
CGImageDestinationAddImageFromSource(imageDestination, imageSource, imageIndex, (CFDictionaryRef)@{});
|
||||
if (CGImageDestinationFinalize(imageDestination)) {
|
||||
iconAuthorizationItem.valueLength = strlen(pathBuffer);
|
||||
iconAuthorizationItem.value = pathBuffer;
|
||||
|
||||
authorizationEnvironment.count = 1;
|
||||
authorizationEnvironment.items = &iconAuthorizationItem;
|
||||
}
|
||||
|
||||
CFRelease(imageDestination);
|
||||
}
|
||||
authorizationEnvironment.count = 1;
|
||||
authorizationEnvironment.items = &iconAuthorizationItem;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
CFRelease(imageSource);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// This should prompt up the authorization dialog if necessary
|
||||
OSStatus copyStatus = AuthorizationCopyRights(auth, &rights, &authorizationEnvironment, flags, NULL);
|
||||
@@ -252,9 +244,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (tempIconDestinationURL != nil) {
|
||||
[fileManager removeItemAtURL:tempIconDestinationURL error:NULL];
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
if (tempIconDestinationPath != nil) {
|
||||
[[NSFileManager defaultManager] removeItemAtPath:tempIconDestinationPath error:NULL];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Boolean submittedJob = false;
|
||||
@@ -403,7 +397,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
}
|
||||
|
||||
// Note: do not pass untrusted information such as paths to the installer and progress agent tools, when we can find them ourselves here
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
// We could do a sort of preflight Authorization test instead of testing if we are running as root,
|
||||
@@ -535,7 +529,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
return;
|
||||
}
|
||||
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory authorizationPrompt:authorizationPrompt inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:iconBundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory authorizationPrompt:authorizationPrompt inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
|
||||
BOOL submittedProgressTool = NO;
|
||||
if (installerStatus == SUInstallerLauncherSuccess) {
|
||||
|
||||
@@ -11,6 +11,6 @@
|
||||
|
||||
@protocol SUInstallerLauncherProtocol
|
||||
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
|
||||
@end
|
||||
@@ -56,7 +56,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
--
|
||||
|
||||
sais.c and sais.c, from sais-lite (2010/08/07) <https://sites.google.com/site/yuta256/sais>:
|
||||
sais.c and sais.h, from sais-lite (2010/08/07) <https://sites.google.com/site/yuta256/sais>:
|
||||
|
||||
The sais-lite copyright is as follows:
|
||||
|
||||
|
||||
+3
-3
@@ -2,10 +2,10 @@
|
||||
import PackageDescription
|
||||
|
||||
// Version is technically not required here, SPM doesn't check
|
||||
let version = "2.6.1"
|
||||
let version = "2.7.1"
|
||||
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
|
||||
let tag = "2.6.1"
|
||||
let checksum = "f37b84ffdb79f1afef627ab23ddb2c2e3ce1ca496adf3e5b39428fec13af4b62"
|
||||
let tag = "2.7.1"
|
||||
let checksum = "3b9d424d79b1f3453cc44d23c3b0105bdff1298f5321aad8722f98b9149d5e95"
|
||||
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
|
||||
|
||||
let package = Package(
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 176 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
@@ -0,0 +1,64 @@
|
||||
{
|
||||
"fill" : {
|
||||
"automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : {
|
||||
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
|
||||
}
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
|
||||
}
|
||||
}
|
||||
],
|
||||
"glass" : true,
|
||||
"hidden" : false,
|
||||
"image-name" : "sparkles.png",
|
||||
"name" : "sparkles",
|
||||
"position" : {
|
||||
"scale" : 1.15,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"glass" : true,
|
||||
"hidden" : false,
|
||||
"image-name" : "circular_arrow.png",
|
||||
"name" : "circular_arrow",
|
||||
"position" : {
|
||||
"scale" : 1.25,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.5
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : true,
|
||||
"value" : 0.5
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB |
Binary file not shown.
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Sparkle"
|
||||
s.version = "2.6.1"
|
||||
s.version = "2.7.1"
|
||||
s.summary = "A software update framework for macOS"
|
||||
s.description = "Sparkle is an easy-to-use software update framework for macOS."
|
||||
s.homepage = "https://sparkle-project.org"
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
/* End PBXAggregateTarget section */
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; };
|
||||
142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */; };
|
||||
@@ -106,10 +105,8 @@
|
||||
61EF67560E25B58D00F754E0 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
|
||||
61EF67590E25C5B400F754E0 /* SUHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 61EF67580E25C5B400F754E0 /* SUHost.h */; };
|
||||
654F352529B1548700B10EEB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 654F352629B154AE00B10EEB /* ImageIO.framework */; };
|
||||
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55C14F31136EFC2400649790 /* SystemConfiguration.framework */; };
|
||||
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 724BB3B51D35AAC3005D534A /* ServiceManagement.framework */; };
|
||||
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
|
||||
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */; };
|
||||
72045CE026FEE535004F96E5 /* Downloader.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 726E07EF1CAF37BD001A286B /* Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
@@ -146,10 +143,6 @@
|
||||
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */; };
|
||||
720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */; };
|
||||
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */; };
|
||||
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B87F1D456A8500CB5CED /* SUBundleIcon.h */; };
|
||||
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 72162B071C82C9600013C1C5 /* SULocalizations.h */; };
|
||||
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */; };
|
||||
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
|
||||
@@ -173,7 +166,6 @@
|
||||
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */ = {isa = PBXBuildFile; fileRef = 722545B526805FF80036465C /* testappcast_info_updates.xml */; };
|
||||
72266A872946359600645376 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
72266A88294635BA00645376 /* SUAppcastDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767C91C9B707000A07552 /* SUAppcastDriver.m */; };
|
||||
72266A89294636FB00645376 /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
|
||||
72266A8A2946493C00645376 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
|
||||
72266A8B29464CEA00645376 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
|
||||
72266A8C29464D0200645376 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
|
||||
@@ -185,6 +177,7 @@
|
||||
722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
722FB7E5260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
|
||||
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
|
||||
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7230BCDD2E22E2BC00B71297 /* Images.xcassets */; };
|
||||
72316BD31E0DA8430039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
|
||||
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
|
||||
723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */; };
|
||||
@@ -206,6 +199,7 @@
|
||||
723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
|
||||
723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */; };
|
||||
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7240852D2CA11C1400ED2FCD /* libz.tbd */; };
|
||||
72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
|
||||
@@ -223,6 +217,7 @@
|
||||
724BB3AA1D3347C2005D534A /* SUInstallerStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3971D333832005D534A /* SUInstallerStatus.m */; };
|
||||
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
724F76F91D6EAD0D00ECD062 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; };
|
||||
725453552C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 725453542C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg */; };
|
||||
725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 725602D31C83551C00DAA70E /* SUApplicationInfo.h */; };
|
||||
725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 725602D41C83551C00DAA70E /* SUApplicationInfo.m */; };
|
||||
725B3A82263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml in Resources */ = {isa = PBXBuildFile; fileRef = 725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */; };
|
||||
@@ -293,7 +288,6 @@
|
||||
7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
7267E5E71D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
7267E5EA1D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
7267E5EC1D3D912900D1BF90 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */; };
|
||||
7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */; };
|
||||
@@ -314,6 +308,8 @@
|
||||
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
|
||||
7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
|
||||
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E4992648F7C00088C213 /* SPUUserUpdateState.m */; };
|
||||
726B20612CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */; };
|
||||
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */ = {isa = PBXBuildFile; fileRef = 726DF88D1C84277500188804 /* SPUUserUpdateState.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */; };
|
||||
726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
|
||||
@@ -334,8 +330,9 @@
|
||||
726F2CE51BC9C33D001971A4 /* SUOperatingSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 726F2CE31BC9C33D001971A4 /* SUOperatingSystem.h */; };
|
||||
726F2CE61BC9C33D001971A4 /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
726F2CE81BC9C48F001971A4 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
|
||||
726F2CE91BC9C499001971A4 /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
726F2CEB1BC9C733001971A4 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
|
||||
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */ = {isa = PBXBuildFile; fileRef = 726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */; };
|
||||
726FC0382C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar in Resources */ = {isa = PBXBuildFile; fileRef = 726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */; };
|
||||
727DBAE526B5BBFD00111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE426B5BBFD00111F0C /* ArgumentParser */; };
|
||||
727DBAE726B5C47800111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE626B5C47800111F0C /* ArgumentParser */; };
|
||||
727DBAE926B5C48A00111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE826B5C48A00111F0C /* ArgumentParser */; };
|
||||
@@ -411,6 +408,8 @@
|
||||
72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */; };
|
||||
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 72E45CFB1B641961005C701A /* sparkletestcast.xml */; };
|
||||
72E539121D68C3FA0092CE5E /* SPUDownloadData.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */; };
|
||||
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72E6D9702C04DE19005496E4 /* SparkleTestCodeSign_pkg.dmg */; };
|
||||
72E6D9732C0526DC005496E4 /* SparkleTestCodeSignApp.enc.nolicense.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72E6D9722C0526DC005496E4 /* SparkleTestCodeSignApp.enc.nolicense.dmg */; };
|
||||
72EB735F29BE981300FBCEE7 /* DevSignedApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */; };
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */; };
|
||||
72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
|
||||
@@ -437,7 +436,6 @@
|
||||
72F0EC4B278A5BB2002A876A /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E07681CA616A4001A286B /* libxar.tbd */; };
|
||||
72F0EC4C278A5BB9002A876A /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E076A1CA616B3001A286B /* libbz2.tbd */; };
|
||||
72F0EC4D278A5BCA002A876A /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
|
||||
72F0EC4E278A73C6002A876A /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
|
||||
72F94F581CC44DE1002DEE68 /* SPUXPCServiceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F94F561CC44DE1002DEE68 /* SPUXPCServiceInfo.h */; };
|
||||
72F94F591CC44DE1002DEE68 /* SPUXPCServiceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F94F571CC44DE1002DEE68 /* SPUXPCServiceInfo.m */; };
|
||||
72F94F5A1CC450DE002DEE68 /* SUInstallerLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E07B11CAF08D6001A286B /* SUInstallerLauncher.m */; };
|
||||
@@ -484,7 +482,6 @@
|
||||
EA1E287022B66621004AA304 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
|
||||
EA1E287922B666EB004AA304 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E287822B666EB004AA304 /* main.swift */; };
|
||||
EA1E287E22B66705004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
|
||||
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
|
||||
F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */; };
|
||||
F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */; };
|
||||
FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */; };
|
||||
@@ -916,9 +913,9 @@
|
||||
/* Begin PBXFileReference section */
|
||||
004A8652192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
0263187214FEBB31005EBF43 /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
0580A0572C0D3B9200FE836A /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
||||
0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
|
||||
1420DF4F196247F900203BB0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = "<group>"; };
|
||||
14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = "<group>"; };
|
||||
14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = "<group>"; };
|
||||
@@ -1050,8 +1047,6 @@
|
||||
720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterCycle.h; sourceTree = "<group>"; };
|
||||
720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterCycle.m; sourceTree = "<group>"; };
|
||||
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; sourceTree = "<group>"; };
|
||||
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBundleIcon.h; sourceTree = "<group>"; };
|
||||
7214B8801D456A8500CB5CED /* SUBundleIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBundleIcon.m; sourceTree = "<group>"; };
|
||||
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallationType.h; sourceTree = "<group>"; };
|
||||
72162B071C82C9600013C1C5 /* SULocalizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULocalizations.h; sourceTree = "<group>"; };
|
||||
721652671D3C8FED00FD13D8 /* SUInstallerLauncherStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerLauncherStatus.h; path = InstallerLauncher/SUInstallerLauncherStatus.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1086,9 +1081,11 @@
|
||||
722FB7CA1DD69897001D40CE /* ConfigSwift.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwift.xcconfig; sourceTree = "<group>"; };
|
||||
722FB7E3260EE53F00EB571C /* SUNormalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUNormalization.h; sourceTree = "<group>"; };
|
||||
722FB7E4260EE53F00EB571C /* SUNormalization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUNormalization.m; sourceTree = "<group>"; };
|
||||
7230BCDD2E22E2BC00B71297 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
72316BD11E0DA8430039EFD9 /* SUUnarchiverNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUnarchiverNotifier.h; path = Autoupdate/SUUnarchiverNotifier.h; sourceTree = SOURCE_ROOT; };
|
||||
72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUnarchiverNotifier.m; path = Autoupdate/SUUnarchiverNotifier.m; sourceTree = SOURCE_ROOT; };
|
||||
7235B75E29DFC0120081FE4E /* make-xcframework.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "make-xcframework.sh"; sourceTree = "<group>"; };
|
||||
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Sparkle.private.modulemap; sourceTree = "<group>"; };
|
||||
723ABCD7259A9A9D00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
723ABD37259A9BA500BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdateAlert.xib; sourceTree = "<group>"; };
|
||||
723ABD4C259A9BB900BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
@@ -1202,6 +1199,7 @@
|
||||
723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTouchBarButtonGroup.m; sourceTree = "<group>"; };
|
||||
723DFF962B3DFF6E00628E6C /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
|
||||
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_channels.xml; sourceTree = "<group>"; };
|
||||
7240852D2CA11C1400ED2FCD /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUpdaterController.h; sourceTree = "<group>"; };
|
||||
7246E0A21C83B685003B4E75 /* SPUStandardUpdaterController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUpdaterController.m; sourceTree = "<group>"; };
|
||||
724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = InstallerConnection.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@@ -1226,6 +1224,7 @@
|
||||
724BB3A61D33461B005D534A /* SUXPCInstallerStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUXPCInstallerStatus.h; sourceTree = "<group>"; };
|
||||
724BB3A71D33461B005D534A /* SUXPCInstallerStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUXPCInstallerStatus.m; sourceTree = "<group>"; };
|
||||
724BB3B51D35AAC3005D534A /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
|
||||
725453542C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg; sourceTree = "<group>"; };
|
||||
725602D31C83551C00DAA70E /* SUApplicationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUApplicationInfo.h; sourceTree = "<group>"; };
|
||||
725602D41C83551C00DAA70E /* SUApplicationInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUApplicationInfo.m; sourceTree = "<group>"; };
|
||||
72563CA9272E1C5400AF39F0 /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = "<group>"; };
|
||||
@@ -1301,6 +1300,7 @@
|
||||
7269E493264798200088C213 /* SPUSkippedUpdate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUSkippedUpdate.m; sourceTree = "<group>"; };
|
||||
7269E4992648F7C00088C213 /* SPUUserUpdateState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUserUpdateState.m; sourceTree = "<group>"; };
|
||||
7269E49C2648FC6C0088C213 /* SPUUserUpdateState+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUserUpdateState+Private.h"; sourceTree = "<group>"; };
|
||||
726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = DevSignedAppVersion2.dmg; sourceTree = "<group>"; };
|
||||
726B2B5D1C645FC900388755 /* UI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
726DF88D1C84277500188804 /* SPUUserUpdateState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserUpdateState.h; sourceTree = "<group>"; };
|
||||
726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUSecureCoding.h; path = Sparkle/SPUSecureCoding.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1328,6 +1328,8 @@
|
||||
726E4A361C89116000C57C6A /* SPUStandardUserDriverDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriverDelegate.h; sourceTree = "<group>"; };
|
||||
726F2CE31BC9C33D001971A4 /* SUOperatingSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUOperatingSystem.h; sourceTree = "<group>"; };
|
||||
726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUOperatingSystem.m; sourceTree = "<group>"; };
|
||||
726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.aar; sourceTree = "<group>"; };
|
||||
726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.enc.aar; sourceTree = "<group>"; };
|
||||
726FD2CB25F4BE5F00123BC6 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
726FD2CC25F4BE5F00123BC6 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
727F340A2605321D00020E85 /* SULog+NSError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SULog+NSError.m"; sourceTree = "<group>"; };
|
||||
@@ -1421,6 +1423,8 @@
|
||||
72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateSettingsWindowController.m; sourceTree = "<group>"; };
|
||||
72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUUpdateSettingsWindowController.xib; sourceTree = "<group>"; };
|
||||
72E45CFB1B641961005C701A /* sparkletestcast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sparkletestcast.xml; sourceTree = "<group>"; };
|
||||
72E6D9702C04DE19005496E4 /* SparkleTestCodeSign_pkg.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_pkg.dmg; sourceTree = "<group>"; };
|
||||
72E6D9722C0526DC005496E4 /* SparkleTestCodeSignApp.enc.nolicense.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.enc.nolicense.dmg; sourceTree = "<group>"; };
|
||||
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedApp.zip; sourceTree = "<group>"; };
|
||||
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedAppVersion2.zip; sourceTree = "<group>"; };
|
||||
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShowInstallerProgress.m; path = Sparkle/InstallerProgress/ShowInstallerProgress.m; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1569,7 +1573,6 @@
|
||||
files = (
|
||||
721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */,
|
||||
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */,
|
||||
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1598,11 +1601,10 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */,
|
||||
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */,
|
||||
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */,
|
||||
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */,
|
||||
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */,
|
||||
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */,
|
||||
654F352529B1548700B10EEB /* Security.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1626,6 +1628,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */,
|
||||
EA1E281722B645AE004AA304 /* libbsdiff.a in Frameworks */,
|
||||
7267E5C91D3D8C4300D1BF90 /* CoreServices.framework in Frameworks */,
|
||||
7267E5CA1D3D8C4800D1BF90 /* Foundation.framework in Frameworks */,
|
||||
@@ -1734,6 +1737,7 @@
|
||||
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
7240852D2CA11C1400ED2FCD /* libz.tbd */,
|
||||
654F352629B154AE00B10EEB /* ImageIO.framework */,
|
||||
725B81F92781AEA40041746F /* libcompression.tbd */,
|
||||
0867D6A5FE840307C02AAC07 /* AppKit.framework */,
|
||||
@@ -1811,10 +1815,10 @@
|
||||
61C268090E2DB5D000175E6C /* LICENSE */,
|
||||
14732BC11960F3B200593899 /* Makefile */,
|
||||
147D6D9E1B66DC3C006607AB /* CheckLocalizations.swift */,
|
||||
1420DF4F196247F900203BB0 /* Images.xcassets */,
|
||||
14732BBC1960EFB500593899 /* README.markdown */,
|
||||
14732BB91960EEEE00593899 /* SampleAppcast.xml */,
|
||||
1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */,
|
||||
7230BCDD2E22E2BC00B71297 /* Images.xcassets */,
|
||||
);
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
@@ -1832,6 +1836,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
720767D11E2EB86200F9A850 /* AppKitPrevention.h */,
|
||||
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */,
|
||||
61299B3909CB055000B7442F /* Appcast Support */,
|
||||
55C14BD5136EEFD000649790 /* Autoupdate */,
|
||||
72F9EBE41D519425004AC8B6 /* Deprecated */,
|
||||
@@ -1853,16 +1858,22 @@
|
||||
14958C6B19AEBC530061B14F /* signed-test-file.txt */,
|
||||
72AC6B2D1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg */,
|
||||
C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */,
|
||||
72E6D9722C0526DC005496E4 /* SparkleTestCodeSignApp.enc.nolicense.dmg */,
|
||||
72AC6B271B9AAD6700F62325 /* SparkleTestCodeSignApp.tar */,
|
||||
72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */,
|
||||
725453542C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg */,
|
||||
72E6D9702C04DE19005496E4 /* SparkleTestCodeSign_pkg.dmg */,
|
||||
72AC6B291B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 */,
|
||||
72AC6B251B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz */,
|
||||
72AC6B2B1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz */,
|
||||
729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */,
|
||||
72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */,
|
||||
F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */,
|
||||
726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */,
|
||||
726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */,
|
||||
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */,
|
||||
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */,
|
||||
726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */,
|
||||
14958C6C19AEBC610061B14F /* test-pubkey.pem */,
|
||||
5AF6C74E1AEA46D10014A3AB /* test.pkg */,
|
||||
5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */,
|
||||
@@ -2042,8 +2053,6 @@
|
||||
721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */,
|
||||
729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */,
|
||||
729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */,
|
||||
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */,
|
||||
7214B8801D456A8500CB5CED /* SUBundleIcon.m */,
|
||||
61299A5B09CA6D4500B7442F /* SUConstants.h */,
|
||||
61299A5F09CA6EB100B7442F /* SUConstants.m */,
|
||||
55E6F33219EC9F6C00005E76 /* SUErrors.h */,
|
||||
@@ -2580,7 +2589,6 @@
|
||||
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
|
||||
61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */,
|
||||
725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */,
|
||||
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */,
|
||||
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */,
|
||||
14652F8419A978C200959E44 /* SUExport.h in Headers */,
|
||||
7267E5E51D3D90AA00D1BF90 /* SUFileManager.h in Headers */,
|
||||
@@ -2997,7 +3005,7 @@
|
||||
attributes = {
|
||||
CLASSPREFIX = SU;
|
||||
LastSwiftUpdateCheck = 1020;
|
||||
LastUpgradeCheck = 1400;
|
||||
LastUpgradeCheck = 1630;
|
||||
ORGANIZATIONNAME = "Sparkle Project";
|
||||
TargetAttributes = {
|
||||
5D06E8CF0FD68C7C005AE3F6 = {
|
||||
@@ -3167,13 +3175,16 @@
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */,
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
|
||||
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
|
||||
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
|
||||
72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
|
||||
72AC6B281B9AAD6700F62325 /* SparkleTestCodeSignApp.tar in Resources */,
|
||||
72AC6B2A1B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 in Resources */,
|
||||
72E6D9732C0526DC005496E4 /* SparkleTestCodeSignApp.enc.nolicense.dmg in Resources */,
|
||||
72AC6B261B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz in Resources */,
|
||||
72AC6B2C1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz in Resources */,
|
||||
729F7ECE27409077004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip in Resources */,
|
||||
725453552C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg in Resources */,
|
||||
5A5DD41D249F116E0045EB3E /* test-relative-urls.xml in Resources */,
|
||||
F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */,
|
||||
5A5DD40424958B000045EB3E /* SUUpdateValidatorTest in Resources */,
|
||||
@@ -3181,10 +3192,13 @@
|
||||
5AF6C74F1AEA46D10014A3AB /* test.pkg in Resources */,
|
||||
72EB735F29BE981300FBCEE7 /* DevSignedApp.zip in Resources */,
|
||||
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */,
|
||||
726FC0382C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar in Resources */,
|
||||
726B20612CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg in Resources */,
|
||||
720DC50627A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml in Resources */,
|
||||
5AD0FA7F1C73F2E2004BCEFF /* testappcast.xml in Resources */,
|
||||
FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */,
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
|
||||
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */,
|
||||
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
|
||||
5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
|
||||
@@ -3196,8 +3210,8 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1420DF50196247F900203BB0 /* Images.xcassets in Resources */,
|
||||
723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */,
|
||||
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */,
|
||||
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
|
||||
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
|
||||
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
|
||||
@@ -3357,8 +3371,6 @@
|
||||
7267E5781D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */,
|
||||
7267E57A1D3D895B00D1BF90 /* SUBinaryDeltaCreate.m in Sources */,
|
||||
726F2CE81BC9C48F001971A4 /* SUConstants.m in Sources */,
|
||||
7267E5EA1D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
|
||||
726F2CE91BC9C499001971A4 /* SUOperatingSystem.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3370,7 +3382,6 @@
|
||||
72266A8C29464D0200645376 /* SUSignatures.m in Sources */,
|
||||
72266A8B29464CEA00645376 /* SUHost.m in Sources */,
|
||||
72266A8A2946493C00645376 /* SUCodeSigningVerifier.m in Sources */,
|
||||
72266A89294636FB00645376 /* SUStandardVersionComparator.m in Sources */,
|
||||
72266A88294635BA00645376 /* SUAppcastDriver.m in Sources */,
|
||||
72266A872946359600645376 /* SUFileManager.m in Sources */,
|
||||
725EE488277D398100D820CE /* SPUDeltaArchive.m in Sources */,
|
||||
@@ -3412,7 +3423,6 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72F0EC4E278A73C6002A876A /* SUFileManager.m in Sources */,
|
||||
72F0EC48278A5B95002A876A /* SPUDeltaArchive.m in Sources */,
|
||||
72F0EC49278A5B95002A876A /* SPUSparkleDeltaArchive.m in Sources */,
|
||||
72F0EC4A278A5B95002A876A /* SPUXarDeltaArchive.m in Sources */,
|
||||
@@ -3479,7 +3489,6 @@
|
||||
5AA89BA623FE276A0094DAB8 /* SUSignatures.m in Sources */,
|
||||
7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */,
|
||||
720595EF1D700568000572E8 /* SUApplicationInfo.m in Sources */,
|
||||
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */,
|
||||
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */,
|
||||
721C245E1CB757DE005440CB /* SUConstants.m in Sources */,
|
||||
7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */,
|
||||
@@ -3525,7 +3534,6 @@
|
||||
721D8A7B1D4963190032E472 /* SPULocalCacheDirectory.m in Sources */,
|
||||
7267E5E11D3D901600D1BF90 /* SPUMessageTypes.m in Sources */,
|
||||
5AA89BA523FE27660094DAB8 /* SUSignatures.m in Sources */,
|
||||
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */,
|
||||
726E07BF1CAF0C6C001A286B /* SUConstants.m in Sources */,
|
||||
7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
|
||||
726E07B21CAF08D6001A286B /* SUInstallerLauncher.m in Sources */,
|
||||
@@ -3656,7 +3664,6 @@
|
||||
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */,
|
||||
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */,
|
||||
725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */,
|
||||
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */,
|
||||
72DBA37F1D62C23E002594A8 /* SUCodeSigningVerifier.m in Sources */,
|
||||
61299A6009CA6EB100B7442F /* SUConstants.m in Sources */,
|
||||
7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
|
||||
@@ -4057,6 +4064,7 @@
|
||||
72E1DAB525B3E8AE0001BA6D /* hr */,
|
||||
37A5F28628E9219000891504 /* zh_HK */,
|
||||
728FBA192BB5013300651EDF /* nn */,
|
||||
0580A0572C0D3B9200FE836A /* he */,
|
||||
);
|
||||
name = SUUpdatePermissionPrompt.xib;
|
||||
sourceTree = "<group>";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "2.0">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1400"
|
||||
LastUpgradeVersion = "1630"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
Vendored
+189
-176
@@ -1,217 +1,230 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.9" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.9"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="SUUpdateAlert">
|
||||
<connections>
|
||||
<outlet property="_automaticallyInstallUpdatesButton" destination="117" id="IBi-aO-qkM"/>
|
||||
<outlet property="_descriptionField" destination="101" id="JkK-Xy-kns"/>
|
||||
<outlet property="_installButton" destination="76" id="GVS-sG-rgG"/>
|
||||
<outlet property="_laterButton" destination="22" id="dk6-u6-yYI"/>
|
||||
<outlet property="_releaseNotesBoxView" destination="89" id="kwH-2g-hlh"/>
|
||||
<outlet property="_releaseNotesContainerView" destination="fKC-QA-GZa" id="j3k-Pl-zNb"/>
|
||||
<outlet property="_skipButton" destination="23" id="PPe-jC-Pvc"/>
|
||||
<outlet property="_automaticallyInstallUpdatesButton" destination="xYY-q8-ZyN" id="yjl-z6-hNj"/>
|
||||
<outlet property="_installButton" destination="sUq-y0-gA3" id="hQ1-WX-CFo"/>
|
||||
<outlet property="_laterButton" destination="uGk-Ks-HQR" id="QLX-rC-OVd"/>
|
||||
<outlet property="_releaseNotesBoxView" destination="ikY-gb-bgB" id="8ep-uz-XVh"/>
|
||||
<outlet property="_releaseNotesContentView" destination="YbC-Ky-Aam" id="nng-CZ-Hwe"/>
|
||||
<outlet property="_skipButton" destination="nRH-TL-zdL" id="1wh-qo-iMh"/>
|
||||
<outlet property="_stackView" destination="61v-5k-OXp" id="1rj-X0-yNf"/>
|
||||
<outlet property="_titleView" destination="cGD-9V-Gym" id="4EE-yh-bV0"/>
|
||||
<outlet property="window" destination="5" id="69"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<window identifier="SUUpdateAlert" title="Software Update" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
|
||||
<window identifier="SUUpdateAlert" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="5" userLabel="Update Alert (release notes)">
|
||||
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="746" y="229" width="620" height="370"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
|
||||
<value key="minSize" type="size" width="550" height="150"/>
|
||||
<view key="contentView" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="620" height="370"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<rect key="contentRect" x="746" y="229" width="532" height="370"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
|
||||
<value key="minSize" type="size" width="462" height="150"/>
|
||||
<view key="contentView" misplaced="YES" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="532" height="370"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="Program icon">
|
||||
<rect key="frame" x="22" y="286" width="64" height="64"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="7" secondAttribute="height" multiplier="1:1" id="7pS-Kw-VGo"/>
|
||||
<constraint firstAttribute="width" priority="800" constant="64" id="QhW-E9-8Br"/>
|
||||
<constraint firstAttribute="height" priority="800" constant="64" id="aXh-vN-k5u"/>
|
||||
</constraints>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="168"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Version text field">
|
||||
<rect key="frame" x="106" y="338" width="494" height="17"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" priority="777" constant="17" id="n8w-DR-XEM"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="169">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="titleText" id="11"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="350" verticalHuggingPriority="999" horizontalCompressionResistancePriority="100" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="101" userLabel="Question text field">
|
||||
<rect key="frame" x="106" y="316" width="494" height="14"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="300" constant="28" id="H6E-te-Fog"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="KUO-Dw-g6s"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="174">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="descriptionText" id="103"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="fKC-QA-GZa" userLabel="Container to hide release notes">
|
||||
<rect key="frame" x="108" y="73" width="492" height="235"/>
|
||||
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61v-5k-OXp">
|
||||
<rect key="frame" x="0.0" y="0.0" width="680" height="377"/>
|
||||
<subviews>
|
||||
<box boxType="oldStyle" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="89">
|
||||
<rect key="frame" x="0.0" y="0.0" width="492" height="215"/>
|
||||
<view key="contentView" id="hbB-V1-Bf6">
|
||||
<rect key="frame" x="1" y="1" width="490" height="213"/>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="cGD-9V-Gym" userLabel="Title View">
|
||||
<rect key="frame" x="0.0" y="313" width="680" height="64"/>
|
||||
<subviews>
|
||||
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="F1L-zh-U8Z" userLabel="Program icon">
|
||||
<rect key="frame" x="20" y="0.0" width="64" height="64"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="64" id="66j-dF-FGm"/>
|
||||
<constraint firstAttribute="width" secondItem="F1L-zh-U8Z" secondAttribute="height" multiplier="1:1" id="OlN-VE-Lim"/>
|
||||
</constraints>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="k4f-D1-7oF"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="applicationIcon" id="DAK-U8-9cN"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="UU2-7C-LCJ" userLabel="Version & Question view">
|
||||
<rect key="frame" x="92" y="13" width="568" height="38"/>
|
||||
<subviews>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Nvn-Dp-hAH" userLabel="Version text field">
|
||||
<rect key="frame" x="-2" y="22" width="572" height="16"/>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Version title" usesSingleLineMode="YES" id="f6r-wP-EYG">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="titleText" id="j4H-SG-IuG"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<textField focusRingType="none" verticalHuggingPriority="999" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="WdU-eY-Ta9" userLabel="Question text field">
|
||||
<rect key="frame" x="-2" y="0.0" width="572" height="14"/>
|
||||
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Question" id="Jsa-P1-mWz">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="descriptionText" id="83R-0d-Obq"/>
|
||||
</connections>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="Nvn-Dp-hAH" firstAttribute="leading" secondItem="UU2-7C-LCJ" secondAttribute="leading" id="25L-Ag-aFU"/>
|
||||
<constraint firstItem="WdU-eY-Ta9" firstAttribute="top" secondItem="Nvn-Dp-hAH" secondAttribute="bottom" constant="8" id="9M6-6n-Bro"/>
|
||||
<constraint firstAttribute="bottom" secondItem="WdU-eY-Ta9" secondAttribute="bottom" id="CZX-9a-gJl"/>
|
||||
<constraint firstAttribute="trailing" secondItem="WdU-eY-Ta9" secondAttribute="trailing" id="WZm-Si-7IJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Nvn-Dp-hAH" secondAttribute="trailing" id="aGK-sK-0uf"/>
|
||||
<constraint firstItem="Nvn-Dp-hAH" firstAttribute="top" secondItem="UU2-7C-LCJ" secondAttribute="top" id="kgy-Vi-Ea3"/>
|
||||
<constraint firstItem="WdU-eY-Ta9" firstAttribute="leading" secondItem="Nvn-Dp-hAH" secondAttribute="leading" id="vtl-AO-H0b"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="F1L-zh-U8Z" firstAttribute="top" secondItem="cGD-9V-Gym" secondAttribute="top" id="29T-yc-60G"/>
|
||||
<constraint firstAttribute="bottom" secondItem="F1L-zh-U8Z" secondAttribute="bottom" id="72d-EQ-SSU"/>
|
||||
<constraint firstItem="F1L-zh-U8Z" firstAttribute="leading" secondItem="cGD-9V-Gym" secondAttribute="leading" constant="20" symbolic="YES" id="Mg4-Zl-nWT"/>
|
||||
<constraint firstItem="UU2-7C-LCJ" firstAttribute="centerY" secondItem="F1L-zh-U8Z" secondAttribute="centerY" id="WwT-ww-Twu"/>
|
||||
<constraint firstAttribute="trailing" secondItem="UU2-7C-LCJ" secondAttribute="trailing" constant="20" symbolic="YES" id="eyz-xg-wVZ"/>
|
||||
<constraint firstItem="UU2-7C-LCJ" firstAttribute="leading" secondItem="F1L-zh-U8Z" secondAttribute="trailing" constant="8" symbolic="YES" id="pUk-FW-06K"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ikY-gb-bgB" userLabel="Release Notes Box">
|
||||
<rect key="frame" x="20" y="70" width="640" height="235"/>
|
||||
<view key="contentView" id="YbC-Ky-Aam" userLabel="Release Notes Content View">
|
||||
<rect key="frame" x="1" y="1" width="638" height="233"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
</view>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="pvn-8k-9Ev"/>
|
||||
<constraint firstAttribute="height" constant="235" placeholder="YES" id="MvR-0E-bDS"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="999" constant="200" id="g5s-9E-8SF"/>
|
||||
</constraints>
|
||||
<font key="titleFont" size="11" name="LucidaGrande"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="164">
|
||||
<dictionary key="options">
|
||||
<string key="NSValueTransformerName">NSNegateBoolean</string>
|
||||
</dictionary>
|
||||
</binding>
|
||||
</connections>
|
||||
</box>
|
||||
<textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="17">
|
||||
<rect key="frame" x="-2" y="221" width="88" height="14"/>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Dg5-0U-d14" userLabel="Options view">
|
||||
<rect key="frame" x="0.0" y="48" width="680" height="14"/>
|
||||
<subviews>
|
||||
<button verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="xYY-q8-ZyN">
|
||||
<rect key="frame" x="19" y="-1" width="316" height="16"/>
|
||||
<buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="fPh-Q9-vLr">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="self.updaterSettings.automaticallyDownloadsUpdates" id="ckv-Jc-M6i"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="100" constant="100" id="gkn-FW-9aC"/>
|
||||
<constraint firstItem="xYY-q8-ZyN" firstAttribute="top" secondItem="Dg5-0U-d14" secondAttribute="top" id="9SN-p3-BTb"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xYY-q8-ZyN" secondAttribute="trailing" constant="20" symbolic="YES" id="CQ6-qx-HSc"/>
|
||||
<constraint firstAttribute="bottom" secondItem="xYY-q8-ZyN" secondAttribute="bottom" id="PoC-Dx-8Jc"/>
|
||||
<constraint firstItem="xYY-q8-ZyN" firstAttribute="leading" secondItem="Dg5-0U-d14" secondAttribute="leading" constant="20" symbolic="YES" id="wWK-qz-vla"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Release Notes:" usesSingleLineMode="YES" id="170">
|
||||
<font key="font" metaFont="smallSystemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="72">
|
||||
<dictionary key="options">
|
||||
<string key="NSValueTransformerName">NSNegateBoolean</string>
|
||||
</dictionary>
|
||||
</binding>
|
||||
</connections>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="89" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="6" id="1H8-33-yNF"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="17" secondAttribute="trailing" constant="408" id="5ym-81-wbN"/>
|
||||
<constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" id="Bv8-Jz-SXd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="89" secondAttribute="bottom" id="E4h-VA-0Xt"/>
|
||||
<constraint firstItem="17" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="top" id="P9G-6a-y7j"/>
|
||||
<constraint firstItem="89" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="e5T-q1-kq1"/>
|
||||
<constraint firstItem="17" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="tFH-k0-O7I"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="22">
|
||||
<rect key="frame" x="338" y="12" width="137" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="90" id="2Zy-5G-GBj"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
<string key="keyEquivalent" base64-UTF8="YES">
|
||||
</customView>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="iUh-Md-dRX" userLabel="Choices view">
|
||||
<rect key="frame" x="0.0" y="0.0" width="680" height="40"/>
|
||||
<subviews>
|
||||
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="uGk-Ks-HQR">
|
||||
<rect key="frame" x="395" y="13" width="137" height="32"/>
|
||||
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="G8s-oM-9gf">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
<string key="keyEquivalent" base64-UTF8="YES">
|
||||
Gw
|
||||
</string>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="remindMeLater:" target="-2" id="34"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="23">
|
||||
<rect key="frame" x="102" y="12" width="139" height="32"/>
|
||||
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="172">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="skipThisVersion:" target="-2" id="33"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="76">
|
||||
<rect key="frame" x="473" y="12" width="134" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="N94-uf-6oP"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="173">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
<string key="keyEquivalent" base64-UTF8="YES">
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="90" id="8FZ-lB-M5G"/>
|
||||
</constraints>
|
||||
<accessibility identifier="SPUUserUpdateChoiceDismiss"/>
|
||||
<connections>
|
||||
<action selector="remindMeLater:" target="-2" id="108-L6-c2e"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="sUq-y0-gA3">
|
||||
<rect key="frame" x="530" y="13" width="137" height="32"/>
|
||||
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="IIY-s3-hkz">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
<string key="keyEquivalent" base64-UTF8="YES">
|
||||
DQ
|
||||
</string>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="installUpdate:" target="-2" id="77"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button translatesAutoresizingMaskIntoConstraints="NO" id="117">
|
||||
<rect key="frame" x="108" y="50" width="491" height="16"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="Gsu-Ko-2TJ"/>
|
||||
</constraints>
|
||||
<accessibility identifier="SPUUserUpdateChoiceInstall"/>
|
||||
<connections>
|
||||
<action selector="installUpdate:" target="-2" id="8TR-Ao-zjt"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="nRH-TL-zdL">
|
||||
<rect key="frame" x="13" y="13" width="139" height="32"/>
|
||||
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="kVE-pO-gl0">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<accessibility identifier="SPUUserUpdateChoiceSkip"/>
|
||||
<connections>
|
||||
<action selector="skipThisVersion:" target="-2" id="cXW-0s-yIT"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="uGk-Ks-HQR" firstAttribute="baseline" secondItem="sUq-y0-gA3" secondAttribute="baseline" id="7hK-NU-1pL"/>
|
||||
<constraint firstItem="nRH-TL-zdL" firstAttribute="top" secondItem="iUh-Md-dRX" secondAttribute="top" id="Cwv-ha-SRC"/>
|
||||
<constraint firstItem="uGk-Ks-HQR" firstAttribute="width" secondItem="sUq-y0-gA3" secondAttribute="width" id="EWD-pD-s8E"/>
|
||||
<constraint firstItem="sUq-y0-gA3" firstAttribute="leading" secondItem="uGk-Ks-HQR" secondAttribute="trailing" constant="12" symbolic="YES" id="GNV-C1-iwM"/>
|
||||
<constraint firstItem="uGk-Ks-HQR" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="nRH-TL-zdL" secondAttribute="trailing" constant="12" symbolic="YES" id="JIK-Ix-vKz"/>
|
||||
<constraint firstItem="nRH-TL-zdL" firstAttribute="width" relation="greaterThanOrEqual" secondItem="sUq-y0-gA3" secondAttribute="width" id="ZG6-hO-ueO"/>
|
||||
<constraint firstAttribute="bottom" secondItem="nRH-TL-zdL" secondAttribute="bottom" constant="20" symbolic="YES" id="hi9-TB-2I7"/>
|
||||
<constraint firstAttribute="trailing" secondItem="sUq-y0-gA3" secondAttribute="trailing" constant="20" symbolic="YES" id="qFp-Lz-Zct"/>
|
||||
<constraint firstItem="nRH-TL-zdL" firstAttribute="baseline" secondItem="uGk-Ks-HQR" secondAttribute="baseline" id="u6y-Qc-AKF"/>
|
||||
<constraint firstItem="nRH-TL-zdL" firstAttribute="leading" secondItem="iUh-Md-dRX" secondAttribute="leading" constant="20" symbolic="YES" id="z77-Ds-Apc"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
|
||||
<constraint firstItem="iUh-Md-dRX" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="9Qm-jR-l2n"/>
|
||||
<constraint firstAttribute="trailing" secondItem="cGD-9V-Gym" secondAttribute="trailing" id="Hzm-0Q-nAs"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Dg5-0U-d14" secondAttribute="trailing" id="QtQ-Z7-Sy3"/>
|
||||
<constraint firstItem="cGD-9V-Gym" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="fKq-7a-nM1"/>
|
||||
<constraint firstAttribute="trailing" secondItem="iUh-Md-dRX" secondAttribute="trailing" id="fly-DF-xg8"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ikY-gb-bgB" secondAttribute="trailing" constant="20" symbolic="YES" id="gyA-Og-04f"/>
|
||||
<constraint firstItem="ikY-gb-bgB" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" constant="20" symbolic="YES" id="zdI-MC-GvM"/>
|
||||
<constraint firstItem="Dg5-0U-d14" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="zjt-Mp-9hy"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<binding destination="93" name="value" keyPath="values.SUAutomaticallyUpdate" id="135"/>
|
||||
</connections>
|
||||
</button>
|
||||
<visibilityPriorities>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
</visibilityPriorities>
|
||||
<customSpacing>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
</customSpacing>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="10" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="22" id="2ef-4I-Il3"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fKC-QA-GZa" secondAttribute="trailing" constant="20" id="406-Cn-C5d"/>
|
||||
<constraint firstItem="101" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="7XS-9C-U6N"/>
|
||||
<constraint firstItem="23" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="12" id="CBk-cX-pk2"/>
|
||||
<constraint firstItem="22" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="23" secondAttribute="trailing" constant="12" id="EeC-NR-NYg"/>
|
||||
<constraint firstAttribute="trailing" secondItem="76" secondAttribute="trailing" constant="20" id="GdV-QF-Cdi"/>
|
||||
<constraint firstItem="76" firstAttribute="width" secondItem="22" secondAttribute="width" multiplier="0.8" priority="110" id="I8t-73-gX0"/>
|
||||
<constraint firstItem="117" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="bottom" priority="900" constant="8" id="M7E-UY-nWx"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="top" secondItem="101" secondAttribute="bottom" constant="8" id="Mbz-C0-6Cx"/>
|
||||
<constraint firstItem="117" firstAttribute="leading" secondItem="23" secondAttribute="leading" id="Nm4-V1-7X0"/>
|
||||
<constraint firstItem="23" firstAttribute="leading" secondItem="117" secondAttribute="leading" id="OXY-8u-ljs"/>
|
||||
<constraint firstItem="23" firstAttribute="leading" secondItem="10" secondAttribute="leading" constant="1" id="RRB-n5-xid"/>
|
||||
<constraint firstItem="76" firstAttribute="leading" secondItem="22" secondAttribute="trailing" constant="12" id="VQk-Ut-ggj"/>
|
||||
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" id="alH-AL-5RD"/>
|
||||
<constraint firstItem="22" firstAttribute="baseline" secondItem="23" secondAttribute="baseline" id="ayY-6b-JGg"/>
|
||||
<constraint firstItem="76" firstAttribute="baseline" secondItem="22" secondAttribute="baseline" id="dIR-3Q-wQx"/>
|
||||
<constraint firstAttribute="bottom" secondItem="76" secondAttribute="bottom" constant="19" id="gcR-Kl-Wlq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="101" secondAttribute="trailing" constant="22" id="k7p-HC-x7i"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="23" secondAttribute="leading" constant="-1" id="nVW-Qt-8JE"/>
|
||||
<constraint firstAttribute="trailing" secondItem="10" secondAttribute="trailing" constant="22" id="oQx-Oc-awc"/>
|
||||
<constraint firstItem="76" firstAttribute="width" secondItem="23" secondAttribute="width" priority="109" id="pLI-z3-P0b"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="qQ9-OJ-06z"/>
|
||||
<constraint firstItem="101" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" id="r7Q-z5-jkx"/>
|
||||
<constraint firstItem="10" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="rXd-o0-WQQ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="117" secondAttribute="trailing" constant="21" id="sHI-Hm-eSA"/>
|
||||
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="22" id="zSE-lw-Ggj"/>
|
||||
<constraint firstAttribute="bottom" secondItem="61v-5k-OXp" secondAttribute="bottom" id="5XV-te-jdS"/>
|
||||
<constraint firstItem="61v-5k-OXp" firstAttribute="leading" secondItem="6" secondAttribute="leading" id="ISL-gI-Nqo"/>
|
||||
<constraint firstItem="61v-5k-OXp" firstAttribute="top" secondItem="6" secondAttribute="top" id="Xwp-R6-5u2"/>
|
||||
<constraint firstAttribute="trailing" secondItem="61v-5k-OXp" secondAttribute="trailing" id="pAA-qg-9qi"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="-2" id="50"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="466" y="290"/>
|
||||
<point key="canvasLocation" x="602" y="352"/>
|
||||
</window>
|
||||
<userDefaultsController representsSharedInstance="YES" id="93" userLabel="Shared Defaults"/>
|
||||
</objects>
|
||||
|
||||
+31
-32
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
@@ -29,7 +29,7 @@
|
||||
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="83" y="492" width="488" height="379"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="2304" height="1271"/>
|
||||
<view key="contentView" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
@@ -71,7 +71,7 @@
|
||||
<rect key="frame" x="0.0" y="0.0" width="437" height="78"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8">
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8">
|
||||
<rect key="frame" x="104" y="42" width="315" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="J49-m7-iIa"/>
|
||||
@@ -82,7 +82,7 @@
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia">
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia">
|
||||
<rect key="frame" x="104" y="0.0" width="315" height="34"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="HfG-Lg-91D"/>
|
||||
@@ -123,11 +123,11 @@
|
||||
<point key="canvasLocation" x="-241" y="-37"/>
|
||||
</view>
|
||||
<customView hidden="YES" id="39" userLabel="MoreInfoView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="437" height="205"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="434" height="205"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="SystemProfileInfo">
|
||||
<rect key="frame" x="107" y="123" width="312" height="70"/>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="SystemProfileInfo">
|
||||
<rect key="frame" x="104" y="123" width="312" height="70"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="70" id="Csk-S6-dh4"/>
|
||||
<constraint firstAttribute="width" constant="308" id="iAG-SY-yVp"/>
|
||||
@@ -142,13 +142,13 @@ This is the information that would be sent:</string>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
|
||||
<rect key="frame" x="109" y="0.0" width="308" height="115"/>
|
||||
<rect key="frame" x="103" y="0.0" width="314" height="115"/>
|
||||
<clipView key="contentView" id="sbp-rk-wxX">
|
||||
<rect key="frame" x="1" y="1" width="306" height="113"/>
|
||||
<rect key="frame" x="1" y="1" width="312" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" id="41">
|
||||
<rect key="frame" x="0.0" y="0.0" width="306" height="113"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="312" height="113"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<size key="intercellSpacing" width="3" height="2"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
@@ -206,10 +206,9 @@ This is the information that would be sent:</string>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" constant="12" id="0rj-EA-SIj"/>
|
||||
<constraint firstItem="40" firstAttribute="trailing" secondItem="46" secondAttribute="trailing" id="5Ze-wu-AsK"/>
|
||||
<constraint firstItem="40" firstAttribute="width" secondItem="46" secondAttribute="width" id="AfJ-OK-Apa"/>
|
||||
<constraint firstItem="40" firstAttribute="leading" secondItem="46" secondAttribute="leading" id="Qg9-kp-Lzl"/>
|
||||
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="109" id="TMg-61-Tbj"/>
|
||||
<constraint firstItem="40" firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="3" id="5Ze-wu-AsK"/>
|
||||
<constraint firstItem="40" firstAttribute="leading" secondItem="46" secondAttribute="leading" constant="-3" id="Qg9-kp-Lzl"/>
|
||||
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="106" id="TMg-61-Tbj"/>
|
||||
<constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" id="fYg-If-EVL"/>
|
||||
<constraint firstAttribute="bottom" secondItem="40" secondAttribute="bottom" id="o4Y-3j-NmQ"/>
|
||||
<constraint firstItem="40" firstAttribute="top" secondItem="46" secondAttribute="bottom" constant="8" symbolic="YES" id="seb-Gl-jtw"/>
|
||||
@@ -223,11 +222,8 @@ This is the information that would be sent:</string>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ilj-QP-33p" userLabel="View">
|
||||
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
|
||||
<subviews>
|
||||
<button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
|
||||
<button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
|
||||
<rect key="frame" x="260" y="13" width="164" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="gon-Nu-M8r"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
@@ -235,15 +231,15 @@ This is the information that would be sent:</string>
|
||||
DQ
|
||||
</string>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="gon-Nu-M8r"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
|
||||
<rect key="frame" x="145" y="13" width="115" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="Fta-eR-U3P"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
@@ -251,6 +247,9 @@ DQ
|
||||
Gw
|
||||
</string>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="Fta-eR-U3P"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<action selector="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
|
||||
</connections>
|
||||
@@ -284,13 +283,13 @@ Gw
|
||||
<subviews>
|
||||
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="IncludeInfoButton">
|
||||
<rect key="frame" x="104" y="-1" width="200" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="14" id="STF-87-eYy"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="14" id="STF-87-eYy"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
|
||||
<dictionary key="options">
|
||||
@@ -302,14 +301,14 @@ Gw
|
||||
</button>
|
||||
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3">
|
||||
<rect key="frame" x="85" y="-1" width="16" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
|
||||
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
|
||||
<behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
|
||||
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
|
||||
<binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
|
||||
@@ -349,13 +348,13 @@ Gw
|
||||
<subviews>
|
||||
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kb-eYW" userLabel="automaticallyDownloadUpdatesButton">
|
||||
<rect key="frame" x="104" y="-1" width="248" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="14" id="kJy-g7-0Un"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="check" title="Automatically download and install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" focusRingType="none" inset="2" id="AUc-33-qGN">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="14" id="kJy-g7-0Un"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="automaticallyDownloadUpdates" id="5Me-7t-mMu"/>
|
||||
</connections>
|
||||
|
||||
Vendored
+52
-1
@@ -14,7 +14,7 @@
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ can’t be updated if it’s running from the location it was downloaded to.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ can’t be updated, because it was opened from a read-only or a temporary location.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ can’t be updated because it was opened from a read-only or a temporary location.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available.";
|
||||
@@ -76,6 +76,12 @@
|
||||
/* No comment provided by engineer. */
|
||||
"An important update to %@ is ready to install" = "An important update to %@ is ready to install";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Name" = "Application Name";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Version" = "Application Version";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancel";
|
||||
|
||||
@@ -85,6 +91,18 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Checking for updates…" = "Checking for updates…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU is 64-Bit?" = "CPU is 64-Bit?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Speed (MHz)" = "CPU Speed (MHz)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Subtype" = "CPU Subtype";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Type" = "CPU Type";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Downloading update…" = "Downloading update…";
|
||||
|
||||
@@ -103,12 +121,33 @@
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "Installing update…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Interactive based packages cannot be installed as the root user." = "Interactive based packages cannot be installed as the root user.";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
"Learn More…" = "Learn More…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Mac Model" = "Mac Model";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Memory (MB)" = "Memory (MB)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"No" = "No";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Number of CPUs" = "Number of CPUs";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OK" = "OK";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OS Version" = "OS Version";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Preferred Language" = "Preferred Language";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Quit %1$@, move it into your Applications folder, relaunch it from there and try again.";
|
||||
|
||||
@@ -118,6 +157,9 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The installation failed due to not having permission to write the new update." = "The installation failed due to not having permission to write the new update.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version.";
|
||||
|
||||
@@ -142,6 +184,12 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Version History" = "Version History";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Yes" = "Yes";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too new" = "Your macOS version is too new";
|
||||
|
||||
@@ -150,3 +198,6 @@
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "You’re up to date!";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Software Update";
|
||||
@@ -230,11 +230,40 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
// We will want to terminate those apps and observe their pids, but we will only do this if we don't find any regular matches
|
||||
NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = [[NSMutableArray alloc] init];
|
||||
|
||||
BOOL needsToHandleImproperBundles;
|
||||
if (@available(macOS 16, *)) {
|
||||
needsToHandleImproperBundles = NO;
|
||||
} else {
|
||||
needsToHandleImproperBundles = YES;
|
||||
}
|
||||
|
||||
for (NSRunningApplication *runningApplication in runningApplications) {
|
||||
// Comparing the URLs hasn't worked well for me in practice, so I'm comparing the file paths instead
|
||||
NSString *candidatePath = runningApplication.bundleURL.URLByResolvingSymlinksInPath.path;
|
||||
if (candidatePath != nil) {
|
||||
NSArray<NSString *> *candidatePathComponents = candidatePath.pathComponents;
|
||||
|
||||
if (needsToHandleImproperBundles) {
|
||||
// Workaround cases where macOS appends Contents/MacOS/<executable> to the bundle path which can happen in corner cases (eg: mishandled bundles or helper executables).
|
||||
// This may happen with app bundles which have wrapper/tramopline executables that spawn the main executable
|
||||
// https://github.com/sparkle-project/Sparkle/issues/2725
|
||||
|
||||
NSUInteger candidatePathComponentsCount = candidatePathComponents.count;
|
||||
// > 3 is fine instead of >= 3 because there should be another parent path component for the bundle
|
||||
if (candidatePathComponentsCount > 3 && [candidatePathComponents[candidatePathComponentsCount - 3] isEqualToString:@"Contents"] && [candidatePathComponents[candidatePathComponentsCount - 2] isEqualToString:@"MacOS"]) {
|
||||
|
||||
// Lastly verify if the bundle is not actually a directory
|
||||
// Note the IO check is the last check for this corner case
|
||||
// This ensures it's not an ordinary helper app that happens to be inside another app bundle.
|
||||
BOOL candidatePathIsDir = YES;
|
||||
if ([[NSFileManager defaultManager] fileExistsAtPath:candidatePath isDirectory:&candidatePathIsDir] && !candidatePathIsDir) {
|
||||
NSMutableArray<NSString *> *trimmedBundlePath = [candidatePathComponents mutableCopy];
|
||||
[trimmedBundlePath removeObjectsInRange:NSMakeRange(candidatePathComponentsCount - 3, 3)];
|
||||
candidatePathComponents = trimmedBundlePath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ([candidatePathComponents isEqualToArray:bundlePathComponents]) {
|
||||
[matchedRunningApplications addObject:runningApplication];
|
||||
} else if (matchedRunningApplications.count == 0 && candidatePathComponents.count > 0 && bundlePathComponents.count > 0) {
|
||||
|
||||
+1
-1
@@ -96,7 +96,7 @@
|
||||
{
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO];
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -77,7 +77,7 @@
|
||||
if ([_host isRunningTranslocated]) {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningTranslocated userInfo:@{ NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Quit %1$@, move it into your Applications folder, relaunch it from there and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated if it’s running from the location it was downloaded to.", SPARKLE_TABLE, sparkleBundle, nil), hostName], }]];
|
||||
} else {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated, because it was opened from a read-only or a temporary location.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName] }]];
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated because it was opened from a read-only or a temporary location.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName] }]];
|
||||
}
|
||||
} else {
|
||||
[_appcastDriver loadAppcastFromURL:appcastURL userAgent:userAgent httpHeaders:httpHeaders inBackground:background];
|
||||
|
||||
Vendored
+2
-1
@@ -112,7 +112,8 @@
|
||||
_delegate = delegate;
|
||||
_inBackground = background;
|
||||
|
||||
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30.0];
|
||||
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
|
||||
request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
|
||||
|
||||
if (userAgent != nil) {
|
||||
[request setValue:(NSString * _Nonnull)userAgent forHTTPHeaderField:@"User-Agent"];
|
||||
|
||||
Vendored
+3
-5
@@ -225,10 +225,8 @@
|
||||
{
|
||||
NSString *pathToRelaunch = _applicationBundle.bundlePath;
|
||||
|
||||
#if SPARKLE_BUILD_DMG_SUPPORT || SPARKLE_BUILD_LEGACY_SUUPDATER
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
id updater = _updater;
|
||||
#endif
|
||||
|
||||
#if SPARKLE_BUILD_LEGACY_SUUPDATER
|
||||
// Give the delegate one more chance for determining the path to relaunch via a private API used by SUUpdater
|
||||
@@ -241,11 +239,9 @@
|
||||
#endif
|
||||
|
||||
NSString *decryptionPassword = nil;
|
||||
#if SPARKLE_BUILD_DMG_SUPPORT
|
||||
if (updater != nil && [updaterDelegate respondsToSelector:@selector(decryptionPasswordForUpdater:)]) {
|
||||
decryptionPassword = [updaterDelegate decryptionPasswordForUpdater:updater];
|
||||
}
|
||||
#endif
|
||||
|
||||
id<SPUInstallerDriverDelegate> delegate = _delegate;
|
||||
|
||||
@@ -472,7 +468,9 @@
|
||||
mainBundleIdentifier = (bundleIdentifier == nil) ? mainBundleName : bundleIdentifier;
|
||||
}
|
||||
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath updaterIdentifier:mainBundleIdentifier authorizationPrompt:authorizationPrompt installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
NSString *iconBundlePath = mainBundleHost.bundlePath;
|
||||
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath iconBundlePath:iconBundlePath updaterIdentifier:mainBundleIdentifier authorizationPrompt:authorizationPrompt installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
#if INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED
|
||||
retrievedLaunchStatus = YES;
|
||||
|
||||
Vendored
+7
-3
@@ -12,15 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class SUHost, SUAppcastItem;
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
#define SPUSkippedUpdateDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SPUSkippedUpdateDefinitionAttribute __attribute__((objc_runtime_name("SPUTestSkippedUpdate")))
|
||||
#endif
|
||||
|
||||
/*
|
||||
A skipped update tracks an optional minor version and an optional major version the user may skip.
|
||||
The minor and major versions are independent versions, so the user can choose to skip at most two separate versions.
|
||||
The intent is when the user is faced with a major upgrade, they can skip a major version.
|
||||
Otherwise they can choose to skip a minor version.
|
||||
*/
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#endif
|
||||
SPUSkippedUpdateDefinitionAttribute
|
||||
@interface SPUSkippedUpdate : NSObject
|
||||
|
||||
+ (nullable SPUSkippedUpdate *)skippedUpdateForHost:(SUHost *)host;
|
||||
|
||||
+2
@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
It also allows hooking up the updater's and user driver's delegates.
|
||||
|
||||
If you need more control over what bundle you want to update, or you want to provide a custom user interface (via `SPUUserDriver`), please use `SPUUpdater` directly instead.
|
||||
|
||||
This class must be used on the main thread.
|
||||
*/
|
||||
SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
{
|
||||
|
||||
Vendored
+19
-7
@@ -497,7 +497,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Ready to Install", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:1.0]; // Fill the bar.
|
||||
[_statusController setButtonEnabled:YES];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES accessibilityIdentifier:@"SUStatusInstallAndRelaunch"];
|
||||
}
|
||||
|
||||
- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
|
||||
@@ -538,10 +538,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, sparkleBundle, nil), [_host name]] centerPointValue:nil minimizable:NO closable:NO];
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil) centerPointValue:nil minimizable:NO closable:NO];
|
||||
[[_checkingController window] center]; // Force the checking controller to load its window.
|
||||
[_checkingController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Checking for updates…", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:0.0 statusText:nil];
|
||||
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO];
|
||||
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
// For background applications, obtain focus.
|
||||
// Useful if the update check is requested from another app like System Preferences.
|
||||
@@ -586,9 +586,21 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
// Ideally we should use -[NSAlert alertWithError:] however
|
||||
// unfortunately Sparkle may return error messages with descriptions that contain
|
||||
// recovery suggestions. So we will check if an explicit recovery suggestion exists,
|
||||
// and set the mesage and informative text appropriately.
|
||||
// In the future we should audit potential error messages and make them consistent.
|
||||
NSAlert *alert = [[NSAlert alloc] init];
|
||||
alert.messageText = SULocalizedStringFromTableInBundle(@"Update Error!", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = [NSString stringWithFormat:@"%@", [error localizedDescription]];
|
||||
NSString *recoverySuggestion = [error localizedRecoverySuggestion];
|
||||
if (recoverySuggestion != nil) {
|
||||
alert.messageText = error.localizedDescription;
|
||||
alert.informativeText = recoverySuggestion;
|
||||
} else {
|
||||
alert.messageText = SULocalizedStringFromTableInBundle(@"Update Error!", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = error.localizedDescription;
|
||||
}
|
||||
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, nil)];
|
||||
[self showAlert:alert secondaryAction:nil];
|
||||
|
||||
@@ -769,7 +781,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Downloading update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:0.0];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
_bytesDownloaded = 0;
|
||||
}
|
||||
@@ -829,7 +841,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Extracting update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:0.0];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
[_statusController setButtonEnabled:NO];
|
||||
}
|
||||
|
||||
|
||||
Vendored
+30
-5
@@ -42,6 +42,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- `feedURL`
|
||||
|
||||
Please view the documentation on each of these properties for more detail if you are to configure them dynamically.
|
||||
|
||||
This class must be used on the main thread.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUpdater : NSObject
|
||||
|
||||
@@ -96,11 +98,13 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
|
||||
If an update hasn't started, the user may be shown that a new check for updates is occurring.
|
||||
If an update has already been downloaded or begun installing from a previous session, the user may be presented to install that update.
|
||||
If the user is already being presented with an update, that update will be shown to the user in active focus.
|
||||
If the user is already being presented with an update or update permission prompt, that notice may be shown to the user in active focus
|
||||
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
|
||||
|
||||
This will find updates that the user has previously opted into skipping.
|
||||
|
||||
See `canCheckForUpdates` property which can determine when this method may be invoked.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdates;
|
||||
|
||||
@@ -126,6 +130,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
This will not find updates that the user has opted into skipping.
|
||||
|
||||
This method does not do anything if there is a `sessionInProgress`.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdatesInBackground;
|
||||
|
||||
@@ -144,13 +150,18 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Updates that have been skipped by the user will not be found.
|
||||
|
||||
This method does not do anything if there is a `sessionInProgress`.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdateInformation;
|
||||
|
||||
/**
|
||||
A property indicating whether or not updates can be checked by the user.
|
||||
|
||||
An update check can be made by the user when an update session isn't in progress, or when an update or its progress is being shown to the user.
|
||||
An update check can be made by the user when an update session isn't in progress.
|
||||
An update check can also be made when an update or its progress is being shown to the user
|
||||
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
|
||||
|
||||
A user cannot check for updates when data (such as the feed or an update) is still being downloaded automatically in the background.
|
||||
|
||||
This property is suitable to use for menu item validation for seeing if `-checkForUpdates` can be invoked.
|
||||
@@ -194,7 +205,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
to your app's command line arguments instead of setting this property.
|
||||
|
||||
The update schedule cycle will be reset in a short delay after the property's new value is set.
|
||||
This is to allow reverting this property without kicking off a schedule change immediately
|
||||
This is to allow reverting this property without kicking off a schedule change immediately.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
|
||||
@@ -209,7 +222,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Do not always set it on launch unless you want to ignore the user's preference.
|
||||
|
||||
The update schedule cycle will be reset in a short delay after the property's new value is set.
|
||||
This is to allow reverting this property without kicking off a schedule change immediately
|
||||
This is to allow reverting this property without kicking off a schedule change immediately.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) NSTimeInterval updateCheckInterval;
|
||||
|
||||
@@ -231,6 +246,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Hence developers shouldn't maintain an additional user default for this property.
|
||||
Only set this property if the user wants to change the default via a user settings option.
|
||||
Do not always set it on launch unless you want to ignore the user's preference.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
|
||||
@@ -322,6 +339,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
A property indicating whether or not the user's system profile information is sent when checking for updates.
|
||||
|
||||
Setting this property will persist in the host bundle's user defaults.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL sendsSystemProfile;
|
||||
|
||||
@@ -331,6 +350,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
For testing purposes, the last update check is stored in the `SULastCheckTime` key in the host bundle's user defaults.
|
||||
For example, `defaults delete my-bundle-id SULastCheckTime` can be invoked to clear the last update check time and test
|
||||
if update checks are automatically scheduled.
|
||||
|
||||
This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate;
|
||||
|
||||
@@ -342,6 +363,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked after a short delay using `-resetUpdateCycleAfterShortDelay`. In these cases, manually resetting the update cycle is not necessary.
|
||||
|
||||
See also `-resetUpdateCycleAfterShortDelay` which gives the user a short delay before triggering a cycle reset.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)resetUpdateCycle;
|
||||
|
||||
@@ -355,6 +378,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
no cycle reset will be done.
|
||||
|
||||
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked. In these cases, manually resetting the update cycle is not necessary.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)resetUpdateCycleAfterShortDelay;
|
||||
|
||||
|
||||
Vendored
+214
-36
@@ -76,6 +76,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
BOOL _showingPermissionRequest;
|
||||
BOOL _loggedATSWarning;
|
||||
BOOL _loggedNoSecureKeyWarning;
|
||||
BOOL _loggedUpdateSecurityPolicyWarning;
|
||||
BOOL _updatingMainBundle;
|
||||
}
|
||||
|
||||
@@ -155,6 +156,13 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (BOOL)startUpdater:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: @"-[SPUUpdater startUpdater:] must be called on the main thread]"}];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
return YES;
|
||||
}
|
||||
@@ -170,6 +178,8 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
_startedUpdater = YES;
|
||||
[self setCanCheckForUpdates:YES];
|
||||
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(updateAutomaticCheckSettingChanged:) name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
|
||||
|
||||
// Start updater on next update cycle so we make sure the application invoking the updater is ready
|
||||
// This also gives the developer a cycle to check for updates before Sparkle's update cycle scheduler kicks in
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -341,11 +351,18 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
if (!hasAnyPublicKey) {
|
||||
if ((feedURL != nil && !servingOverHttps) || ![SUCodeSigningVerifier bundleAtURLIsCodeSigned:[[self hostBundle] bundleURL]]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, updates need to be signed with an EdDSA key for %@. See Sparkle's documentation for more information.", hostName] }];
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, updates need to be signed with an EdDSA key for %@. Visit Sparkle's documentation for more information.", hostName] }];
|
||||
}
|
||||
return NO;
|
||||
} else {
|
||||
if (_updatingMainBundle && !_loggedNoSecureKeyWarning) {
|
||||
BOOL verifyBeforeExtraction = [_host boolForInfoDictionaryKey:SUVerifyUpdateBeforeExtractionKey];
|
||||
|
||||
if (verifyBeforeExtraction) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, updates need to be signed with an EdDSA key because %@ is specified for %@. Visit Sparkle's documentation for more information.", SUVerifyUpdateBeforeExtractionKey, hostName] }];
|
||||
}
|
||||
return NO;
|
||||
} else if (_updatingMainBundle && !_loggedNoSecureKeyWarning) {
|
||||
SULog(SULogLevelError, @"Error: Serving updates without an EdDSA key and only using Apple Code Signing is deprecated and may be unsupported in a future release. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/#3-segue-for-security-concerns");
|
||||
|
||||
_loggedNoSecureKeyWarning = YES;
|
||||
@@ -361,6 +378,14 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
}
|
||||
}
|
||||
|
||||
if (_updatingMainBundle) {
|
||||
if (!_loggedUpdateSecurityPolicyWarning && mainBundleHost.hasUpdateSecurityPolicy) {
|
||||
SULog(SULogLevelDefault, @"Warning: %@ has a custom NSUpdateSecurityPolicy in its Info.plist. This may cause issues when installing updates. Please consider removing this key for your builds using Sparkle if you do not really require a custom update security policy.", hostName);
|
||||
|
||||
_loggedUpdateSecurityPolicyWarning = YES;
|
||||
}
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
@@ -373,19 +398,18 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
id<SPUUpdaterDelegate> delegate = _delegate;
|
||||
|
||||
// If the user has been asked about automatic checks, don't bother prompting
|
||||
// If the user has been asked about automatic checks or the developer has overridden the setting, don't bother prompting
|
||||
// When the user answers to the permission prompt, this will be set to either @YES or @NO instead of nil
|
||||
if ([_host objectForUserDefaultsKey:SUEnableAutomaticChecksKey] != nil) {
|
||||
if ([_host objectForKey:SUEnableAutomaticChecksKey] != nil) {
|
||||
shouldPrompt = NO;
|
||||
}
|
||||
// Does the delegate want to take care of the logic for when we should ask permission to update?
|
||||
else if ([delegate respondsToSelector:@selector((updaterShouldPromptForPermissionToCheckForUpdates:))]) {
|
||||
shouldPrompt = [delegate updaterShouldPromptForPermissionToCheckForUpdates:self];
|
||||
}
|
||||
// Has the user been asked already? And don't ask if the host has a default value set in its Info.plist.
|
||||
else if ([_host objectForKey:SUEnableAutomaticChecksKey] == nil) {
|
||||
else {
|
||||
// We wait until the second launch of the updater for this host bundle, unless explicitly overridden via SUPromptUserOnFirstLaunchKey.
|
||||
shouldPrompt = [_host objectForKey:SUPromptUserOnFirstLaunchKey] || hasLaunchedBefore;
|
||||
shouldPrompt = hasLaunchedBefore || [_host boolForInfoDictionaryKey:SUPromptUserOnFirstLaunchKey];
|
||||
}
|
||||
|
||||
if (!hasLaunchedBefore) {
|
||||
@@ -406,7 +430,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
_showingPermissionRequest = YES;
|
||||
[self setSessionInProgress:YES];
|
||||
[self setCanCheckForUpdates:YES];
|
||||
|
||||
BOOL canShowUserDriverInFocusDuringPermissionPrompt = [_userDriver respondsToSelector:@selector(showUpdateInFocus)];
|
||||
[self setCanCheckForUpdates:canShowUserDriverInFocusDuringPermissionPrompt];
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
[_userDriver showUpdatePermissionRequest:updatePermissionRequest reply:^(SUUpdatePermissionResponse *response) {
|
||||
@@ -417,6 +443,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
strongSelf->_showingPermissionRequest = NO;
|
||||
|
||||
[strongSelf updatePermissionRequestFinishedWithResponse:response];
|
||||
|
||||
if (!canShowUserDriverInFocusDuringPermissionPrompt) {
|
||||
[strongSelf setCanCheckForUpdates:YES];
|
||||
}
|
||||
|
||||
// Schedule checks, but make sure we ignore the delayed call from KVO
|
||||
[strongSelf resetUpdateCycle];
|
||||
}
|
||||
@@ -443,6 +474,10 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (NSDate *)lastUpdateCheckDate
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater lastUpdateCheckDate] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_updateLastCheckedDate == nil)
|
||||
{
|
||||
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey];
|
||||
@@ -549,7 +584,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)updaterTimerDidFire
|
||||
{
|
||||
[self _checkForUpdatesInBackground];
|
||||
// User can perform a checkForUpdates check around the same time the timer is ready to fire
|
||||
if (!_sessionInProgress)
|
||||
{
|
||||
[self _checkForUpdatesInBackground];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)_checkForUpdatesInBackground SPU_OBJC_DIRECT
|
||||
@@ -598,6 +637,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
// Sparkle internally uses _checkForUpdatesInBackground
|
||||
- (void)checkForUpdatesInBackground
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdatesInBackground] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdatesInBackground];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: checkForUpdatesInBackground - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
return;
|
||||
@@ -625,9 +674,24 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)checkForUpdates
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdates] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdates];
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (_showingPermissionRequest || _driver.showingUpdate) {
|
||||
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
|
||||
[_userDriver showUpdateInFocus];
|
||||
} else {
|
||||
NSString *noticeType = _showingPermissionRequest ? @"permission request" : @"update";
|
||||
|
||||
SULog(SULogLevelError, @"Error: checkForUpdates called but %@ is being shown and %@ does not implement -[SPUUserDriver showUpdateInFocus]", noticeType, _userDriver);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -667,6 +731,17 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)checkForUpdateInformation
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdateInformation] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdateInformation];
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
@@ -695,8 +770,8 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)checkForUpdatesWithDriver:(id <SPUUpdateDriver> )d updateCheck:(SPUUpdateCheck)updateCheck installerInProgress:(BOOL)installerInProgress SPU_OBJC_DIRECT
|
||||
{
|
||||
assert(_driver == nil);
|
||||
if (_driver != nil) {
|
||||
SULog(SULogLevelError, @"Error: checkForUpdatesWithDriver:updateCheck:installerInProgress: called when _driver != nil");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -793,6 +868,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
[strongSelf setSessionInProgress:NO];
|
||||
[strongSelf setCanCheckForUpdates:YES];
|
||||
|
||||
if (!strongSelf->_updatingMainBundle && error == nil && !shouldShowUpdateImmediately && resumableUpdate == nil) {
|
||||
// If we're not updating the main bundle, a potentially new installed bundle may have different info
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateSettingsNeedsSynchronizationNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: strongSelf->_host.bundlePath}];
|
||||
}
|
||||
|
||||
notifyDelegateOfDriverCompletion(error, shouldShowUpdateImmediately);
|
||||
|
||||
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
|
||||
@@ -802,9 +882,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
}
|
||||
}];
|
||||
|
||||
[_driver setUpdateShownHandler:^{
|
||||
weakSelf.canCheckForUpdates = YES;
|
||||
}];
|
||||
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
|
||||
[_driver setUpdateShownHandler:^{
|
||||
weakSelf.canCheckForUpdates = YES;
|
||||
}];
|
||||
}
|
||||
|
||||
[_driver setUpdateWillInstallHandler:^{
|
||||
[weakSelf updateLastUpdateCheckDate];
|
||||
@@ -849,6 +931,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)resetUpdateCycle
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycle] must be called on the main thread.");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self resetUpdateCycle];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: resetUpdateCycle - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
return; // not even ready yet
|
||||
@@ -887,38 +979,87 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)resetUpdateCycleAfterShortDelay
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycleAfterShortDelay] must be called on the main thread.");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
[self cancelNextUpdateCycle];
|
||||
[_updaterCycle resetUpdateCycleAfterDelay];
|
||||
}
|
||||
|
||||
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
|
||||
{
|
||||
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
|
||||
// Hack to support backwards compatibility with older Sparkle versions, which supported
|
||||
// disabling updates by setting the check interval to 0.
|
||||
if (automaticallyCheckForUpdates && (NSInteger)[self updateCheckInterval] == 0) {
|
||||
[self setUpdateCheckInterval:SUDefaultUpdateCheckInterval];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyChecksForUpdates:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
_updaterSettings.automaticallyChecksForUpdates = automaticallyCheckForUpdates;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyChecksForUpdates] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings automaticallyChecksForUpdates];
|
||||
}
|
||||
|
||||
- (void)updateAutomaticCheckSettingChanged:(NSNotification *)notification
|
||||
{
|
||||
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
|
||||
if (![bundlePath isEqualToString:_host.bundlePath]) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_startedUpdater && !_sessionInProgress) {
|
||||
// Provide a small delay in case multiple preferences are being updated simultaneously.
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyChecksForUpdates
|
||||
{
|
||||
return [_updaterSettings automaticallyChecksForUpdates];
|
||||
return [NSSet setWithObject:@"updaterSettings.automaticallyChecksForUpdates"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyUpdates
|
||||
{
|
||||
[_host setBool:automaticallyUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyDownloadsUpdates:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
_updaterSettings.automaticallyDownloadsUpdates = automaticallyUpdates;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyDownloadsUpdates
|
||||
{
|
||||
return [_updaterSettings allowsAutomaticUpdates] && [_updaterSettings automaticallyDownloadsUpdates];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyDownloadsUpdates] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings automaticallyDownloadsUpdates];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.automaticallyDownloadsUpdates"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)setFeedURL:(NSURL * _Nullable)feedURL
|
||||
@@ -1035,14 +1176,32 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
|
||||
{
|
||||
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setSendsSystemProfile:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
_updaterSettings.sendsSystemProfile = sendsSystemProfile;
|
||||
}
|
||||
|
||||
- (BOOL)sendsSystemProfile
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater sendsSystemProfile] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings sendsSystemProfile];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingSendsSystemProfile
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.sendsSystemProfile"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
static NSString *escapeURLComponent(NSString *str) {
|
||||
NSString *escapedString = [str stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
|
||||
|
||||
@@ -1062,12 +1221,17 @@ static NSString *escapeURLComponent(NSString *str) {
|
||||
BOOL sendingSystemProfile = [self sendsSystemProfile];
|
||||
|
||||
// Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such.
|
||||
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
|
||||
if (!lastSubmitDate) {
|
||||
lastSubmitDate = [NSDate distantPast];
|
||||
if (sendingSystemProfile) {
|
||||
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
|
||||
if (!lastSubmitDate) {
|
||||
lastSubmitDate = [NSDate distantPast];
|
||||
}
|
||||
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
|
||||
NSTimeInterval timeSinceLastSubmission = [lastSubmitDate timeIntervalSinceNow] * -1;
|
||||
if (timeSinceLastSubmission < oneWeek) {
|
||||
sendingSystemProfile = NO;
|
||||
}
|
||||
}
|
||||
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
|
||||
sendingSystemProfile &= (-[lastSubmitDate timeIntervalSinceNow] >= oneWeek);
|
||||
|
||||
id<SPUUpdaterDelegate> delegate = _delegate;
|
||||
NSArray<NSDictionary<NSString *, NSString *> *> *parameters = @[];
|
||||
@@ -1125,24 +1289,38 @@ static NSString *escapeURLComponent(NSString *str) {
|
||||
|
||||
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
|
||||
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
|
||||
[self setAutomaticallyChecksForUpdates:NO];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setUpdateCheckInterval:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
// Provide a small delay in case multiple preferences are being updated simultaneously.
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
}
|
||||
_updaterSettings.updateCheckInterval = updateCheckInterval;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater updateCheckInterval] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings updateCheckInterval];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingUpdateCheckInterval
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.updateCheckInterval"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
if (_startedUpdater) {
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
|
||||
}
|
||||
|
||||
// Stop checking for updates
|
||||
[self cancelNextUpdateCycle];
|
||||
[_updaterTimer invalidate];
|
||||
|
||||
Vendored
+7
-3
@@ -108,7 +108,7 @@ SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
|
||||
This feature was added in Sparkle 2.
|
||||
|
||||
@return The set of channel names the updater is allowed to find new updates in. An empty set is the default behavior,
|
||||
which means the updater will only look for updates in the default channel.
|
||||
which means the updater will only look for updates in the default channel. The default channel is always included in the allowed set.
|
||||
*/
|
||||
- (NSSet<NSString *> *)allowedChannelsForUpdater:(SPUUpdater *)updater;
|
||||
|
||||
@@ -137,7 +137,11 @@ SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
|
||||
/**
|
||||
Returns whether Sparkle should prompt the user about checking for new updates automatically.
|
||||
|
||||
Use this to override the default behavior.
|
||||
Use this to override the default behavior, which is to prompt for permission to check for updates on second app launch
|
||||
(if SUEnableAutomaticChecks is not specified).
|
||||
|
||||
This method is not called if SUEnableAutomaticChecks is defined in Info.plist or
|
||||
if the user has responded to a permission prompt before.
|
||||
|
||||
@param updater The updater instance.
|
||||
@return @c YES if the updater should prompt for permission to check for new updates automatically, otherwise @c NO
|
||||
@@ -382,7 +386,7 @@ SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
|
||||
@param updater The updater instance.
|
||||
@return The custom version comparator or @c nil if you don't want to be delegated this task.
|
||||
*/
|
||||
- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)updater;
|
||||
- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)updater __deprecated_msg("Custom version comparators are deprecated because they are incompatible with how the system compares different versions of an app.");
|
||||
|
||||
/**
|
||||
Called when a background update will be scheduled after a delay.
|
||||
|
||||
Vendored
+15
-5
@@ -21,10 +21,12 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
This class can be used for reading certain updater settings.
|
||||
This class can be used for reading and updating updater settings.
|
||||
|
||||
It retrieves the settings by first looking into the host's user defaults.
|
||||
If the setting is not found in there, then the host's Info.plist file is looked at.
|
||||
|
||||
For updating updater settings, changes are made in the host's user defaults.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUpdaterSettings : NSObject
|
||||
|
||||
@@ -32,13 +34,17 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
|
||||
|
||||
/**
|
||||
* Indicates whether or not automatic update checks are enabled.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
@property (nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
|
||||
/**
|
||||
* The regular update check interval.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) NSTimeInterval updateCheckInterval;
|
||||
@property (nonatomic) NSTimeInterval updateCheckInterval;
|
||||
|
||||
/**
|
||||
* Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
|
||||
@@ -56,13 +62,17 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
|
||||
*
|
||||
* Note this does not indicate whether or not automatic downloading of updates is allowable.
|
||||
* See `-allowsAutomaticUpdates` property for that.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
|
||||
/**
|
||||
* Indicates whether or not anonymous system profile information is sent when checking for updates.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL sendsSystemProfile;
|
||||
@property (nonatomic) BOOL sendsSystemProfile;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Vendored
+202
-10
@@ -13,37 +13,195 @@
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
static NSString *SUAutomaticallyChecksForUpdatesKeyPath = @"automaticallyChecksForUpdates";
|
||||
static NSString *SUUpdateCheckIntervalKeyPath = @"updateCheckInterval";
|
||||
static NSString *SUAutomaticallyDownloadsUpdatesKeyPath = @"automaticallyDownloadsUpdates";
|
||||
static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
|
||||
|
||||
@implementation SPUUpdaterSettings
|
||||
{
|
||||
SUHost *_host;
|
||||
}
|
||||
|
||||
@synthesize automaticallyChecksForUpdates = _automaticallyChecksForUpdates;
|
||||
@synthesize updateCheckInterval = _updateCheckInterval;
|
||||
@synthesize automaticallyDownloadsUpdates = _automaticallyDownloadsUpdates;
|
||||
@synthesize sendsSystemProfile = _sendsSystemProfile;
|
||||
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
|
||||
_automaticallyChecksForUpdates = [self currentAutomaticallyChecksForUpdates];
|
||||
_updateCheckInterval = [self currentUpdateCheckInterval];
|
||||
_automaticallyDownloadsUpdates = [self currentAutomaticallyDownloadsUpdates];
|
||||
_sendsSystemProfile = [self currentSendsSystemProfile];
|
||||
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(synchronize:) name:SUUpdateSettingsNeedsSynchronizationNotification object:nil];
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
[_host observeChangesFromUserDefaultKeys:[NSSet setWithArray:@[SUEnableAutomaticChecksKey, SUScheduledCheckIntervalKey, SUAutomaticallyUpdateKey, SUSendProfileInfoKey]] changeHandler:^(NSString *keyPath) {
|
||||
__typeof(self) strongSelf = weakSelf;
|
||||
if (strongSelf == nil) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ([keyPath isEqualToString:SUEnableAutomaticChecksKey]) {
|
||||
[strongSelf processCurrentAutomaticallyChecksForUpdates];
|
||||
} else if ([keyPath isEqualToString:SUScheduledCheckIntervalKey]) {
|
||||
[strongSelf processUpdateCheckInterval];
|
||||
} else if ([keyPath isEqualToString:SUAutomaticallyUpdateKey]) {
|
||||
[strongSelf processAutomaticallyDownloadsUpdates];
|
||||
} else if ([keyPath isEqualToString:SUSendProfileInfoKey]) {
|
||||
[strongSelf processSendsSystemProfile];
|
||||
}
|
||||
}];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
- (void)dealloc
|
||||
{
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateSettingsNeedsSynchronizationNotification object:_host.bundlePath];
|
||||
}
|
||||
|
||||
- (void)processCurrentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentAutomaticallyChecksForUpdates];
|
||||
|
||||
if (currentValue != _automaticallyChecksForUpdates) {
|
||||
NSString *updatedKeyPath = SUAutomaticallyChecksForUpdatesKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_automaticallyChecksForUpdates = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
NSTimeInterval currentValue = [self currentUpdateCheckInterval];
|
||||
|
||||
if (fabs(currentValue - _updateCheckInterval) >= 0.001) {
|
||||
NSString *updatedKeyPath = SUUpdateCheckIntervalKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_updateCheckInterval = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentAutomaticallyDownloadsUpdates];
|
||||
|
||||
if (currentValue != _automaticallyDownloadsUpdates) {
|
||||
NSString *updatedKeyPath = SUAutomaticallyDownloadsUpdatesKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_automaticallyDownloadsUpdates = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processSendsSystemProfile SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentSendsSystemProfile];
|
||||
|
||||
if (currentValue != _sendsSystemProfile) {
|
||||
NSString *updatedKeyPath = SUSendsSystemProfileKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_sendsSystemProfile = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)synchronize:(NSNotification *)notification
|
||||
{
|
||||
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
|
||||
if (![bundlePath isEqualToString:_host.bundlePath]) {
|
||||
return;
|
||||
}
|
||||
|
||||
[self processCurrentAutomaticallyChecksForUpdates];
|
||||
[self processUpdateCheckInterval];
|
||||
[self processAutomaticallyDownloadsUpdates];
|
||||
[self processSendsSystemProfile];
|
||||
}
|
||||
|
||||
- (BOOL)currentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
// Don't automatically update when the check interval is 0, to be compatible with 1.1 settings.
|
||||
if ((NSInteger)[self updateCheckInterval] == 0) {
|
||||
if ((NSInteger)[self currentUpdateCheckInterval] == 0) {
|
||||
return NO;
|
||||
}
|
||||
return [_host boolForKey:SUEnableAutomaticChecksKey];
|
||||
}
|
||||
|
||||
- (NSTimeInterval)updateCheckInterval
|
||||
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
|
||||
{
|
||||
[self willChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
|
||||
|
||||
_automaticallyChecksForUpdates = automaticallyCheckForUpdates;
|
||||
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
|
||||
|
||||
[self didChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
|
||||
|
||||
// Hack to support backwards compatibility with older Sparkle versions, which supported
|
||||
// disabling updates by setting the check interval to 0.
|
||||
if (automaticallyCheckForUpdates && (NSInteger)[self currentUpdateCheckInterval] == 0) {
|
||||
[self setUpdateCheckInterval:SUDefaultUpdateCheckInterval];
|
||||
} else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
|
||||
}
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)currentUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
// Find the stored check interval. User defaults override Info.plist.
|
||||
NSNumber *intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
|
||||
if (intervalValue)
|
||||
return [intervalValue doubleValue];
|
||||
else
|
||||
id intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
|
||||
if (intervalValue == nil || ![(NSObject *)intervalValue isKindOfClass:[NSNumber class]]) {
|
||||
return SUDefaultUpdateCheckInterval;
|
||||
}
|
||||
|
||||
return [(NSNumber *)intervalValue doubleValue];
|
||||
}
|
||||
|
||||
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
[self willChangeValueForKey:SUUpdateCheckIntervalKeyPath];
|
||||
|
||||
_updateCheckInterval = updateCheckInterval;
|
||||
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
|
||||
|
||||
[self didChangeValueForKey:SUUpdateCheckIntervalKeyPath];
|
||||
|
||||
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
|
||||
[self setAutomaticallyChecksForUpdates:NO];
|
||||
} else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
|
||||
}
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
// For allowing automatic downloaded updates to be turned on or off
|
||||
@@ -59,14 +217,48 @@
|
||||
return (developerAllowsAutomaticUpdates == nil || developerAllowsAutomaticUpdates.boolValue);
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyDownloadsUpdates
|
||||
- (BOOL)currentAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
return [_host boolForKey:SUAutomaticallyUpdateKey];
|
||||
return [self allowsAutomaticUpdates] && [_host boolForKey:SUAutomaticallyUpdateKey];
|
||||
}
|
||||
|
||||
- (BOOL)sendsSystemProfile
|
||||
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates
|
||||
{
|
||||
if (![self allowsAutomaticUpdates]) {
|
||||
return;
|
||||
}
|
||||
|
||||
[self willChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
|
||||
|
||||
_automaticallyDownloadsUpdates = automaticallyDownloadsUpdates;
|
||||
[_host setBool:automaticallyDownloadsUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
|
||||
|
||||
[self didChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)currentSendsSystemProfile SPU_OBJC_DIRECT
|
||||
{
|
||||
return [_host boolForKey:SUSendProfileInfoKey];
|
||||
}
|
||||
|
||||
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
|
||||
{
|
||||
[self willChangeValueForKey:SUSendsSystemProfileKeyPath];
|
||||
|
||||
_sendsSystemProfile = sendsSystemProfile;
|
||||
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
|
||||
|
||||
[self didChangeValueForKey:SUSendsSystemProfileKeyPath];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
Vendored
+11
-9
@@ -256,14 +256,6 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
*/
|
||||
- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement;
|
||||
|
||||
/**
|
||||
* Show the user the current presented update or its progress in utmost focus
|
||||
*
|
||||
* The user wishes to check for updates while the user is being shown update progress.
|
||||
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
|
||||
*/
|
||||
- (void)showUpdateInFocus;
|
||||
|
||||
/**
|
||||
* Dismiss the current update installation
|
||||
*
|
||||
@@ -273,12 +265,22 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
*/
|
||||
- (void)dismissUpdateInstallation;
|
||||
|
||||
@optional
|
||||
|
||||
/**
|
||||
* Show the user the current presented update or its progress in utmost focus
|
||||
*
|
||||
* The user wishes to check for updates while the user is being shown update progress.
|
||||
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
|
||||
* Implementing this method is optional.
|
||||
*/
|
||||
- (void)showUpdateInFocus;
|
||||
|
||||
/*
|
||||
* Below are deprecated methods that have been replaced by better alternatives.
|
||||
* The deprecated methods will be used if the alternatives have not been implemented yet.
|
||||
* In the future support for using these deprecated methods may be removed however.
|
||||
*/
|
||||
@optional
|
||||
|
||||
// Clients should move to non-deprecated methods
|
||||
// Deprecated methods are only (temporarily) kept around for compatibility reasons
|
||||
|
||||
Vendored
+5
-1
@@ -23,8 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@end
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#define SUAppcastDriverDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUAppcastDriverDefinitionAttribute __attribute__((objc_runtime_name("SUTestAppcastDriver")))
|
||||
#endif
|
||||
|
||||
SUAppcastDriverDefinitionAttribute
|
||||
@interface SUAppcastDriver : NSObject
|
||||
|
||||
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id <SUAppcastDriverDelegate>)delegate;
|
||||
|
||||
Vendored
+8
-2
@@ -163,7 +163,7 @@
|
||||
if (fileSize != nil && ![deltaItem.deltaFromSparkleExecutableSize isEqualToNumber:fileSize]) {
|
||||
sparkleExecutableIsOK = NO;
|
||||
|
||||
SULog(SULogLevelDefault, @"Expected file size (%lld) of Sparkle's executable does not match actual file size (%lld). Skipping delta update.", deltaItem.deltaFromSparkleExecutableSize.unsignedLongLongValue, fileSize.unsignedLongLongValue);
|
||||
SULog(SULogLevelDefault, @"Expected file size (%llu) of Sparkle's executable does not match actual file size (%llu). Skipping delta update.", deltaItem.deltaFromSparkleExecutableSize.unsignedLongLongValue, fileSize.unsignedLongLongValue);
|
||||
} else {
|
||||
sparkleExecutableIsOK = YES;
|
||||
}
|
||||
@@ -429,11 +429,17 @@ SPU_OBJC_DIRECT
|
||||
{
|
||||
id<SUVersionComparison> comparator = nil;
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
// Give the delegate a chance to provide a custom version comparator
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
if ([updaterDelegate respondsToSelector:@selector((versionComparatorForUpdater:))]) {
|
||||
comparator = [updaterDelegate versionComparatorForUpdater:_updater];
|
||||
id updater = _updater;
|
||||
if (updater != nil) {
|
||||
comparator = [updaterDelegate versionComparatorForUpdater:updater];
|
||||
}
|
||||
}
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
// If we don't get a comparator from the delegate, use the default comparator
|
||||
if (comparator == nil) {
|
||||
|
||||
Vendored
+1
-1
@@ -335,7 +335,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
// Initializer used for making delta items
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL state:(SPUAppcastItemState * _Nullable)state SPU_OBJC_DIRECT
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:state failureReason:nil];
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:state failureReason:nil];
|
||||
}
|
||||
|
||||
// Exported public initializer
|
||||
|
||||
Vendored
+7
-26
@@ -9,10 +9,8 @@
|
||||
#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
|
||||
|
||||
#import "SUApplicationInfo.h"
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SUHost.h"
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
|
||||
|
||||
@implementation SUApplicationInfo
|
||||
|
||||
@@ -23,33 +21,16 @@
|
||||
|
||||
+ (NSImage *)bestIconForHost:(SUHost *)host
|
||||
{
|
||||
NSURL *iconURL = [SUBundleIcon iconURLForHost:host];
|
||||
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
|
||||
|
||||
// First try NSImageNameApplicationIcon. This image can be dynamically updated if the user's system icon settings change.
|
||||
NSImage *icon = isMainBundle ? [NSImage imageNamed:NSImageNameApplicationIcon] : nil;
|
||||
|
||||
NSImage *icon = (iconURL == nil) ? nil : [[NSImage alloc] initWithContentsOfURL:iconURL];
|
||||
|
||||
// Get icon from asset catalog if no explicit filename is provided.
|
||||
if (!icon) {
|
||||
icon = [host.bundle imageForResource:@SPARKLE_ICON_NAME];
|
||||
// Next try asking NSWorkspace for icon of the bundle
|
||||
if (icon == nil) {
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForFile:host.bundlePath];
|
||||
}
|
||||
|
||||
// Use a default icon if none is defined.
|
||||
if (!icon) {
|
||||
// this assumption may not be correct (eg. even though we're not the main bundle, it could be still be a regular app)
|
||||
// but still better than nothing if no icon was included
|
||||
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
|
||||
|
||||
if (@available(macOS 11, *)) {
|
||||
UTType *contentType = isMainBundle ? UTTypeApplication : UTTypeBundle;
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForContentType:contentType];
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
|
||||
else
|
||||
{
|
||||
NSString *fileType = isMainBundle ? (__bridge NSString *)kUTTypeApplication : (__bridge NSString *)kUTTypeBundle;
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForFileType:fileType];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
Vendored
-21
@@ -1,21 +0,0 @@
|
||||
//
|
||||
// SUBundleIcon.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Mayur Pawashe on 7/24/16.
|
||||
// Copyright © 2016 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class SUHost;
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUBundleIcon : NSObject
|
||||
|
||||
+ (NSURL * _Nullable)iconURLForHost:(SUHost *)host;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
Vendored
-34
@@ -1,34 +0,0 @@
|
||||
//
|
||||
// SUBundleIcon.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Mayur Pawashe on 7/24/16.
|
||||
// Copyright © 2016 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SUHost.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@implementation SUBundleIcon
|
||||
|
||||
// Note: To obtain the most current bundle icon file from the Info dictionary, this should take a SUHost, not a NSBundle
|
||||
+ (NSURL *)iconURLForHost:(SUHost *)host
|
||||
{
|
||||
NSString *resource = [host objectForInfoDictionaryKey:@"CFBundleIconFile"];
|
||||
if (resource == nil || ![resource isKindOfClass:[NSString class]]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSURL *iconURL = [host.bundle URLForResource:resource withExtension:@"icns"];
|
||||
|
||||
// The resource could already be containing the path extension, so try again without the extra extension
|
||||
if (iconURL == nil) {
|
||||
iconURL = [host.bundle URLForResource:resource withExtension:nil];
|
||||
}
|
||||
return iconURL;
|
||||
}
|
||||
|
||||
@end
|
||||
Vendored
+4
@@ -31,6 +31,9 @@ extern NSString *const SUAppcastAttributeValueMacOS;
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
extern NSString *const SUTechnicalErrorInformationKey;
|
||||
extern NSString *const SUUpdateAutomaticCheckSettingChangedNotification;
|
||||
extern NSString *const SUUpdateSettingsNeedsSynchronizationNotification;
|
||||
extern NSString *const SUUpdateBundlePathUserInfoKey;
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// PList keys::
|
||||
@@ -48,6 +51,7 @@ extern NSString *const SULastCheckTimeKey;
|
||||
extern NSString *const SUPublicDSAKeyKey;
|
||||
extern NSString *const SUPublicDSAKeyFileKey;
|
||||
extern NSString *const SUPublicEDKeyKey;
|
||||
extern NSString *const SUVerifyUpdateBeforeExtractionKey;
|
||||
extern NSString *const SUAutomaticallyUpdateKey;
|
||||
extern NSString *const SUAllowsAutomaticUpdatesKey;
|
||||
extern NSString *const SUEnableAutomaticChecksKey;
|
||||
|
||||
Vendored
+4
@@ -31,6 +31,9 @@ NSString *const SUBundleIdentifier = @SPARKLE_BUNDLE_IDENTIFIER;
|
||||
NSString *const SUAppcastAttributeValueMacOS = @"macos";
|
||||
|
||||
NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
|
||||
NSString *const SUUpdateAutomaticCheckSettingChangedNotification = @"SUUpdateAutomaticCheckSettingChanged";
|
||||
NSString *const SUUpdateSettingsNeedsSynchronizationNotification = @"SUUpdateSettingsNeedsSynchronization";
|
||||
NSString *const SUUpdateBundlePathUserInfoKey = @"SUBundlePath";
|
||||
|
||||
NSString *const SUFeedURLKey = @"SUFeedURL";
|
||||
NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore";
|
||||
@@ -44,6 +47,7 @@ NSString *const SULastCheckTimeKey = @"SULastCheckTime";
|
||||
NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey";
|
||||
NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile";
|
||||
NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
|
||||
NSString *const SUVerifyUpdateBeforeExtractionKey = @"SUVerifyUpdateBeforeExtraction";
|
||||
NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
|
||||
NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
|
||||
NSString *const SUEnableSystemProfilingKey = @"SUEnableSystemProfiling";
|
||||
|
||||
Vendored
+7
-3
@@ -11,14 +11,18 @@
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
#define SUFileManagerDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUFileManagerDefinitionAttribute __attribute__((objc_runtime_name("SUTestFileManager")))
|
||||
#endif
|
||||
|
||||
/**
|
||||
* A class used for performing file operations more suitable than NSFileManager for performing installation work.
|
||||
* All operations on this class may be used on thread other than the main thread.
|
||||
* This class provides just basic file operations and stays away from including much application-level logic.
|
||||
*/
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#endif
|
||||
SUFileManagerDefinitionAttribute
|
||||
@interface SUFileManager : NSObject
|
||||
|
||||
/**
|
||||
|
||||
Vendored
+10
-1
@@ -12,8 +12,12 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@class SUPublicKeys;
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#define SUHostDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUHostDefinitionAttribute __attribute__((objc_runtime_name("SUTestHost")))
|
||||
#endif
|
||||
|
||||
SUHostDefinitionAttribute
|
||||
@interface SUHost : NSObject
|
||||
|
||||
@property (nonatomic, readonly) NSBundle *bundle;
|
||||
@@ -33,6 +37,8 @@ SPU_OBJC_DIRECT_MEMBERS
|
||||
@property (getter=isRunningTranslocated, nonatomic, readonly) BOOL runningTranslocated;
|
||||
@property (readonly, nonatomic, copy, nullable) NSString *publicDSAKeyFileKey;
|
||||
|
||||
@property (nonatomic, readonly) BOOL hasUpdateSecurityPolicy;
|
||||
|
||||
- (nullable id)objectForInfoDictionaryKey:(NSString *)key;
|
||||
- (BOOL)boolForInfoDictionaryKey:(NSString *)key;
|
||||
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName;
|
||||
@@ -41,6 +47,9 @@ SPU_OBJC_DIRECT_MEMBERS
|
||||
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName;
|
||||
- (nullable id)objectForKey:(NSString *)key;
|
||||
- (BOOL)boolForKey:(NSString *)key;
|
||||
|
||||
- (void)observeChangesFromUserDefaultKeys:(NSSet<NSString *> *)keyPaths changeHandler:(void (^)(NSString *))changeHandler;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
Vendored
+88
-53
@@ -23,11 +23,16 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
// if the process is sandboxed or not; eg: finding the user's caches directory. Or code that depends
|
||||
// on compilation flags and if other files exist relative to the host bundle.
|
||||
|
||||
static void *SUHostObservableContext = &SUHostObservableContext;
|
||||
|
||||
@implementation SUHost
|
||||
{
|
||||
NSString *_defaultsDomain;
|
||||
NSUserDefaults *_userDefaults;
|
||||
NSSet<NSString *> *_observedUserDefaultKeyPaths;
|
||||
NSMutableSet<NSString *> *_modifyingKeyPaths;
|
||||
|
||||
void (^_changeObservationHandler)(NSString *);
|
||||
|
||||
BOOL _usesStandardUserDefaults;
|
||||
BOOL _isMainBundle;
|
||||
}
|
||||
|
||||
@@ -45,18 +50,67 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
_isMainBundle = [aBundle isEqualTo:[NSBundle mainBundle]];
|
||||
|
||||
_defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey];
|
||||
if (_defaultsDomain == nil) {
|
||||
_defaultsDomain = [_bundle bundleIdentifier];
|
||||
NSString *domainIdentifier;
|
||||
{
|
||||
NSString *defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey];
|
||||
if (defaultsDomain != nil) {
|
||||
domainIdentifier = defaultsDomain;
|
||||
} else if (!_isMainBundle) {
|
||||
domainIdentifier = aBundle.bundleIdentifier;
|
||||
} else {
|
||||
domainIdentifier = nil;
|
||||
}
|
||||
}
|
||||
|
||||
if (domainIdentifier == nil) {
|
||||
_userDefaults = [NSUserDefaults standardUserDefaults];
|
||||
} else {
|
||||
_userDefaults = [[NSUserDefaults alloc] initWithSuiteName:domainIdentifier];
|
||||
}
|
||||
|
||||
// If we're using the main bundle's defaults we'll use the standard user defaults mechanism, otherwise we have to get CF-y.
|
||||
NSString *mainBundleIdentifier = NSBundle.mainBundle.bundleIdentifier;
|
||||
_usesStandardUserDefaults = _defaultsDomain == nil || [_defaultsDomain isEqualToString:mainBundleIdentifier];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
if (_observedUserDefaultKeyPaths != nil) {
|
||||
for (NSString *keyPath in _observedUserDefaultKeyPaths) {
|
||||
[_userDefaults removeObserver:self forKeyPath:keyPath];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)observeChangesFromUserDefaultKeys:(NSSet<NSString *> *)keyPaths changeHandler:(void (^)(NSString *))changeHandler
|
||||
{
|
||||
_modifyingKeyPaths = [NSMutableSet set];
|
||||
|
||||
for (NSString *keyPath in keyPaths) {
|
||||
[_userDefaults addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:SUHostObservableContext];
|
||||
}
|
||||
|
||||
_observedUserDefaultKeyPaths = keyPaths;
|
||||
_changeObservationHandler = [changeHandler copy];
|
||||
}
|
||||
|
||||
- (void)observeValueForKeyPath:(nullable NSString *)keyPath ofObject:(nullable id)object change:(nullable NSDictionary<NSKeyValueChangeKey,id> *)change context:(nullable void *)context
|
||||
{
|
||||
if (context != SUHostObservableContext)
|
||||
{
|
||||
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
||||
return;
|
||||
}
|
||||
|
||||
if (keyPath == nil || [_modifyingKeyPaths containsObject:(NSString * _Nonnull)keyPath]) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_changeObservationHandler == nil) {
|
||||
return;
|
||||
}
|
||||
|
||||
_changeObservationHandler((NSString * _Nonnull)keyPath);
|
||||
}
|
||||
|
||||
- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], [self bundlePath]]; }
|
||||
|
||||
- (NSString *)bundlePath
|
||||
@@ -120,7 +174,11 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- (BOOL)isRunningOnReadOnlyVolume
|
||||
{
|
||||
struct statfs statfs_info;
|
||||
statfs(_bundle.bundlePath.fileSystemRepresentation, &statfs_info);
|
||||
if (statfs(_bundle.bundlePath.fileSystemRepresentation, &statfs_info) != 0)
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
return (statfs_info.f_flags & MNT_RDONLY) != 0;
|
||||
}
|
||||
|
||||
@@ -161,6 +219,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
return key;
|
||||
}
|
||||
|
||||
- (BOOL)hasUpdateSecurityPolicy
|
||||
{
|
||||
NSDictionary<NSString *, id> *updateSecurityPolicy = [self objectForInfoDictionaryKey:@"NSUpdateSecurityPolicy"];
|
||||
|
||||
return (updateSecurityPolicy != nil);
|
||||
}
|
||||
|
||||
- (SUPublicKeys *)publicKeys
|
||||
{
|
||||
return [[SUPublicKeys alloc] initWithEd:[self publicEDKey]
|
||||
@@ -198,65 +263,35 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName
|
||||
{
|
||||
if (!defaultName || _defaultsDomain == nil) {
|
||||
if (defaultName == nil || _userDefaults == nil) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
// Under Tiger, CFPreferencesCopyAppValue doesn't get values from NSRegistrationDomain, so anything
|
||||
// passed into -[NSUserDefaults registerDefaults:] is ignored. The following line falls
|
||||
// back to using NSUserDefaults, but only if the host bundle is the main bundle.
|
||||
if (_usesStandardUserDefaults) {
|
||||
return [[NSUserDefaults standardUserDefaults] objectForKey:defaultName];
|
||||
}
|
||||
|
||||
CFPropertyListRef obj = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)_defaultsDomain);
|
||||
return CFBridgingRelease(obj);
|
||||
return [_userDefaults objectForKey:defaultName];
|
||||
}
|
||||
|
||||
// Note this handles nil being passed for defaultName, in which case the user default will be removed
|
||||
- (void)setObject:(nullable id)value forUserDefaultsKey:(NSString *)defaultName
|
||||
{
|
||||
if (_usesStandardUserDefaults)
|
||||
{
|
||||
[[NSUserDefaults standardUserDefaults] setObject:value forKey:defaultName];
|
||||
}
|
||||
else
|
||||
{
|
||||
CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFPropertyListRef)(value), (__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
|
||||
CFPreferencesSynchronize((__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
|
||||
}
|
||||
[_modifyingKeyPaths addObject:defaultName];
|
||||
|
||||
[_userDefaults setObject:value forKey:defaultName];
|
||||
|
||||
[_modifyingKeyPaths removeObject:defaultName];
|
||||
}
|
||||
|
||||
- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName
|
||||
{
|
||||
if (_usesStandardUserDefaults) {
|
||||
return [[NSUserDefaults standardUserDefaults] boolForKey:defaultName];
|
||||
}
|
||||
|
||||
BOOL value;
|
||||
CFPropertyListRef plr = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)_defaultsDomain);
|
||||
if (plr == NULL) {
|
||||
value = NO;
|
||||
}
|
||||
else
|
||||
{
|
||||
value = CFBooleanGetValue((CFBooleanRef)plr) ? YES : NO;
|
||||
CFRelease(plr);
|
||||
}
|
||||
return value;
|
||||
return [_userDefaults boolForKey:defaultName];
|
||||
}
|
||||
|
||||
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
|
||||
{
|
||||
if (_usesStandardUserDefaults)
|
||||
{
|
||||
[[NSUserDefaults standardUserDefaults] setBool:value forKey:defaultName];
|
||||
}
|
||||
else
|
||||
{
|
||||
CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFBooleanRef) @(value), (__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
|
||||
CFPreferencesSynchronize((__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
|
||||
}
|
||||
[_modifyingKeyPaths addObject:defaultName];
|
||||
|
||||
[_userDefaults setBool:value forKey:defaultName];
|
||||
|
||||
[_modifyingKeyPaths removeObject:defaultName];
|
||||
}
|
||||
|
||||
- (nullable id)objectForKey:(NSString *)key {
|
||||
|
||||
Vendored
+31
-6
@@ -11,12 +11,37 @@
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
static void SULogErrors(NSArray<NSError *> *errors, int recursionLimit)
|
||||
{
|
||||
if (recursionLimit == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (NSError *error in errors) {
|
||||
SULog(SULogLevelError, @"Error: %@ %@ (URL %@)", error.localizedDescription, error.localizedFailureReason, error.userInfo[NSURLErrorFailingURLErrorKey]);
|
||||
|
||||
NSDictionary<NSErrorUserInfoKey, id> *userInfo = error.userInfo;
|
||||
|
||||
if (@available(macOS 11.3, *)) {
|
||||
NSArray<NSError *> *underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey];
|
||||
if (underlyingErrors != nil) {
|
||||
SULogErrors(underlyingErrors, recursionLimit - 1);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
NSError *underlyingError = userInfo[NSUnderlyingErrorKey];
|
||||
if (underlyingError != nil) {
|
||||
SULogErrors(@[underlyingError], recursionLimit - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SULogError(NSError *error)
|
||||
{
|
||||
NSError *errorToDisplay = error;
|
||||
int finiteRecursion = 5;
|
||||
do {
|
||||
SULog(SULogLevelError, @"Error: %@ %@ (URL %@)", errorToDisplay.localizedDescription, errorToDisplay.localizedFailureReason, errorToDisplay.userInfo[NSURLErrorFailingURLErrorKey]);
|
||||
errorToDisplay = errorToDisplay.userInfo[NSUnderlyingErrorKey];
|
||||
} while(--finiteRecursion && errorToDisplay);
|
||||
if (error == nil) {
|
||||
return;
|
||||
}
|
||||
|
||||
SULogErrors(@[error], 7);
|
||||
}
|
||||
Vendored
+5
@@ -32,6 +32,10 @@ void SULog(SULogLevel level, NSString *format, ...)
|
||||
// Note we don't take advantage of info like the source line number because we wrap this macro inside our own function
|
||||
// And we don't really leverage of os_log's deferred formatting processing because we format the string before passing it in
|
||||
switch (level) {
|
||||
#pragma clang diagnostic push
|
||||
#if __has_warning("-Wpre-c11-compat")
|
||||
#pragma clang diagnostic ignored "-Wpre-c11-compat"
|
||||
#endif
|
||||
case SULogLevelDefault:
|
||||
// See docs for OS_LOG_TYPE_DEFAULT
|
||||
// By default, OS_LOG_TYPE_DEFAULT seems to be more noticeable than OS_LOG_TYPE_INFO
|
||||
@@ -41,5 +45,6 @@ void SULog(SULogLevel level, NSString *format, ...)
|
||||
// See docs for OS_LOG_TYPE_ERROR
|
||||
os_log_error(logger, "%{public}@", logMessage);
|
||||
break;
|
||||
#pragma clang diagnostic pop
|
||||
}
|
||||
}
|
||||
Vendored
+10
-3
@@ -23,8 +23,12 @@ typedef NS_ENUM(uint8_t, SUSigningInputStatus) {
|
||||
};
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#define SUSignaturesDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUSignaturesDefinitionAttribute __attribute__((objc_runtime_name("SUTestSignatures")))
|
||||
#endif
|
||||
|
||||
SUSignaturesDefinitionAttribute
|
||||
@interface SUSignatures : NSObject <NSSecureCoding>
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
@property (nonatomic, readonly, nullable) NSData *dsaSignature;
|
||||
@@ -41,10 +45,13 @@ SPU_OBJC_DIRECT_MEMBERS
|
||||
;
|
||||
@end
|
||||
|
||||
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT_MEMBERS
|
||||
#define SUPublicKeysDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUPublicKeysDefinitionAttribute __attribute__((objc_runtime_name("SUTestPublicKeys")))
|
||||
#endif
|
||||
|
||||
SUPublicKeysDefinitionAttribute
|
||||
@interface SUPublicKeys : NSObject
|
||||
|
||||
@property (nonatomic, readonly, nullable) NSString *dsaPubKey;
|
||||
|
||||
Vendored
+52
-40
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.8" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.8"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
@@ -21,14 +21,14 @@
|
||||
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="200" y="222" width="400" height="107"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
|
||||
<value key="minSize" type="size" width="213" height="107"/>
|
||||
<view key="contentView" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="400" height="106"/>
|
||||
<view key="contentView" misplaced="YES" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="400" height="105"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7">
|
||||
<rect key="frame" x="24" y="27" width="64" height="64"/>
|
||||
<rect key="frame" x="20" y="37" width="64" height="64"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="64" id="BT1-iv-l2H"/>
|
||||
<constraint firstAttribute="width" constant="64" id="eYK-yn-PVe"/>
|
||||
@@ -38,26 +38,40 @@
|
||||
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
|
||||
<rect key="frame" x="106" y="75" width="277" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="title" id="26"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
|
||||
<rect key="frame" x="107" y="47" width="273" height="20"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
|
||||
<binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
|
||||
</connections>
|
||||
</progressIndicator>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="E7u-iB-1VW" userLabel="Status text and progress">
|
||||
<rect key="frame" x="92" y="48" width="288" height="42"/>
|
||||
<subviews>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
|
||||
<rect key="frame" x="-2" y="26" width="292" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="title" id="26"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
|
||||
<rect key="frame" x="0.0" y="-1" width="288" height="20"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
|
||||
<binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
|
||||
</connections>
|
||||
</progressIndicator>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" id="9Rq-vq-cJo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" id="PDQ-9x-h82"/>
|
||||
<constraint firstItem="8" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="top" id="Rtg-8u-ed1"/>
|
||||
<constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" id="YFJ-Gi-yRc"/>
|
||||
<constraint firstItem="8" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="f16-mO-wfq"/>
|
||||
<constraint firstItem="11" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="jvG-0L-tcl"/>
|
||||
<constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="8" symbolic="YES" id="mKu-OU-ujj"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
|
||||
<rect key="frame" x="273" y="12" width="114" height="32"/>
|
||||
<rect key="frame" x="273" y="13" width="114" height="32"/>
|
||||
<buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="55">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
@@ -65,12 +79,13 @@
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="3tI-Ef-LLb"/>
|
||||
</constraints>
|
||||
<accessibility identifier="SUStatusButton"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="title" keyPath="buttonTitle" id="21"/>
|
||||
</connections>
|
||||
</button>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="16">
|
||||
<rect key="frame" x="106" y="23" width="146" height="16"/>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="16">
|
||||
<rect key="frame" x="90" y="23" width="146" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Small System Font Text" id="56">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
@@ -87,20 +102,17 @@
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" constant="20" id="1eu-lX-1HN"/>
|
||||
<constraint firstItem="12" firstAttribute="top" secondItem="11" secondAttribute="bottom" constant="9" id="3RZ-xs-4zc"/>
|
||||
<constraint firstItem="8" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="5bq-w6-BOU"/>
|
||||
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="9Mg-Ac-X6m"/>
|
||||
<constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="9" id="B9k-9V-CdX"/>
|
||||
<constraint firstItem="11" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="19" id="EQn-l8-5gk"/>
|
||||
<constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="LTo-e9-myp"/>
|
||||
<constraint firstItem="16" firstAttribute="top" secondItem="11" secondAttribute="bottom" constant="9" id="ViF-iJ-I4A"/>
|
||||
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="24" id="ZLG-dr-gmv"/>
|
||||
<constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="19" id="iY3-LJ-ivz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="E7u-iB-1VW" secondAttribute="trailing" constant="20" symbolic="YES" id="3uo-mB-Q9M"/>
|
||||
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="4" id="9Mg-Ac-X6m"/>
|
||||
<constraint firstItem="E7u-iB-1VW" firstAttribute="centerY" secondItem="7" secondAttribute="centerY" id="Jcg-BS-tJ1"/>
|
||||
<constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="LTo-e9-myp"/>
|
||||
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="ZLG-dr-gmv"/>
|
||||
<constraint firstItem="12" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="bottom" constant="8" id="dHH-r0-at5"/>
|
||||
<constraint firstItem="16" firstAttribute="firstBaseline" secondItem="12" secondAttribute="firstBaseline" id="dHQ-hW-3QN"/>
|
||||
<constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="20" symbolic="YES" id="iY3-LJ-ivz"/>
|
||||
<constraint firstItem="12" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="16" secondAttribute="trailing" constant="25" id="k07-gJ-v9t"/>
|
||||
<constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" id="onJ-J5-mra"/>
|
||||
<constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="19" id="pHi-Hm-GAw"/>
|
||||
<constraint firstItem="8" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="tAo-wJ-XR0"/>
|
||||
<constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" symbolic="YES" id="onJ-J5-mra"/>
|
||||
<constraint firstItem="E7u-iB-1VW" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="wiO-j2-ud9"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<point key="canvasLocation" x="-158" y="132"/>
|
||||
|
||||
Vendored
+1
-1
@@ -30,7 +30,7 @@
|
||||
- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText SPU_OBJC_DIRECT;
|
||||
|
||||
// If isDefault is YES, the button's key equivalent will be \r.
|
||||
- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault SPU_OBJC_DIRECT;
|
||||
- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault accessibilityIdentifier:(NSString *)accessibilityIdentifier SPU_OBJC_DIRECT;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Vendored
+6
-1
@@ -88,6 +88,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
|
||||
[_progressBar setUsesThreadedAnimation:YES];
|
||||
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
|
||||
|
||||
if (@available(macOS 16, *)) {
|
||||
_actionButton.controlSize = NSControlSizeLarge;
|
||||
}
|
||||
|
||||
window.title = _windowTitle;
|
||||
}
|
||||
|
||||
@@ -104,9 +108,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
|
||||
self.statusText = aStatusText;
|
||||
}
|
||||
|
||||
- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault
|
||||
- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault accessibilityIdentifier:(NSString *)accessibilityIdentifier
|
||||
{
|
||||
self.buttonTitle = aButtonTitle;
|
||||
_actionButton.accessibilityIdentifier = [accessibilityIdentifier copy];
|
||||
|
||||
[self window];
|
||||
[_actionButton sizeToFit];
|
||||
|
||||
Vendored
+16
-11
@@ -12,6 +12,7 @@
|
||||
#import "SUOperatingSystem.h"
|
||||
#include <sys/sysctl.h>
|
||||
#import "SPUUpdaterDelegate.h"
|
||||
#import "SULocalizations.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -32,6 +33,10 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
|
||||
+ (NSArray<NSDictionary<NSString *, NSString *> *> *)systemProfileArrayForHost:(SUHost *)host
|
||||
{
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
// Gather profile information and append it to the URL.
|
||||
NSMutableArray<NSDictionary<NSString *, NSString *> *> *profileArray = [NSMutableArray array];
|
||||
NSArray *profileDictKeys = @[@"key", @"displayKey", @"value", @"displayValue"];
|
||||
@@ -42,7 +47,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
// OS version
|
||||
NSString *currentSystemVersion = [SUOperatingSystem systemVersionString];
|
||||
if (currentSystemVersion != nil) {
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerOperatingSystemVersionKey, @"OS Version", currentSystemVersion, currentSystemVersion] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerOperatingSystemVersionKey, SULocalizedStringFromTableInBundle(@"OS Version", SPARKLE_TABLE, sparkleBundle, nil), currentSystemVersion, currentSystemVersion] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
// CPU type (decoder info for values found here is in mach/machine.h)
|
||||
@@ -58,7 +63,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
case CPU_TYPE_POWERPC: visibleCPUType = @"PowerPC"; break;
|
||||
default: visibleCPUType = @"Other"; break;
|
||||
}
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUTypeKey, @"CPU Type", [NSString stringWithFormat:@"%d", value], visibleCPUType] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUTypeKey, SULocalizedStringFromTableInBundle(@"CPU Type", SPARKLE_TABLE, sparkleBundle, nil), [NSString stringWithFormat:@"%d", value], visibleCPUType] forKeys:profileDictKeys]];
|
||||
}
|
||||
error = sysctlbyname("hw.cpu64bit_capable", &value, &length, NULL, 0);
|
||||
if (error != 0) {
|
||||
@@ -72,7 +77,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
|
||||
if (error == 0) {
|
||||
is64bit = value == 1;
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPU64bitKey, @"CPU is 64-Bit?", [NSString stringWithFormat:@"%d", is64bit], is64bit ? @"Yes" : @"No"] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPU64bitKey, SULocalizedStringFromTableInBundle(@"CPU is 64-Bit?", SPARKLE_TABLE, sparkleBundle, nil), [NSString stringWithFormat:@"%d", is64bit], is64bit ? SULocalizedStringFromTableInBundle(@"Yes", SPARKLE_TABLE, sparkleBundle, nil) : SULocalizedStringFromTableInBundle(@"No", SPARKLE_TABLE, sparkleBundle, nil)] forKeys:profileDictKeys]];
|
||||
}
|
||||
error = sysctlbyname("hw.cpusubtype", &value, &length, NULL, 0);
|
||||
if (error == 0) {
|
||||
@@ -97,7 +102,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
} else {
|
||||
visibleCPUSubType = @"Other";
|
||||
}
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUSubtypeKey, @"CPU Subtype", [NSString stringWithFormat:@"%d", value], visibleCPUSubType] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUSubtypeKey, SULocalizedStringFromTableInBundle(@"CPU Subtype", SPARKLE_TABLE, sparkleBundle, nil), [NSString stringWithFormat:@"%d", value], visibleCPUSubType] forKeys:profileDictKeys]];
|
||||
}
|
||||
error = sysctlbyname("hw.model", NULL, &length, NULL, 0);
|
||||
if (error == 0) {
|
||||
@@ -107,7 +112,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
if (error == 0) {
|
||||
NSString *rawModelName = @(cpuModel);
|
||||
NSString *visibleModelName = rawModelName;
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerHardwareModelKey, @"Mac Model", rawModelName, visibleModelName] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerHardwareModelKey, SULocalizedStringFromTableInBundle(@"Mac Model", SPARKLE_TABLE, sparkleBundle, nil), rawModelName, visibleModelName] forKeys:profileDictKeys]];
|
||||
}
|
||||
free(cpuModel);
|
||||
}
|
||||
@@ -117,24 +122,24 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
error = sysctlbyname("hw.ncpu", &value, &length, NULL, 0);
|
||||
if (error == 0) {
|
||||
NSString *stringValue = [NSString stringWithFormat:@"%d", value];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUCountKey, @"Number of CPUs", stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUCountKey, SULocalizedStringFromTableInBundle(@"Number of CPUs", SPARKLE_TABLE, sparkleBundle, nil), stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
// User preferred language
|
||||
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
|
||||
NSArray *languages = [defs objectForKey:@"AppleLanguages"];
|
||||
if ([languages count] > 0) {
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerPreferredLanguageKey, @"Preferred Language", [languages objectAtIndex:0], [languages objectAtIndex:0]] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerPreferredLanguageKey, SULocalizedStringFromTableInBundle(@"Preferred Language", SPARKLE_TABLE, sparkleBundle, nil), [languages objectAtIndex:0], [languages objectAtIndex:0]] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
// Application sending the request
|
||||
NSString *appName = [host name];
|
||||
if (appName) {
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerApplicationNameKey, @"Application Name", appName, appName] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerApplicationNameKey, SULocalizedStringFromTableInBundle(@"Application Name", SPARKLE_TABLE, sparkleBundle, nil), appName, appName] forKeys:profileDictKeys]];
|
||||
}
|
||||
NSString *appVersion = [host version];
|
||||
if (appVersion) {
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerApplicationVersionKey, @"Application Version", appVersion, appVersion] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerApplicationVersionKey, SULocalizedStringFromTableInBundle(@"Application Version", SPARKLE_TABLE, sparkleBundle, nil), appVersion, appVersion] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
// Number of displays?
|
||||
@@ -145,7 +150,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
if (sysctlbyname("hw.cpufrequency", &hz, &hz_size, NULL, 0) == 0) {
|
||||
unsigned long mhz = hz / 1000000;
|
||||
NSString *stringValue = [NSString stringWithFormat:@"%lu", mhz];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUFrequencyKey, @"CPU Speed (MHz)", stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerCPUFrequencyKey, SULocalizedStringFromTableInBundle(@"CPU Speed (MHz)", SPARKLE_TABLE, sparkleBundle, nil), stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
// amount of RAM
|
||||
@@ -154,7 +159,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
|
||||
if (sysctlbyname("hw.memsize", &bytes, &bytes_size, NULL, 0) == 0) {
|
||||
double megabytes = bytes / (1024. * 1024.);
|
||||
NSString *stringValue = [NSString stringWithFormat:@"%lu", (unsigned long)megabytes];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerMemoryKey, @"Memory (MB)", stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerMemoryKey, SULocalizedStringFromTableInBundle(@"Memory (MB)", SPARKLE_TABLE, sparkleBundle, nil), stringValue, stringValue] forKeys:profileDictKeys]];
|
||||
}
|
||||
|
||||
return [profileArray copy];
|
||||
|
||||
Vendored
+74
-54
@@ -33,31 +33,35 @@
|
||||
|
||||
static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdateAlert";
|
||||
|
||||
static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
|
||||
|
||||
@interface SUUpdateAlert () <NSTouchBarDelegate>
|
||||
@end
|
||||
|
||||
@implementation SUUpdateAlert
|
||||
{
|
||||
SPUUpdaterSettings *_updaterSettings;
|
||||
SUAppcastItem *_updateItem;
|
||||
SUHost *_host;
|
||||
SPUUserUpdateState *_state;
|
||||
NSProgressIndicator *_releaseNotesSpinner;
|
||||
NSBox *_backgroundView;
|
||||
id<SUReleaseNotesView> _releaseNotesView;
|
||||
id<SUVersionDisplay> _versionDisplayer;
|
||||
|
||||
IBOutlet NSStackView *_stackView;
|
||||
IBOutlet NSButton *_installButton;
|
||||
IBOutlet NSButton *_laterButton;
|
||||
IBOutlet NSButton *_skipButton;
|
||||
IBOutlet NSBox *_releaseNotesBoxView;
|
||||
IBOutlet NSTextField *_descriptionField;
|
||||
IBOutlet NSView *_releaseNotesContainerView;
|
||||
IBOutlet NSView *_releaseNotesContentView;
|
||||
IBOutlet NSButton *_automaticallyInstallUpdatesButton;
|
||||
IBOutlet NSView *_titleView;
|
||||
|
||||
void (^_didBecomeKeyBlock)(void);
|
||||
void(^_completionBlock)(SPUUserUpdateChoice, NSRect, BOOL);
|
||||
|
||||
BOOL _allowsAutomaticUpdates;
|
||||
BOOL _windowLoadedAndShowsReleaseNotes;
|
||||
}
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id<SUVersionDisplay>)versionDisplayer completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock
|
||||
@@ -72,14 +76,14 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
_completionBlock = [completionBlock copy];
|
||||
_didBecomeKeyBlock = [didBecomeKeyBlock copy];
|
||||
|
||||
SPUUpdaterSettings *updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:aHost.bundle];
|
||||
_updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:aHost.bundle];
|
||||
|
||||
BOOL allowsAutomaticUpdates;
|
||||
NSNumber *allowsAutomaticUpdatesOption = updaterSettings.allowsAutomaticUpdatesOption;
|
||||
NSNumber *allowsAutomaticUpdatesOption = _updaterSettings.allowsAutomaticUpdatesOption;
|
||||
if (item.informationOnlyUpdate) {
|
||||
allowsAutomaticUpdates = NO;
|
||||
} else if (allowsAutomaticUpdatesOption == nil) {
|
||||
allowsAutomaticUpdates = updaterSettings.automaticallyChecksForUpdates;
|
||||
allowsAutomaticUpdates = _updaterSettings.automaticallyChecksForUpdates;
|
||||
} else {
|
||||
allowsAutomaticUpdates = allowsAutomaticUpdatesOption.boolValue;
|
||||
}
|
||||
@@ -151,12 +155,20 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
- (void)displayReleaseNotesSpinner SPU_OBJC_DIRECT
|
||||
{
|
||||
// Stick a nice big spinner in the middle of the web view until the page is loaded.
|
||||
NSView *boxContentView = _releaseNotesBoxView.contentView;
|
||||
NSRect frame = boxContentView.frame;
|
||||
_releaseNotesSpinner = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(NSMidX(frame) - 16, NSMidY(frame) - 16, 32, 32)];
|
||||
_releaseNotesSpinner = [[NSProgressIndicator alloc] init];
|
||||
_releaseNotesSpinner.controlSize = NSControlSizeRegular;
|
||||
[_releaseNotesSpinner setStyle:NSProgressIndicatorStyleSpinning];
|
||||
|
||||
[_releaseNotesContentView addSubview:_releaseNotesSpinner];
|
||||
|
||||
_releaseNotesSpinner.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
[_releaseNotesSpinner.centerXAnchor constraintEqualToAnchor:_releaseNotesContentView.centerXAnchor],
|
||||
[_releaseNotesSpinner.centerYAnchor constraintEqualToAnchor:_releaseNotesContentView.centerYAnchor]
|
||||
]];
|
||||
|
||||
_releaseNotesSpinner.displayedWhenStopped = NO;
|
||||
[_releaseNotesSpinner startAnimation:self];
|
||||
[boxContentView addSubview:_releaseNotesSpinner];
|
||||
|
||||
// If there's no release notes URL, just stick the contents of the description into the web view
|
||||
// Otherwise we'll wait until the client wants us to show release notes
|
||||
@@ -184,8 +196,13 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
|
||||
- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
|
||||
{
|
||||
if (![self showsReleaseNotes]) {
|
||||
if ([_host.bundle isEqual:NSBundle.mainBundle]) {
|
||||
if (!_windowLoadedAndShowsReleaseNotes) {
|
||||
if (self.window == nil) {
|
||||
// Window was not properly loaded.
|
||||
// This can happen if the app moves and the update alert nib fails to load
|
||||
// This puts Sparkle in an unsupported state but we will try to avoid crashing
|
||||
SULog(SULogLevelError, @"Error: SUUpdateAlert window is nil and failed to load, which may mean the app was moved. Sparkle is running in an unsupported state.");
|
||||
} else if ([_host.bundle isEqual:NSBundle.mainBundle]) {
|
||||
SULog(SULogLevelError, @"Warning: '%@' is configured to not show release notes but release notes for version %@ were downloaded. Consider either removing release notes from your appcast or implementing -[SPUUpdaterDelegate updater:shouldDownloadReleaseNotesForUpdate:]", _host.name, _updateItem.displayVersionString);
|
||||
}
|
||||
return;
|
||||
@@ -227,7 +244,6 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
- (void)stopReleaseNotesSpinner SPU_OBJC_DIRECT
|
||||
{
|
||||
[_releaseNotesSpinner stopAnimation:self];
|
||||
[_releaseNotesSpinner setHidden:YES];
|
||||
}
|
||||
|
||||
- (BOOL)showsReleaseNotes
|
||||
@@ -308,11 +324,10 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
}
|
||||
}
|
||||
|
||||
NSView *boxContentView = _releaseNotesBoxView.contentView;
|
||||
assert(_releaseNotesSpinner != nil);
|
||||
[boxContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
|
||||
[_releaseNotesContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
|
||||
|
||||
_releaseNotesView.view.frame = boxContentView.bounds;
|
||||
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
|
||||
_releaseNotesView.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
|
||||
|
||||
if (@available(macOS 10.14, *)) {
|
||||
@@ -320,16 +335,6 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
// This avoids a "white flash" that may be present when the webview initially loads in dark mode
|
||||
// This also is necessary for macOS 10.14, otherwise the background may stay white on 10.14 (but not in later OS's)
|
||||
[_releaseNotesView setDrawsBackground:NO];
|
||||
|
||||
// Use NSBox to get the proper dynamically colored background behind the release notes view when
|
||||
// the release notes view background is transparent
|
||||
_backgroundView = [[NSBox alloc] initWithFrame:_releaseNotesView.view.frame];
|
||||
_backgroundView.boxType = NSBoxCustom;
|
||||
_backgroundView.fillColor = [NSColor textBackgroundColor];
|
||||
_backgroundView.borderColor = [NSColor clearColor];
|
||||
// Using auto-resizing mask instead of constraints works well enough
|
||||
_backgroundView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
|
||||
[_releaseNotesView.view.superview addSubview:_backgroundView positioned:NSWindowBelow relativeTo:_releaseNotesView.view];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -337,16 +342,52 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
{
|
||||
NSWindow *window = self.window;
|
||||
|
||||
window.movableByWindowBackground = YES;
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
[_stackView setCustomSpacing:SUUpdateAlertGroupElementSpacing afterView:_titleView];
|
||||
|
||||
// Customize custom NSBox
|
||||
{
|
||||
CGFloat boxCornerRadius = 6.0;
|
||||
CGFloat boxBorderWidth = 1.0;
|
||||
|
||||
_releaseNotesBoxView.boxType = NSBoxCustom;
|
||||
_releaseNotesBoxView.cornerRadius = boxCornerRadius;
|
||||
if (@available(macOS 10.14, *)) {
|
||||
_releaseNotesBoxView.borderColor = NSColor.separatorColor;
|
||||
} else {
|
||||
_releaseNotesBoxView.borderColor = [NSColor colorWithCalibratedWhite:0.84 alpha:1.0];
|
||||
}
|
||||
_releaseNotesBoxView.borderWidth = boxBorderWidth;
|
||||
_releaseNotesBoxView.fillColor = NSColor.textBackgroundColor;
|
||||
|
||||
// Needed so we don't clip the corners if the CSS uses a custom background
|
||||
_releaseNotesBoxView.contentView.wantsLayer = YES;
|
||||
_releaseNotesBoxView.contentView.layer.masksToBounds = YES;
|
||||
_releaseNotesBoxView.contentView.layer.cornerRadius = boxCornerRadius - boxBorderWidth;
|
||||
}
|
||||
|
||||
if (@available(macOS 16, *)) {
|
||||
_skipButton.controlSize = NSControlSizeLarge;
|
||||
_laterButton.controlSize = NSControlSizeLarge;
|
||||
_installButton.controlSize = NSControlSizeLarge;
|
||||
}
|
||||
|
||||
BOOL showReleaseNotes = [self showsReleaseNotes];
|
||||
if (showReleaseNotes) {
|
||||
window.frameAutosaveName = @"SUUpdateAlert";
|
||||
window.frameAutosaveName = @"SUUpdateAlert2";
|
||||
} else {
|
||||
// Update alert should not be resizable when no release notes are available
|
||||
window.styleMask &= ~NSWindowStyleMaskResizable;
|
||||
}
|
||||
_windowLoadedAndShowsReleaseNotes = showReleaseNotes;
|
||||
|
||||
if (_updateItem.informationOnlyUpdate) {
|
||||
[_installButton setTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, SUSparkleBundle(), @"Alternate title for 'Install Update' button when there's no download in RSS feed.")];
|
||||
[_installButton setTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, sparkleBundle, @"Alternate title for 'Install Update' button when there's no download in RSS feed.")];
|
||||
[_installButton setAction:@selector(openInfoURL:)];
|
||||
}
|
||||
|
||||
@@ -354,41 +395,20 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
|
||||
|
||||
if (showReleaseNotes) {
|
||||
[self displayReleaseNotesSpinner];
|
||||
} else {
|
||||
// When automatic updates aren't allowed we won't show the automatic install updates button
|
||||
// This button is removed later below
|
||||
if (allowsAutomaticUpdates) {
|
||||
NSLayoutConstraint *automaticallyInstallUpdatesButtonToDescriptionFieldConstraint = [NSLayoutConstraint constraintWithItem:_automaticallyInstallUpdatesButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:8.0];
|
||||
|
||||
[window.contentView addConstraint:automaticallyInstallUpdatesButtonToDescriptionFieldConstraint];
|
||||
}
|
||||
|
||||
[_releaseNotesContainerView removeFromSuperview];
|
||||
// Add more spacing to give choices and automatic installs checkbox better grouping
|
||||
[_stackView setCustomSpacing:SUUpdateAlertGroupElementSpacing afterView:_releaseNotesBoxView];
|
||||
} else {
|
||||
_releaseNotesBoxView.hidden = YES;
|
||||
}
|
||||
|
||||
// NOTE: The code below for deciding what buttons to hide is complex! Due to array of feature configurations :)
|
||||
|
||||
// When we show release notes, it looks ugly if the install buttons are not closer to the release notes view
|
||||
// However when we don't show release notes, it looks ugly if the install buttons are too close to the description field. Shrugs.
|
||||
if (!allowsAutomaticUpdates) {
|
||||
if (showReleaseNotes) {
|
||||
// Fix constraints so that buttons aren't far away from web view when we hide the automatic updates check box
|
||||
NSLayoutConstraint *skipButtonToReleaseNotesContainerConstraint = [NSLayoutConstraint constraintWithItem:_skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_releaseNotesContainerView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:12.0];
|
||||
|
||||
[window.contentView addConstraint:skipButtonToReleaseNotesContainerConstraint];
|
||||
} else {
|
||||
NSLayoutConstraint *skipButtonToDescriptionConstraint = [NSLayoutConstraint constraintWithItem:_skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:20.0];
|
||||
|
||||
[window.contentView addConstraint:skipButtonToDescriptionConstraint];
|
||||
}
|
||||
[_automaticallyInstallUpdatesButton removeFromSuperview];
|
||||
_automaticallyInstallUpdatesButton.superview.hidden = YES;
|
||||
}
|
||||
|
||||
if (_state.stage == SPUUserUpdateStageInstalling) {
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
// We're going to be relaunching pretty instantaneously
|
||||
_installButton.title = SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
|
||||
|
||||
Vendored
+3
-1
@@ -23,8 +23,10 @@ SPU_OBJC_DIRECT_MEMBERS
|
||||
|
||||
- (instancetype)initWithDownloadPath:(NSString *)downloadPath signatures:(SUSignatures *)signatures host:(SUHost *)host verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation;
|
||||
|
||||
- (BOOL)validateHostHasPublicKeys:(NSError **)error;
|
||||
|
||||
// This is "pre" validation, before the archive has been extracted
|
||||
- (BOOL)validateDownloadPathWithError:(NSError **)error;
|
||||
- (BOOL)validateDownloadPathWithFallbackOnCodeSigning:(BOOL)fallbackOnCodeSigning error:(NSError **)error;
|
||||
|
||||
// This is "post" validation, after an archive has been extracted
|
||||
- (BOOL)validateWithUpdateDirectory:(NSString *)updateDirectory error:(NSError **)error;
|
||||
|
||||
Vendored
+192
-38
@@ -27,6 +27,7 @@
|
||||
SPUVerifierInformation *_verifierInformation;
|
||||
|
||||
BOOL _prevalidatedSignature;
|
||||
BOOL _validatedDownloadUsingCodeSigning;
|
||||
}
|
||||
|
||||
- (instancetype)initWithDownloadPath:(NSString *)downloadPath signatures:(SUSignatures *)signatures host:(SUHost *)host verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation
|
||||
@@ -41,25 +42,76 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)validateDownloadPathWithError:(NSError * __autoreleasing *)error
|
||||
- (BOOL)validateHostHasPublicKeys:(NSError * __autoreleasing *)error
|
||||
{
|
||||
SUPublicKeys *publicKeys = _host.publicKeys;
|
||||
|
||||
if (!publicKeys.hasAnyKeys) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to validate update before unarchiving because no (Ed)DSA public key was found in the old app" }];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)validateDownloadPathWithFallbackOnCodeSigning:(BOOL)fallbackOnCodeSigning error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
SUPublicKeys *publicKeys = _host.publicKeys;
|
||||
SUSignatures *signatures = _signatures;
|
||||
|
||||
if (!publicKeys.hasAnyKeys) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to validate update before unarchiving because no (Ed)DSA public key was found in the old app" }];
|
||||
}
|
||||
} else {
|
||||
NSError *innerError = nil;
|
||||
if ([SUSignatureVerifier validatePath:_downloadPath withSignatures:signatures withPublicKeys:publicKeys verifierInformation:_verifierInformation error:&innerError]) {
|
||||
NSError *dsaVerificationError = nil;
|
||||
if ([SUSignatureVerifier validatePath:_downloadPath withSignatures:signatures withPublicKeys:publicKeys verifierInformation:_verifierInformation error:&dsaVerificationError]) {
|
||||
_prevalidatedSignature = YES;
|
||||
return YES;
|
||||
}
|
||||
|
||||
NSMutableArray<NSError *> *underlyingErrors = [[NSMutableArray alloc] init];
|
||||
if (dsaVerificationError != nil) {
|
||||
[underlyingErrors addObject:dsaVerificationError];
|
||||
}
|
||||
|
||||
if (fallbackOnCodeSigning) {
|
||||
SULog(SULogLevelError, @"Failed to validate update archive with (Ed)DSA signing. Trying fallback with Apple Developer ID code signing verification: %@", dsaVerificationError);
|
||||
|
||||
// (Ed)DSA validation failed + signed archives are required + regular app update
|
||||
// As fallback for key rotation, check if the archive is Developer ID signed with a team ID that matches the host
|
||||
NSError *codeSignError = nil;
|
||||
NSURL *downloadURL = [NSURL fileURLWithPath:_downloadPath isDirectory:NO];
|
||||
|
||||
if (![SUCodeSigningVerifier codeSignatureIsValidAtDownloadURL:downloadURL andMatchesDeveloperIDTeamFromOldBundleURL:_host.bundle.bundleURL error:&codeSignError]) {
|
||||
SULog(SULogLevelError, @"Failed to validate update archive with Developer ID code signing fallback: %@", codeSignError);
|
||||
|
||||
if (codeSignError != nil) {
|
||||
[underlyingErrors addObject:codeSignError];
|
||||
}
|
||||
} else {
|
||||
_prevalidatedSignature = YES;
|
||||
_validatedDownloadUsingCodeSigning = YES;
|
||||
return YES;
|
||||
}
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"(Ed)DSA signature validation before unarchiving failed for update %@", _downloadPath], NSUnderlyingErrorKey: innerError }];
|
||||
}
|
||||
}
|
||||
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary<NSString *, id> *userInfo = [[NSMutableDictionary alloc] init];
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"(Ed)DSA signature validation before unarchiving failed for update %@", _downloadPath];
|
||||
|
||||
if (dsaVerificationError != nil) {
|
||||
// This is the primary error
|
||||
userInfo[NSUnderlyingErrorKey] = dsaVerificationError;
|
||||
}
|
||||
|
||||
if (underlyingErrors.count > 1) {
|
||||
if (@available(macOS 11.3, *)) {
|
||||
userInfo[NSMultipleUnderlyingErrorsKey] = [underlyingErrors copy];
|
||||
}
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
@@ -119,23 +171,130 @@
|
||||
#endif
|
||||
else
|
||||
{
|
||||
// Because we already validated the EdDSA signature, this is just a consistency check to see
|
||||
// if the developer signed their application properly with their Apple ID
|
||||
// Currently, this case only gets hit for binary delta updates
|
||||
// We already validated the download archive
|
||||
// Let's check if the update passes Sparkle's basic update policy and that the update is properly signed
|
||||
// Currently, this case gets hit for binary delta updates and updates requiring SUVerifyUpdateBeforeExtraction
|
||||
|
||||
NSError *innerError = nil;
|
||||
if ([SUCodeSigningVerifier bundleAtURLIsCodeSigned:installSourceURL] && ![SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:installSourceURL error:&innerError]) {
|
||||
NSBundle *newBundle = [NSBundle bundleWithURL:installSourceURL];
|
||||
SUHost *newHost = [[SUHost alloc] initWithBundle:newBundle];
|
||||
|
||||
SUPublicKeys *publicKeys = host.publicKeys;
|
||||
SUPublicKeys *newPublicKeys = newHost.publicKeys;
|
||||
|
||||
BOOL oldHasAnyDSAKey = NO;
|
||||
BOOL newHasAnyDSAKey = NO;
|
||||
BOOL hostIsCodeSigned = NO;
|
||||
BOOL updateIsCodeSigned = NO;
|
||||
|
||||
[self getHostIsCodeSigned:&hostIsCodeSigned updateIsCodeSigned:&updateIsCodeSigned hostHasAnyDSAKey:&oldHasAnyDSAKey updateHasAnyDSAKey:&newHasAnyDSAKey migratesDSAKeys:NULL hostPublicKeys:publicKeys updatePublicKeys:newPublicKeys hostBundleURL:host.bundle.bundleURL updateBundleURL:installSourceURL];
|
||||
|
||||
if (![self passesBasicUpdatePolicyWithHostIsCodeSigned:hostIsCodeSigned updateIsCodeSigned:updateIsCodeSigned hostHasAnyDSAKey:oldHasAnyDSAKey updateHasAnyDSAKey:newHasAnyDSAKey error:error]) {
|
||||
return NO;
|
||||
}
|
||||
|
||||
NSError *codeSigningInnerError = nil;
|
||||
if (updateIsCodeSigned && ![SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:installSourceURL error:&codeSigningInnerError]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to validate apple code sign signature on bundle after archive validation", NSUnderlyingErrorKey: innerError }];
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
|
||||
userInfo[NSLocalizedDescriptionKey] = @"The update archive is validly signed, but the app's Apple code signing signature is corrupted. The update will be rejected.";
|
||||
|
||||
if (codeSigningInnerError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = codeSigningInnerError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo];
|
||||
}
|
||||
|
||||
return NO;
|
||||
} else {
|
||||
return YES;
|
||||
}
|
||||
|
||||
if (_validatedDownloadUsingCodeSigning) {
|
||||
// Old EdDSA key failed on download archive, and Apple Code signing validation was used as a fallback (with SUVerifyUpdateBeforeExtraction set to YES),
|
||||
// which means the developer may be rotating keys.
|
||||
// So we must validate new EdDSA key with the new download.
|
||||
// This is a policy to ensure the next update can be updatable with the new EdDSA key (not a security measure).
|
||||
NSError *validateInnerError = nil;
|
||||
BOOL validationCheckSuccess = [SUSignatureVerifier validatePath:downloadPath withSignatures:signatures withPublicKeys:newPublicKeys verifierInformation:_verifierInformation error:&validateInnerError];
|
||||
if (!validationCheckSuccess) {
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
|
||||
userInfo[NSLocalizedDescriptionKey] = @"(Ed)DSA signature validation failed after using Apple code signing to validate the update archive. The update has a public (Ed)DSA key, but the public key shipped with the update doesn't match the signature. To prevent future problems, the update will be rejected.";
|
||||
|
||||
if (validateInnerError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = validateInnerError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)getHostIsCodeSigned:(BOOL *)outHostIsCodeSigned updateIsCodeSigned:(BOOL *)outUpdateIsCodeSigned hostHasAnyDSAKey:(BOOL *)outHostHasAnyDSAKey updateHasAnyDSAKey:(BOOL *)outUpdateHasAnyDSAKey migratesDSAKeys:(BOOL *)outMigratesDSAKeys hostPublicKeys:(SUPublicKeys *)hostPublicKeys updatePublicKeys:(SUPublicKeys *)updatePublicKeys hostBundleURL:(NSURL *)hostBundleURL updateBundleURL:(NSURL *)updateBundleURL SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL oldHasLegacyDSAKey = hostPublicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL oldHasEdDSAKey = hostPublicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL oldHasAnyDSAKey = oldHasLegacyDSAKey || oldHasEdDSAKey;
|
||||
if (outHostHasAnyDSAKey != NULL) {
|
||||
*outHostHasAnyDSAKey = oldHasAnyDSAKey;
|
||||
}
|
||||
|
||||
BOOL newHasLegacyDSAKey = updatePublicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL newHasEdDSAKey = updatePublicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL newHasAnyDSAKey = newHasLegacyDSAKey || newHasEdDSAKey;
|
||||
if (outUpdateHasAnyDSAKey != NULL) {
|
||||
*outUpdateHasAnyDSAKey = newHasAnyDSAKey;
|
||||
}
|
||||
|
||||
BOOL migratesDSAKeys = oldHasLegacyDSAKey && !oldHasEdDSAKey && newHasEdDSAKey && !newHasLegacyDSAKey;
|
||||
if (outMigratesDSAKeys != NULL) {
|
||||
*outMigratesDSAKeys = migratesDSAKeys;
|
||||
}
|
||||
|
||||
BOOL hostIsCodeSigned = [SUCodeSigningVerifier bundleAtURLIsCodeSigned:hostBundleURL];
|
||||
if (outHostIsCodeSigned != NULL) {
|
||||
*outHostIsCodeSigned = hostIsCodeSigned;
|
||||
}
|
||||
|
||||
BOOL updateIsCodeSigned = [SUCodeSigningVerifier bundleAtURLIsCodeSigned:updateBundleURL];
|
||||
if (outUpdateIsCodeSigned != NULL) {
|
||||
*outUpdateIsCodeSigned = updateIsCodeSigned;
|
||||
}
|
||||
}
|
||||
|
||||
// This is not essential for security, only a policy
|
||||
- (BOOL)passesBasicUpdatePolicyWithHostIsCodeSigned:(BOOL)hostIsCodeSigned updateIsCodeSigned:(BOOL)updateIsCodeSigned hostHasAnyDSAKey:(BOOL)hostHasAnyDSAKey updateHasAnyDSAKey:(BOOL)updateHasAnyDSAKey error:(NSError * __autoreleasing *)error SPU_OBJC_DIRECT
|
||||
{
|
||||
// Don't allow removal of (Ed)DSA keys
|
||||
if (hostHasAnyDSAKey && !updateHasAnyDSAKey) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"A public (Ed)DSA key was found in the old bundle but no public (Ed)DSA key was found in the new update. Sparkle only supports rotation, but not removal of (Ed)DSA keys. Please add an EdDSA key to the new app." }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
// Don't allow removal of code signing
|
||||
if (hostIsCodeSigned && !updateIsCodeSigned) {
|
||||
if (error != NULL) {
|
||||
if (hostHasAnyDSAKey) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"The old bundle is code signed but the update is not code signed. Sparkle only supports rotation, but not removal of Apple Code Signing identity. Please code sign the new app. If no Apple Code Signing certificate is available, adhoc signing can be used at minimum." }];
|
||||
} else {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"The old bundle is code signed but the update is not code signed. Please code sign the new app with the same signing identity." }];
|
||||
}
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the update is a bundle, then it must meet any one of:
|
||||
*
|
||||
@@ -161,21 +320,15 @@
|
||||
|
||||
_verifierInformation.actualVersion = newHost.version;
|
||||
|
||||
BOOL oldHasLegacyDSAKey = publicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL oldHasEdDSAKey = publicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL oldHasAnyDSAKey = oldHasLegacyDSAKey || oldHasEdDSAKey;
|
||||
BOOL newHasLegacyDSAKey = newPublicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL newHasEdDSAKey = newPublicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
|
||||
BOOL newHasAnyDSAKey = newHasLegacyDSAKey || newHasEdDSAKey;
|
||||
BOOL migratesDSAKeys = oldHasLegacyDSAKey && !oldHasEdDSAKey && newHasEdDSAKey && !newHasLegacyDSAKey;
|
||||
BOOL updateIsCodeSigned = [SUCodeSigningVerifier bundleAtURLIsCodeSigned:newHost.bundle.bundleURL];
|
||||
BOOL hostIsCodeSigned = [SUCodeSigningVerifier bundleAtURLIsCodeSigned:host.bundle.bundleURL];
|
||||
|
||||
// This is not essential for security, only a policy
|
||||
if (oldHasAnyDSAKey && !newHasAnyDSAKey) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"A public (Ed)DSA key was found in the old bundle but no public (Ed)DSA key was found in the new update. Sparkle only supports rotation, but not removal of (Ed)DSA keys. Please add an EdDSA key to the new app." }];
|
||||
}
|
||||
BOOL oldHasAnyDSAKey = NO;
|
||||
BOOL newHasAnyDSAKey = NO;
|
||||
BOOL migratesDSAKeys = NO;
|
||||
BOOL hostIsCodeSigned = NO;
|
||||
BOOL updateIsCodeSigned = NO;
|
||||
|
||||
[self getHostIsCodeSigned:&hostIsCodeSigned updateIsCodeSigned:&updateIsCodeSigned hostHasAnyDSAKey:&oldHasAnyDSAKey updateHasAnyDSAKey:&newHasAnyDSAKey migratesDSAKeys:&migratesDSAKeys hostPublicKeys:publicKeys updatePublicKeys:newPublicKeys hostBundleURL:host.bundle.bundleURL updateBundleURL:newHost.bundle.bundleURL];
|
||||
|
||||
if (![self passesBasicUpdatePolicyWithHostIsCodeSigned:hostIsCodeSigned updateIsCodeSigned:updateIsCodeSigned hostHasAnyDSAKey:oldHasAnyDSAKey updateHasAnyDSAKey:newHasAnyDSAKey error:error]) {
|
||||
return NO;
|
||||
}
|
||||
|
||||
@@ -193,10 +346,10 @@
|
||||
if (hostIsCodeSigned) {
|
||||
passedCodeSigning = [SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:newHost.bundle.bundleURL andMatchesSignatureAtBundleURL:host.bundle.bundleURL error:&codeSignedError];
|
||||
}
|
||||
// End of security-critical part
|
||||
|
||||
// If the new DSA key differs from the old, then this check is not a security measure, because the new key is not trusted.
|
||||
// In that case, the check ensures that the app author has correctly used DSA keys, so that the app will be updateable in the next version.
|
||||
|
||||
// If code signing passes, and the new DSA key differs from the old, the check ensures that the app author has correctly used DSA keys for the new update, so the app will be updateable in the next version.
|
||||
// Code signing passing ensures the new DSA key can also be trusted for validating the archive.
|
||||
// If code signing doesn't pass, DSA validation failing will be an error either way.
|
||||
if (!passedDSACheck && newHasAnyDSAKey) {
|
||||
NSError *innerError = nil;
|
||||
if (![SUSignatureVerifier validatePath:downloadedPath withSignatures:signatures withPublicKeys:newPublicKeys verifierInformation:_verifierInformation error:&innerError]) {
|
||||
@@ -206,6 +359,7 @@
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
// End of security-critical part
|
||||
|
||||
// If the new update is code signed but it's not validly code signed, we reject it
|
||||
NSError *innerError = nil;
|
||||
|
||||
Vendored
+4
-1
@@ -292,7 +292,7 @@ static NSMutableDictionary *sharedUpdaters = nil;
|
||||
- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)__unused updater
|
||||
{
|
||||
BOOL shouldPrompt = YES;
|
||||
if ([_delegate respondsToSelector:@selector(updater:didFinishLoadingAppcast:)]) {
|
||||
if ([_delegate respondsToSelector:@selector(updaterShouldPromptForPermissionToCheckForUpdates:)]) {
|
||||
shouldPrompt = [_delegate updaterShouldPromptForPermissionToCheckForUpdates:self];
|
||||
}
|
||||
return shouldPrompt;
|
||||
@@ -460,6 +460,8 @@ static NSMutableDictionary *sharedUpdaters = nil;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-implementations"
|
||||
- (id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)__unused updater
|
||||
{
|
||||
id<SUVersionComparison> versionComparator;
|
||||
@@ -468,6 +470,7 @@ static NSMutableDictionary *sharedUpdaters = nil;
|
||||
}
|
||||
return versionComparator;
|
||||
}
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
// Private SPUUpdater API that allows us to defer providing an application path to relaunch
|
||||
- (NSString * _Nullable)_pathToRelaunchForUpdater:(SPUUpdater *)__unused updater
|
||||
|
||||
Vendored
+4
-4
@@ -35,7 +35,7 @@
|
||||
BOOL _drawsWebViewBackground;
|
||||
}
|
||||
|
||||
static WKUserScript *_userScriptWithInjectedStyleSource(NSString *styleSource)
|
||||
static WKUserScript *makeUserScriptWithInjectedStyleSource(NSString *styleSource)
|
||||
{
|
||||
// We must remove newlines when inserting the style source in this interpolated string below
|
||||
NSString *strippedStyleSource = [styleSource stringByReplacingOccurrencesOfString:@"\n" withString:@""];
|
||||
@@ -53,7 +53,7 @@ static WKUserScript *_userScriptWithInjectedStyleSource(NSString *styleSource)
|
||||
return [[WKUserScript alloc] initWithSource:scriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
|
||||
}
|
||||
|
||||
static WKUserScript *_userScriptForExposingCurrentRelease(NSString *releaseString)
|
||||
static WKUserScript *makeUserScriptForExposingCurrentRelease(NSString *releaseString)
|
||||
{
|
||||
// Check that release string can be safely injected
|
||||
NSMutableCharacterSet *allowedCharacterSet = [NSMutableCharacterSet alphanumericCharacterSet];
|
||||
@@ -112,14 +112,14 @@ static WKUserScript *_userScriptForExposingCurrentRelease(NSString *releaseStrin
|
||||
// In fact, we must execute javascript to properly inject our default CSS style into the DOM
|
||||
// Legacy WebView has exposed methods for custom stylesheets and default fonts,
|
||||
// but WKWebView seems to forgo that type of API surface in favor of user scripts like this
|
||||
WKUserScript *userScriptWithInjectedStyleSource = _userScriptWithInjectedStyleSource(finalStyleContents);
|
||||
WKUserScript *userScriptWithInjectedStyleSource = makeUserScriptWithInjectedStyleSource(finalStyleContents);
|
||||
if (userScriptWithInjectedStyleSource == nil) {
|
||||
SULog(SULogLevelError, @"Failed to create script for injecting style");
|
||||
} else {
|
||||
[userContentController addUserScript:userScriptWithInjectedStyleSource];
|
||||
}
|
||||
|
||||
WKUserScript *userScriptForExposingCurrentRelease = _userScriptForExposingCurrentRelease(installedVersion);
|
||||
WKUserScript *userScriptForExposingCurrentRelease = makeUserScriptForExposingCurrentRelease(installedVersion);
|
||||
if (userScriptForExposingCurrentRelease == nil) {
|
||||
SULog(SULogLevelDefault, @"warning: Failed to create script for injecting version %@", installedVersion);
|
||||
} else {
|
||||
|
||||
Vendored
+38
@@ -0,0 +1,38 @@
|
||||
//
|
||||
// Sparkle.private.modulemap
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 4/30/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
framework module Sparkle_Private {
|
||||
// Nothing exported here
|
||||
}
|
||||
|
||||
explicit module Sparkle_Private.SPUStandardUserDriver {
|
||||
header "SPUStandardUserDriver+Private.h"
|
||||
export *
|
||||
}
|
||||
|
||||
explicit module Sparkle_Private.SPUGentleUserDriverReminders {
|
||||
header "SPUGentleUserDriverReminders.h"
|
||||
export *
|
||||
}
|
||||
|
||||
explicit module Sparkle_Private.SPUUserAgent {
|
||||
header "SPUUserAgent+Private.h"
|
||||
export *
|
||||
}
|
||||
|
||||
explicit module Sparkle_Private.SUAppcastItem {
|
||||
header "SUAppcastItem+Private.h"
|
||||
header "SPUAppcastItemStateResolver.h"
|
||||
export *
|
||||
}
|
||||
|
||||
explicit module Sparkle_Private.SUInstallerLauncher {
|
||||
header "SUInstallerLauncher+Private.h"
|
||||
header "SPUInstallationType.h"
|
||||
export *
|
||||
}
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "محدث البرنامج";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "تذكيري لاحقًا";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "معلومات عن الإصدار:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "تخطي هذا الإصدار";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "تذكيري لاحقًا";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "تثبيت التحديث";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "تخطي هذا الإصدار";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "تثبيت التحديث";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "تنزيل التحديثات وتثبيتها تلقائيًا في المستقبل";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "تنزيل التحديثات وتثبيتها تلقائيًا في المستقبل";
|
||||
Vendored
+3
@@ -54,3 +54,6 @@
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "انقل %1$@ إلى مجلد التطبيقات وأعد تشغيله من هناك ثم حاول مجددًا.";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "محدث البرنامج";
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Actualització del programari";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "Recorda-m'ho més tard";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Notes d'aquesta versió:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "Omet aquesta versió";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Recorda-m'ho més tard";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "Instal·la l'actualització";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Omet aquesta versió";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Instal·la l'actualització";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "Descarrega i instal·la les actualitzacions automàticament en el futur";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "Descarrega i instal·la les actualitzacions automàticament en el futur";
|
||||
Vendored
+4
-1
@@ -11,7 +11,7 @@
|
||||
"%@ of %@" = "%1$@ de %2$@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ no es pot actualitzar quan funciona des d'un disc d'imatge.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ no es pot actualitzar quan funciona des d'un disc d'imatge.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "Hi ha una nova versió de %@ disponible!";
|
||||
@@ -60,3 +60,6 @@
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "Ja esteu al dia!";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Actualització del programari";
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Aktualizace aplikace";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "Připomenout později";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Poznámky k vydání:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "Přeskočit tuto verzi";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Připomenout později";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "Instalovat aktualizaci";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Přeskočit tuto verzi";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Instalovat aktualizaci";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "V budoucnu stahovat a instalovat aktualizace automaticky";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "V budoucnu stahovat a instalovat aktualizace automaticky";
|
||||
Vendored
+3
-1
@@ -41,7 +41,7 @@
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "Aplikace %1$@ nemůže být aktualizována pokud je spuštěna z umístění, ve kterém je stažena.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Aplikace %1$@ nemůže být aktualizována, protože je spuštěna z dočasného umístění nebo z umístění, na které nelze zapisovat.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "Aplikace %1$@ nemůže být aktualizována, protože je spuštěna z dočasného umístění nebo z umístění, na které nelze zapisovat.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "Je dostupná nová verze aplikace %@!";
|
||||
@@ -151,3 +151,5 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "Vaše verze macOS je příliš stará";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Aktualizace aplikace";
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Software Update";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "Påmind mig senere";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Om denne udgivelse:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "Spring over";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Påmind mig senere";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "Installer";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Spring over";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Installer";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "Hent og installer opdateringer automatisk i fremtiden";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "Hent og installer opdateringer automatisk i fremtiden";
|
||||
Vendored
+4
-1
@@ -20,7 +20,7 @@
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er hentet og klar til brug! Vil du installere og genstarte %1$@ nu?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kan ikke opdateres når det køres fra en kun læsbar enhed.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ kan ikke opdateres når det køres fra en kun læsbar enhed.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "En ny version af %@ er tilgængelig!";
|
||||
@@ -84,3 +84,6 @@
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "Der er ingen opdateringer";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Software Update";
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Softwareupdate";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "Später erinnern";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Versionshinweise:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "Diese Version überspringen";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Später erinnern";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "Installieren";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Diese Version überspringen";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Installieren";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "Updates in Zukunft automatisch laden und installieren";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "Updates in Zukunft automatisch laden und installieren";
|
||||
Vendored
+55
-4
@@ -5,13 +5,13 @@
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ ist zurzeit die neueste verfügbare Version.\n(Die derzeit installierte Version ist %3$@.)";
|
||||
|
||||
/* Description text for SUUpdateAlert when the critical update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Dies ist ein wichtiges Update. Möchtest du die neue Version jetzt laden?";
|
||||
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Dies ist ein wichtiges Update. Möchtest du die neue Version jetzt laden?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du die neue Version jetzt laden?";
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du die neue Version jetzt laden?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update informational with no download. */
|
||||
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du mehr über dieses Update erfahren?";
|
||||
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du mehr über dieses Update erfahren?";
|
||||
|
||||
/* The download progress in a unit of bytes, e.g. 100 KB */
|
||||
"%@ downloaded" = "%@ geladen";
|
||||
@@ -41,7 +41,7 @@
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "„%1$@“ kann nicht aktualisiert werden, wenn das Programm von dem Ort ausgeführt wird, an den es heruntergeladen wurde.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kann nicht aktualisiert werden, da es aus dem Downloads-Order, oder von einer DMG-Datei oder einem Laufwerk ohne Schreibzugriff gestartet wurde.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ kann nicht aktualisiert werden, da es aus dem Downloads-Order, oder von einer DMG-Datei oder einem Laufwerk ohne Schreibzugriff gestartet wurde.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "Eine neue Version von %@ ist verfügbar!";
|
||||
@@ -76,6 +76,12 @@
|
||||
/* No comment provided by engineer. */
|
||||
"An important update to %@ is ready to install" = "Ein wichtiges Update von %@ steht zur Installation bereit";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Name" = "App-Name";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Version" = "App-Version";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Abbrechen";
|
||||
|
||||
@@ -85,6 +91,18 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Checking for updates…" = "Nach Updates suchen …";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU is 64-Bit?" = "CPU ist 64-Bit?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Speed (MHz)" = "CPU-Geschwindigkeit (MHz)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Subtype" = "CPU-Untertyp";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Type" = "CPU-Typ";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Downloading update…" = "Update laden …";
|
||||
|
||||
@@ -103,12 +121,33 @@
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "Update installieren …";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Interactive based packages cannot be installed as the root user." = "Interaktive Installationspakete können nicht als root-Benutzer installiert werden.";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
"Learn More…" = "Mehr über …";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Mac Model" = "Mac-Modell";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Memory (MB)" = "Speicher (MB)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"No" = "Nein";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Number of CPUs" = "Anzahl der CPUs";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OK" = "OK";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OS Version" = "OS-Version";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Preferred Language" = "Bevorzugte Sprache";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Beende „%1$@“, bewege es in den Ordner „Programme“, starte das Programm von dort erneut und versuche es noch einmal.";
|
||||
|
||||
@@ -118,6 +157,9 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Soll %1$@ automatisch nach Updates suchen? Du kannst im %1$@-Menü auch manuell nach Updates suchen.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The installation failed due to not having permission to write the new update." = "Die Installation ist fehlgeschlagen aufgrund fehlender Berechtigung zum Schreiben des neuen Updates.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "Das Aktualisierungsprogramm wurde nicht richtig gestartet. Du solltest den App-Entwickler kontaktieren, um diesen Fehler zu melden und zu prüfen, ob du die neueste Version hast.";
|
||||
|
||||
@@ -142,6 +184,12 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Version History" = "Versionsverlauf";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Yes" = "Ja";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Du musst möglicherweise %1$@ in den Systemeinstellungen unter „Datenschutz & Sicherheit“ und „App-Verwaltung“ hinzufügen, um künftige Updates zu installieren.";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "Du bist auf dem neuesten Stand!";
|
||||
|
||||
@@ -150,3 +198,6 @@
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "Deine Version von macOS ist zu alt";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Softwareupdate";
|
||||
+8
-14
@@ -1,17 +1,11 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Ενημέρωση προγράμματος";
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
|
||||
"G8s-oM-9gf.title" = "Υπενθύμιση Αργότερα";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Σημειώσεις Έκδοσης:";
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
|
||||
"kVE-pO-gl0.title" = "Παράλειψη Έκδοσης";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Υπενθύμιση Αργότερα";
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
|
||||
"IIY-s3-hkz.title" = "Εγκατάσταση Ενημέρωσης";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Παράλειψη Έκδοσης";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Εγκατάσταση Ενημέρωσης";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "Αυτόματη λήψη και εγκατάσταση ενημερώσεων στο μέλλον";
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
|
||||
"fPh-Q9-vLr.title" = "Αυτόματη λήψη και εγκατάσταση ενημερώσεων στο μέλλον";
|
||||
Loaded 100 of 185 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user