Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eef1a539a3 | ||
|
|
19041aaa4f | ||
|
|
c98fe67b3f | ||
|
|
89f135b438 | ||
|
|
3c28a554cd | ||
|
|
bb91fffa5d | ||
|
|
5f2b248e3e | ||
|
|
5fc946b35e | ||
|
|
39c97c96e6 | ||
|
|
c9afdf87a2 | ||
|
|
8ecff1d99c | ||
|
|
e0f80730c7 | ||
|
|
07c631ca99 | ||
|
|
4d95137122 | ||
|
|
164f2fd30f | ||
|
|
cb2c83e200 | ||
|
|
180b46555d | ||
|
|
91ac4bbe81 | ||
|
|
14d644c781 | ||
|
|
3ca274e711 | ||
|
|
b7b02e4929 | ||
|
|
3edaeee785 | ||
|
|
db50933867 | ||
|
|
8b73733ac2 | ||
|
|
dcfe48d282 | ||
|
|
57dc6e0138 | ||
|
|
cfa1190509 | ||
|
|
f6b2bf3814 | ||
|
|
59e2f8779d | ||
|
|
303db88948 | ||
|
|
c7f635dc24 | ||
|
|
4a84bf2108 | ||
|
|
63e2e40934 | ||
|
|
a741b7c539 | ||
|
|
4d19b90bd4 | ||
|
|
9c8b94c3cb | ||
|
|
e217de97a2 | ||
|
|
31b7654b5b | ||
|
|
d80452a6b4 | ||
|
|
d46d456107 | ||
|
|
00e7c24b6a | ||
|
|
e6a344a570 | ||
|
|
6276ba2b40 | ||
|
|
113279a21f | ||
|
|
7c4741d762 | ||
|
|
5df807d5ac | ||
|
|
c6ab245eba | ||
|
|
6e370a5ab8 | ||
|
|
cbdc150cfb | ||
|
|
fe7b718d07 | ||
|
|
d2b796bc3e | ||
|
|
2f33f56afb | ||
|
|
f27a02f068 | ||
|
|
1520cda1bd | ||
|
|
066e75a8b3 | ||
|
|
e97ba759e1 | ||
|
|
c625894761 | ||
|
|
c1dbf52970 | ||
|
|
cd20a12e92 | ||
|
|
59ff700f51 | ||
|
|
829fa4c38b | ||
|
|
ae10c16bbb | ||
|
|
a888daa6f5 | ||
|
|
61a100ab89 | ||
|
|
21d8df8044 | ||
|
|
cb33faafa2 | ||
|
|
79475ea34a | ||
|
|
aa42f7a020 | ||
|
|
a3f136022a | ||
|
|
192dce5f72 | ||
|
|
afea2cda87 | ||
|
|
99ace46e4a | ||
|
|
90eff791ec | ||
|
|
7ba3dedd6d | ||
|
|
7c460d70f6 | ||
|
|
596b6b031b | ||
|
|
480b895279 | ||
|
|
e641adb419 | ||
|
|
52e9c64b48 | ||
|
|
88a0edc38d | ||
|
|
787d844be3 | ||
|
|
6460d63f3e | ||
|
|
ca426e4b2d | ||
|
|
cb2dea4178 | ||
|
|
736b331dd6 | ||
|
|
d3ae95f76f | ||
|
|
b4f427b747 | ||
|
|
5e527f9a11 | ||
|
|
4cda0dc428 | ||
|
|
7761e65c78 | ||
|
|
2c60bb2825 | ||
|
|
f28aacfd89 | ||
|
|
04a15cbc28 | ||
|
|
0516f07b7c | ||
|
|
82d7da9326 | ||
|
|
5d9649e29b | ||
|
|
15f7dd5690 | ||
|
|
8c2ff583a0 | ||
|
|
8ed643c901 | ||
|
|
a5401bbf3f | ||
|
|
fc7350329e | ||
|
|
3dfee03f5c | ||
|
|
b83c87c033 | ||
|
|
d9180f7d7f | ||
|
|
9faabd7c69 | ||
|
|
ccd1e7a2be | ||
|
|
956385b5aa | ||
|
|
f80d06325c | ||
|
|
0843eee299 | ||
|
|
70b82ce304 | ||
|
|
ee39041587 | ||
|
|
c8cc30f0a7 | ||
|
|
557218237f | ||
|
|
927adb667f | ||
|
|
cbfa447282 | ||
|
|
687ef39706 | ||
|
|
2767b01d68 | ||
|
|
3c83ebb5cf | ||
|
|
68d664f13b | ||
|
|
6e065ba0ea | ||
|
|
b685fedc5c | ||
|
|
9a1d2a19d3 | ||
|
|
f800572421 | ||
|
|
f37e511c31 | ||
|
|
65898f2dc6 | ||
|
|
65bff871e2 | ||
|
|
488fd7d8bd | ||
|
|
86d11fd407 | ||
|
|
167db6f80c | ||
|
|
f1ecf8e445 | ||
|
|
ba41d1b7b1 | ||
|
|
f52d989151 | ||
|
|
ee00f4f63c | ||
|
|
4dac8e3ce8 | ||
|
|
4d7ad5613b | ||
|
|
366e8a0bf9 | ||
|
|
1603296a50 | ||
|
|
fa4176fdb6 | ||
|
|
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 |
No files matched your search
@@ -17,6 +17,8 @@ Please use Console.app and search for Sparkle.
|
||||
Please try troubleshooting steps:
|
||||
https://github.com/sparkle-project/Sparkle#troubleshooting
|
||||
|
||||
For security sensitive issues, please file them at https://github.com/sparkle-project/Sparkle/security
|
||||
|
||||
-->
|
||||
|
||||
## Summary
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
(Insert summary of your pull request here)
|
||||
(Insert summary of your pull request here. Major changes in functionality without prior discussion may be rejected.)
|
||||
|
||||
Fixes # (issue)
|
||||
|
||||
@@ -6,6 +6,7 @@ Fixes # (issue)
|
||||
|
||||
- [ ] My change requires a documentation update on [Sparkle's website repository](https://github.com/sparkle-project/sparkle-project.github.io)
|
||||
- [ ] My change requires changes to generate_appcast, generate_keys, or sign_update
|
||||
- [ ] My change was generated/assisted using AI and if so was reviewed by me in whole (explain in detail in the summary)
|
||||
|
||||
## Testing
|
||||
|
||||
|
||||
@@ -10,31 +10,40 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode: ['xcode16.1', 'xcode15.4']
|
||||
xcode: ['xcode26.6', 'xcode27.0']
|
||||
include:
|
||||
- xcode: 'xcode15.4'
|
||||
xcode-path: '/Applications/Xcode_15.4.app/Contents/Developer'
|
||||
- xcode: 'xcode27.0'
|
||||
xcode-path: '/Applications/Xcode_27.0.app/Contents/Developer'
|
||||
upload-dist: false
|
||||
run-analyzer: false
|
||||
macos: 'macos-14'
|
||||
- xcode: 'xcode16.1'
|
||||
xcode-path: '/Applications/Xcode_16.1.app'
|
||||
image: 'xcode-27'
|
||||
- xcode: 'xcode26.6'
|
||||
xcode-path: '/Applications/Xcode_26.6.app/Contents/Developer'
|
||||
upload-dist: true
|
||||
run-analyzer: true
|
||||
macos: 'macos-15'
|
||||
image: 'macos-26'
|
||||
|
||||
name: Build and Test Sparkle
|
||||
runs-on: ${{ matrix.macos }}
|
||||
runs-on: ${{ matrix.image }}
|
||||
|
||||
permissions:
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: true
|
||||
fetch-depth: 0
|
||||
- name: Check Installer Progress localizations are up to date
|
||||
if: ${{ matrix.upload-dist }}
|
||||
run: |
|
||||
python3 Configurations/generate_progress_tool_localizations.py
|
||||
if [ -n "$(git status --porcelain -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist)" ]; then
|
||||
echo "::error::Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h or InstallerProgress-Info.plist is out of date. Run Configurations/generate_progress_tool_localizations.py and commit the result."
|
||||
git diff -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist
|
||||
exit 1
|
||||
fi
|
||||
- name: Build Unit Tests
|
||||
env:
|
||||
DEVELOPER_DIR: ${{ matrix.xcode-path }}
|
||||
@@ -70,16 +79,20 @@ jobs:
|
||||
DEVELOPER_DIR: ${{ matrix.xcode-path }}
|
||||
run: |
|
||||
if grep -q "warning:" analyze_output.txt; then
|
||||
echo '::set-output name=analyzestatus::0'
|
||||
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' }}
|
||||
@@ -95,13 +108,15 @@ jobs:
|
||||
xcodebuild build -project Sparkle.xcodeproj -scheme Distribution -configuration Release -derivedDataPath build
|
||||
- name: Archive Test Results
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: build-logs
|
||||
path: build/Logs
|
||||
path: |
|
||||
build/Logs
|
||||
~/Library/Logs/DiagnosticReports
|
||||
- name: Upload Distribution
|
||||
if: ${{ success() && matrix.upload-dist }}
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Sparkle-distribution-${{ matrix.xcode }}.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_16.1.app/Contents/Developer"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_26.6.app/Contents/Developer"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
@@ -29,11 +29,11 @@ concurrency:
|
||||
jobs:
|
||||
release:
|
||||
name: "Publish binaries for release"
|
||||
runs-on: macos-15
|
||||
runs-on: macos-26
|
||||
|
||||
steps:
|
||||
- name: "Checkout sources"
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
token: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
|
||||
submodules: true
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
// Hardening but not critical for security
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
|
||||
@@ -97,6 +97,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
// Setting _performedStage1Installation on main thread must be synchronzied with reading it from new connection handler
|
||||
BOOL _performedStage1Installation;
|
||||
BOOL _receivedAppcastItemData;
|
||||
|
||||
BOOL _performedStage2Installation;
|
||||
BOOL _performedStage3Installation;
|
||||
@@ -142,12 +143,12 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
BOOL connectionCodeSigningValidationSkipped = NO;
|
||||
#endif
|
||||
|
||||
// It's safe to allow any connections once stage 1 installation is complete
|
||||
// It's safe to allow any connections once stage 1 installation is complete and appcast data has been received.
|
||||
// This is to allow general updaters to resume the installation.
|
||||
if (!_performedStage1Installation) {
|
||||
if (!_performedStage1Installation || !_receivedAppcastItemData) {
|
||||
BOOL passesValidation;
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
|
||||
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (status) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
passesValidation = YES;
|
||||
@@ -480,9 +481,21 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
return;
|
||||
}
|
||||
|
||||
// Try to resolve the download URL from symlinks
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
NSError *resolveError = nil;
|
||||
NSURL *resolvedDownloadURL = [fileManager resolveSymlinksInURL:downloadURL isDirectory:NO error:&resolveError];
|
||||
if (resolvedDownloadURL == nil) {
|
||||
SULogError(resolveError);
|
||||
|
||||
// Try to fallback onto regular downloadURL if resolving fails
|
||||
// Later file operations are performed safely even if the URL doesn't have symlinks resolved.
|
||||
resolvedDownloadURL = downloadURL;
|
||||
}
|
||||
|
||||
// Validate the download URL before moving it
|
||||
{
|
||||
NSArray<NSString *> *downloadURLPathComponents = downloadURL.URLByResolvingSymlinksInPath.pathComponents;
|
||||
NSArray<NSString *> *downloadURLPathComponents = resolvedDownloadURL.pathComponents;
|
||||
if (downloadURLPathComponents == nil) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to retrieve path components from download URL" }]];
|
||||
|
||||
@@ -545,12 +558,38 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
// 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
|
||||
|
||||
NSURL *downloadDestinationURL = [[NSURL fileURLWithPath:cacheInstallationPath] URLByAppendingPathComponent:downloadName];
|
||||
NSURL *cacheInstallationURL = [NSURL fileURLWithPath:cacheInstallationPath isDirectory:YES];
|
||||
|
||||
NSError *moveError = nil;
|
||||
if (![[[SUFileManager alloc] init] moveItemAtURL:downloadURL toURL:downloadDestinationURL error:&moveError]) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to move download archive to new location", NSUnderlyingErrorKey: moveError }]];
|
||||
return;
|
||||
NSError *resolvedCacheInstallationError = nil;
|
||||
NSURL *resolvedCacheInstallationURL = [fileManager resolveSymlinksInURL:cacheInstallationURL isDirectory:YES error:&resolvedCacheInstallationError];
|
||||
if (resolvedCacheInstallationURL == nil) {
|
||||
// Fallback to original cache installation URL if resolving fails
|
||||
SULogError(resolvedCacheInstallationError);
|
||||
resolvedCacheInstallationURL = cacheInstallationURL;
|
||||
}
|
||||
|
||||
NSURL *downloadDestinationURL = [resolvedCacheInstallationURL URLByAppendingPathComponent:downloadName isDirectory:NO];
|
||||
|
||||
BOOL fallbackToFileCopy;
|
||||
NSError *renameError = nil;
|
||||
if (![fileManager renameItemAtResolvedSymlinkURL:resolvedDownloadURL toResolvedSymlinkURL:downloadDestinationURL error:&renameError]) {
|
||||
SULog(SULogLevelError, @"Error: failed to rename '%@' to '%@'. Falling back to copy operation.", resolvedDownloadURL.path, downloadDestinationURL.path);
|
||||
|
||||
SULogError(renameError);
|
||||
|
||||
fallbackToFileCopy = YES;
|
||||
} else {
|
||||
fallbackToFileCopy = NO;
|
||||
}
|
||||
|
||||
if (fallbackToFileCopy) {
|
||||
// The client will be responsible for cleaning up the download.
|
||||
// We will not risk removing it here if rename failed. Copying the file is safer.
|
||||
NSError *copyError = nil;
|
||||
if (![fileManager copyItemAtURL:resolvedDownloadURL toURL:downloadDestinationURL error:©Error]) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to copy download archive to new location", NSUnderlyingErrorKey: copyError }]];
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Make sure the downloaded archive we moved over is a regular file and not a symbolic link placed by an attacker
|
||||
@@ -597,22 +636,28 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
[self extractAndInstallUpdate];
|
||||
});
|
||||
} else if (identifier == SPUSentUpdateAppcastItemData) {
|
||||
SUAppcastItem *updateItem = (data != nil) ? (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]) : nil;
|
||||
if (updateItem != nil) {
|
||||
SPUInstallationInfo *installationInfo = [[SPUInstallationInfo alloc] initWithAppcastItem:updateItem canSilentlyInstall:[_installer canInstallSilently]];
|
||||
os_unfair_lock_lock(&_newConnectionLock);
|
||||
if (!_receivedAppcastItemData) {
|
||||
_receivedAppcastItemData = YES;
|
||||
|
||||
NSData *archivedData = SPUArchiveRootObjectSecurely(installationInfo);
|
||||
if (archivedData != nil) {
|
||||
[_agentConnection.agent registerInstallationInfoData:archivedData];
|
||||
SUAppcastItem *updateItem = (data != nil) ? (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]) : nil;
|
||||
if (updateItem != nil) {
|
||||
SPUInstallationInfo *installationInfo = [[SPUInstallationInfo alloc] initWithAppcastItem:updateItem];
|
||||
|
||||
NSData *archivedData = SPUArchiveRootObjectSecurely(installationInfo);
|
||||
if (archivedData != nil) {
|
||||
[_agentConnection.agent registerInstallationInfoData:archivedData];
|
||||
}
|
||||
}
|
||||
}
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
} else if (identifier == SPUResumeInstallationToStage2 && data.length == sizeof(uint8_t) * 2) {
|
||||
// Because anyone can ask us to resume the installation, it may be wise to think about backwards compatibility here if IPC changes
|
||||
uint8_t relaunch = *((const uint8_t *)data.bytes);
|
||||
uint8_t showsUI = *((const uint8_t *)data.bytes + 1);
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
// This flag has an impact on interactive type installations and showing UI progress during non-interactive installations
|
||||
// This flag has an impact on showing UI progress during installations
|
||||
self->_shouldShowUI = (BOOL)showsUI;
|
||||
// Don't test if the application was alive initially, leave that to the progress agent if we decide to relaunch
|
||||
self->_shouldRelaunch = (BOOL)relaunch;
|
||||
@@ -679,8 +724,6 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
return;
|
||||
}
|
||||
|
||||
uint8_t canPerformSilentInstall = (uint8_t)[installer canInstallSilently];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self->_installer = installer;
|
||||
|
||||
@@ -688,9 +731,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
self->_performedStage1Installation = YES;
|
||||
os_unfair_lock_unlock(&self->_newConnectionLock);
|
||||
|
||||
uint8_t sendInformation[] = {canPerformSilentInstall, (uint8_t)self->_targetTerminated};
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
NSData *sendData = [NSData dataWithBytes:sendInformation length:sizeof(sendInformation)];
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage1 data:sendData];
|
||||
|
||||
@@ -705,37 +748,27 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
- (void)performStage2Installation SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL canPerformSecondStage = _shouldShowUI || [_installer canInstallSilently];
|
||||
if (canPerformSecondStage) {
|
||||
_performedStage2Installation = YES;
|
||||
_performedStage2Installation = YES;
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage2 data:sendData];
|
||||
|
||||
// Don't check if the target is already terminated, leave that to the progress agent
|
||||
// We could be slightly off if there were multiple instances running
|
||||
[self->_agentConnection.agent sendTerminationSignal];
|
||||
});
|
||||
} else {
|
||||
_installer = nil;
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage2 data:sendData];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to resume installer on stage 2 because installation cannot be installed silently" }]];
|
||||
});
|
||||
}
|
||||
// Don't check if the target is already terminated, leave that to the progress agent
|
||||
// We could be slightly off if there were multiple instances running
|
||||
[self->_agentConnection.agent sendTerminationSignal];
|
||||
});
|
||||
}
|
||||
|
||||
- (void)finishInstallationAfterHostTermination SPU_OBJC_DIRECT
|
||||
{
|
||||
assert(self->_targetTerminated);
|
||||
|
||||
// Show our installer progress UI tool if only after a certain amount of time passes,
|
||||
// and if our installer is silent (i.e, doesn't show progress on its own)
|
||||
// Show our installer progress UI tool if only after a certain amount of time passes
|
||||
__block BOOL shouldShowUIProgress = YES;
|
||||
if (self->_shouldShowUI && [self->_installer canInstallSilently]) {
|
||||
if (self->_shouldShowUI) {
|
||||
// Ask the updater if it is still alive
|
||||
// If they are, we will receive a pong response back
|
||||
// Reset if we received a pong just to be on the safe side
|
||||
|
||||
@@ -14,10 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SPUInstallationInfo : NSObject <NSSecureCoding>
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall;
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem;
|
||||
|
||||
@property (nonatomic, readonly) SUAppcastItem *appcastItem;
|
||||
@property (nonatomic, readonly) BOOL canSilentlyInstall;
|
||||
|
||||
@property (nonatomic) BOOL systemDomain;
|
||||
|
||||
|
||||
@@ -19,23 +19,21 @@ static NSString *SUSystemDomainKey = @"SUSystemDomain";
|
||||
@implementation SPUInstallationInfo
|
||||
|
||||
@synthesize appcastItem = _appcastItem;
|
||||
@synthesize canSilentlyInstall = _canSilentlyInstall;
|
||||
@synthesize systemDomain = _systemDomain;
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall systemDomain:(BOOL)systemDomain
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem systemDomain:(BOOL)systemDomain
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_appcastItem = appcastItem;
|
||||
_canSilentlyInstall = canSilentlyInstall;
|
||||
_systemDomain = systemDomain;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem
|
||||
{
|
||||
return [self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:NO];
|
||||
return [self initWithAppcastItem:appcastItem systemDomain:NO];
|
||||
}
|
||||
|
||||
- (nullable instancetype)initWithCoder:(NSCoder *)decoder
|
||||
@@ -45,16 +43,18 @@ static NSString *SUSystemDomainKey = @"SUSystemDomain";
|
||||
return nil;
|
||||
}
|
||||
|
||||
BOOL canSilentlyInstall = [decoder decodeBoolForKey:SUCanSilentlyInstallKey];
|
||||
BOOL systemDomain = [decoder decodeBoolForKey:SUSystemDomainKey];
|
||||
return [self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:systemDomain];
|
||||
return [self initWithAppcastItem:appcastItem systemDomain:systemDomain];
|
||||
}
|
||||
|
||||
- (void)encodeWithCoder:(NSCoder *)coder
|
||||
{
|
||||
[coder encodeObject:_appcastItem forKey:SUAppcastItemKey];
|
||||
[coder encodeBool:_canSilentlyInstall forKey:SUCanSilentlyInstallKey];
|
||||
[coder encodeBool:_systemDomain forKey:SUSystemDomainKey];
|
||||
|
||||
// Installation types can always be silently installed for newer versions of Sparkle
|
||||
// Still encode this key to maintain backwards compatibility with older Sparkle clients
|
||||
[coder encodeBool:YES forKey:SUCanSilentlyInstallKey];
|
||||
}
|
||||
|
||||
+ (BOOL)supportsSecureCoding
|
||||
|
||||
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP 4
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES 5
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG 6
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX 7
|
||||
|
||||
/*
|
||||
Modern container format for binary delta archives.
|
||||
|
||||
@@ -178,7 +178,7 @@ typedef struct
|
||||
FILE *file = _file;
|
||||
void *compressionBuffer = _compressionBuffer;
|
||||
|
||||
_compressionStream.dst_ptr = buffer;
|
||||
_compressionStream.dst_ptr = (uint8_t *)buffer;
|
||||
_compressionStream.dst_size = (size_t)length;
|
||||
|
||||
while (_compressionStream.dst_size > 0) {
|
||||
@@ -194,7 +194,7 @@ typedef struct
|
||||
}
|
||||
|
||||
// Reset source buffer
|
||||
_compressionStream.src_ptr = compressionBuffer;
|
||||
_compressionStream.src_ptr = (const uint8_t *)compressionBuffer;
|
||||
_compressionStream.src_size = bytesRead;
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
return nil;
|
||||
}
|
||||
|
||||
SPUDeltaCompressionMode compression = 0;
|
||||
SPUDeltaCompressionMode compression = SPUDeltaCompressionModeNone;
|
||||
if (fread(&compression, sizeof(compression), 1, file) < 1) {
|
||||
_error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to read compression value from patch file: %@", patchFile] }];
|
||||
return nil;
|
||||
@@ -379,7 +379,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
return @[];
|
||||
}
|
||||
|
||||
char *fileTableData = calloc(1, filePathSectionSize);
|
||||
char *fileTableData = (char *)calloc(1, filePathSectionSize);
|
||||
if (fileTableData == NULL) {
|
||||
_error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to calloc() %llu bytes for relative file paths.", filePathSectionSize] }];
|
||||
return nil;
|
||||
@@ -449,7 +449,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
{
|
||||
uint64_t currentItemIndex = 0;
|
||||
while (YES) {
|
||||
SPUDeltaItemCommands commands = 0;
|
||||
SPUDeltaItemCommands commands = (SPUDeltaItemCommands)0;
|
||||
if (![self _readBuffer:&commands length:sizeof(commands)]) {
|
||||
break;
|
||||
}
|
||||
@@ -458,7 +458,12 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
if (commands == SPUDeltaItemCommandEndMarker) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if (currentItemIndex >= relativeFilePaths.count) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Item index %llu is past relative path table bounds of length %lu", currentItemIndex, (unsigned long)relativeFilePaths.count] }];
|
||||
break;
|
||||
}
|
||||
|
||||
// Check if we need to decode additional data
|
||||
uint16_t decodedMode = 0;
|
||||
uint64_t decodedDataLength = 0;
|
||||
@@ -715,14 +720,14 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
case SPUDeltaCompressionModeLZFSE:
|
||||
case SPUDeltaCompressionModeLZ4:
|
||||
case SPUDeltaCompressionModeZLIB: {
|
||||
_compressionStream.src_ptr = buffer;
|
||||
_compressionStream.src_ptr = (const uint8_t *)buffer;
|
||||
_compressionStream.src_size = (size_t)length;
|
||||
|
||||
FILE *file = _file;
|
||||
void *compressionBuffer = _compressionBuffer;
|
||||
while (_compressionStream.src_size > 0) {
|
||||
// Reset destination buffer
|
||||
_compressionStream.dst_ptr = compressionBuffer;
|
||||
_compressionStream.dst_ptr = (uint8_t *)compressionBuffer;
|
||||
_compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
|
||||
|
||||
if (compression_stream_process(&_compressionStream, 0) == COMPRESSION_STATUS_ERROR) {
|
||||
@@ -1259,7 +1264,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
_compressionStream.src_size = 0;
|
||||
|
||||
while (_compressionStream.dst_size > 0) {
|
||||
_compressionStream.dst_ptr = compressionBuffer;
|
||||
_compressionStream.dst_ptr = (uint8_t *)compressionBuffer;
|
||||
_compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
|
||||
|
||||
compression_status status = compression_stream_process(&_compressionStream, COMPRESSION_STREAM_FINALIZE);
|
||||
|
||||
@@ -252,7 +252,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
|
||||
NSArray<NSString *> *subpathComponents = [relativePathComponents subarrayWithRange:NSMakeRange(0, componentIndex + 1)];
|
||||
NSString *subpathKey = [subpathComponents componentsJoinedByString:@"/"];
|
||||
|
||||
xar_file_t cachedFile = [fileTable[subpathKey] pointerValue];
|
||||
xar_file_t cachedFile = (xar_file_t)[fileTable[subpathKey] pointerValue];
|
||||
if (cachedFile != NULL) {
|
||||
lastParent = cachedFile;
|
||||
} else {
|
||||
@@ -349,7 +349,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
|
||||
continue;
|
||||
}
|
||||
|
||||
SPUDeltaItemCommands commands = 0;
|
||||
SPUDeltaItemCommands commands = (SPUDeltaItemCommands)0;
|
||||
{
|
||||
const char *value = NULL;
|
||||
if (xar_prop_get(file, DELETE_KEY, &value) == 0) {
|
||||
@@ -399,7 +399,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
|
||||
assert(item.itemFilePath != nil);
|
||||
assert(item.xarContext != NULL);
|
||||
|
||||
xar_file_t file = item.xarContext;
|
||||
xar_file_t file = (xar_file_t)item.xarContext;
|
||||
if (xar_extract_tofile(_x, file, item.itemFilePath.fileSystemRepresentation) != 0) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_EXTRACT_FAILURE userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to extract xar file entry to %@", item.itemFilePath] }];
|
||||
return NO;
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#import <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -41,7 +43,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
|
||||
progressCallback(0/7.0);
|
||||
|
||||
SUBinaryDeltaMajorVersion majorDiffVersion = header.majorVersion;
|
||||
SUBinaryDeltaMajorVersion majorDiffVersion = (SUBinaryDeltaMajorVersion)header.majorVersion;
|
||||
uint16_t minorDiffVersion = header.minorVersion;
|
||||
|
||||
unsigned char *expectedBeforeHash = header.beforeTreeHash;
|
||||
@@ -173,11 +175,12 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = nil;
|
||||
}
|
||||
|
||||
|
||||
[archive enumerateItems:^(SPUDeltaArchiveItem *item, BOOL *stop) {
|
||||
NSString *relativePath = item.relativeFilePath;
|
||||
|
||||
if ([relativePath.pathComponents containsObject:@".."]) {
|
||||
NSArray<NSString *> *relativePathComponents = relativePath.pathComponents;
|
||||
if ([relativePathComponents containsObject:@".."]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Relative path '%@' contains '..' path component", relativePath] }];
|
||||
}
|
||||
@@ -187,18 +190,40 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
|
||||
NSString *sourceFilePath = [source stringByAppendingPathComponent:relativePath];
|
||||
NSString *destinationFilePath = [destination stringByAppendingPathComponent:relativePath];
|
||||
|
||||
{
|
||||
NSString *destinationParentDirectory = destinationFilePath.stringByDeletingLastPathComponent;
|
||||
NSDictionary<NSFileAttributeKey, id> *destinationParentDirectoryAttributes = [fileManager attributesOfItemAtPath:destinationParentDirectory error:NULL];
|
||||
|
||||
// It is OK for the directory parent to not exist if it has already been removed
|
||||
if (destinationParentDirectoryAttributes != nil) {
|
||||
// But if it does exist, make sure the entry in the parent directory we're looking at is good
|
||||
// If it's inside a symlink, this is not good in any circumstance
|
||||
NSString *fileType = destinationParentDirectoryAttributes[NSFileType];
|
||||
if ([fileType isEqualToString:NSFileTypeSymbolicLink]) {
|
||||
// Walk each intermediate directory component of relativePath, excluding the last component, and verify none are symlinks.
|
||||
NSUInteger relativePathComponentCount = relativePathComponents.count;
|
||||
NSString *cumulativePath = destination;
|
||||
for (NSUInteger relativePathComponentIndex = 0; relativePathComponentIndex + 1 < relativePathComponentCount; relativePathComponentIndex++) {
|
||||
cumulativePath = [cumulativePath stringByAppendingPathComponent:relativePathComponents[relativePathComponentIndex]];
|
||||
|
||||
char cumulativePathBuffer[PATH_MAX + 1] = {0};
|
||||
if (![cumulativePath getFileSystemRepresentation:cumulativePathBuffer maxLength:PATH_MAX]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to create patch because '%@' cannot be a symbolic link.", destinationParentDirectory] }];
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to create patch because '%@' cannot be converted to file system path.", cumulativePath] }];
|
||||
}
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
|
||||
struct stat cumulativePathStat = {0};
|
||||
if (lstat(cumulativePathBuffer, &cumulativePathStat) != 0) {
|
||||
if (errno == ENOENT) {
|
||||
// Directory doesn't exist, so it can't be a symlink - safe to continue
|
||||
break;
|
||||
}
|
||||
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to create patch because failed to stat '%@' with error: %d", cumulativePath, errno] }];
|
||||
}
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
|
||||
if (S_ISLNK(cumulativePathStat.st_mode)) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to create patch because '%@' cannot contain a symbolic link in its intermediate path.", destinationFilePath.stringByDeletingLastPathComponent] }];
|
||||
}
|
||||
*stop = YES;
|
||||
return;
|
||||
@@ -206,8 +231,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
}
|
||||
|
||||
// Don't use -[NSFileManager fileExistsAtPath:] because it will follow symbolic links
|
||||
BOOL fileExisted = verbose && [fileManager attributesOfItemAtPath:destinationFilePath error:nil];
|
||||
BOOL fileExisted = verbose && fileExists(destinationFilePath);
|
||||
BOOL removedFile = NO;
|
||||
|
||||
// Files that have no property set that we check for will get ignored
|
||||
@@ -270,7 +294,9 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Unable to extract diffed file to %@", tempDiffFile], NSUnderlyingErrorKey: (NSError * _Nonnull)archive.error }];
|
||||
}
|
||||
|
||||
|
||||
unlink(tempDiffFile.fileSystemRepresentation);
|
||||
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
@@ -283,6 +309,9 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Relative path for clone '%@' contains '..' path component", clonedRelativePath] }];
|
||||
}
|
||||
|
||||
unlink(tempDiffFile.fileSystemRepresentation);
|
||||
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
@@ -297,8 +326,18 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
// applyBinaryDeltaToFile() normally preserves file permissions on the file it's replacing.
|
||||
// However this is not possible if the destination file we're patching is not writable.
|
||||
// We also need to preserve permissions for clones except when we'll be changing permissions later anyway.
|
||||
BOOL destinationFileIsWritable;
|
||||
{
|
||||
const char *destinationFileSystemRepresentation = destinationFilePath.fileSystemRepresentation;
|
||||
struct stat destinationFileInfo;
|
||||
destinationFileIsWritable =
|
||||
(lstat(destinationFileSystemRepresentation, &destinationFileInfo) == 0 &&
|
||||
!S_ISLNK(destinationFileInfo.st_mode) &&
|
||||
access(destinationFileSystemRepresentation, W_OK) == 0);
|
||||
|
||||
}
|
||||
BOOL needsToCopyFilePermissions;
|
||||
if (![fileManager isWritableFileAtPath:destinationFilePath]) {
|
||||
if (!destinationFileIsWritable) {
|
||||
// Remove the file non-writable we're patching that may cause issues
|
||||
[fileManager removeItemAtPath:destinationFilePath error:NULL];
|
||||
|
||||
@@ -417,10 +456,16 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
fprintf(stderr, "\nApplying file system compression...");
|
||||
}
|
||||
|
||||
NSTask *dittoTask = [[NSTask alloc] init];
|
||||
NSMutableArray<NSString *> *dittoArguments = [@[@"--hfsCompression"] mutableCopy];
|
||||
if (@available(macOS 27, *)) {
|
||||
// Compression won't be applied on macOS 27 without passing --noclone
|
||||
[dittoArguments addObject:@"--noclone"];
|
||||
}
|
||||
[dittoArguments addObjectsFromArray:@[destination, finalDestination]];
|
||||
|
||||
NSTask *dittoTask = [[NSTask alloc] init];
|
||||
dittoTask.executableURL = [NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO];
|
||||
dittoTask.arguments = @[@"--hfsCompression", destination, finalDestination];
|
||||
dittoTask.arguments = [dittoArguments copy];
|
||||
|
||||
// If we fail to apply file system compression, we will try falling back to not doing this
|
||||
BOOL failedToApplyFileSystemCompression = NO;
|
||||
@@ -444,7 +489,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
|
||||
if (failedToApplyFileSystemCompression) {
|
||||
// Try to replace bundle normally
|
||||
if (![fileManager replaceItemAtURL:[NSURL fileURLWithPath:finalDestination] withItemAtURL:[NSURL fileURLWithPath:destination isDirectory:YES] backupItemName:nil options:0 resultingItemURL:NULL error:error]) {
|
||||
if (![fileManager replaceItemAtURL:[NSURL fileURLWithPath:finalDestination] withItemAtURL:[NSURL fileURLWithPath:destination isDirectory:YES] backupItemName:nil options:(NSFileManagerItemReplacementOptions)0 resultingItemURL:NULL error:error]) {
|
||||
removeTree(destination);
|
||||
return NO;
|
||||
}
|
||||
@@ -454,6 +499,31 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
}
|
||||
|
||||
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
|
||||
// we should make sure mdimporter bundles have an up to date modification time in case they were delta updated.
|
||||
// We used to invoke mdimport on the bundle but this is not a very good approach.
|
||||
// Updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle.
|
||||
NSString *spotlightDirectory = [finalDestination stringByAppendingPathComponent:@"Contents/Library/Spotlight"];
|
||||
for (NSString *spotlightItem in [fileManager contentsOfDirectoryAtPath:spotlightDirectory error:NULL]) {
|
||||
if ([spotlightItem.pathExtension isEqualToString:@"mdimporter"]) {
|
||||
const char *mdimporterPath = [spotlightDirectory stringByAppendingPathComponent:spotlightItem].fileSystemRepresentation;
|
||||
|
||||
// Using O_SYMLINK so we touch the item itself rather than what it may point to
|
||||
int mdimporterFileDescriptor = open(mdimporterPath, O_RDONLY | O_SYMLINK);
|
||||
if (mdimporterFileDescriptor == -1) {
|
||||
fprintf(stderr, "\nWarning: failed to open file descriptor to touch %s: %s", mdimporterPath, strerror(errno));
|
||||
continue;
|
||||
}
|
||||
|
||||
// Using futimes() because utimes() follows symbolic links
|
||||
if (futimes(mdimporterFileDescriptor, NULL) != 0) {
|
||||
fprintf(stderr, "\nWarning: failed to touch %s: %s", mdimporterPath, strerror(errno));
|
||||
}
|
||||
|
||||
close(mdimporterFileDescriptor);
|
||||
}
|
||||
}
|
||||
|
||||
progressCallback(6/7.0);
|
||||
|
||||
if (verbose) {
|
||||
|
||||
@@ -70,12 +70,12 @@ 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);
|
||||
BOOL fileExists(NSString *path);
|
||||
extern BOOL removeTree(NSString *path);
|
||||
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);
|
||||
NSString *temporaryDirectory(NSString *base);
|
||||
NSString *stringWithFileSystemRepresentation(const char*);
|
||||
uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersion);
|
||||
#endif
|
||||
@@ -113,11 +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 0;
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -128,7 +128,7 @@ NSString *temporaryFilename(NSString *base)
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
|
||||
|
||||
char *buffer = data.mutableBytes;
|
||||
char *buffer = (char *)data.mutableBytes;
|
||||
int fd = mkstemp(buffer);
|
||||
if (fd == -1) {
|
||||
perror("mkstemp");
|
||||
@@ -143,22 +143,6 @@ NSString *temporaryFilename(NSString *base)
|
||||
return stringWithFileSystemRepresentation(buffer);
|
||||
}
|
||||
|
||||
NSString *temporaryDirectory(NSString *base)
|
||||
{
|
||||
NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.XXXXXXXXXX", base]];
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
|
||||
|
||||
char *buffer = data.mutableBytes;
|
||||
char *templateResult = mkdtemp(buffer);
|
||||
if (templateResult == NULL) {
|
||||
perror("mkdtemp");
|
||||
return nil;
|
||||
}
|
||||
|
||||
return stringWithFileSystemRepresentation(templateResult);
|
||||
}
|
||||
|
||||
static void sha1HashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
|
||||
{
|
||||
assert(bufferLength >= 0 && bufferLength <= UINT32_MAX);
|
||||
@@ -180,12 +164,12 @@ static BOOL crc32HashOfFileContents(uLong *outChecksum, FTSENT *ent, void *tempB
|
||||
return NO;
|
||||
}
|
||||
|
||||
checksum = crc32(checksum, (const void *)linkDestination, (unsigned int)linkDestinationLength);
|
||||
checksum = crc32(checksum, (const Bytef *)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));
|
||||
checksum = crc32(checksum, (const Bytef *)&encodedFileSize, sizeof(encodedFileSize));
|
||||
|
||||
if (fileSize > 0) {
|
||||
FILE *file = fopen(ent->fts_path, "rb");
|
||||
@@ -204,7 +188,7 @@ static BOOL crc32HashOfFileContents(uLong *outChecksum, FTSENT *ent, void *tempB
|
||||
return NO;
|
||||
}
|
||||
|
||||
checksum = crc32(checksum, tempBuffer, (uInt)bytesToConsume);
|
||||
checksum = crc32(checksum, (const Bytef *)tempBuffer, (uInt)bytesToConsume);
|
||||
|
||||
bytesLeft -= bytesToConsume;
|
||||
}
|
||||
@@ -337,7 +321,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
|
||||
|
||||
uint64_t encodedFileContentsChecksum = fileContentsChecksum;
|
||||
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&encodedFileContentsChecksum, sizeof(encodedFileContentsChecksum));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&encodedFileContentsChecksum, sizeof(encodedFileContentsChecksum));
|
||||
|
||||
if (ent->fts_info == FTS_F) {
|
||||
fileHashKey = [NSData dataWithBytes:&encodedFileContentsChecksum length:sizeof(encodedFileContentsChecksum)];
|
||||
@@ -378,7 +362,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
|
||||
const char *relativePathBytes = [relativePath fileSystemRepresentation];
|
||||
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)relativePathBytes, (uInt)strlen(relativePathBytes));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)relativePathBytes, (uInt)strlen(relativePathBytes));
|
||||
} else {
|
||||
CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes));
|
||||
}
|
||||
@@ -393,8 +377,8 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
|
||||
uint16_t hashedPermissions = (ent->fts_info == FTS_SL) ? VALID_SYMBOLIC_LINK_PERMISSIONS : permissions;
|
||||
|
||||
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&type, sizeof(type));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&hashedPermissions, sizeof(hashedPermissions));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&type, sizeof(type));
|
||||
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&hashedPermissions, sizeof(hashedPermissions));
|
||||
} else {
|
||||
CC_SHA1_Update(&hashContext, &type, sizeof(type));
|
||||
CC_SHA1_Update(&hashContext, &hashedPermissions, sizeof(hashedPermissions));
|
||||
@@ -410,7 +394,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
|
||||
memset(hashBuffer, 0, BINARY_DELTA_HASH_LENGTH);
|
||||
memcpy(hashBuffer, &encodedCrc32ChecksumValue, sizeof(encodedCrc32ChecksumValue));
|
||||
} else {
|
||||
CC_SHA1_Final(hashBuffer, &hashContext);
|
||||
CC_SHA1_Final((unsigned char *)hashBuffer, &hashContext);
|
||||
}
|
||||
|
||||
return YES;
|
||||
@@ -453,14 +437,20 @@ extern NSString *hashOfTree(NSString *path)
|
||||
return hashOfTreeWithVersion(path, SUBinaryDeltaMajorVersionLatest);
|
||||
}
|
||||
|
||||
BOOL fileExists(NSString *path)
|
||||
{
|
||||
// Don't use fileExistsForPath: because it will try to follow symbolic links
|
||||
struct stat fileInfo;
|
||||
return lstat(path.fileSystemRepresentation, &fileInfo) == 0;
|
||||
}
|
||||
|
||||
BOOL removeTree(NSString *path)
|
||||
{
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
// Don't use fileExistsForPath: because it will try to follow symbolic links
|
||||
if (![fileManager attributesOfItemAtPath:path error:nil]) {
|
||||
if (!fileExists(path)) {
|
||||
return YES;
|
||||
}
|
||||
return [fileManager removeItemAtPath:path error:nil];
|
||||
|
||||
return [NSFileManager.defaultManager removeItemAtPath:path error:nil];
|
||||
}
|
||||
|
||||
BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest)
|
||||
|
||||
@@ -81,6 +81,8 @@ extern int bsdiff(int argc, const char **argv);
|
||||
int result = bsdiff(4, argv);
|
||||
if (result == 0) {
|
||||
_resultPath = temporaryFile;
|
||||
} else {
|
||||
unlink(temporaryFile.fileSystemRepresentation);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +135,7 @@ static bool codeSignatureExtendedAttributeExists(const FTSENT *ent)
|
||||
return false;
|
||||
}
|
||||
|
||||
char *buffer = malloc((size_t)listSize);
|
||||
char *buffer = (char *)malloc((size_t)listSize);
|
||||
assert(buffer != NULL);
|
||||
|
||||
ssize_t sizeBack = listxattr(ent->fts_path, buffer, (size_t)listSize, options);
|
||||
@@ -345,7 +347,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;
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
#import "SUUnarchiverNotifier.h"
|
||||
#import "SUBinaryDeltaCommon.h"
|
||||
#import "SUBinaryDeltaApply.h"
|
||||
#import "SULog.h"
|
||||
#import "SUFileManager.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -33,45 +31,6 @@
|
||||
return YES;
|
||||
}
|
||||
|
||||
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
|
||||
// We should make sure mdimporter bundles have an up to date time in the event they were delta updated.
|
||||
// We used to invoke mdimport on the bundle but this is not a very good approach.
|
||||
// There's no need to do that for non-delta updates and for updates that contain no mdimporters.
|
||||
// Moreover, updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle
|
||||
// Note: this is used from unit tests
|
||||
+ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT
|
||||
#endif
|
||||
{
|
||||
NSURL *targetURL = [NSURL fileURLWithPath:targetPath];
|
||||
// Only recurse if it's actually a directory. Don't recurse into a
|
||||
// root-level symbolic link.
|
||||
NSDictionary *rootAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:targetPath error:nil];
|
||||
NSString *rootType = [rootAttributes objectForKey:NSFileType];
|
||||
|
||||
if ([rootType isEqualToString:NSFileTypeDirectory]) {
|
||||
// The NSDirectoryEnumerator will avoid recursing into any contained
|
||||
// symbolic links, so no further type checks are needed.
|
||||
NSDirectoryEnumerator *directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil];
|
||||
|
||||
NSMutableArray *filesToUpdate = [[NSMutableArray alloc] init];
|
||||
for (NSURL *file in directoryEnumerator) {
|
||||
if ([file.pathExtension isEqualToString:@"mdimporter"]) {
|
||||
[filesToUpdate addObject:file];
|
||||
}
|
||||
}
|
||||
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
for (NSURL *file in filesToUpdate) {
|
||||
NSError *error = nil;
|
||||
if (![fileManager updateModificationAndAccessTimeOfItemAtURL:file error:&error]) {
|
||||
SULog(SULogLevelError, @"Error: During delta unarchiving, failed to touch %@", error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory updateHostBundlePath:(NSString *)updateHostBundlePath
|
||||
{
|
||||
self = [super init];
|
||||
@@ -110,7 +69,6 @@ SPU_OBJC_DIRECT
|
||||
}, &applyDiffError);
|
||||
|
||||
if (success) {
|
||||
[SUBinaryDeltaUnarchiver updateSpotlightImportersAtBundlePath:targetPath];
|
||||
[notifier notifySuccess];
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -27,14 +27,6 @@ typedef NS_ENUM(NSUInteger, SUValidateConnectionStatus) {
|
||||
SUValidateConectionNoSupportedValidationMethodFailure,
|
||||
};
|
||||
|
||||
typedef NS_OPTIONS(NSUInteger, SUValidateConnectionOptions) {
|
||||
// Default validation behavior (matches against Team ID from main executable if available)
|
||||
SUValidateConnectionOptionDefault = 0,
|
||||
|
||||
// Require that the connecting client has the app sandbox entitlement
|
||||
SUValidateConnectionOptionRequireSandboxEntitlement = 1 << 0,
|
||||
};
|
||||
|
||||
SUCodeSigningVerifierDefinitionAttribute
|
||||
@interface SUCodeSigningVerifier : NSObject
|
||||
|
||||
@@ -52,7 +44,7 @@ SUCodeSigningVerifierDefinitionAttribute
|
||||
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url;
|
||||
+ (NSString * _Nullable)teamIdentifierFromMainExecutable;
|
||||
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error;
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -74,8 +74,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 = kSecCSCheckAllArchitectures;
|
||||
result = SecStaticCodeCheckValidityWithErrors(staticCode, flags, requirement, &cfError);
|
||||
result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSCheckAllArchitectures, requirement, &cfError);
|
||||
|
||||
if (result != errSecSuccess) {
|
||||
NSError *underlyingError;
|
||||
@@ -147,6 +146,8 @@ finally:
|
||||
OSStatus result;
|
||||
SecStaticCodeRef staticCode = NULL;
|
||||
CFErrorRef cfError = NULL;
|
||||
// See also code further below where kSecCSCheckNestedCode may be added
|
||||
SecCSFlags flags = kSecCSCheckAllArchitectures;
|
||||
|
||||
result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
|
||||
if (result != noErr) {
|
||||
@@ -160,7 +161,6 @@ finally:
|
||||
}
|
||||
|
||||
// See in -codeSignatureIsValidAtBundleURL:andMatchesSignatureAtBundleURL:error: for why kSecCSCheckNestedCode is not always passed
|
||||
SecCSFlags flags = kSecCSCheckAllArchitectures;
|
||||
if (checkNestedCode) {
|
||||
flags |= kSecCSCheckNestedCode;
|
||||
}
|
||||
@@ -330,6 +330,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
|
||||
OSStatus result;
|
||||
|
||||
NSError *resultError = nil;
|
||||
CFErrorRef cfError = NULL;
|
||||
|
||||
NSString *commonErrorMessage = @"The download archive cannot be validated with Apple Developer ID code signing as fallback (after (Ed)DSA verification has failed)";
|
||||
|
||||
@@ -379,9 +380,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
|
||||
goto finally;
|
||||
}
|
||||
|
||||
SecCSFlags flags = (SecCSFlags)kSecCSDefaultFlags;
|
||||
CFErrorRef cfError = NULL;
|
||||
result = SecStaticCodeCheckValidityWithErrors(downloadStaticCode, flags, requirement, &cfError);
|
||||
result = SecStaticCodeCheckValidityWithErrors(downloadStaticCode, kSecCSDefaultFlags, requirement, &cfError);
|
||||
if (result != errSecSuccess) {
|
||||
NSError *underlyingError;
|
||||
if (cfError != NULL) {
|
||||
@@ -443,30 +442,16 @@ finally:
|
||||
return (resultError == nil);
|
||||
}
|
||||
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
NSMutableArray<NSString *> *codeSigningRequirementComponents = [NSMutableArray array];
|
||||
|
||||
// Build the default team ID signing requirement
|
||||
// Check if code signing requirement is required
|
||||
NSString *hostTeamIdentifier = [self teamIdentifierFromMainExecutable];
|
||||
if (hostTeamIdentifier != nil) {
|
||||
NSString *teamIdentifierRequirement = [NSString stringWithFormat:@"(anchor apple generic and certificate leaf[subject.OU] = \"%@\")", hostTeamIdentifier];
|
||||
[codeSigningRequirementComponents addObject:teamIdentifierRequirement];
|
||||
}
|
||||
|
||||
// Build the sandboxing requirement
|
||||
if ((options & SUValidateConnectionOptionRequireSandboxEntitlement) != 0) {
|
||||
// This ensures the entitlement is set to true too
|
||||
NSString *sandboxingRequirement = @"(entitlement [\"com.apple.security.app-sandbox\"] exists)";
|
||||
[codeSigningRequirementComponents addObject:sandboxingRequirement];
|
||||
}
|
||||
|
||||
// Check if no requirement is required
|
||||
if (codeSigningRequirementComponents.count == 0) {
|
||||
if (hostTeamIdentifier == nil) {
|
||||
return SUValidateConnectionStatusSetNoRequirementSuccess;
|
||||
}
|
||||
|
||||
NSString *codeSigningRequirement = [codeSigningRequirementComponents componentsJoinedByString:@" and "];
|
||||
// Build the default team ID signing requirement
|
||||
NSString *codeSigningRequirement = [NSString stringWithFormat:@"(anchor apple generic and certificate leaf[subject.OU] = \"%@\")", hostTeamIdentifier];
|
||||
|
||||
if (@available(macOS 13.0, *)) {
|
||||
[connection setCodeSigningRequirement:codeSigningRequirement];
|
||||
@@ -486,7 +471,9 @@ finally:
|
||||
SecCodeRef code = NULL;
|
||||
OSStatus result = SecCodeCopyGuestWithAttributes(NULL, (__bridge CFDictionaryRef _Nullable)(attributes), kSecCSDefaultFlags, &code);
|
||||
if (result != errSecSuccess) {
|
||||
CFRelease(code);
|
||||
if (code != NULL) {
|
||||
CFRelease(code);
|
||||
}
|
||||
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because SecCodeCopyGuestWithAttributes() failed with error %d", result] }];
|
||||
|
||||
@@ -133,6 +133,8 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
|
||||
NSMutableArray<NSString *> *itemsToExtract = [NSMutableArray array];
|
||||
NSUInteger totalFileExtractionCount = 0;
|
||||
|
||||
BOOL success = YES;
|
||||
|
||||
{
|
||||
NSTask *task = [[NSTask alloc] init];
|
||||
task.launchPath = @"/usr/bin/hdiutil";
|
||||
@@ -163,21 +165,9 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
|
||||
goto reportError;
|
||||
}
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
|
||||
goto reportError;
|
||||
}
|
||||
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
|
||||
goto reportError;
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
@try {
|
||||
[inputPipe.fileHandleForWriting writeData:inputData];
|
||||
} @catch (NSException *) {
|
||||
goto reportError;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
[inputPipe.fileHandleForWriting closeFile];
|
||||
|
||||
@@ -269,7 +259,7 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
|
||||
[itemsToExtract addObject:item];
|
||||
}
|
||||
|
||||
_fileProgressIncrement = (0.99 - _currentExtractionProgress) / totalFileExtractionCount;
|
||||
_fileProgressIncrement = (0.99 - _currentExtractionProgress) / (double)totalFileExtractionCount;
|
||||
_notifier = notifier;
|
||||
|
||||
// Copy all items we want to extract and notify of progress
|
||||
@@ -286,7 +276,6 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
|
||||
|
||||
[notifier notifyProgress:1.0];
|
||||
|
||||
BOOL success = YES;
|
||||
goto finally;
|
||||
|
||||
reportError:
|
||||
|
||||
@@ -82,11 +82,6 @@
|
||||
{
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#import "SUInstaller.h"
|
||||
#import "SUPlainInstaller.h"
|
||||
#import "SUPackageInstaller.h"
|
||||
#import "SUGuidedPackageInstaller.h"
|
||||
#import "SUHost.h"
|
||||
#import "SUConstants.h"
|
||||
@@ -123,7 +122,7 @@
|
||||
|
||||
if (isPackage) {
|
||||
// Guided (or now "normal") installs used to be opt-in (i.e, Sparkle would detect foo.sparkle_guided.pkg or foo.sparkle_guided.mpkg),
|
||||
// but to get an interactive (or "unguided") install, the developer now must opt-out of guided installations.
|
||||
// Interactive installs are no longer supported, so isGuided = NO will later turn into an error
|
||||
|
||||
// foo.app -> foo.sparkle_interactive.pkg or foo.sparkle_interactive.mpkg
|
||||
if ([[[newAppDownloadPath stringByDeletingPathExtension] pathExtension] isEqualToString:@"sparkle_interactive"]) {
|
||||
@@ -261,12 +260,8 @@
|
||||
installer = [[SUGuidedPackageInstaller alloc] initWithPackagePath:newDownloadPath homeDirectory:homeDirectory userName:userName];
|
||||
}
|
||||
} else if (isPackage) {
|
||||
if (![expectedInstallationType isEqualToString:SPUInstallationTypeInteractivePackage]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Found package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeInteractivePackage] }];
|
||||
}
|
||||
} else {
|
||||
installer = [[SUPackageInstaller alloc] initWithPackagePath:newDownloadPath];
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Found interactive package installer (with 'sparkle_interactive' in the filename) but these are no longer supported. Please remove 'sparkle_interactive' from the filename." }];
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
|
||||
@@ -28,11 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
// Should be able to be called from any thread
|
||||
- (void)performCleanup;
|
||||
|
||||
// Indicates whether or not this installer can install the update silently in the background, without hindering the user
|
||||
// If this returns NO, then the installation can fail if the user did not directly request for the install to occur.
|
||||
// Should be thread safe
|
||||
- (BOOL)canInstallSilently;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,23 +0,0 @@
|
||||
//
|
||||
// SUPackageInstaller.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Andy Matuschak on 4/10/08.
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SUInstallerProtocol.h"
|
||||
|
||||
// This is the deprecated package installation type, aka the "interactive" package installer
|
||||
// For a more supported package installation, see SUGuidedPackageInstaller
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUPackageInstaller : NSObject <SUInstallerProtocol>
|
||||
|
||||
- (instancetype)initWithPackagePath:(NSString *)packagePath;
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -1,81 +0,0 @@
|
||||
//
|
||||
// SUPackageInstaller.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Andy Matuschak on 4/10/08.
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
#import "SUPackageInstaller.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SUErrors.h"
|
||||
#import "SULog.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@implementation SUPackageInstaller
|
||||
{
|
||||
NSString *_packagePath;
|
||||
}
|
||||
|
||||
static NSString *SUOpenUtilityPath = @"/usr/bin/open";
|
||||
|
||||
- (instancetype)initWithPackagePath:(NSString *)packagePath
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_packagePath = [packagePath copy];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)performInitialInstallation:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:SUOpenUtilityPath]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingInstallerToolError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find Apple's installer tool!" }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))__unused cb error:(NSError *__autoreleasing*)error
|
||||
{
|
||||
// Run installer using the "open" command to ensure it is launched in front of current application.
|
||||
// -W = wait until the app has quit.
|
||||
// -n = Open another instance if already open.
|
||||
// -b = app bundle identifier
|
||||
NSArray *args = @[@"-W", @"-n", @"-b", @"com.apple.installer", _packagePath];
|
||||
|
||||
// Known bug: if the installation fails or is canceled, Sparkle goes ahead and restarts, thinking everything is fine.
|
||||
@try {
|
||||
NSTask *installer = [NSTask launchedTaskWithLaunchPath:SUOpenUtilityPath arguments:args];
|
||||
[installer waitUntilExit];
|
||||
}
|
||||
@catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Error: Failed to launch package installer: %@", exception);
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Package installer failed to launch." }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (void)performCleanup
|
||||
{
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -41,25 +41,12 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
@".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,
|
||||
}];
|
||||
}
|
||||
NSArray <NSString *> *extractAppleArchive = @[@"/usr/bin/aa", @"extract", @"-d"];
|
||||
|
||||
[extractCommandDictionary addEntriesFromDictionary:@{
|
||||
@".aar" : extractAppleArchive,
|
||||
@".yaa" : extractAppleArchive,
|
||||
}];
|
||||
|
||||
NSString *lastPathComponent = [path lastPathComponent];
|
||||
for (NSString *currentType in extractCommandDictionary)
|
||||
@@ -234,38 +221,12 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
|
||||
NSFileHandle *archiveOutput = [pipe fileHandleForWriting];
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
BOOL hasIOErrorMethods;
|
||||
if (@available(macOS 10.15, *)) {
|
||||
hasIOErrorMethods = YES;
|
||||
} else {
|
||||
hasIOErrorMethods = NO;
|
||||
}
|
||||
#endif
|
||||
|
||||
do {
|
||||
NSData *data;
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
if (!hasIOErrorMethods) {
|
||||
@try {
|
||||
data = [archiveInput readDataOfLength:256*1024];
|
||||
} @catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with exception reason %@", exception.reason);
|
||||
data = nil;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
NSError *readError = nil;
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wpartial-availability"
|
||||
data = [archiveInput readDataUpToLength:256*1024 error:&readError];
|
||||
#pragma clang diagnostic pop
|
||||
if (data == nil) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
|
||||
underlyingOutError = readError;
|
||||
}
|
||||
NSError *readError = nil;
|
||||
NSData *data = [archiveInput readDataUpToLength:256*1024 error:&readError];
|
||||
if (data == nil) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
|
||||
underlyingOutError = readError;
|
||||
}
|
||||
|
||||
NSUInteger len = [data length];
|
||||
@@ -274,37 +235,13 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
}
|
||||
|
||||
NSError *writeError = nil;
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
if (!hasIOErrorMethods) {
|
||||
@try {
|
||||
[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;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wpartial-availability"
|
||||
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;
|
||||
}
|
||||
if (![archiveOutput writeData:data error:&writeError]) {
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
|
||||
|
||||
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
break;
|
||||
}
|
||||
|
||||
bytesWritten += len;
|
||||
@@ -313,31 +250,15 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
}
|
||||
while(bytesWritten < expectedLength);
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
NSError *archiveOutputCloseError = nil;
|
||||
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
|
||||
}
|
||||
NSError *archiveOutputCloseError = nil;
|
||||
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
[archiveOutput closeFile];
|
||||
}
|
||||
#endif
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
NSError *archiveInputCloseError = nil;
|
||||
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
|
||||
}
|
||||
NSError *archiveInputCloseError = nil;
|
||||
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
[archiveInput closeFile];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
[task waitUntilExit];
|
||||
|
||||
@@ -328,7 +328,7 @@
|
||||
|
||||
NSBundle *bundle = [NSBundle bundleWithPath:_bundlePath];
|
||||
SUHost *updateHost = [[SUHost alloc] initWithBundle:bundle];
|
||||
NSString *updateVersion = [updateHost objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey];
|
||||
NSString *updateVersion = [updateHost objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey ofClass:NSString.class];
|
||||
|
||||
id<SUVersionComparison> comparator = [[SUStandardVersionComparator alloc] init];
|
||||
if (!updateVersion || [comparator compareVersion:hostVersion toVersion:updateVersion] == NSOrderedDescending) {
|
||||
@@ -406,9 +406,4 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -22,16 +22,27 @@
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUSignatureVerifier : NSObject
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
#define SUSignatureVerifierDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
|
||||
#else
|
||||
#define SUSignatureVerifierDefinitionAttribute __attribute__((objc_runtime_name("SUTestSignatureVerifier")))
|
||||
#endif
|
||||
|
||||
SUSignatureVerifierDefinitionAttribute @interface SUSignatureVerifier : NSObject
|
||||
|
||||
// Helper for verifying downloaded updates
|
||||
+ (BOOL)validatePath:(NSString *)path withSignatures:(SUSignatures *)signatures withPublicKeys:(SUPublicKeys *)pkeys verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithPublicKeys:(SUPublicKeys *)pkeys;
|
||||
|
||||
// Used for verifying downloaded updates
|
||||
- (BOOL)verifyFileAtPath:(NSString *)path signatures:(SUSignatures *)signatures verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
// Used for verifying non-update data (like release notes)
|
||||
- (BOOL)verifyData:(NSData *)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -34,14 +34,6 @@
|
||||
+ (BOOL)validatePath:(NSString *)path withSignatures:(SUSignatures *)signatures withPublicKeys:(SUPublicKeys *)pkeys verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
SUSignatureVerifier *verifier = [(SUSignatureVerifier *)[self alloc] initWithPublicKeys:pkeys];
|
||||
|
||||
if (verifier == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to create SUSignatureVerifier instance" }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return [verifier verifyFileAtPath:path signatures:signatures verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
@@ -94,16 +86,45 @@
|
||||
|
||||
- (BOOL)verifyFileAtPath:(NSString *)path signatures:(SUSignatures *)signatures verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (!path || !path.length) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Path passed to verify has zero length and is not valid" }];
|
||||
// Data is used only in the case where ed25519 signature is present
|
||||
NSData *data;
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusPresent) {
|
||||
data = nil;
|
||||
} else {
|
||||
NSError *dataError = nil;
|
||||
data = [NSData dataWithContentsOfFile:path options:NSDataReadingMappedIfSafe error:&dataError];
|
||||
|
||||
if (data == nil || data.length == 0) {
|
||||
SULog(SULogLevelError, @"Failed to load file %@: %@", path, dataError);
|
||||
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"Failed to load file: %@", path];
|
||||
if (dataError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = dataError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return [self verifyData:data signatures:signatures fileKind:@"update" fromPath:path verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
- (BOOL)verifyData:(NSData *)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
return [self verifyData:data signatures:signatures fileKind:fileKind fromPath:nil verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
// Note the path must be provided for verifying update archives
|
||||
- (BOOL)verifyData:(NSData * _Nullable)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind fromPath:(NSString * _Nullable)path verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error SPU_OBJC_DIRECT
|
||||
{
|
||||
if (!signatures) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"No signatures given to verifyFileAtPath" }];
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"No signatures given to verify data for %@", fileKind] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
@@ -111,12 +132,12 @@
|
||||
switch (_pubKeys.ed25519PubKeyStatus) {
|
||||
case SUSigningInputStatusAbsent:
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
|
||||
SULog(SULogLevelDefault, @"The update has an EdDSA signature, but it won't be used, because the old app doesn't have an EdDSA public key");
|
||||
SULog(SULogLevelDefault, @"The %@ has an EdDSA signature, but it won't be used, because the old app doesn't have an EdDSA public key", fileKind);
|
||||
}
|
||||
break;
|
||||
case SUSigningInputStatusInvalid:
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
|
||||
NSString *message = @"The update has an EdDSA signature, but the app has an invalid EdDSA public key, so the update will automatically be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The %@ has an EdDSA signature, but the app has an invalid EdDSA public key, so the %@ will automatically be rejected.", fileKind, fileKind];
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
if (error != NULL) {
|
||||
@@ -125,12 +146,12 @@
|
||||
|
||||
return NO;
|
||||
}
|
||||
SULog(SULogLevelDefault, @"The app has an invalid EdDSA public key, but there is no EdDSA signature in the update. Falling back to DSA.");
|
||||
SULog(SULogLevelDefault, @"The app has an invalid EdDSA public key, but there is no EdDSA signature in the %@. Falling back to DSA.", fileKind);
|
||||
break;
|
||||
case SUSigningInputStatusPresent:
|
||||
switch (signatures.ed25519SignatureStatus) {
|
||||
case SUSigningInputStatusAbsent: {
|
||||
NSString *message = @"The app has an EdDSA public key, but there is no EdDSA signature in the update, so the update will be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The app has an EdDSA public key, but there is no EdDSA signature in the %@, so the %@ will be rejected.", fileKind, fileKind];
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
if (error != NULL) {
|
||||
@@ -140,7 +161,7 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusInvalid: {
|
||||
NSString *message = @"The update has an EdDSA signature, but it's invalid, so the update will automatically be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The %@ has an EdDSA signature, but it's invalid, so the %@ will automatically be rejected.", fileKind, fileKind];
|
||||
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
@@ -150,25 +171,9 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusPresent: {
|
||||
NSError *dataError = nil;
|
||||
NSData *data = [NSData dataWithContentsOfFile:path options:NSDataReadingMappedAlways error:&dataError];
|
||||
if (!data || !data.length) {
|
||||
SULog(SULogLevelError, @"Failed to load file %@: %@", path, dataError);
|
||||
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"Failed to load file: %@", path];
|
||||
if (dataError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = dataError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
if (ed25519_verify(signatures.ed25519Signature, data.bytes, data.length, _pubKeys.ed25519PubKey)) {
|
||||
SULog(SULogLevelDefault, @"OK: EdDSA signature is correct");
|
||||
assert(data != nil);
|
||||
if (ed25519_verify(signatures.ed25519Signature, (const unsigned char *)data.bytes, data.length, _pubKeys.ed25519PubKey)) {
|
||||
SULog(SULogLevelDefault, @"OK: EdDSA signature is correct for %@", fileKind);
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
// No need to check DSA when EdDSA verification succeeded, unless a DSA signature is provided and it's
|
||||
// erroneously invalid
|
||||
@@ -178,34 +183,38 @@
|
||||
return YES;
|
||||
}
|
||||
} else {
|
||||
NSMutableString *message = [NSMutableString stringWithString:@"EdDSA signature does not match. Data of the update file being checked is different than data that has been signed, or the public key and the private key are not from the same set."];
|
||||
NSMutableString *message = [NSMutableString stringWithFormat:@"EdDSA signature does not match. Data of the %@ being checked is different than data that has been signed, or the public key and the private key are not from the same set.", fileKind];
|
||||
|
||||
// Elaborate on the error message if we have more information about the download archive
|
||||
// If there is verifierInformation it must be for a downloaded update (rather than feed or release notes)
|
||||
if (verifierInformation != nil) {
|
||||
BOOL reportedDiscrepancy = NO;
|
||||
|
||||
NSString *downloadedFileDescription = (path != nil) ? [NSString stringWithFormat:@"%@ (%@)", fileKind, path.lastPathComponent] : fileKind;
|
||||
|
||||
if (verifierInformation.expectedContentLength > 0 && verifierInformation.actualContentLength > 0) {
|
||||
if (verifierInformation.expectedContentLength != verifierInformation.actualContentLength) {
|
||||
[message appendFormat:@" The downloaded update (%@) is likely different than the signed archive because the expected content length from the appcast item (%llu bytes) differs from the downloaded archive length (%llu bytes).", path.lastPathComponent, verifierInformation.expectedContentLength, verifierInformation.actualContentLength];
|
||||
[message appendFormat:@" The downloaded %@ is likely different than the signed file because the expected content length from the appcast item (%llu bytes) differs from the downloaded file length (%llu bytes).", downloadedFileDescription, verifierInformation.expectedContentLength, verifierInformation.actualContentLength];
|
||||
reportedDiscrepancy = YES;
|
||||
}
|
||||
}
|
||||
|
||||
NSString *actualVersion = verifierInformation.actualVersion;
|
||||
if (actualVersion != nil && ![verifierInformation.expectedVersion isEqualToString:actualVersion]) {
|
||||
[message appendFormat:@" The downloaded update (%@) also has a CFBundleVersion (%@) which differs from the %@ in the appcast item (%@).", path.lastPathComponent, actualVersion, SUAppcastAttributeVersion, verifierInformation.expectedVersion];
|
||||
[message appendFormat:@" The downloaded %@ also has a CFBundleVersion (%@) which differs from the %@ in the appcast item (%@).", downloadedFileDescription, actualVersion, SUAppcastAttributeVersion, verifierInformation.expectedVersion];
|
||||
reportedDiscrepancy = YES;
|
||||
}
|
||||
|
||||
if (!reportedDiscrepancy && verifierInformation.expectedContentLength > 0) {
|
||||
[message appendFormat:@" The downloaded update (%@) is likely not signed correctly because the archive has the expected content length (%llu bytes)%@ which matches the appcast item.", path.lastPathComponent, verifierInformation.actualContentLength, (actualVersion == nil ? @"" : [NSString stringWithFormat:@" and CFBundleVersion (%@)", actualVersion])];
|
||||
[message appendFormat:@" The downloaded %@ is likely not signed correctly because the file has the expected content length (%llu bytes)%@ which matches the appcast item.", downloadedFileDescription, verifierInformation.actualContentLength, (actualVersion == nil ? @"" : [NSString stringWithFormat:@" and CFBundleVersion (%@)", actualVersion])];
|
||||
}
|
||||
}
|
||||
|
||||
SULog(SULogLevelError, @"%@", [message copy]);
|
||||
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
// Legacy DSA verification is only applicable if archive file path is provided
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
SULog(SULogLevelDefault, @"DSA signature won't be checked, because EdDSA verification has already failed");
|
||||
}
|
||||
#endif
|
||||
@@ -222,14 +231,15 @@
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
// Legacy DSA verification is only for downloaded updates
|
||||
switch (_pubKeys.dsaPubKeyStatus) {
|
||||
case SUSigningInputStatusAbsent:
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
SULog(SULogLevelDefault, @"The update has a DSA signature, but it can't be used, because the old app doesn't have a DSA public key");
|
||||
}
|
||||
break;
|
||||
case SUSigningInputStatusInvalid:
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
// We will have already logged an error for this failure when the public key was read in, so just do an informational log here.
|
||||
NSString *message = @"The update has a DSA signature, but the app has an invalid DSA public key, so the update will automatically be rejected.";
|
||||
|
||||
@@ -260,7 +270,7 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusPresent: {
|
||||
NSInputStream *dataInputStream = [NSInputStream inputStreamWithFileAtPath:path];
|
||||
NSInputStream *dataInputStream = (path != nil) ? [NSInputStream inputStreamWithFileAtPath:(NSString * _Nonnull)path] : nil;
|
||||
return [self verifyDSASignatureOfStream:dataInputStream dsaSignature:signatures.dsaSignature error:error];
|
||||
}
|
||||
}
|
||||
@@ -283,7 +293,7 @@
|
||||
|
||||
if (error != NULL) {
|
||||
// Use generic failure
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"EdDSA and DSA verification for the update has failed" }];
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"EdDSA and DSA verification for the %@ has failed", fileKind] }];
|
||||
}
|
||||
|
||||
return NO;
|
||||
|
||||
@@ -1,3 +1,105 @@
|
||||
# 2.10.0
|
||||
|
||||
* Bump minimum deployment target to macOS 12.0 (#2883, #2892) (Zorg, F1248)
|
||||
* Don't copy updater progress tool app outside of its bundle (#2900) (Zorg)
|
||||
* Fix updating not working the first time if bundle ID ends with ".service" or other irregular bundle-like extensions (#2909) (Zorg, youngjunning)
|
||||
* Fix using appcast length fallback if server reports no content size (resulting in indeterminate progress) (#2922) (Zorg)
|
||||
* Fix reading release notes content length from appcast for signed feed diagnostics (#2921) (Leo Camus)
|
||||
* Update European Portuguese localization (#2912) (Andrei)
|
||||
* Fix temporary file leaks when applying binary delta file fails (#2906) (Zorg)
|
||||
* Optimize and move updating mdimporter bundles to BinaryDelta applying code (#2905) (Zorg)
|
||||
* Fix re-applying file system compression for delta updates on macOS 27 (#2904) (Zorg)
|
||||
* Remove CocoaPods support (#2899) (Zorg)
|
||||
|
||||
macOS 12.0 or later is now required (due to Xcode 27 dropping support for deploying to older OS versions). CocoaPods support is also now dropped.
|
||||
|
||||
If you're not generating appcasts automatically, remember to add `<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>` element to `<item>`s in your appcast.
|
||||
|
||||
# 2.9.6
|
||||
|
||||
* Harden safety of installer moving the download archive (#2898) (Zorg, Joshua Rogers)
|
||||
* Don't copy progress tool for root user (#2897) (Zorg, Joshua Rogers)
|
||||
* Reject package based installs when signing validation failed (#2895) (Zorg)
|
||||
|
||||
# 2.9.5
|
||||
|
||||
* Harden patching delta file against symbolic link at destination path (#2891) (Zorg, Arpit Jain)
|
||||
|
||||
# 2.9.4
|
||||
|
||||
* Fix backgrounded apps sometimes not bringing windows from user initiated actions in active focus (#2890) (Zorg, wojciech-kulik)
|
||||
|
||||
# 2.9.3
|
||||
|
||||
* Fix updating not working the first time if the app's bundle ID ends with ".app" (#2882) (Zorg)
|
||||
|
||||
# 2.9.2
|
||||
|
||||
* Show hidden window title in update window for accessibility (#2871) (Zorg)
|
||||
* Polish and update Spanish translations to be gender neutral (#2874, #2875) (Emilio P Egido)
|
||||
* Guard against NULL CFRelease() on failure condition in fallback path (#2867) (Zorg)
|
||||
* Guard against symlinks when applying delta update files (fe7b718) (Zorg, fg0x0)
|
||||
* Enforce connection to installer to be validated before receiving appcast item data (#2876, #2877) (Zorg, fg0x0)
|
||||
|
||||
# 2.9.1
|
||||
|
||||
* Fix potential crash due to race condition within clearDownloadedUpdate (#2863) (Julian Pscheid)
|
||||
* Fix generate_appcast failing if feed URL doesn't have lastPathComponent (#2862) (Julian Pscheid)
|
||||
* Don't let progress status text title string line wrap (#2856) (Zorg)
|
||||
* Add minimal framework support for building arm64e (#2858, #2860) (Zorg)
|
||||
* Add SKIP_INSTALL=YES to for XPCServices targets (#2864) (Jeremy Huddleston Sequoia)
|
||||
|
||||
# 2.9.0
|
||||
|
||||
* Add basic markdown support for release notes (requires macOS 12+) including [customizing its presentation](https://sparkle-project.org/documentation/publishing#adapting-markdown-or-plain-text-release-notes) (#2810, #2817) (Zorg)
|
||||
* Add support for [signing and verifying appcast feeds](https://sparkle-project.org/documentation#signing-feeds-optional) (#2822, #2828) (Zorg)
|
||||
* Add [sparkle:hardwareRequirements](https://sparkle-project.org/documentation/publishing#minimum-system-version-requirements) for enforcing an Apple silicon (arm64) requirement (#2797) (Zorg)
|
||||
* Add [sparkle:minimumUpdateVersion](https://sparkle-project.org/documentation/publishing/#upgrading-to-newer-features) for specifying a minimum version an app needs to be on before upgrading (#2811) (Zorg)
|
||||
* Add API annotations for Swift concurrency (#2827) (Zorg)
|
||||
* Validate Obj-C class when reading objects from user defaults / Info plists (#2782) (Zorg)
|
||||
* Download temporary files in-memory using NSURLSessionDataTask (#2825) (Zorg)
|
||||
* Allow [impatient update check interval](https://sparkle-project.org/documentation/customization/) to be configured for updates that are downloaded automatically (#2799) (Zorg)
|
||||
* Probe agent & status service as soon as we launch it to reduce timeout issues (#2852) (Zorg)
|
||||
* Add `allowsAutomaticUpdates` property to determine if automatic downloading/installing of updates option should be enabled (#2809) (Zorg)
|
||||
* Add Vietnamese translation (#2816, #2839) (TranPhuong319)
|
||||
* Add missing nn language to Installer progress Info.plist (#2818) (Zorg)
|
||||
* Improve German localization (#2847) (Marco Hillger)
|
||||
* Find non-canonical Sparkle.framework locations in generate_appcast when creating delta updates to determine compatibility (#2833) (Zorg)
|
||||
* Make Debug builds of Sparkle use same time interval settings as Release (#2805) (Zorg)
|
||||
* Remove sparkle-cli from the binary distribution (#2826) (Zorg)
|
||||
* Make generate_appcast deltas order stable and thread-safe (#2848) (Nathan Manceaux-Panot)
|
||||
* Fix Xcode 26.4 beta compiler warnings (#2850) (Zorg)
|
||||
|
||||
# 2.8.1
|
||||
|
||||
* Enforce RunAtLoad to reduce potential timeout issue when launching updater task (#2795) (Zorg)
|
||||
* Add missing executable bit permission warnings on connection failure (#2792) (Zorg)
|
||||
* Add missing localizations to zh-CN & zh-TW (#2789, #2791) (Francis Feng)
|
||||
* Add documentation note for delegates being weakly referenced (#2802) (Zorg)
|
||||
* Include app name in startUpdater: failure in SPUStandardUpdaterController (#2780) (Zorg)
|
||||
|
||||
# 2.8.0
|
||||
|
||||
* UI modernization and macOS Tahoe support
|
||||
* Modernize update alert and release notes UI (#2737) (Zorg, Noah Nuebling, Cykelero, Daniel Jalkut, Peter Nowell)
|
||||
* Update retrieving app icon to work better in Tahoe (#2742) (Zorg)
|
||||
* Improve retrieval of main app icon for authorization dialog (#2743) (Zorg)
|
||||
* Delta updates
|
||||
* Improve bsdiff performance by preventing excessive iterations when processing similar data blocks (#2693) (Will Fairclough)
|
||||
* Fix an issue while searching a cloneable file for delta updates (#2748, #2753) (Vincent Bénony, Zorg)
|
||||
* Add support for relative URLs for delta updates (#2741) (jj)
|
||||
* Localization
|
||||
* Set STRINGS_FILE_OUTPUT_ENCODING build setting to "binary" (#2712) (Nicolas Kick)
|
||||
* Move all localizations to main Sparkle.strings (#2760) (Zorg)
|
||||
* Synchronize updater settings with user defaults to fix out-of-sync UI state (#2728) (Zorg)
|
||||
* Document and better enforce main thread only requirement for using Sparkle methods (#2746, #2754, #2768)) (Sebastien Marchand, Zorg)
|
||||
* Make -[SPUUserDriver showUpdateInFocus] optional (#2717) (Zorg)
|
||||
* Add private module map for framework (#2722) (Zorg)
|
||||
* Workaround a corner case in which the bundle path of a running application contains Contents/MacOS/Executable (#2726, #2747) (Jeremy Huddleston Sequoia, Zorg)
|
||||
* Disable false dependency scan analysis warnings when building Sparkle from source (#2762) (Daniel Jalkut)
|
||||
* Refactor the logic for avoiding re-sending the system profile more frequently than once a week (#2720) (Daniel Jalkut)
|
||||
* Remove deprecated interactive package installer type (#2767) (Zorg)
|
||||
|
||||
# 2.7.3
|
||||
|
||||
* Double quote team identifiers in requirement strings to fix crash if Team ID starts with number (#2766) (Zorg)
|
||||
|
||||
@@ -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.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", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.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", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
|
||||
@@ -4,3 +4,4 @@
|
||||
|
||||
SWIFT_OBJC_BRIDGING_HEADER = $(PRODUCT_NAME)/Bridging-Header.h
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_EXTERNALLY=1
|
||||
ARCHS = $(ARCHS_COMMAND_LINE_TOOLS)
|
||||
@@ -46,11 +46,16 @@ SPARKLE_COPY_LOCALIZATIONS = 1
|
||||
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
|
||||
MACOSX_DEPLOYMENT_TARGET = 12.0
|
||||
|
||||
// Supported architectures
|
||||
// Archs to use for Sparkle
|
||||
// You can change this for example to add arm64e or remove x86_64
|
||||
ARCHS = $(ARCHS_STANDARD)
|
||||
|
||||
// Archs to use for command line tools (generate_appcast, sign_update, BinaryDelta, etc)
|
||||
// arm64e is not supported for these yet
|
||||
ARCHS_COMMAND_LINE_TOOLS = $(ARCHS_STANDARD)
|
||||
|
||||
// Default Sparkle names
|
||||
SPARKLE_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle
|
||||
SPARKLE_RELAUNCH_TOOL_NAME = Autoupdate
|
||||
@@ -93,13 +98,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 = 7
|
||||
SPARKLE_VERSION_PATCH = 3
|
||||
SPARKLE_VERSION_MINOR = 10
|
||||
SPARKLE_VERSION_PATCH = 0
|
||||
|
||||
// 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 = 2045.2
|
||||
CURRENT_PROJECT_VERSION = 2064
|
||||
|
||||
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
@@ -165,3 +170,6 @@ 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 -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
|
||||
|
||||
// Prevents spurious warnings based on dependency scan considering Sparkle itself a dependency
|
||||
DIAGNOSE_MISSING_TARGET_DEPENDENCIES = NO
|
||||
@@ -6,4 +6,5 @@ PRODUCT_BUNDLE_IDENTIFIER = ${DOWNLOADER_BUNDLE_ID}
|
||||
PRODUCT_NAME = ${DOWNLOADER_NAME}
|
||||
CODE_SIGN_ENTITLEMENTS = $(DOWNLOADER_SANDBOXED_ENTITLEMENTS)
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_SPARKLE_SOURCES_EXTERNALLY=1
|
||||
SKIP_INSTALL = YES
|
||||
CLANG_MODULES_AUTOLINK = NO
|
||||
@@ -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
|
||||
@@ -5,4 +5,5 @@ WRAPPER_EXTENSION = xpc
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${INSTALLER_CONNECTION_BUNDLE_ID}
|
||||
PRODUCT_NAME = ${INSTALLER_CONNECTION_NAME}
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_SPARKLE_SOURCES_EXTERNALLY=1
|
||||
SKIP_INSTALL = YES
|
||||
CLANG_MODULES_AUTOLINK = NO
|
||||
@@ -5,4 +5,5 @@ WRAPPER_EXTENSION = xpc
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${INSTALLER_LAUNCHER_BUNDLE_ID}
|
||||
PRODUCT_NAME = ${INSTALLER_LAUNCHER_NAME}
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_SPARKLE_SOURCES_EXTERNALLY=1
|
||||
SKIP_INSTALL = YES
|
||||
CLANG_MODULES_AUTOLINK = NO
|
||||
@@ -5,4 +5,5 @@ WRAPPER_EXTENSION = xpc
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${INSTALLER_STATUS_BUNDLE_ID}
|
||||
PRODUCT_NAME = ${INSTALLER_STATUS_NAME}
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_SPARKLE=0 BUILDING_SPARKLE_SOURCES_EXTERNALLY=1
|
||||
SKIP_INSTALL = YES
|
||||
CLANG_MODULES_AUTOLINK = NO
|
||||
@@ -12,3 +12,6 @@ ALWAYS_SEARCH_USER_PATHS = NO
|
||||
|
||||
// Disable Warnings - this is a third-party project, and we'll trust that the maintainers know what they're doing.
|
||||
WARNING_CFLAGS = $(inherited) -Wno-comma
|
||||
|
||||
// bsdiff is used by command line tools too
|
||||
ARCHS = $(inherited) $(ARCHS_COMMAND_LINE_TOOLS)
|
||||
@@ -15,3 +15,6 @@ WARNING_CFLAGS = $(inherited) -Wno-cast-qual -Wno-conversion -Wno-sign-conversio
|
||||
|
||||
// Disable dead stores analyzer warning
|
||||
CLANG_ANALYZER_DEADCODE_DEADSTORES = NO
|
||||
|
||||
// ed25519 is used by command line tools too
|
||||
ARCHS = $(inherited) $(ARCHS_COMMAND_LINE_TOOLS)
|
||||
@@ -7,6 +7,7 @@ import os, sys
|
||||
|
||||
hit_first_changelog_note = False
|
||||
with open("CHANGELOG", "r") as changelog_file:
|
||||
sys.stdout.write("Changes:\n\n")
|
||||
for line in changelog_file:
|
||||
if line.startswith("#"):
|
||||
if hit_first_changelog_note:
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# generate_progress_tool_localizations.py
|
||||
#
|
||||
# The Installer Progress helper is a minimal tool that minimizes loading resolve resources.
|
||||
# This script reads the localizations from Sparkle/*.lproj/Sparkle.strings
|
||||
# and generates a header with the handful of strings the tool needs.
|
||||
# It also keeps CFBundleLocalizations in InstallerProgress-Info.plist in sync
|
||||
# with the set of locales found.
|
||||
#
|
||||
# This script must be re-run by hand after changing any of the strings below in
|
||||
# Sparkle/*.lproj/Sparkle.strings, or after adding/removing a locale.
|
||||
# Output is deterministic between runs.
|
||||
|
||||
import glob
|
||||
import json
|
||||
import os
|
||||
import plistlib
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
REPO_ROOT = os.path.dirname(SCRIPT_DIR)
|
||||
SPARKLE_DIR = os.path.join(REPO_ROOT, "Sparkle")
|
||||
OUTPUT_HEADER = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "SPUInstallerProgressLocalizedStrings.h")
|
||||
INFO_PLIST = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "InstallerProgress-Info.plist")
|
||||
|
||||
# Fixed order so regenerating the header without content changes never reorders keys
|
||||
REQUIRED_KEYS = (
|
||||
"Cancel Update",
|
||||
"Installing update…",
|
||||
"Updating %@",
|
||||
)
|
||||
|
||||
# Base.lproj holds the canonical/development-language (English) strings, but "Base"
|
||||
# is not a real locale identifier for +[NSBundle preferredLocalizationsFromArray:]
|
||||
# to match against, so it's keyed as "en" in the generated table.
|
||||
LPROJ_LOCALE_OVERRIDES = {
|
||||
"Base": "en",
|
||||
}
|
||||
|
||||
|
||||
def load_strings(strings_path):
|
||||
result = subprocess.run(
|
||||
["plutil", "-convert", "json", "-o", "-", strings_path],
|
||||
capture_output=True,
|
||||
check=True,
|
||||
text=True,
|
||||
)
|
||||
return json.loads(result.stdout)
|
||||
|
||||
|
||||
def objc_string_literal(value):
|
||||
escaped = value.replace("\\", "\\\\").replace('"', '\\"')
|
||||
escaped = escaped.replace("\n", "\\n").replace("\t", "\\t")
|
||||
return '@"' + escaped + '"'
|
||||
|
||||
|
||||
def collect_localizations():
|
||||
localizations = {}
|
||||
|
||||
lproj_dirs = sorted(glob.glob(os.path.join(SPARKLE_DIR, "*.lproj")))
|
||||
for lproj_dir in lproj_dirs:
|
||||
lproj_name = os.path.basename(lproj_dir)[: -len(".lproj")]
|
||||
locale = LPROJ_LOCALE_OVERRIDES.get(lproj_name, lproj_name)
|
||||
|
||||
strings_path = os.path.join(lproj_dir, "Sparkle.strings")
|
||||
if not os.path.isfile(strings_path):
|
||||
continue
|
||||
|
||||
table = load_strings(strings_path)
|
||||
|
||||
localized_values = {}
|
||||
for key in REQUIRED_KEYS:
|
||||
value = table.get(key)
|
||||
if value is None:
|
||||
print("warning: %s.lproj/Sparkle.strings is missing key %r" % (lproj_name, key), file=sys.stderr)
|
||||
continue
|
||||
localized_values[key] = value
|
||||
|
||||
if localized_values:
|
||||
localizations[locale] = localized_values
|
||||
|
||||
return localizations
|
||||
|
||||
|
||||
def generate_header(localizations):
|
||||
lines = []
|
||||
lines.append("//")
|
||||
lines.append("// SPUInstallerProgressLocalizedStrings.h")
|
||||
lines.append("// Sparkle")
|
||||
lines.append("//")
|
||||
lines.append("// This file is auto-generated by Configurations/generate_progress_tool_localizations.py")
|
||||
lines.append("// Do not edit by hand. Re-run the script after changing the strings below in")
|
||||
lines.append("// Sparkle/*.lproj/Sparkle.strings")
|
||||
lines.append("//")
|
||||
lines.append("")
|
||||
lines.append("#import <Foundation/Foundation.h>")
|
||||
lines.append("")
|
||||
lines.append("static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{")
|
||||
for locale in sorted(localizations.keys()):
|
||||
lines.append(' @"%s": @{' % locale)
|
||||
for key in REQUIRED_KEYS:
|
||||
value = localizations[locale].get(key)
|
||||
if value is None:
|
||||
continue
|
||||
lines.append(" %s: %s," % (objc_string_literal(key), objc_string_literal(value)))
|
||||
lines.append(" },")
|
||||
lines.append("};")
|
||||
lines.append("")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def update_info_plist_localizations(locales):
|
||||
with open(INFO_PLIST, "rb") as f:
|
||||
plist = plistlib.load(f)
|
||||
|
||||
sorted_locales = sorted(locales)
|
||||
if plist.get("CFBundleLocalizations") == sorted_locales:
|
||||
print("%s is already up to date (%d locales)" % (INFO_PLIST, len(sorted_locales)))
|
||||
return
|
||||
|
||||
plist["CFBundleLocalizations"] = sorted_locales
|
||||
|
||||
# sort_keys=False preserves the existing top-level key order, so only
|
||||
# CFBundleLocalizations's contents change in the diff
|
||||
with open(INFO_PLIST, "wb") as f:
|
||||
plistlib.dump(plist, f, fmt=plistlib.FMT_XML, sort_keys=False)
|
||||
|
||||
print("Wrote %s (%d locales)" % (INFO_PLIST, len(sorted_locales)))
|
||||
|
||||
def update_header(localizations):
|
||||
header_contents = generate_header(localizations)
|
||||
|
||||
if os.path.isfile(OUTPUT_HEADER):
|
||||
with open(OUTPUT_HEADER, "r", encoding="utf-8") as f:
|
||||
if f.read() == header_contents:
|
||||
print("%s is already up to date (%d locales)" % (OUTPUT_HEADER, len(localizations)))
|
||||
return
|
||||
|
||||
with open(OUTPUT_HEADER, "w", encoding="utf-8") as f:
|
||||
f.write(header_contents)
|
||||
|
||||
print("Wrote %s (%d locales)" % (OUTPUT_HEADER, len(localizations)))
|
||||
|
||||
|
||||
def main():
|
||||
localizations = collect_localizations()
|
||||
update_header(localizations)
|
||||
update_info_plist_localizations(localizations.keys())
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -16,7 +16,6 @@ function verify_code_signatures() {
|
||||
find "${verification_directory}" -name "Sparkle.framework" -type d -exec codesign --verify -vvv --deep {} \;
|
||||
|
||||
if [ "$check_aux_apps" = true ] ; then
|
||||
codesign --verify -vvv --deep "${verification_directory}/sparkle.app"
|
||||
codesign --verify -vvv --deep "${verification_directory}/Sparkle Test App.app"
|
||||
fi
|
||||
codesign --verify -vvv --deep "${verification_directory}/bin/BinaryDelta"
|
||||
@@ -42,7 +41,6 @@ if [ "$ACTION" = "" ] ; then
|
||||
cp "$CONFIGURATION_BUILD_DIR/generate_keys" "$CONFIGURATION_BUILD_DIR/staging/bin"
|
||||
cp "$CONFIGURATION_BUILD_DIR/sign_update" "$CONFIGURATION_BUILD_DIR/staging/bin"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.xcframework" "$CONFIGURATION_BUILD_DIR/staging-spm"
|
||||
|
||||
@@ -61,8 +59,6 @@ if [ "$ACTION" = "" ] ; then
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Autoupdate.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
@@ -126,10 +122,9 @@ if [ "$ACTION" = "" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Generate new Package manifest, podspec, and carthage files
|
||||
# Generate new Package manifest and carthage files
|
||||
cd "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Package.swift" "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Sparkle.podspec" "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Carthage-dev.json" "$CONFIGURATION_BUILD_DIR"
|
||||
fi
|
||||
|
||||
@@ -145,14 +140,11 @@ if [ "$ACTION" = "" ] ; then
|
||||
echo "Version: $MARKETING_VERSION"
|
||||
echo "Tag: $latest_git_tag"
|
||||
echo "Checksum: $spm_checksum"
|
||||
|
||||
sed -E -i '' -e "/s\.version.+=/ s/\".+\"/\"$MARKETING_VERSION\"/" "Sparkle.podspec"
|
||||
|
||||
"$PROJECT_DIR/Configurations/update-carthage.py" "Carthage-dev.json" "$MARKETING_VERSION"
|
||||
cp "Sparkle.podspec" "$PROJECT_DIR"
|
||||
# Note the Carthage-dev.json file will finally be copied to the website repo in Carthage/Sparkle.json in the end
|
||||
cp "Carthage-dev.json" "$PROJECT_DIR"
|
||||
echo "Sparkle.podspec and Carthage-dev.json updated with following values:"
|
||||
echo "Carthage-dev.json is updated with following values:"
|
||||
echo "Version: $MARKETING_VERSION"
|
||||
else
|
||||
echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually."
|
||||
|
||||
@@ -13,10 +13,10 @@ function move_tag() {
|
||||
long_message=$(git tag -n99 -l $latest_git_tag) # gets corresponding message
|
||||
long_message=${long_message/$latest_git_tag} # trims tag name
|
||||
long_message="$(echo -e "${long_message}" | sed -e 's/^[[:space:]]*//')" # trim leading whitespace
|
||||
git add Package.swift Sparkle.podspec Carthage-dev.json
|
||||
git add Package.swift Carthage-dev.json
|
||||
git commit -m "Update Package management files for version ${latest_git_tag}"
|
||||
git tag -fa $latest_git_tag -m "${long_message}"
|
||||
echo "Package.swift and Sparkle.podspec committed and tag '$latest_git_tag' moved."
|
||||
echo "Package.swift is committed and tag '$latest_git_tag' moved."
|
||||
}
|
||||
|
||||
if [ "$commits_since_tag" -gt 0 ]; then
|
||||
@@ -27,11 +27,11 @@ elif [ "$CI" == true ]; then
|
||||
move_tag
|
||||
else
|
||||
# TODO: add sanity check to see if version is actually being updated or not?
|
||||
read -p "Do you want to commit changes to Package.swift, Sparkle.podspec, Carthage-dev.json and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
|
||||
read -p "Do you want to commit changes to Package.swift, Carthage-dev.json, and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
|
||||
echo # (optional) move to a new line
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
move_tag
|
||||
else
|
||||
echo "Package.swift, Sparkle.podspec, and Carthage-dev.json have not been committed and tag has not been moved."
|
||||
echo "Package.swift and Carthage-dev.json have not been committed and tag has not been moved."
|
||||
fi
|
||||
fi
|
||||
@@ -19,7 +19,6 @@ The launcher then looks for the installer and agent application. If we are insid
|
||||
|
||||
The installer is first submitted. If it requires root privileges, it will ask for an admin user name and password. How it determines if root privileges are necessary is based on:
|
||||
|
||||
* If the installation type from the appcast is an interactive package based installer, then no root privileges are necessary because the package installer will ask for them. Note this type of installation is deprecated however.
|
||||
* If the installation type from the appcast is a guided or regular package based installer, then root privileges are necessary because the system installer utility has to run as root.
|
||||
* Otherwise the installation type is a normal application update, and root privileges are only needed if write permission or changing the owner is currently insufficient.
|
||||
|
||||
@@ -69,17 +68,16 @@ When the installer gets the process identifier, it begins the installation. At t
|
||||
|
||||
### Starting the Installation
|
||||
|
||||
The installer figures out what kind of installer to use (regular, guided pkg, interactive pkg) based on the type of file inside the archive. If the type of file doesn't match the expected installation type from the input installation data, then the installer aborts causing the updater to abort as well.
|
||||
The installer figures out what kind of installer to use (regular, guided pkg) based on the type of file inside the archive. If the type of file doesn't match the expected installation type from the input installation data, then the installer aborts causing the updater to abort as well.
|
||||
|
||||
Once the type of installer is found, the first stage of installation is performed:
|
||||
|
||||
* Regular application installer 1st stage: Makes sure this update is not a downgrade and do all initial installation work if possible (such as clearing quarantine, changing owner/group, updating modification date, invoking GateKeeper scan). This initial work is not done if the bundle has to transfer to another volume; in this case, this work will be done in a later stage.
|
||||
* Guided Package installer 1st stage: Does nothing.
|
||||
* Interactive Package installer (deprecated) 1st stage: Makes sure /usr/bin/open utility is available.
|
||||
|
||||
If the first stage fails, the installer aborts causing the updater to abort the update.
|
||||
|
||||
Otherwise a `SPUInstallationFinishedStage1` message is sent back to the updater along with some data. This data includes whether the application bundle to relaunch is currently terminated, and whether the installation at later stages can be performed silently (that is, with no user interaction allowed). If we reach here, only the interactive package installer can't be performed silently.
|
||||
Otherwise a `SPUInstallationFinishedStage1` message is sent back to the updater along with some data. This data includes whether the application bundle to relaunch is currently terminated, and whether the installation at later stages can be performed silently (that is, with no user interaction allowed). If we reach here, only the interactive package installer can't be performed silently (however interactive pkg installer is no longer supported).
|
||||
|
||||
The installer then listens and waits for the target application to relaunch terminates. If it is already terminated, then it resumes to stage 2 and 3 of the installation immediately on the assumption that the installer does not have permission to show UI interaction to the user. Thus if the installer has to show user interaction here and hasn't received an OK from the updater (it won't if the target application is already terminated), the install will fail. If the target is already terminated, the installer will also assume that the target should not be relaunched after installation.
|
||||
|
||||
@@ -99,7 +97,7 @@ Afterwards the resumed update driver then allows the user driver to decide wheth
|
||||
### Continue to Installation
|
||||
If the user driver decides to install the update, it sends a `SPUResumeInstallationToStage2` message to the installer and supplies whether the update should be relaunched, and whether user interface can be displayed. The user driver specifies that the user interface can be displayed as long as the updater delegate allows interaction. If the updater's delegate handles immediate installation in the automatic based update driver, UI cannot be displayed there too.
|
||||
|
||||
The installer receives `SPUResumeInstallationToStage2` and reads whether it should relaunch the target application and whether it can show UI (thus be allowed to show user interaction). The installer then resumes to stage 2 of the installation if it has not been performed already (that is if the target app already terminated). Note if the installer doesn't receive this message before the target application terminates, then the installer will not relaunch or show UI and resume stage 2 & 3 by itself. Again not displaying UI is only an issue for interactive based package installers which are deprecated.
|
||||
The installer receives `SPUResumeInstallationToStage2` and reads whether it should relaunch the target application and whether it can show UI (thus be allowed to show user interaction). The installer then resumes to stage 2 of the installation if it has not been performed already (that is if the target app already terminated). Note if the installer doesn't receive this message before the target application terminates, then the installer will not relaunch or show UI and resume stage 2 & 3 by itself. Again not displaying UI is only an issue for interactive based package installers which are no longer supported.
|
||||
|
||||
If the 2nd stage succeeds, the installer sends a `SPUInstallationFinishedStage2` message back to the updater, including if the target application has already terminated at this time. If the target application has not already been terminated, the installer sends a request to the progress agent to *terminate* the application. By *terminate*, we mean sending an Apple quit event, allowing the application or user to possibly cancel or delay termination.
|
||||
|
||||
@@ -109,7 +107,7 @@ In the case termination of the application is delayed or canceled, the user driv
|
||||
|
||||
### Showing Progress
|
||||
|
||||
When the target application is terminated, if the updater allowed the installer to show UI progress and the installation type doesn't show progress on its own (only interactive package installer shows progress on its own), then the installer sends a `SPUUpdaterAlivePing` message to the updater. If the updater is still alive by now and receives the message, the updater will then send back a `SPUUpdaterAlivePong` message. This lets the installer know that the updater is still active after the target application is terminated, and whether the installer should later be responsible for displaying updater progress or not if a short time passes by, and the installation is still not finished. If the updater is still not alive, then the installer should be responsible for showing progress if otherwise allowed.
|
||||
When the target application is terminated, if the updater allowed the installer to show UI progress and the installation type doesn't show progress on its own (only interactive package installer shows progress on its own, but these are no longer supported), then the installer sends a `SPUUpdaterAlivePing` message to the updater. If the updater is still alive by now and receives the message, the updater will then send back a `SPUUpdaterAlivePong` message. This lets the installer know that the updater is still active after the target application is terminated, and whether the installer should later be responsible for displaying updater progress or not if a short time passes by, and the installation is still not finished. If the updater is still not alive, then the installer should be responsible for showing progress if otherwise allowed.
|
||||
|
||||
If the installer decides to show progress, it sends a message to the progress agent to show progress UI. Under most circumstances, the installation will finish faster than this point is reached however (exceptions may be guided package installers and updates over a remote network mount). If the connection to the updater is still connected after this short time passes (eg: like with sparkle-cli), then it's the updater's job to show progress instead.
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@ Sparkle 2.0 puts a huge emphasis on splitting Sparkle into several components to
|
||||
* Progress Agent (Application; AppKit permitted)
|
||||
* Installer (Agent and Daemon safe)
|
||||
|
||||
These achieve privilege separation, because at least theoretically, they can all be placed into different processes from one another, although in practice the user driver and updater framework will likely be in the same process.
|
||||
These achieve privilege separation, because at least theoretically, they can all be placed into different processes from one another (except for the user driver & updater scheduler).
|
||||
|
||||
For XPC Services, it's significant to understand they can be used independent of sandboxing (although I wouldn't recommend this personally). Besides privilege separation, they also have an impact on fault tolerance and termination.
|
||||
For XPC Services, it's significant to understand they can be used independent of sandboxing (but this is strongly discouraged). Besides privilege separation, they also have an impact on fault tolerance and termination.
|
||||
|
||||
We have code that detects whether or not XPC services are available and enabled by the main application bundle. This is simpler and more efficient than attempting to create a connection and wait for a timeout. We don't have *any* checks for seeing if the "current process" is sandboxed; doing so is a rather broken behavior. The XPC Services are important, not the sandboxing.
|
||||
We have code that detects whether or not XPC services are available and enabled by the main application bundle. This is simpler and more efficient than attempting to create a connection and wait for a timeout. We don't have *any* checks for seeing if the "current process" is sandboxed; doing so is a rather brittle. The XPC Services are important, not the sandboxing.
|
||||
|
||||
I said above that XPC services are looked up in the main bundle. One may think this assumption doesn't hold for helpers or plug-ins inside applications. My response to that is they probably don't need the services, and they probably shouldn't be injecting Sparkle inside the host application anyway due to unintended conflicts and other consequences. A more appropriate approach may be to bundle a separate tool such as the sparkle command line utility.
|
||||
|
||||
@@ -33,3 +33,6 @@ For sending Obj-C objects across the wire, we use `SPUSecureCoding` because Coco
|
||||
The installer handles extraction, validation, and installation of the update. This was the main reason why other sandboxed-capable forks were rejected from being secure. The point to be stressed anyway is that these all need to be done in the same process; they can't be handed off by some other process. This is also why removing references to `AuthorizationExecuteWithPrivileges` is crucial as well.
|
||||
|
||||
Note that the installer does *not* handle downloading. That is handled by the updater framework. This is ideal because downloading can be done without disrupting the user, allowing it to be done silently without presenting an authorization dialog. The downloading portion of code can also be stuck into a XPC service with just an entitlement for allowing incoming connections. This also means for secure installations the installer cannot know (or trust) what protocol the update was downloaded from (i.e: http vs https). A good installer will not care, which is why applying updates without a EdDSA signature/key is now deprecated (reminder that Apple's code signature checks are not intended for complete integrity).
|
||||
|
||||
The XPC Services and Autoupdate, if code signed, also check if the clients are code signed with the same team ID and may reject connections or reject policies if this is not the case. This is a "backup" check because we still do not want endpoints to open up and allow arbitrary operations across different levels of security boundaries, even if apps are not code signed.
|
||||
|
||||
|
Before Width: | Height: | Size: 3.2 MiB |
@@ -29,11 +29,10 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
|
||||
@implementation SPUDownloader
|
||||
{
|
||||
NSURLSessionDownloadTask *_download;
|
||||
NSURLSessionTask *_sessionTask;
|
||||
NSURLSession *_downloadSession;
|
||||
NSString *_bundleIdentifier;
|
||||
NSString *_desiredFilename;
|
||||
NSString *_downloadFilename;
|
||||
|
||||
// Delegate is intentionally strongly referenced; see header
|
||||
id <SPUDownloaderDelegate> _delegate;
|
||||
@@ -85,8 +84,21 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
|
||||
delegate:self
|
||||
delegateQueue:[NSOperationQueue mainQueue]];
|
||||
_download = [_downloadSession downloadTaskWithRequest:request];
|
||||
[_download resume];
|
||||
|
||||
switch (_mode) {
|
||||
case SPUDownloadModePersistent:
|
||||
_sessionTask = [_downloadSession downloadTaskWithRequest:request];
|
||||
break;
|
||||
case SPUDownloadModeTemporary: {
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
_sessionTask = [_downloadSession dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
|
||||
[weakSelf temporaryDownloadDidFinishWithData:data response:response error:error];
|
||||
}];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
[_sessionTask resume];
|
||||
}
|
||||
|
||||
// Don't implement dealloc - make the client call cleanup, which is the only way to remove the reference cycle from the delegate anyway
|
||||
@@ -94,7 +106,7 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)startPersistentDownloadWithRequest:(NSURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (self->_download == nil && self->_delegate != nil) {
|
||||
if (self->_sessionTask == nil && self->_delegate != nil) {
|
||||
// Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
|
||||
[[NSProcessInfo processInfo] disableAutomaticTermination:SUDownloadingReason];
|
||||
self->_disabledAutomaticTermination = YES;
|
||||
@@ -111,7 +123,7 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)startTemporaryDownloadWithRequest:(NSURLRequest *)request
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (self->_download == nil && self->_delegate != nil) {
|
||||
if (self->_sessionTask == nil && self->_delegate != nil) {
|
||||
// Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
|
||||
[[NSProcessInfo processInfo] disableAutomaticTermination:SUDownloadingReason];
|
||||
self->_disabledAutomaticTermination = YES;
|
||||
@@ -158,17 +170,11 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)_cleanup SPU_OBJC_DIRECT
|
||||
{
|
||||
[self enableAutomaticTermination];
|
||||
[_download cancel];
|
||||
[_sessionTask cancel];
|
||||
[_downloadSession finishTasksAndInvalidate];
|
||||
_download = nil;
|
||||
_sessionTask = nil;
|
||||
_downloadSession = nil;
|
||||
_delegate = nil;
|
||||
|
||||
if (_mode == SPUDownloadModeTemporary && _downloadFilename != nil)
|
||||
{
|
||||
[[NSFileManager defaultManager] removeItemAtPath:_downloadFilename error:NULL];
|
||||
_downloadFilename = nil;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)cleanup:(void (^)(void))completionHandler
|
||||
@@ -182,76 +188,119 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
});
|
||||
}
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
|
||||
static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable response, NSURL *url, id<SPUDownloaderDelegate> delegate)
|
||||
{
|
||||
NSInteger statusCode = [downloadTask.response isKindOfClass:[NSHTTPURLResponse class]] ? ((NSHTTPURLResponse *)downloadTask.response).statusCode : 200;
|
||||
NSInteger statusCode = [response isKindOfClass:[NSHTTPURLResponse class]] ? ((NSHTTPURLResponse *)response).statusCode : 200;
|
||||
|
||||
if ((statusCode < 200) || (statusCode >= 400))
|
||||
{
|
||||
NSString *message = [NSString stringWithFormat:@"A network error occurred while downloading %@. %@ (%ld)", downloadTask.originalRequest.URL.absoluteString, [NSHTTPURLResponse localizedStringForStatusCode:statusCode], (long)statusCode];
|
||||
NSString *message = [NSString stringWithFormat:@"A network error occurred while downloading %@. %@ (%ld)", url.absoluteString, [NSHTTPURLResponse localizedStringForStatusCode:statusCode], (long)statusCode];
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
}
|
||||
else if (_mode == SPUDownloadModeTemporary)
|
||||
{
|
||||
_downloadFilename = location.path;
|
||||
[self downloadDidFinish]; // file is already in a system temp dir
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remove our old caches path so we don't start accumulating files in there
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:_bundleIdentifier];
|
||||
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath];
|
||||
[delegate downloaderDidFailWithError:error];
|
||||
|
||||
NSString *tempDir = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootPersistentDownloadCachePath];
|
||||
if (tempDir == nil)
|
||||
{
|
||||
// Okay, something's really broken with this user's file structure.
|
||||
[_download cancel];
|
||||
_download = nil;
|
||||
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", tempDir] }];
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)temporaryDownloadDidFinishWithData:(NSData * _Nullable)data response:(NSURLResponse * _Nullable)response error:(NSError * _Nullable)error SPU_OBJC_DIRECT
|
||||
{
|
||||
if (!SPUValidateStatusCodeAndFailIfInvalid(response, _sessionTask.originalRequest.URL, _delegate)) {
|
||||
return;
|
||||
}
|
||||
|
||||
SPUDownloadData *downloadData = nil;
|
||||
if (data != nil) {
|
||||
NSURL *responseURL = response.URL;
|
||||
if (responseURL == nil) {
|
||||
responseURL = _sessionTask.currentRequest.URL;
|
||||
}
|
||||
if (responseURL == nil) {
|
||||
responseURL = _sessionTask.originalRequest.URL;
|
||||
}
|
||||
assert(responseURL != nil);
|
||||
|
||||
downloadData = [[SPUDownloadData alloc] initWithData:(NSData * _Nonnull)data URL:responseURL textEncodingName:response.textEncodingName MIMEType:response.MIMEType];
|
||||
}
|
||||
|
||||
_sessionTask = nil;
|
||||
|
||||
if (downloadData != nil) {
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:downloadData];
|
||||
} else {
|
||||
NSMutableDictionary *userInfo = [@{NSLocalizedDescriptionKey: @"Failed to download temporary data."} mutableCopy];
|
||||
|
||||
if (error != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = error;
|
||||
}
|
||||
|
||||
[_delegate downloaderDidFailWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]];
|
||||
}
|
||||
|
||||
[self _cleanup];
|
||||
}
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
|
||||
{
|
||||
if (!SPUValidateStatusCodeAndFailIfInvalid(downloadTask.response, downloadTask.originalRequest.URL, _delegate)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Remove our old caches path so we don't start accumulating files in there
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:_bundleIdentifier];
|
||||
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath];
|
||||
|
||||
NSString *tempDir = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootPersistentDownloadCachePath];
|
||||
if (tempDir == nil)
|
||||
{
|
||||
// Okay, something's really broken with this user's file structure.
|
||||
[_sessionTask cancel];
|
||||
_sessionTask = nil;
|
||||
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", tempDir] }];
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *downloadFileName = _desiredFilename;
|
||||
NSString *downloadFileNameDirectory = [tempDir stringByAppendingPathComponent:downloadFileName];
|
||||
|
||||
NSError *createError = nil;
|
||||
if (![[NSFileManager defaultManager] createDirectoryAtPath:downloadFileNameDirectory withIntermediateDirectories:NO attributes:nil error:&createError]) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a download file name %@ directory inside temporary directory for the update download at %@.", downloadFileName, downloadFileNameDirectory] }];
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *downloadFileName = _desiredFilename;
|
||||
NSString *downloadFileNameDirectory = [tempDir stringByAppendingPathComponent:downloadFileName];
|
||||
|
||||
NSError *createError = nil;
|
||||
if (![[NSFileManager defaultManager] createDirectoryAtPath:downloadFileNameDirectory withIntermediateDirectories:NO attributes:nil error:&createError]) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a download file name %@ directory inside temporary directory for the update download at %@.", downloadFileName, downloadFileNameDirectory] }];
|
||||
NSString *name = _sessionTask.response.suggestedFilename;
|
||||
if (!name) {
|
||||
name = location.lastPathComponent; // This likely contains nothing useful to identify the file (e.g. CFNetworkDownload_87LVIz.tmp)
|
||||
}
|
||||
NSString *toPath = [downloadFileNameDirectory stringByAppendingPathComponent:name];
|
||||
NSString *fromPath = location.path; // suppress moveItemAtPath: non-null warning
|
||||
NSError *error = nil;
|
||||
if ([[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:&error]) {
|
||||
// Create a bookmark for the download
|
||||
// Don't pass any options (we don't want a persistent security scoped bookmark)
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *name = _download.response.suggestedFilename;
|
||||
if (!name) {
|
||||
name = location.lastPathComponent; // This likely contains nothing useful to identify the file (e.g. CFNetworkDownload_87LVIz.tmp)
|
||||
}
|
||||
NSString *toPath = [downloadFileNameDirectory stringByAppendingPathComponent:name];
|
||||
NSString *fromPath = location.path; // suppress moveItemAtPath: non-null warning
|
||||
NSError *error = nil;
|
||||
if ([[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:&error]) {
|
||||
_downloadFilename = toPath;
|
||||
|
||||
// Create a bookmark for the download
|
||||
// Don't pass any options (we don't want a persistent security scoped bookmark)
|
||||
|
||||
NSURL *downloadURL = [NSURL fileURLWithPath:toPath isDirectory:NO];
|
||||
|
||||
NSError *bookmarkError = nil;
|
||||
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
|
||||
if (bookmarkData == nil) {
|
||||
[_delegate downloaderDidFailWithError:bookmarkError];
|
||||
} else {
|
||||
// The download token may be provided later to the downloader for removing a download
|
||||
// and its temporary directory
|
||||
NSString *downloadToken = tempDir.lastPathComponent;
|
||||
[_delegate downloaderDidSetDownloadBookmarkData:bookmarkData downloadToken:downloadToken];
|
||||
[self downloadDidFinish];
|
||||
}
|
||||
NSURL *downloadURL = [NSURL fileURLWithPath:toPath isDirectory:NO];
|
||||
|
||||
NSError *bookmarkError = nil;
|
||||
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:(NSURLBookmarkCreationOptions)0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
|
||||
if (bookmarkData == nil) {
|
||||
[_delegate downloaderDidFailWithError:bookmarkError];
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
// The download token may be provided later to the downloader for removing a download
|
||||
// and its temporary directory
|
||||
NSString *downloadToken = tempDir.lastPathComponent;
|
||||
[_delegate downloaderDidSetDownloadBookmarkData:bookmarkData downloadToken:downloadToken];
|
||||
|
||||
_sessionTask = nil;
|
||||
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:nil];
|
||||
}
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -259,67 +308,26 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)__unused downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)__unused totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
|
||||
{
|
||||
|
||||
if (_mode == SPUDownloadModePersistent && totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
|
||||
if (_mode != SPUDownloadModePersistent) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_receivedExpectedBytes) {
|
||||
_receivedExpectedBytes = YES;
|
||||
[_delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite];
|
||||
[_delegate downloaderDidReceiveExpectedContentLength:(totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown) ? totalBytesExpectedToWrite : 0];
|
||||
}
|
||||
|
||||
if (_mode == SPUDownloadModePersistent && bytesWritten >= 0) {
|
||||
if (bytesWritten >= 0) {
|
||||
[_delegate downloaderDidReceiveDataOfLength:(uint64_t)bytesWritten];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)downloadDidFinish SPU_OBJC_DIRECT
|
||||
{
|
||||
assert(_downloadFilename != nil);
|
||||
|
||||
SPUDownloadData *downloadData = nil;
|
||||
if (_mode == SPUDownloadModeTemporary) {
|
||||
NSData *data = [NSData dataWithContentsOfFile:_downloadFilename];
|
||||
if (data != nil) {
|
||||
NSURLResponse *response = _download.response;
|
||||
|
||||
NSURL *responseURL = response.URL;
|
||||
if (responseURL == nil) {
|
||||
responseURL = _download.currentRequest.URL;
|
||||
}
|
||||
if (responseURL == nil) {
|
||||
responseURL = _download.originalRequest.URL;
|
||||
}
|
||||
assert(responseURL != nil);
|
||||
|
||||
downloadData = [[SPUDownloadData alloc] initWithData:data URL:responseURL textEncodingName:response.textEncodingName MIMEType:response.MIMEType];
|
||||
}
|
||||
}
|
||||
|
||||
_download = nil;
|
||||
|
||||
switch (_mode) {
|
||||
case SPUDownloadModeTemporary:
|
||||
if (downloadData != nil) {
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:downloadData];
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to read temporary downloaded data from %@", _downloadFilename]}]];
|
||||
}
|
||||
|
||||
[self _cleanup];
|
||||
break;
|
||||
case SPUDownloadModePersistent:
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:nil];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session task:(NSURLSessionTask *)__unused task didCompleteWithError:(NSError *)error
|
||||
{
|
||||
_download = nil;
|
||||
_sessionTask = nil;
|
||||
if (error != nil) {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
}
|
||||
}
|
||||
|
||||
// NSURLDownload has a [download:shouldDecodeSourceDataOfMIMEType:] to determine if the data should be decoded.
|
||||
// This does not exist for NSURLSessionDownloadTask and appears unnecessary. Data tasks will decode data, but not download tasks.
|
||||
|
||||
@end
|
||||
@@ -26,7 +26,7 @@
|
||||
// This is a policy, not a security critical enforcement.
|
||||
{
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
|
||||
@@ -73,7 +73,7 @@ static NSString *SUInstallerConnectionKeepAliveReason = @"Installer Connection K
|
||||
|
||||
- (void)_setServiceName:(NSString *)serviceName systemDomain:(BOOL)systemDomain SPU_OBJC_DIRECT
|
||||
{
|
||||
NSXPCConnectionOptions options = systemDomain ? NSXPCConnectionPrivileged : 0;
|
||||
NSXPCConnectionOptions options = systemDomain ? NSXPCConnectionPrivileged : (NSXPCConnectionOptions)0;
|
||||
NSXPCConnection *connection = [[NSXPCConnection alloc] initWithMachServiceName:serviceName options:options];
|
||||
|
||||
connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol)];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -79,8 +86,7 @@
|
||||
jobDictionary[@"Label"] = label;
|
||||
jobDictionary[@"ProgramArguments"] = arguments;
|
||||
jobDictionary[@"EnableTransactions"] = @NO;
|
||||
jobDictionary[@"KeepAlive"] = @{@"SuccessfulExit" : @NO};
|
||||
jobDictionary[@"RunAtLoad"] = @NO;
|
||||
jobDictionary[@"RunAtLoad"] = @YES;
|
||||
jobDictionary[@"Nice"] = @0;
|
||||
jobDictionary[@"ProcessType"] = @"Interactive";
|
||||
jobDictionary[@"LaunchOnlyOnce"] = @YES;
|
||||
@@ -106,10 +112,8 @@
|
||||
return (submittedJob == true);
|
||||
}
|
||||
|
||||
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory mainBundleName:(NSString *)mainBundleName 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 mainBundleName:(NSString *)mainBundleName 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.
|
||||
|
||||
@@ -175,81 +179,60 @@
|
||||
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
|
||||
const NSInteger imageDimensions = 64;
|
||||
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, 0.0, (CGFloat)imageDimensions, (CGFloat)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);
|
||||
@@ -263,9 +246,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;
|
||||
@@ -290,7 +275,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *jobDictionary = @{@"Label" : label, @"ProgramArguments" : arguments, @"EnableTransactions" : @NO, @"KeepAlive" : @{@"SuccessfulExit" : @NO}, @"RunAtLoad" : @NO, @"Nice" : @0, @"ProcessType": @"Interactive", @"LaunchOnlyOnce": @YES, @"MachServices" : @{SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES, SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES}};
|
||||
NSDictionary *jobDictionary = @{@"Label" : label, @"ProgramArguments" : arguments, @"EnableTransactions" : @NO, @"RunAtLoad" : @YES, @"Nice" : @0, @"ProcessType": @"Interactive", @"LaunchOnlyOnce": @YES, @"MachServices" : @{SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES, SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES}};
|
||||
|
||||
CFErrorRef submitError = NULL;
|
||||
#pragma clang diagnostic push
|
||||
@@ -399,8 +384,6 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
if ([installationType isEqualToString:SPUInstallationTypeGuidedPackage]) {
|
||||
return YES;
|
||||
} else if ([installationType isEqualToString:SPUInstallationTypeInteractivePackage]) {
|
||||
return NO;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
@@ -413,8 +396,8 @@ 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 mainBundleName:(NSString *)mainBundleName installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
// Note: do not pass information which can we compute ourselves here, such as paths to the installer and progress agent tools
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath mainBundlePath:(NSString *)mainBundlePath installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (completionHandler == NULL) {
|
||||
@@ -428,18 +411,35 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
return;
|
||||
}
|
||||
|
||||
if (updaterIdentifier == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve updaterIdentifier (nil)");
|
||||
if (mainBundlePath == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundlePath (nil)");
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mainBundleName == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundleName (nil)");
|
||||
NSBundle *mainBundle = [NSBundle bundleWithPath:mainBundlePath];
|
||||
if (mainBundle == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundle from path: %@", mainBundlePath);
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:mainBundle];
|
||||
|
||||
// We use SUHost.name property, so an application
|
||||
// or Sparkle helper application can override its name with SUBundleName key
|
||||
NSString *mainBundleName = mainBundleHost.name;
|
||||
|
||||
// This updaterIdentifier is just used for authorization prompt
|
||||
NSString *updaterIdentifier;
|
||||
NSString *mainBundleIdentifier = mainBundle.bundleIdentifier;
|
||||
if (mainBundleIdentifier != nil) {
|
||||
updaterIdentifier = mainBundleIdentifier;
|
||||
} else {
|
||||
// Should be unlikely
|
||||
updaterIdentifier = mainBundleHost.name;
|
||||
}
|
||||
|
||||
if (installationType == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve installationType (nil)");
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
@@ -498,8 +498,6 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
|
||||
NSString *userName;
|
||||
NSString *homeDirectory;
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
if (!rootUser) {
|
||||
// Normal path
|
||||
homeDirectory = NSHomeDirectory();
|
||||
@@ -510,7 +508,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
} else {
|
||||
// As the root user we need to obtain the user name and home directory reflecting
|
||||
// the user's console session.
|
||||
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, &uid, &gid);
|
||||
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, NULL, NULL);
|
||||
if (userNameRef == NULL) {
|
||||
SULog(SULogLevelError, @"Failed to retrieve user name from the console user");
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
@@ -527,59 +525,11 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
}
|
||||
}
|
||||
|
||||
// It may be tempting here to validate/match the signature of the installer and progress tool, however this is not very reliable
|
||||
// We can't compare the signature of this framework/XPC service (depending how it's run) to the host bundle because
|
||||
// they could be different (eg: take a look at sparkle-cli). We also can't easily tell if the signature of the service/framework is the same as the bundle it's inside.
|
||||
// The service/framework also need not even be signed in the first place. We'll just assume for now the original bundle hasn't been tampered with
|
||||
NSString *cachePath = rootUser ?
|
||||
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier userName:userName] :
|
||||
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier];
|
||||
|
||||
NSString *rootLauncherCachePath = [cachePath stringByAppendingPathComponent:@"Launcher"];
|
||||
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath];
|
||||
|
||||
NSDictionary<NSFileAttributeKey, id> *fileAttributes = rootUser ?
|
||||
@{NSFileOwnerAccountID: @(uid), NSFileGroupOwnerAccountID: @(gid)} :
|
||||
nil;
|
||||
|
||||
NSString *launcherCachePath = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath intermediateDirectoryFileAttributes:fileAttributes];
|
||||
|
||||
if (launcherCachePath == nil) {
|
||||
SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
|
||||
if (rootUser) {
|
||||
// Ensure the console user has ownership of the launcher cache directory
|
||||
// Otherwise the updater may not launch and not be able to clean up itself
|
||||
NSError *changeOwnerAndGroupError = nil;
|
||||
if (![fileManager changeOwnerAndGroupOfItemAtURL:[NSURL fileURLWithPath:launcherCachePath] ownerID:uid groupID:gid error:&changeOwnerAndGroupError]) {
|
||||
SULog(SULogLevelError, @"Failed to change owner and group for launcher cache directory: %@", changeOwnerAndGroupError);
|
||||
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NSString *progressToolPath = [launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app"];
|
||||
|
||||
NSError *copyError = nil;
|
||||
// SUFileManager is more reliable for copying files around
|
||||
if (![fileManager copyItemAtURL:[NSURL fileURLWithPath:progressToolResourcePath] toURL:[NSURL fileURLWithPath:progressToolPath] error:©Error]) {
|
||||
SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:mainBundle.bundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
|
||||
BOOL submittedProgressTool = NO;
|
||||
if (installerStatus == SUInstallerLauncherSuccess) {
|
||||
submittedProgressTool = [self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
|
||||
submittedProgressTool = [self submitProgressToolAtPath:progressToolResourcePath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
|
||||
|
||||
if (!submittedProgressTool) {
|
||||
SULog(SULogLevelError, @"Failed to submit progress tool job");
|
||||
|
||||
@@ -11,6 +11,6 @@
|
||||
|
||||
@protocol SUInstallerLauncherProtocol
|
||||
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier mainBundleName:(NSString *)mainBundleName installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath mainBundlePath:(NSString *)mainBundlePath installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
|
||||
@end
|
||||
@@ -23,7 +23,7 @@
|
||||
// This is a policy, not a security critical enforcement.
|
||||
{
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options: SUValidateConnectionOptionDefault error:&validationError];
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
|
||||
@@ -16,8 +16,6 @@ release:
|
||||
xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build
|
||||
./Configurations/release-move-tag.sh
|
||||
open "$(BUILDDIR)/Build/Products/Release/"
|
||||
cat Sparkle.podspec
|
||||
@echo "Don't forget to update CocoaPods! pod trunk push"
|
||||
@echo "Don't forget to upload Sparkle-for-Swift-Package-Manager.zip!"
|
||||
|
||||
build:
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
// swift-tools-version:5.3
|
||||
// swift-tools-version:5.5
|
||||
import PackageDescription
|
||||
|
||||
// Version is technically not required here, SPM doesn't check
|
||||
let version = "2.7.3"
|
||||
let version = "2.10.0"
|
||||
// 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.7.3"
|
||||
let checksum = "2e0bf15ae74c13e7b16b76e34ba56fe3a44683e35473298225f4a2a2c274329a"
|
||||
let tag = "2.10.0"
|
||||
let checksum = "17e28312b8e18ab7cdbbe09a6fb28cc55a5479ec6c371dbc07cdecd2a14fd959"
|
||||
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
|
||||
|
||||
let package = Package(
|
||||
name: "Sparkle",
|
||||
platforms: [.macOS(.v10_13)], // leaving "10.13" as a breadcrumb for searching
|
||||
platforms: [.macOS(.v12)], // leaving "12.0" as a breadcrumb for searching; aligned with swift-tools-version at top of file (see https://developer.apple.com/documentation/packagedescription/supportedplatform/macosversion)
|
||||
products: [
|
||||
.library(
|
||||
name: "Sparkle",
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Sparkle 2   [](https://github.com/Carthage/Carthage) [](https://cocoapods.org/pods/Sparkle)
|
||||
# Sparkle 2 [](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml)  [](https://github.com/Carthage/Carthage)
|
||||
|
||||
Secure and reliable software update framework for macOS.
|
||||
|
||||
<img src="Resources/Screenshot.png" width="732" alt="Sparkle shows familiar update window with release notes">
|
||||
<img src="Resources/Screenshot2.png" width="732" alt="Sparkle shows familiar update window with release notes">
|
||||
|
||||
Sparkle 2 adds support for application sandboxing, custom user interfaces, updating external bundles, and a more modern architecture which includes faster and more reliable installs.
|
||||
|
||||
@@ -29,7 +29,7 @@ Please visit [Sparkle's website](http://sparkle-project.org) for up to date docu
|
||||
|
||||
## Requirements
|
||||
|
||||
* Runtime: macOS 10.13 or later.
|
||||
* Runtime: macOS 12.0 or later on `2.x`, macOS 10.13 or later on `2.9.6`.
|
||||
* Build: Latest major Xcode (stable or beta, whichever is latest) and one major version less.
|
||||
* HTTPS server for serving updates (see [App Transport Security](http://sparkle-project.org/documentation/app-transport-security/))
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 176 KiB |
|
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"
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<pubDate>Wed, 09 Jan 2006 19:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%202.0.zip" length="1623481" type="application/octet-stream" sparkle:edSignature="WVyVJpOx+a5+vNWJVY79TRjFKveNk+VhGJf2iti4CZtJsJewIUGvh/1AKKEAFbH1qUwx+vro1ECuzOsMmumoBA==" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
@@ -31,7 +31,7 @@
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<pubDate>Wed, 01 Jan 2006 12:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%201.5.zip" length="1472893" type="application/octet-stream" sparkle:edSignature="pNFd7KbcQSu+Mq7UYrbQXTPq82luht2ACXm/r2utp1u/Uv/5hWqctdT2jwQgMejW7DRoeV/hVr6J4VdZYdwWDw==" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<!-- Now here's an example of a version with a weird internal version number (like an SVN revision) but a human-readable external one. -->
|
||||
@@ -48,7 +48,7 @@
|
||||
<sparkle:shortVersionString>1.4</sparkle:shortVersionString>
|
||||
<pubDate>Wed, 25 Dec 2005 12:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%201.4.zip" sparkle:edSignature="Ody3D/ybSMH4T+P/oNj3LN4F0SA8RJGLEr1TI4UemrBAiJ9aEcDnYV3u58P75AbcFjI13jPYmHDUHXMSTFQbDw==" length="1472349" type="application/octet-stream" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
|
Before Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 381 KiB |
|
Before Width: | Height: | Size: 125 KiB |
@@ -1,33 +0,0 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Sparkle"
|
||||
s.version = "2.7.3"
|
||||
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"
|
||||
s.documentation_url = "https://sparkle-project.org/documentation/"
|
||||
s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow@2x.png"
|
||||
s.license = {
|
||||
:type => 'MIT',
|
||||
:file => 'LICENSE'
|
||||
}
|
||||
s.authors = {
|
||||
'Zorg' => 'zorgiepoo@gmail.com',
|
||||
'Kornel Lesiński' => 'pornel@pornel.net',
|
||||
'Jake Petroules' => 'jake.petroules@petroules.com',
|
||||
'C.W. Betts' => 'computers57@hotmail.com',
|
||||
'Andy Matuschak' => 'andy@andymatuschak.org',
|
||||
}
|
||||
|
||||
s.platform = :osx, '10.13'
|
||||
s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.xz" }
|
||||
s.source_files = 'Sparkle.framework/Versions/B/Headers/*.h'
|
||||
|
||||
s.preserve_paths = ['bin/*', 'Symbols']
|
||||
s.public_header_files = 'Sparkle.framework/Versions/B/Headers/*.h'
|
||||
s.vendored_frameworks = 'Sparkle.framework'
|
||||
s.xcconfig = {
|
||||
'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"',
|
||||
'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks'
|
||||
}
|
||||
s.requires_arc = true
|
||||
end
|
||||
@@ -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 */; };
|
||||
@@ -54,7 +53,6 @@
|
||||
14958C6F19AEBC980061B14F /* test-pubkey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 14958C6C19AEBC610061B14F /* test-pubkey.pem */; };
|
||||
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */ = {isa = PBXBuildFile; fileRef = 1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */; };
|
||||
3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
|
||||
55C14F06136EF6DB00649790 /* SULog.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F04136EF6DB00649790 /* SULog.h */; };
|
||||
55C14F07136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
|
||||
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 55E6F33219EC9F6C00005E76 /* SUErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@@ -106,10 +104,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, ); }; };
|
||||
@@ -120,7 +116,6 @@
|
||||
7205C4411E13049400E370AE /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4401E13049400E370AE /* main.swift */; };
|
||||
7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4471E1304CE00E370AE /* Appcast.swift */; };
|
||||
7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4481E1304CE00E370AE /* ArchiveItem.swift */; };
|
||||
7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4491E1304CE00E370AE /* Signatures.swift */; };
|
||||
7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44A1E1304CE00E370AE /* FeedXML.swift */; };
|
||||
7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44B1E1304CE00E370AE /* Unarchive.swift */; };
|
||||
7205C4561E13060D00E370AE /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
|
||||
@@ -146,10 +141,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 */; };
|
||||
@@ -184,10 +175,10 @@
|
||||
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 */; };
|
||||
723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */; };
|
||||
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */; };
|
||||
723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */; };
|
||||
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABE00259A9E9E00BDB4FA /* MainMenu.xib */; };
|
||||
723ABF1B259D055E00BDB4FA /* SUReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 723ABF1A259D055E00BDB4FA /* SUReleaseNotesView.h */; };
|
||||
@@ -205,7 +196,9 @@
|
||||
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 */; };
|
||||
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 723F25FD2E75F76400462999 /* AppIcon.icon */; };
|
||||
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7240852D2CA11C1400ED2FCD /* libz.tbd */; };
|
||||
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */; };
|
||||
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 +216,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 */; };
|
||||
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */ = {isa = PBXBuildFile; fileRef = 72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */; };
|
||||
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 */; };
|
||||
@@ -235,6 +229,7 @@
|
||||
725CB9571C7120410064365A /* SPUUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9561C7120410064365A /* SPUUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9581C7121830064365A /* SPUStandardUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725CB9591C7121830064365A /* SPUStandardUserDriver.m */; };
|
||||
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */ = {isa = PBXBuildFile; fileRef = 725EA4B13027D2AF0041BFA6 /* test-package-update.xml */; };
|
||||
725EE480277BF13B00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
725EE482277BF44A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
725EE483277C767A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
@@ -248,9 +243,9 @@
|
||||
725F97841C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97831C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m */; };
|
||||
725F97A51C8B304D00265BE4 /* SUInstallUpdateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */; };
|
||||
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */; };
|
||||
72666DC62B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC72B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC82B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC62B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
72666DC72B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
72666DC82B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
7267E5751D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
|
||||
7267E5761D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
|
||||
7267E5771D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
|
||||
@@ -275,7 +270,6 @@
|
||||
7267E5B81D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */; };
|
||||
7267E5C21D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
|
||||
7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */; };
|
||||
7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
|
||||
7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
|
||||
7267E5C91D3D8C4300D1BF90 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
|
||||
7267E5CA1D3D8C4800D1BF90 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
|
||||
@@ -303,7 +297,6 @@
|
||||
7267E5F11D3D917A00D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */; };
|
||||
7267E5F21D3D918000D1BF90 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
|
||||
7267E5F41D3D918B00D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
|
||||
7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
|
||||
7267E5F61D3D919000D1BF90 /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */; };
|
||||
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
|
||||
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
|
||||
@@ -315,6 +308,7 @@
|
||||
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 */; };
|
||||
@@ -347,8 +341,8 @@
|
||||
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */; };
|
||||
728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */; };
|
||||
728638ED1CAF50CE00783084 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
|
||||
7286EE5F28CEC84900163C1D /* SUPlainTextReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */; };
|
||||
7286EE6028CEC84900163C1D /* SUPlainTextReleaseNotesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */; };
|
||||
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */; };
|
||||
7286EE6028CEC84900163C1D /* SUTextViewReleaseNotesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */; };
|
||||
728ED34A277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
728ED34B277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
728ED34C277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
@@ -359,6 +353,7 @@
|
||||
7290BF312E5A5B2F00D75022 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
|
||||
729924941DF4A45000DBCDF5 /* SUUpdateValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */; };
|
||||
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */; };
|
||||
729F7EAC27366353004592DC /* test-links.xml in Resources */ = {isa = PBXBuildFile; fileRef = 729F7EAB27366353004592DC /* test-links.xml */; };
|
||||
729F7EAF273F1840004592DC /* SPUUserAgent+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */; };
|
||||
@@ -398,7 +393,24 @@
|
||||
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */; };
|
||||
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
|
||||
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */; };
|
||||
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
|
||||
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
|
||||
72C56E092EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0A2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0B2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */ = {isa = PBXBuildFile; fileRef = 72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */; };
|
||||
72C56E0D2EFE002D0005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0E2EFEEF8B0005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E102EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E112EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E122EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E192F04343D0005A484 /* SPUAppcastSigningValidationStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */; };
|
||||
72C56E202F04B3760005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */ = {isa = PBXBuildFile; fileRef = 72C56E212F04C28B0005A484 /* testreleasenotes.html */; };
|
||||
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */; };
|
||||
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */; };
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */; };
|
||||
72D04F3D2B094C8400A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
@@ -422,7 +434,6 @@
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */; };
|
||||
72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
|
||||
72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */ = {isa = PBXBuildFile; fileRef = 721C24451CB753E6005440CB /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
|
||||
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@@ -454,6 +465,7 @@
|
||||
72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */; };
|
||||
72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 72FE54412E56A14100227A91 /* SUUpdateAlert.xib */; };
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */ = {isa = PBXBuildFile; fileRef = C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */; };
|
||||
EA1E281722B645AE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
|
||||
EA1E281822B645CE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
|
||||
@@ -490,7 +502,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 */; };
|
||||
@@ -736,13 +747,6 @@
|
||||
remoteGlobalIDString = 721C24441CB753E6005440CB;
|
||||
remoteInfo = "Installer Progress";
|
||||
};
|
||||
72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 72D9549D1CBB415B006F28BD;
|
||||
remoteInfo = "sparkle-cli";
|
||||
};
|
||||
72EF30B826747E39008CE987 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
@@ -922,14 +926,11 @@
|
||||
/* 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>"; };
|
||||
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Sparkle.podspec; sourceTree = SOURCE_ROOT; };
|
||||
14732BB1195FF6B700593899 /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = SOURCE_ROOT; };
|
||||
14732BB91960EEEE00593899 /* SampleAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SampleAppcast.xml; sourceTree = "<group>"; };
|
||||
14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; };
|
||||
@@ -951,13 +952,10 @@
|
||||
1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = ReleaseNotesColorStyle.css; sourceTree = "<group>"; };
|
||||
3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionDisplayProtocol.h; sourceTree = "<group>"; };
|
||||
37A5F28528E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
37A5F28628E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
37A5F28728E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
37A5F28828E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
|
||||
555CF29A196C52330000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = "<group>"; };
|
||||
55C14F04136EF6DB00649790 /* SULog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULog.h; sourceTree = "<group>"; };
|
||||
55C14F05136EF6DB00649790 /* SULog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SULog.m; sourceTree = "<group>"; };
|
||||
55C14F31136EFC2400649790 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
|
||||
@@ -1038,7 +1036,6 @@
|
||||
7205C4461E1304C300E370AE /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
7205C4471E1304CE00E370AE /* Appcast.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Appcast.swift; sourceTree = "<group>"; };
|
||||
7205C4481E1304CE00E370AE /* ArchiveItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArchiveItem.swift; sourceTree = "<group>"; };
|
||||
7205C4491E1304CE00E370AE /* Signatures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signatures.swift; sourceTree = "<group>"; };
|
||||
7205C44A1E1304CE00E370AE /* FeedXML.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedXML.swift; sourceTree = "<group>"; };
|
||||
7205C44B1E1304CE00E370AE /* Unarchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Unarchive.swift; sourceTree = "<group>"; };
|
||||
7205C4511E13053500E370AE /* ConfigSwiftDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwiftDebug.xcconfig; sourceTree = "<group>"; };
|
||||
@@ -1057,8 +1054,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; };
|
||||
@@ -1093,71 +1088,13 @@
|
||||
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; };
|
||||
723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_arm64HardwareRequirement.xml; sourceTree = "<group>"; };
|
||||
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>"; };
|
||||
723ABD4D259A9BE100BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD4E259A9BEF00BDB4FA /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD4F259A9BFD00BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD50259A9C0200BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD51259A9C0600BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD52259A9C0900BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD53259A9C1000BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD54259A9C1300BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD55259A9C1500BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD56259A9C1E00BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD57259A9C2100BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD58259A9C2400BDB4FA /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD59259A9C2C00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5A259A9C3600BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5B259A9C3900BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5C259A9C3B00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5D259A9C3D00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5E259A9C4000BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5F259A9C4900BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
|
||||
723ABD60259A9C4B00BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
|
||||
723ABD61259A9C5400BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD62259A9C5700BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD63259A9C5900BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD64259A9C5B00BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD65259A9C5D00BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD66259A9C5F00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD67259A9C6100BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD68259A9C6300BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD69259A9C6600BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD6B259A9CBB00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
|
||||
723ABD80259A9CD600BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD81259A9CDA00BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD82259A9CEC00BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD83259A9CF000BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD84259A9CF400BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD85259A9CF800BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD86259A9CFC00BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD87259A9CFF00BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD88259A9D0200BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD89259A9D1800BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8A259A9D1C00BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8D259A9D2700BDB4FA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8E259A9D2A00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD91259A9D3400BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD92259A9D3700BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD93259A9D3C00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD94259A9D3E00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD95259A9D4100BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD96259A9D4600BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
|
||||
723ABD97259A9D4900BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
|
||||
723ABD98259A9D4C00BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD99259A9D4F00BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9A259A9D5200BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9B259A9D5500BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9C259A9D5700BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9D259A9D5A00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9E259A9D5D00BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9F259A9D6000BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABDA0259A9D6300BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABDDA259A9E8600BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
723ABE01259A9E9E00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
|
||||
723ABE15259A9EB000BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
@@ -1209,7 +1146,9 @@
|
||||
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>"; };
|
||||
723F25FD2E75F76400462999 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
|
||||
7240852D2CA11C1400ED2FCD /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUpdaterSettings+Debug.h"; sourceTree = "<group>"; };
|
||||
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; };
|
||||
@@ -1234,6 +1173,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; };
|
||||
72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_minimumUpdateVersion.xml; sourceTree = "<group>"; };
|
||||
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>"; };
|
||||
@@ -1247,6 +1187,7 @@
|
||||
725CB9581C7121830064365A /* SPUStandardUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriver.h; sourceTree = "<group>"; };
|
||||
725CB9591C7121830064365A /* SPUStandardUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUserDriver.m; sourceTree = "<group>"; };
|
||||
725DED72263D10C400E7FA8F /* SUAppcast+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUAppcast+Private.h"; sourceTree = "<group>"; };
|
||||
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "test-package-update.xml"; sourceTree = "<group>"; };
|
||||
725EE47E277BF13A00D820CE /* SPUXarDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUXarDeltaArchive.h; path = Autoupdate/SPUXarDeltaArchive.h; sourceTree = SOURCE_ROOT; };
|
||||
725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUXarDeltaArchive.m; path = Autoupdate/SPUXarDeltaArchive.m; sourceTree = SOURCE_ROOT; };
|
||||
725EE481277BF17A00D820CE /* SPUDeltaArchiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaArchiveProtocol.h; path = Autoupdate/SPUDeltaArchiveProtocol.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1259,7 +1200,7 @@
|
||||
725F97A21C8B304D00265BE4 /* SUInstallUpdateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUInstallUpdateViewController.h; sourceTree = "<group>"; };
|
||||
725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUInstallUpdateViewController.m; sourceTree = "<group>"; };
|
||||
725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUInstallUpdateViewController.xib; sourceTree = "<group>"; };
|
||||
72666DC52B0B28F4001511B0 /* secret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = secret.swift; sourceTree = "<group>"; };
|
||||
72666DC52B0B28F4001511B0 /* Secret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secret.swift; sourceTree = "<group>"; };
|
||||
7267E56E1D3D895B00D1BF90 /* SUBinaryDeltaApply.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaApply.h; path = Autoupdate/SUBinaryDeltaApply.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaApply.m; path = Autoupdate/SUBinaryDeltaApply.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5701D3D895B00D1BF90 /* SUBinaryDeltaCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaCommon.h; path = Autoupdate/SUBinaryDeltaCommon.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1297,8 +1238,6 @@
|
||||
7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUGuidedPackageInstaller.m; path = Autoupdate/SUGuidedPackageInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BC1D3D8B2700D1BF90 /* SUInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUInstaller.h; path = Autoupdate/SUInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUInstaller.m; path = Autoupdate/SUInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPackageInstaller.h; path = Autoupdate/SUPackageInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPackageInstaller.m; path = Autoupdate/SUPackageInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPlainInstaller.h; path = Autoupdate/SUPlainInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPlainInstaller.m; path = Autoupdate/SUPlainInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5CF1D3D8C8500D1BF90 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = System/Library/Frameworks/SecurityFoundation.framework; sourceTree = SDKROOT; };
|
||||
@@ -1347,17 +1286,16 @@
|
||||
728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbeInstallStatus.h; sourceTree = "<group>"; };
|
||||
728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbeInstallStatus.m; sourceTree = "<group>"; };
|
||||
728638EE1CAF589C00783084 /* ConfigDownloader.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigDownloader.xcconfig; sourceTree = "<group>"; };
|
||||
7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUPlainTextReleaseNotesView.h; sourceTree = "<group>"; };
|
||||
7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUPlainTextReleaseNotesView.m; sourceTree = "<group>"; };
|
||||
7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUTextViewReleaseNotesView.h; sourceTree = "<group>"; };
|
||||
7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUTextViewReleaseNotesView.m; sourceTree = "<group>"; };
|
||||
728ED348277DA23400D9238F /* SPUSparkleDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUSparkleDeltaArchive.h; path = Autoupdate/SPUSparkleDeltaArchive.h; sourceTree = SOURCE_ROOT; };
|
||||
728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUSparkleDeltaArchive.m; path = Autoupdate/SPUSparkleDeltaArchive.m; sourceTree = SOURCE_ROOT; };
|
||||
728FBA192BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
728FBA1A2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
728FBA1B2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
728FBA1C2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
729924921DF4A45000DBCDF5 /* SUUpdateValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUpdateValidator.h; path = Sparkle/SUUpdateValidator.h; sourceTree = SOURCE_ROOT; };
|
||||
729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUpdateValidator.m; path = Sparkle/SUUpdateValidator.m; sourceTree = SOURCE_ROOT; };
|
||||
729BB3D11D503826007C4276 /* Downloader.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Downloader.entitlements; path = Downloader/Downloader.entitlements; sourceTree = SOURCE_ROOT; };
|
||||
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
|
||||
729F10FD1C65A9B500DFCCC5 /* ConfigUITest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITest.xcconfig; sourceTree = "<group>"; };
|
||||
729F10FE1C65A9B500DFCCC5 /* ConfigUITestCoverage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITestCoverage.xcconfig; sourceTree = "<group>"; };
|
||||
729F7EAB27366353004592DC /* test-links.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "test-links.xml"; sourceTree = "<group>"; };
|
||||
@@ -1403,7 +1341,16 @@
|
||||
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAutomaticUpdateDriver.h; sourceTree = "<group>"; };
|
||||
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAutomaticUpdateDriver.m; sourceTree = "<group>"; };
|
||||
72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs.dmg; sourceTree = "<group>"; };
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUSpotlightImporterTest.swift; sourceTree = "<group>"; };
|
||||
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallerProgressLocalizedStrings.h; sourceTree = "<group>"; };
|
||||
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = generate_progress_tool_localizations.py; sourceTree = "<group>"; };
|
||||
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUExtractSignedFeed.h; sourceTree = "<group>"; };
|
||||
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUExtractSignedFeed.m; sourceTree = "<group>"; };
|
||||
72C56E0F2EFEF10B0005A484 /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = "<group>"; };
|
||||
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUAppcastSigningValidationStatus.h; sourceTree = "<group>"; };
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SUFeedSignatureVerifierTest.swift; sourceTree = "<group>"; };
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = testreleasenotes.html; sourceTree = "<group>"; };
|
||||
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.no-text.dmg"; sourceTree = "<group>"; };
|
||||
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg"; sourceTree = "<group>"; };
|
||||
72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_header.zip; sourceTree = "<group>"; };
|
||||
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUVerifierInformation.h; sourceTree = "<group>"; };
|
||||
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUVerifierInformation.m; sourceTree = "<group>"; };
|
||||
@@ -1423,8 +1370,6 @@
|
||||
72D954B71CBB467F006F28BD /* SPUCommandLineUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCommandLineUserDriver.m; sourceTree = "<group>"; };
|
||||
72DBA37B1D60CC34002594A8 /* SPUUpdatePermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdatePermissionRequest.h; sourceTree = "<group>"; };
|
||||
72DBA37C1D60CC34002594A8 /* SPUUpdatePermissionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdatePermissionRequest.m; sourceTree = "<group>"; };
|
||||
72E1DAB525B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
72E1DAB625B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
72E1DAB725B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
72E1DACB25B3E8DF0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
72E45CF11B640CDD005C701A /* SUTestApplicationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestApplicationDelegate.h; sourceTree = "<group>"; };
|
||||
@@ -1459,11 +1404,14 @@
|
||||
72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadData.h; sourceTree = "<group>"; };
|
||||
72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadData.m; sourceTree = "<group>"; };
|
||||
72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterDelegate.h; sourceTree = "<group>"; };
|
||||
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SUUpdateAlert.xib; sourceTree = "<group>"; };
|
||||
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Sparkle-Info.plist"; sourceTree = "<group>"; };
|
||||
8DC2EF5B0486A6940098B216 /* Sparkle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A5BF4F1B1BC7668B007A052A /* SUTestWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestWebServer.h; sourceTree = "<group>"; };
|
||||
A5BF4F1C1BC7668B007A052A /* SUTestWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTestWebServer.m; sourceTree = "<group>"; };
|
||||
C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.enc.dmg; sourceTree = "<group>"; };
|
||||
E0949FCF2EFC4CFC0039C748 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
E0949FD02EFC4CFD0039C748 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
EA1E280F22B64522004AA304 /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Debug.xcconfig"; sourceTree = "<group>"; };
|
||||
EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Release.xcconfig"; sourceTree = "<group>"; };
|
||||
@@ -1501,7 +1449,6 @@
|
||||
EA1E287822B666EB004AA304 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
|
||||
EA1E287F22B667D8004AA304 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
F67C9B7B281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
F67C9B7C281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
|
||||
F6E11510281410D10003736C /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUCodeSigningVerifierTest.m; sourceTree = "<group>"; };
|
||||
@@ -1583,7 +1530,6 @@
|
||||
files = (
|
||||
721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */,
|
||||
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */,
|
||||
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1612,11 +1558,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;
|
||||
@@ -1666,6 +1611,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */,
|
||||
725B81FC2781CDC20041746F /* libcompression.tbd in Frameworks */,
|
||||
1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */,
|
||||
);
|
||||
@@ -1782,9 +1728,8 @@
|
||||
children = (
|
||||
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */,
|
||||
61AAE8220A321A7F00D8810D /* Sparkle.strings */,
|
||||
55C14BD8136EF00C00649790 /* SUStatus.xib */,
|
||||
723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */,
|
||||
723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */,
|
||||
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */,
|
||||
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */,
|
||||
);
|
||||
name = "Framework Resources";
|
||||
sourceTree = "<group>";
|
||||
@@ -1828,10 +1773,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>";
|
||||
@@ -1849,6 +1794,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
720767D11E2EB86200F9A850 /* AppKitPrevention.h */,
|
||||
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */,
|
||||
61299B3909CB055000B7442F /* Appcast Support */,
|
||||
55C14BD5136EEFD000649790 /* Autoupdate */,
|
||||
72F9EBE41D519425004AC8B6 /* Deprecated */,
|
||||
@@ -1883,6 +1829,8 @@
|
||||
F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */,
|
||||
726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */,
|
||||
726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */,
|
||||
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */,
|
||||
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */,
|
||||
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */,
|
||||
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */,
|
||||
726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */,
|
||||
@@ -1890,9 +1838,11 @@
|
||||
5AF6C74E1AEA46D10014A3AB /* test.pkg */,
|
||||
5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */,
|
||||
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */,
|
||||
72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */,
|
||||
725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */,
|
||||
720DC50327A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml */,
|
||||
720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */,
|
||||
723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */,
|
||||
7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */,
|
||||
722545B526805FF80036465C /* testappcast_info_updates.xml */,
|
||||
5F1510A11C96E591006E1629 /* testnamespaces.xml */,
|
||||
@@ -1900,6 +1850,8 @@
|
||||
5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
|
||||
729F7EAB27366353004592DC /* test-links.xml */,
|
||||
723AD12E29922B5F006BB02F /* test-dangerous-link.xml */,
|
||||
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */,
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
|
||||
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
|
||||
);
|
||||
path = Resources;
|
||||
@@ -1979,9 +1931,9 @@
|
||||
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */,
|
||||
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */,
|
||||
5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */,
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */,
|
||||
72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
|
||||
5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
|
||||
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */,
|
||||
5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */,
|
||||
14950074195FDF5900BC5B5B /* SUUpdaterTest.m */,
|
||||
@@ -1997,6 +1949,7 @@
|
||||
721AB11626C777D900D34A86 /* SPUDownloadDataPrivate.h */,
|
||||
72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */,
|
||||
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */,
|
||||
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */,
|
||||
61B5FB9409C4F04600B25A18 /* SUAppcast.h */,
|
||||
725DED72263D10C400E7FA8F /* SUAppcast+Private.h */,
|
||||
61B5FB9509C4F04600B25A18 /* SUAppcast.m */,
|
||||
@@ -2048,8 +2001,6 @@
|
||||
722FB7E3260EE53F00EB571C /* SUNormalization.h */,
|
||||
722FB7E4260EE53F00EB571C /* SUNormalization.m */,
|
||||
7267E5B91D3D8B0B00D1BF90 /* SUInstallerProtocol.h */,
|
||||
7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */,
|
||||
7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */,
|
||||
7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */,
|
||||
7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */,
|
||||
);
|
||||
@@ -2065,8 +2016,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 */,
|
||||
@@ -2118,6 +2067,7 @@
|
||||
72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */,
|
||||
72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */,
|
||||
61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */,
|
||||
723F25FD2E75F76400462999 /* AppIcon.icon */,
|
||||
72F0EC44278A55CA002A876A /* screenshot.png */,
|
||||
);
|
||||
name = "Test Application";
|
||||
@@ -2131,6 +2081,8 @@
|
||||
7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */,
|
||||
7267E59A1D3D8A5A00D1BF90 /* SUSignatureVerifier.h */,
|
||||
7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */,
|
||||
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */,
|
||||
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */,
|
||||
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */,
|
||||
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */,
|
||||
);
|
||||
@@ -2178,6 +2130,7 @@
|
||||
72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */,
|
||||
72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */,
|
||||
726E078B1CA891E9001A286B /* SPUUpdaterSettings.h */,
|
||||
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */,
|
||||
726E078C1CA891E9001A286B /* SPUUpdaterSettings.m */,
|
||||
72F9EC3D1D5E823F004AC8B6 /* SPUUpdaterTimer.h */,
|
||||
72F9EC3E1D5E823F004AC8B6 /* SPUUpdaterTimer.m */,
|
||||
@@ -2195,7 +2148,6 @@
|
||||
7205C4481E1304CE00E370AE /* ArchiveItem.swift */,
|
||||
7205C44A1E1304CE00E370AE /* FeedXML.swift */,
|
||||
7205C4401E13049400E370AE /* main.swift */,
|
||||
7205C4491E1304CE00E370AE /* Signatures.swift */,
|
||||
7205C44B1E1304CE00E370AE /* Unarchive.swift */,
|
||||
FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */,
|
||||
);
|
||||
@@ -2210,6 +2162,7 @@
|
||||
72D954801CBACC35006F28BD /* InstallerProgressAppController.m */,
|
||||
72D954851CBAD4AE006F28BD /* InstallerProgressDelegate.h */,
|
||||
72D954821CBAD34F006F28BD /* main.m */,
|
||||
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */,
|
||||
72D954841CBAD418006F28BD /* ShowInstallerProgress.h */,
|
||||
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */,
|
||||
722194511D3BF987004C34FF /* SPUInstallerAgentProtocol.h */,
|
||||
@@ -2241,8 +2194,8 @@
|
||||
723ABFC3259D4CB300BDB4FA /* SUWKWebView.m */,
|
||||
723ABF2E259D062F00BDB4FA /* SULegacyWebView.h */,
|
||||
723ABF2F259D062F00BDB4FA /* SULegacyWebView.m */,
|
||||
7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */,
|
||||
7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */,
|
||||
7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */,
|
||||
7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */,
|
||||
);
|
||||
name = "Release Notes Views";
|
||||
sourceTree = "<group>";
|
||||
@@ -2300,7 +2253,8 @@
|
||||
72666DC42B0B28D4001511B0 /* common_cli */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72666DC52B0B28F4001511B0 /* secret.swift */,
|
||||
72666DC52B0B28F4001511B0 /* Secret.swift */,
|
||||
72C56E0F2EFEF10B0005A484 /* Signing.swift */,
|
||||
);
|
||||
path = common_cli;
|
||||
sourceTree = "<group>";
|
||||
@@ -2540,7 +2494,7 @@
|
||||
72045CE426FEE708004F96E5 /* strip-framework.sh */,
|
||||
720C192827127A3800740C8E /* release-move-tag.sh */,
|
||||
720B4C2325EBFAFD005A0592 /* link-tools.sh */,
|
||||
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */,
|
||||
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */,
|
||||
);
|
||||
path = Configurations;
|
||||
sourceTree = "<group>";
|
||||
@@ -2562,13 +2516,15 @@
|
||||
7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */,
|
||||
7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */,
|
||||
7267E5B61D3D8AEE00D1BF90 /* SPUInstallationInfo.h in Headers */,
|
||||
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */,
|
||||
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */,
|
||||
72C56E192F04343D0005A484 /* SPUAppcastSigningValidationStatus.h in Headers */,
|
||||
72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */,
|
||||
723ABF30259D062F00BDB4FA /* SULegacyWebView.h in Headers */,
|
||||
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */,
|
||||
7267E5B11D3D8AD500D1BF90 /* SPUMessageTypes.h in Headers */,
|
||||
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */,
|
||||
7286EE5F28CEC84900163C1D /* SUPlainTextReleaseNotesView.h in Headers */,
|
||||
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */,
|
||||
723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */,
|
||||
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */,
|
||||
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */,
|
||||
@@ -2583,6 +2539,7 @@
|
||||
72EF30BE2675CF38008CE987 /* SPUAppcastItemStateResolver.h in Headers */,
|
||||
72EF30C7267C716A008CE987 /* SUAppcastItem+Private.h in Headers */,
|
||||
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */,
|
||||
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */,
|
||||
61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */,
|
||||
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */,
|
||||
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */,
|
||||
@@ -2603,7 +2560,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 */,
|
||||
@@ -2645,7 +2601,6 @@
|
||||
buildWorkingDirectory = "";
|
||||
dependencies = (
|
||||
14732BCB1960F73500593899 /* PBXTargetDependency */,
|
||||
72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */,
|
||||
72F94F6B1CC4A0C8002DEE68 /* PBXTargetDependency */,
|
||||
725148E9266D918900247C9C /* PBXTargetDependency */,
|
||||
7218EC352623ED97008FECF3 /* PBXTargetDependency */,
|
||||
@@ -3145,6 +3100,7 @@
|
||||
fa,
|
||||
zh_HK,
|
||||
nn,
|
||||
vi,
|
||||
);
|
||||
mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */;
|
||||
packageReferences = (
|
||||
@@ -3186,11 +3142,15 @@
|
||||
files = (
|
||||
725B3A82263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml in Resources */,
|
||||
14958C6E19AEBC950061B14F /* signed-test-file.txt in Resources */,
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */,
|
||||
723AD12F29922B5F006BB02F /* test-dangerous-link.xml in Resources */,
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */,
|
||||
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */,
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
|
||||
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
|
||||
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
|
||||
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */,
|
||||
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */,
|
||||
72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
|
||||
72AC6B281B9AAD6700F62325 /* SparkleTestCodeSignApp.tar in Resources */,
|
||||
@@ -3215,7 +3175,9 @@
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
|
||||
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */,
|
||||
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
|
||||
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */,
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
|
||||
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */,
|
||||
5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
|
||||
729F7EAC27366353004592DC /* test-links.xml in Resources */,
|
||||
);
|
||||
@@ -3225,11 +3187,12 @@
|
||||
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 */,
|
||||
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */,
|
||||
72F0EC45278A55CA002A876A /* screenshot.png in Resources */,
|
||||
72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */,
|
||||
);
|
||||
@@ -3239,7 +3202,6 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3291,9 +3253,8 @@
|
||||
files = (
|
||||
61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,
|
||||
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */,
|
||||
723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */,
|
||||
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */,
|
||||
723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */,
|
||||
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */,
|
||||
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3393,6 +3354,8 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E202F04B3760005A484 /* Signing.swift in Sources */,
|
||||
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */,
|
||||
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */,
|
||||
72266A8C29464D0200645376 /* SUSignatures.m in Sources */,
|
||||
72266A8B29464CEA00645376 /* SUHost.m in Sources */,
|
||||
@@ -3422,15 +3385,14 @@
|
||||
7267E5EC1D3D912900D1BF90 /* SUInstaller.m in Sources */,
|
||||
5AF6C7541AEA49840014A3AB /* SUInstallerTest.m in Sources */,
|
||||
14652F8219A9746000959E44 /* SULog.m in Sources */,
|
||||
7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */,
|
||||
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */,
|
||||
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */,
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */,
|
||||
7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */,
|
||||
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */,
|
||||
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */,
|
||||
5AE459001C34118500E3BB47 /* SUUpdaterTest.m in Sources */,
|
||||
5AE459021C34118500E3BB47 /* SUVersionComparisonTest.m in Sources */,
|
||||
72C56E092EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3457,6 +3419,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0E2EFEEF8B0005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */,
|
||||
725EE489277D39B400D820CE /* SPUDeltaArchive.m in Sources */,
|
||||
725EE48A277D39B400D820CE /* SPUXarDeltaArchive.m in Sources */,
|
||||
@@ -3464,13 +3427,13 @@
|
||||
72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */,
|
||||
7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */,
|
||||
7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */,
|
||||
7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */,
|
||||
7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */,
|
||||
7205C4411E13049400E370AE /* main.swift in Sources */,
|
||||
728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
|
||||
7205C45F1E13066F00E370AE /* SUBinaryDeltaApply.m in Sources */,
|
||||
7205C4621E1306A600E370AE /* SUBinaryDeltaCommon.m in Sources */,
|
||||
FA30773F24CBC3E9007BA37D /* URL+Hashing.swift in Sources */,
|
||||
72C56E102EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
7205C4611E13069000E370AE /* SUBinaryDeltaCreate.m in Sources */,
|
||||
7205C45B1E13064C00E370AE /* SUBinaryDeltaUnarchiver.m in Sources */,
|
||||
7205C45D1E13065F00E370AE /* SUConstants.m in Sources */,
|
||||
@@ -3482,7 +3445,7 @@
|
||||
7205C4571E13061F00E370AE /* SUUnarchiver.m in Sources */,
|
||||
7205C4581E13061F00E370AE /* SUUnarchiverNotifier.m in Sources */,
|
||||
7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */,
|
||||
72666DC62B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC62B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3504,7 +3467,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 */,
|
||||
@@ -3551,7 +3513,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 */,
|
||||
@@ -3618,8 +3579,8 @@
|
||||
7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */,
|
||||
5A6DD17123FE1FFC000AEF33 /* SUSignatures.m in Sources */,
|
||||
721D5A8525C65D3F00D23BEA /* SUFlatPackageUnarchiver.m in Sources */,
|
||||
72C56E0A2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
7267E5CE1D3D8C7500D1BF90 /* SULog.m in Sources */,
|
||||
7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */,
|
||||
7267E5871D3D89B300D1BF90 /* SUPipedUnarchiver.m in Sources */,
|
||||
7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */,
|
||||
7267E5D81D3D8D4400D1BF90 /* SUStandardVersionComparator.m in Sources */,
|
||||
@@ -3644,6 +3605,9 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0B2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */,
|
||||
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */,
|
||||
723ABF31259D062F00BDB4FA /* SULegacyWebView.m in Sources */,
|
||||
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */,
|
||||
72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */,
|
||||
@@ -3683,7 +3647,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 */,
|
||||
@@ -3696,7 +3659,7 @@
|
||||
61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */,
|
||||
727F340B2605321D00020E85 /* SULog+NSError.m in Sources */,
|
||||
EA1E287022B66621004AA304 /* SUSignatures.m in Sources */,
|
||||
7286EE6028CEC84900163C1D /* SUPlainTextReleaseNotesView.m in Sources */,
|
||||
7286EE6028CEC84900163C1D /* SUTextViewReleaseNotesView.m in Sources */,
|
||||
6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */,
|
||||
72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */,
|
||||
72AEB1D929A1CB510033883E /* SPUNoUpdateFoundInfo.m in Sources */,
|
||||
@@ -3744,8 +3707,9 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E122EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
EA1E286122B66487004AA304 /* main.swift in Sources */,
|
||||
72666DC72B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC72B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3753,8 +3717,10 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0D2EFE002D0005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
EA1E287922B666EB004AA304 /* main.swift in Sources */,
|
||||
72666DC82B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC82B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
72C56E112EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3931,11 +3897,6 @@
|
||||
target = 721C24441CB753E6005440CB /* Installer Progress */;
|
||||
targetProxy = 72D954B91CBB6E27006F28BD /* PBXContainerItemProxy */;
|
||||
};
|
||||
72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 72D9549D1CBB415B006F28BD /* sparkle-cli */;
|
||||
targetProxy = 72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */;
|
||||
};
|
||||
72EF30B926747E39008CE987 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
|
||||
@@ -4002,93 +3963,11 @@
|
||||
F6E11510281410D10003736C /* ar */,
|
||||
37A5F28528E9219000891504 /* zh_HK */,
|
||||
728FBA1C2BB5013300651EDF /* nn */,
|
||||
E0949FD02EFC4CFD0039C748 /* vi */,
|
||||
);
|
||||
name = Sparkle.strings;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
723ABD37259A9BA500BDB4FA /* Base */,
|
||||
723ABD4C259A9BB900BDB4FA /* ar */,
|
||||
723ABD4D259A9BE100BDB4FA /* en */,
|
||||
723ABD4E259A9BEF00BDB4FA /* ca */,
|
||||
723ABD4F259A9BFD00BDB4FA /* zh_CN */,
|
||||
723ABD50259A9C0200BDB4FA /* zh_TW */,
|
||||
723ABD51259A9C0600BDB4FA /* cs */,
|
||||
723ABD52259A9C0900BDB4FA /* da */,
|
||||
723ABD53259A9C1000BDB4FA /* nl */,
|
||||
723ABD54259A9C1300BDB4FA /* fi */,
|
||||
723ABD55259A9C1500BDB4FA /* fr */,
|
||||
723ABD56259A9C1E00BDB4FA /* de */,
|
||||
723ABD57259A9C2100BDB4FA /* el */,
|
||||
723ABD58259A9C2400BDB4FA /* he */,
|
||||
723ABD59259A9C2C00BDB4FA /* is */,
|
||||
723ABD5A259A9C3600BDB4FA /* it */,
|
||||
723ABD5B259A9C3900BDB4FA /* ja */,
|
||||
723ABD5C259A9C3B00BDB4FA /* ko */,
|
||||
723ABD5D259A9C3D00BDB4FA /* nb */,
|
||||
723ABD5E259A9C4000BDB4FA /* pl */,
|
||||
723ABD5F259A9C4900BDB4FA /* pt-BR */,
|
||||
723ABD60259A9C4B00BDB4FA /* pt-PT */,
|
||||
723ABD61259A9C5400BDB4FA /* ro */,
|
||||
723ABD62259A9C5700BDB4FA /* ru */,
|
||||
723ABD63259A9C5900BDB4FA /* sk */,
|
||||
723ABD64259A9C5B00BDB4FA /* sl */,
|
||||
723ABD65259A9C5D00BDB4FA /* es */,
|
||||
723ABD66259A9C5F00BDB4FA /* sv */,
|
||||
723ABD67259A9C6100BDB4FA /* th */,
|
||||
723ABD68259A9C6300BDB4FA /* tr */,
|
||||
723ABD69259A9C6600BDB4FA /* uk */,
|
||||
72E1DAB625B3E8AE0001BA6D /* hr */,
|
||||
F67C9B7C281410B600740813 /* hu */,
|
||||
37A5F28728E9219000891504 /* zh_HK */,
|
||||
728FBA1A2BB5013300651EDF /* nn */,
|
||||
);
|
||||
name = SUUpdateAlert.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
723ABD6B259A9CBB00BDB4FA /* Base */,
|
||||
723ABD80259A9CD600BDB4FA /* en */,
|
||||
723ABD81259A9CDA00BDB4FA /* ar */,
|
||||
723ABD82259A9CEC00BDB4FA /* cs */,
|
||||
723ABD83259A9CF000BDB4FA /* zh_CN */,
|
||||
723ABD84259A9CF400BDB4FA /* zh_TW */,
|
||||
723ABD85259A9CF800BDB4FA /* da */,
|
||||
723ABD86259A9CFC00BDB4FA /* nl */,
|
||||
723ABD87259A9CFF00BDB4FA /* fi */,
|
||||
723ABD88259A9D0200BDB4FA /* fr */,
|
||||
723ABD89259A9D1800BDB4FA /* de */,
|
||||
723ABD8A259A9D1C00BDB4FA /* el */,
|
||||
723ABD8D259A9D2700BDB4FA /* hu */,
|
||||
723ABD8E259A9D2A00BDB4FA /* is */,
|
||||
723ABD91259A9D3400BDB4FA /* it */,
|
||||
723ABD92259A9D3700BDB4FA /* ja */,
|
||||
723ABD93259A9D3C00BDB4FA /* ko */,
|
||||
723ABD94259A9D3E00BDB4FA /* nb */,
|
||||
723ABD95259A9D4100BDB4FA /* pl */,
|
||||
723ABD96259A9D4600BDB4FA /* pt-BR */,
|
||||
723ABD97259A9D4900BDB4FA /* pt-PT */,
|
||||
723ABD98259A9D4C00BDB4FA /* ro */,
|
||||
723ABD99259A9D4F00BDB4FA /* ru */,
|
||||
723ABD9A259A9D5200BDB4FA /* sk */,
|
||||
723ABD9B259A9D5500BDB4FA /* sl */,
|
||||
723ABD9C259A9D5700BDB4FA /* es */,
|
||||
723ABD9D259A9D5A00BDB4FA /* sv */,
|
||||
723ABD9E259A9D5D00BDB4FA /* th */,
|
||||
723ABD9F259A9D6000BDB4FA /* tr */,
|
||||
723ABDA0259A9D6300BDB4FA /* uk */,
|
||||
72E1DAB525B3E8AE0001BA6D /* hr */,
|
||||
37A5F28628E9219000891504 /* zh_HK */,
|
||||
728FBA192BB5013300651EDF /* nn */,
|
||||
0580A0572C0D3B9200FE836A /* he */,
|
||||
);
|
||||
name = SUUpdatePermissionPrompt.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
@@ -4136,6 +4015,7 @@
|
||||
726FD2CB25F4BE5F00123BC6 /* fa */,
|
||||
37A5F28828E9219000891504 /* zh_HK */,
|
||||
728FBA1B2BB5013300651EDF /* nn */,
|
||||
E0949FCF2EFC4CFC0039C748 /* vi */,
|
||||
);
|
||||
name = MainMenu.xib;
|
||||
sourceTree = "<group>";
|
||||
|
||||
@@ -55,10 +55,13 @@
|
||||
<EnvironmentVariables>
|
||||
<EnvironmentVariable
|
||||
key = "TEST_MODE"
|
||||
value = "DELTA"
|
||||
value = "DELTA_AND_MARKDOWN"
|
||||
isEnabled = "NO">
|
||||
</EnvironmentVariable>
|
||||
</EnvironmentVariables>
|
||||
<MetalAPIValidationSettings
|
||||
isEnabled = "No">
|
||||
</MetalAPIValidationSettings>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
|
||||
@@ -1,217 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
|
||||
<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="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)">
|
||||
<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="2560" height="1409"/>
|
||||
<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" 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 focusRingType="none" 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 focusRingType="none" 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="77" width="492" height="231"/>
|
||||
<subviews>
|
||||
<box boxType="oldStyle" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="89">
|
||||
<rect key="frame" x="0.0" y="0.0" width="492" height="211"/>
|
||||
<view key="contentView" id="hbB-V1-Bf6">
|
||||
<rect key="frame" x="1" y="1" width="490" height="209"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
</view>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="pvn-8k-9Ev"/>
|
||||
</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 focusRingType="none" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="17">
|
||||
<rect key="frame" x="-2" y="217" width="88" height="14"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="100" constant="100" id="gkn-FW-9aC"/>
|
||||
</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="342" y="19" width="126" height="24"/>
|
||||
<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">
|
||||
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="109" y="19" width="129" height="24"/>
|
||||
<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="480" y="19" width="120" height="24"/>
|
||||
<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">
|
||||
DQ
|
||||
</string>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="N94-uf-6oP"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<action selector="installUpdate:" target="-2" id="77"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button translatesAutoresizingMaskIntoConstraints="NO" id="117">
|
||||
<rect key="frame" x="109" y="55" width="313" height="14"/>
|
||||
<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>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<binding destination="93" name="value" keyPath="values.SUAutomaticallyUpdate" id="135"/>
|
||||
</connections>
|
||||
</button>
|
||||
</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 firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="22" id="zSE-lw-Ggj"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="-2" id="50"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="466" y="290"/>
|
||||
</window>
|
||||
<userDefaultsController representsSharedInstance="YES" id="93" userLabel="Shared Defaults"/>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="NSApplicationIcon" width="32" height="32"/>
|
||||
</resources>
|
||||
</document>
|
||||
@@ -10,6 +10,9 @@
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required.";
|
||||
|
||||
/* Mac is too old and update requires Apple silicon Mac */
|
||||
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "%1$@ %2$@ is available but this update requires a new Apple silicon Mac.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%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.";
|
||||
|
||||
@@ -58,6 +61,9 @@
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the update. Please try again later." = "An error occurred while downloading the update. Please try again later.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the release notes." = "An error occurred while downloading the release notes.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later.";
|
||||
|
||||
@@ -85,7 +91,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancel";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Cancel Update";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,12 +124,9 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Install on Quit";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"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…";
|
||||
|
||||
@@ -161,11 +164,17 @@
|
||||
"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.";
|
||||
"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information." = "The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "The update is improperly signed and could not be validated. Please try again later or contact the app developer.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer." = "The update feed is improperly signed and could not be validated. Please try again later or contact the app developer.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "The release notes is improperly signed and could not be validated. Please contact the app developer for more information.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Unable to Check For Updates" = "Unable to Check For Updates";
|
||||
|
||||
@@ -175,7 +184,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Update Installed";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Updating %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -196,5 +205,41 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "Your macOS version is too old";
|
||||
|
||||
/* Mac is too old and update requires newer hardware */
|
||||
"Your Mac is too old" = "Your Mac is too old";
|
||||
|
||||
/* 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";
|
||||
|
||||
/* Remind Me Later choice for update alert */
|
||||
"Remind Me Later" = "Remind Me Later";
|
||||
|
||||
/* Skip This Version choice for update alert */
|
||||
"Skip This Version" = "Skip This Version";
|
||||
|
||||
/* Install Update choice for update alert */
|
||||
"Install Update" = "Install Update";
|
||||
|
||||
/* Automatically download and install updates in the future option for update alert */
|
||||
"Automatically download and install updates in the future" = "Automatically download and install updates in the future";
|
||||
|
||||
/* Check for updates automatically response for update permission dialog */
|
||||
"Check Automatically" = "Check Automatically";
|
||||
|
||||
/* Don't check for updates automatically response for update permission dialog */
|
||||
"Don’t Check" = "Don’t Check";
|
||||
|
||||
/* Title question for update permission dialog */
|
||||
"Check for updates automatically?" = "Check for updates automatically?";
|
||||
|
||||
/* Include anonymous system profile choice for update permission dialog */
|
||||
"Include anonymous system profile" = "Include anonymous system profile";
|
||||
|
||||
/* Automatically download and install updates choice for update permission dialog */
|
||||
"Automatically download and install updates" = "Automatically download and install updates";
|
||||
|
||||
/* Anonymous system profile information disclosure for update permission dialog */
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
|
||||
@@ -30,9 +30,8 @@
|
||||
<string>1</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
<string>ca</string>
|
||||
<string>ar</string>
|
||||
<string>ca</string>
|
||||
<string>cs</string>
|
||||
<string>da</string>
|
||||
<string>de</string>
|
||||
@@ -51,6 +50,7 @@
|
||||
<string>ko</string>
|
||||
<string>nb</string>
|
||||
<string>nl</string>
|
||||
<string>nn</string>
|
||||
<string>pl</string>
|
||||
<string>pt-BR</string>
|
||||
<string>pt-PT</string>
|
||||
@@ -62,6 +62,7 @@
|
||||
<string>th</string>
|
||||
<string>tr</string>
|
||||
<string>uk</string>
|
||||
<string>vi</string>
|
||||
<string>zh_CN</string>
|
||||
<string>zh_HK</string>
|
||||
<string>zh_TW</string>
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#import "SPUMessageTypes.h"
|
||||
#import "SULog.h"
|
||||
#import "SULog+NSError.h"
|
||||
#import "SUApplicationInfo.h"
|
||||
#import "SPUInstallerAgentProtocol.h"
|
||||
#import "SUInstallerAgentInitiationProtocol.h"
|
||||
#import "StatusInfo.h"
|
||||
@@ -102,7 +101,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
// This difference is significant. We shouldn't have a model where the 'server' tries to connect to a 'client',
|
||||
// nor have a model where a process that runs at the highest level (the installer can run as root) tries to connect to a user level agent or process
|
||||
BOOL systemDomain = arguments[2].boolValue;
|
||||
NSXPCConnectionOptions connectionOptions = systemDomain ? NSXPCConnectionPrivileged : 0;
|
||||
NSXPCConnectionOptions connectionOptions = systemDomain ? NSXPCConnectionPrivileged : (NSXPCConnectionOptions)0;
|
||||
|
||||
_systemDomain = systemDomain;
|
||||
_connection = [[NSXPCConnection alloc] initWithMachServiceName:SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) options:connectionOptions];
|
||||
@@ -114,8 +113,6 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
_application = application;
|
||||
_delegate = delegate;
|
||||
|
||||
[delegate loadLocalizationStringsFromHost:host];
|
||||
|
||||
_connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol)];
|
||||
_connection.exportedObject = self;
|
||||
|
||||
@@ -192,26 +189,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
|
||||
[_statusInfo invalidate];
|
||||
[_connection invalidate];
|
||||
|
||||
// Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
|
||||
NSError *theError = nil;
|
||||
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
|
||||
|
||||
if (![[NSFileManager defaultManager] removeItemAtPath:bundlePath error:&theError]) {
|
||||
SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
|
||||
} else {
|
||||
// There should be nothing else in the parent temporary directory given to us,
|
||||
// so let us try to remove it. Note rmdir() will fail if there are unexpectably other
|
||||
// items present
|
||||
NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
|
||||
const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
|
||||
if (fileSystemRepresentation != NULL) {
|
||||
if (rmdir(fileSystemRepresentation) != 0) {
|
||||
SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
exit(status);
|
||||
}
|
||||
|
||||
@@ -230,11 +208,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 26, *)) {
|
||||
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) {
|
||||
@@ -414,19 +421,9 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (!self->_willTerminate) {
|
||||
// Show app icon in the dock
|
||||
ProcessSerialNumber psn = { 0, kCurrentProcess };
|
||||
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
||||
|
||||
// Note: the application icon needs to be set after showing the icon in the dock
|
||||
self->_application.applicationIconImage = [SUApplicationInfo bestIconForHost:self->_oldHost];
|
||||
|
||||
// Activate ourselves otherwise we will probably be in the background
|
||||
if (@available(macOS 14, *)) {
|
||||
[self->_application activate];
|
||||
} else {
|
||||
[self->_application activateIgnoringOtherApps:YES];
|
||||
}
|
||||
// See comments in -[SPUStandardUserDriver _activateApplication] for why -activate is not used
|
||||
[self->_application activateIgnoringOtherApps:YES];
|
||||
|
||||
[self->_delegate installerProgressShouldDisplayWithHost:self->_oldHost];
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@protocol InstallerProgressDelegate <NSObject>
|
||||
|
||||
- (void)loadLocalizationStringsFromHost:(SUHost *)host;
|
||||
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host;
|
||||
- (void)installerProgressShouldStop;
|
||||
|
||||
|
||||
@@ -0,0 +1,189 @@
|
||||
//
|
||||
// SPUInstallerProgressLocalizedStrings.h
|
||||
// Sparkle
|
||||
//
|
||||
// This file is auto-generated by Configurations/generate_progress_tool_localizations.py
|
||||
// Do not edit by hand. Re-run the script after changing the strings below in
|
||||
// Sparkle/*.lproj/Sparkle.strings
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{
|
||||
@"ar": @{
|
||||
@"Cancel Update": @"إلغاء التحديث",
|
||||
@"Updating %@": @"تحديث %@",
|
||||
},
|
||||
@"ca": @{
|
||||
@"Installing update…": @"Instal·lant l'actualització…",
|
||||
@"Updating %@": @"Actualitzant %@",
|
||||
},
|
||||
@"cs": @{
|
||||
@"Cancel Update": @"Zrušit aktualizaci",
|
||||
@"Installing update…": @"Instaluje se aktualizace…",
|
||||
@"Updating %@": @"Aktualizuje se %@",
|
||||
},
|
||||
@"da": @{
|
||||
@"Cancel Update": @"Annuller opdatering",
|
||||
@"Installing update…": @"Installerer opdatering…",
|
||||
@"Updating %@": @"Opdaterer %@",
|
||||
},
|
||||
@"de": @{
|
||||
@"Cancel Update": @"Aktualisierung abbrechen",
|
||||
@"Installing update…": @"Update installieren …",
|
||||
@"Updating %@": @"Aktualisierung von %@",
|
||||
},
|
||||
@"el": @{
|
||||
@"Cancel Update": @"Ακύρωση Ενημέρωσης",
|
||||
@"Installing update…": @"Εγκατάσταση ενημέρωσης…",
|
||||
@"Updating %@": @"Ενημέρωση %@",
|
||||
},
|
||||
@"en": @{
|
||||
@"Cancel Update": @"Cancel Update",
|
||||
@"Installing update…": @"Installing update…",
|
||||
@"Updating %@": @"Updating %@",
|
||||
},
|
||||
@"es": @{
|
||||
@"Cancel Update": @"Cancelar actualización",
|
||||
@"Installing update…": @"Instalando actualización…",
|
||||
@"Updating %@": @"Actualizando %@",
|
||||
},
|
||||
@"fa": @{
|
||||
@"Cancel Update": @"لغو بهروزرسانی",
|
||||
@"Installing update…": @"در حال نصب بهروزرسانی",
|
||||
@"Updating %@": @"%@ در حال بهروزرسانی",
|
||||
},
|
||||
@"fi": @{
|
||||
@"Cancel Update": @"Peruuta päivitykset",
|
||||
@"Installing update…": @"Päivitys asennetaan…",
|
||||
@"Updating %@": @"Päivitetään %@",
|
||||
},
|
||||
@"fr": @{
|
||||
@"Cancel Update": @"Annuler la mise à jour",
|
||||
@"Installing update…": @"Installation de la mise à jour…",
|
||||
@"Updating %@": @"Mise à jour de %@",
|
||||
},
|
||||
@"he": @{
|
||||
@"Cancel Update": @"בטל את העדכון",
|
||||
@"Installing update…": @"מתקין את העדכון",
|
||||
@"Updating %@": @"עדכון %@",
|
||||
},
|
||||
@"hr": @{
|
||||
@"Cancel Update": @"Prekini aktualiziranje",
|
||||
@"Installing update…": @"Instaliranje nadogradnje …",
|
||||
@"Updating %@": @"%@ se aktualizira",
|
||||
},
|
||||
@"hu": @{
|
||||
@"Cancel Update": @"Frissítés megszakítása",
|
||||
@"Updating %@": @"%@ frissítése",
|
||||
},
|
||||
@"is": @{
|
||||
@"Installing update…": @"Set inn uppfærslu…",
|
||||
@"Updating %@": @"Uppfæri %@",
|
||||
},
|
||||
@"it": @{
|
||||
@"Cancel Update": @"Annulla Aggiornamento",
|
||||
@"Installing update…": @"Installazione aggiornamento in corso…",
|
||||
@"Updating %@": @"Aggiornamento di %@",
|
||||
},
|
||||
@"ja": @{
|
||||
@"Cancel Update": @"アップデートを中止",
|
||||
@"Installing update…": @"アップデートをインストールしています…",
|
||||
@"Updating %@": @"%@をアップデート中",
|
||||
},
|
||||
@"ko": @{
|
||||
@"Cancel Update": @"업데이트 취소",
|
||||
@"Installing update…": @"설치 중…",
|
||||
@"Updating %@": @"%@ 업데이트 중",
|
||||
},
|
||||
@"nb": @{
|
||||
@"Cancel Update": @"Avbryt oppdateringen",
|
||||
@"Installing update…": @"Installerer oppdateringen…",
|
||||
@"Updating %@": @"Oppdaterer %@",
|
||||
},
|
||||
@"nl": @{
|
||||
@"Cancel Update": @"Annuleer update",
|
||||
@"Installing update…": @"Update installeren…",
|
||||
@"Updating %@": @"%@ bijwerken…",
|
||||
},
|
||||
@"nn": @{
|
||||
@"Cancel Update": @"Avbryt oppdateringa",
|
||||
@"Installing update…": @"Installerer oppdateringa…",
|
||||
@"Updating %@": @"Oppdaterer %@",
|
||||
},
|
||||
@"pl": @{
|
||||
@"Cancel Update": @"Anuluj uaktualnianie",
|
||||
@"Installing update…": @"Instalowanie uaktualnienia…",
|
||||
@"Updating %@": @"Uaktualniam %@",
|
||||
},
|
||||
@"pt-BR": @{
|
||||
@"Cancel Update": @"Cancelar Atualização",
|
||||
@"Installing update…": @"Instalando atualização…",
|
||||
@"Updating %@": @"Atualizando o app %@",
|
||||
},
|
||||
@"pt-PT": @{
|
||||
@"Cancel Update": @"Cancelar atualização",
|
||||
@"Installing update…": @"A instalar atualização…",
|
||||
@"Updating %@": @"A atualizar o %@",
|
||||
},
|
||||
@"ro": @{
|
||||
@"Cancel Update": @"Anulează actualizarea",
|
||||
@"Installing update…": @"Instalează actualizarea…",
|
||||
@"Updating %@": @"Actualizează %@",
|
||||
},
|
||||
@"ru": @{
|
||||
@"Cancel Update": @"Отменить обновление",
|
||||
@"Installing update…": @"Устанавливаю обновление…",
|
||||
@"Updating %@": @"Обновляю %@",
|
||||
},
|
||||
@"sk": @{
|
||||
@"Cancel Update": @"Zrušiť aktualizáciu",
|
||||
@"Installing update…": @"Inštaluje sa aktualizácia…",
|
||||
@"Updating %@": @"Aktualizuje sa %@",
|
||||
},
|
||||
@"sl": @{
|
||||
@"Cancel Update": @"Prekliči posodabljanje",
|
||||
@"Installing update…": @"Nameščanje posodobitve …",
|
||||
@"Updating %@": @"Posodabljam %@",
|
||||
},
|
||||
@"sv": @{
|
||||
@"Cancel Update": @"Avbryt uppdatering",
|
||||
@"Installing update…": @"Installerar uppdatering…",
|
||||
@"Updating %@": @"Uppdaterar %@",
|
||||
},
|
||||
@"th": @{
|
||||
@"Cancel Update": @"ยกเลิกอัพเดท",
|
||||
@"Installing update…": @"กำลังติดตั้งอัพเดท…",
|
||||
@"Updating %@": @"กำลังอัพเดท %@",
|
||||
},
|
||||
@"tr": @{
|
||||
@"Cancel Update": @"Güncellemeden Vazgeç",
|
||||
@"Installing update…": @"Güncelleme kuruluyor…",
|
||||
@"Updating %@": @"%@ güncelleniyor",
|
||||
},
|
||||
@"uk": @{
|
||||
@"Cancel Update": @"Відмінити оновлення",
|
||||
@"Installing update…": @"Встановлюю оновлення…",
|
||||
@"Updating %@": @"Оновлюю %@",
|
||||
},
|
||||
@"vi": @{
|
||||
@"Cancel Update": @"Hủy cập nhật",
|
||||
@"Installing update…": @"Đang cài đặt bản cập nhật…",
|
||||
@"Updating %@": @"Đang cập nhật %@",
|
||||
},
|
||||
@"zh_CN": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"正在安装更新…",
|
||||
@"Updating %@": @"正在更新%@",
|
||||
},
|
||||
@"zh_HK": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"安裝緊更新⋯",
|
||||
@"Updating %@": @"更新緊 %@",
|
||||
},
|
||||
@"zh_TW": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"正在安裝更新項目⋯",
|
||||
@"Updating %@": @"正在更新%@",
|
||||
},
|
||||
};
|
||||
@@ -10,95 +10,50 @@
|
||||
#import "ShowInstallerProgress.h"
|
||||
#import "SUStatusController.h"
|
||||
#import "SUHost.h"
|
||||
#import "SULocalizations.h"
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
#import "SPUInstallerProgressLocalizedStrings.h"
|
||||
#endif
|
||||
|
||||
@implementation ShowInstallerProgress
|
||||
{
|
||||
SUStatusController *_statusController;
|
||||
NSString *_updatingString;
|
||||
NSString *_cancelUpdateTitle;
|
||||
NSString *_installingUpdateTitle;
|
||||
}
|
||||
|
||||
- (void)loadLocalizationStringsFromHost:(SUHost *)host
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
// SPUInstallerProgressLocalizedStringsTable is generated at development time (by Configurations/generate_progress_tool_localizations.py)
|
||||
static NSDictionary<NSString *, NSString *> *SUBestMatchingInstallerProgressLocalizedStrings(void)
|
||||
{
|
||||
// Try to retrieve localization strings from the old bundle if possible
|
||||
// We won't display these strings until installerProgressShouldDisplayWithHost:
|
||||
// (which will be after the update is trusted)
|
||||
// If we fail to load localizations in any way, we default to English
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *hostSparkleBundle;
|
||||
{
|
||||
NSURL *hostSparkleURL = [host.bundle.privateFrameworksURL URLByAppendingPathComponent:@"Sparkle.framework" isDirectory:YES];
|
||||
if (hostSparkleURL == nil) {
|
||||
hostSparkleBundle = nil;
|
||||
} else {
|
||||
hostSparkleBundle = [NSBundle bundleWithURL:hostSparkleURL];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
NSString *updatingString;
|
||||
{
|
||||
NSString *hostNameFromBundle = host.name;
|
||||
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *updatingFormatStringFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Updating %@", @"Sparkle", hostSparkleBundle, nil) : nil;
|
||||
|
||||
if (updatingFormatStringFromBundle != nil) {
|
||||
// Replacing the %@ will be a bit safer than using +[NSString stringWithFormat:]
|
||||
updatingString = [updatingFormatStringFromBundle stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
|
||||
} else {
|
||||
updatingString = [@"Updating " stringByAppendingString:hostName];
|
||||
}
|
||||
}
|
||||
#else
|
||||
{
|
||||
updatingString = [@"Updating " stringByAppendingString:hostName];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
_updatingString = updatingString;
|
||||
|
||||
NSString *cancelUpdateTitle;
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *cancelUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Cancel Update", @"Sparkle", hostSparkleBundle, @"") : nil;
|
||||
cancelUpdateTitle = (cancelUpdateTitleFromBundle != nil) ? cancelUpdateTitleFromBundle : @"Cancel Update";
|
||||
}
|
||||
#else
|
||||
{
|
||||
cancelUpdateTitle = @"Cancel Update";
|
||||
}
|
||||
#endif
|
||||
_cancelUpdateTitle = cancelUpdateTitle;
|
||||
|
||||
NSString *installingUpdateTitle;
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *installingUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Installing update…", @"Sparkle", hostSparkleBundle, @"") : nil;
|
||||
installingUpdateTitle = (installingUpdateTitleFromBundle != nil) ? installingUpdateTitleFromBundle : @"Installing update…";
|
||||
}
|
||||
#else
|
||||
{
|
||||
installingUpdateTitle = @"Installing update…";
|
||||
}
|
||||
#endif
|
||||
|
||||
_installingUpdateTitle = installingUpdateTitle;
|
||||
NSArray<NSString *> *availableLocalizations = SPUInstallerProgressLocalizedStringsTable.allKeys;
|
||||
NSArray<NSString *> *preferredLocalizations = [NSBundle preferredLocalizationsFromArray:availableLocalizations];
|
||||
NSString *bestLocalization = preferredLocalizations.firstObject ?: @"en";
|
||||
return SPUInstallerProgressLocalizedStringsTable[bestLocalization] ?: SPUInstallerProgressLocalizedStringsTable[@"en"];
|
||||
}
|
||||
#endif
|
||||
|
||||
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host
|
||||
{
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSDictionary<NSString *, NSString *> *localizedStrings = SUBestMatchingInstallerProgressLocalizedStrings();
|
||||
#else
|
||||
NSDictionary<NSString *, NSString *> *localizedStrings = @{};
|
||||
#endif
|
||||
|
||||
NSString *hostNameFromBundle = host.name;
|
||||
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
|
||||
|
||||
NSString *updatingFormatString = localizedStrings[@"Updating %@"] ?: @"Updating %@";
|
||||
NSString *updatingString = [updatingFormatString stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
|
||||
|
||||
NSString *cancelUpdateTitle = localizedStrings[@"Cancel Update"] ?: @"Cancel Update";
|
||||
|
||||
NSString *installingUpdateTitle = localizedStrings[@"Installing update…"] ?: @"Installing update…";
|
||||
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO];
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
|
||||
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
[_statusController setButtonTitle:cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
[_statusController beginActionWithTitle:installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
|
||||
[_statusController showWindow:self];
|
||||
}
|
||||
|
||||
@@ -15,13 +15,15 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUAppcastItemState : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK;
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumUpdateVersionIsOK:(BOOL)minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:(BOOL)arm64HardwareRequirementIsOK;
|
||||
|
||||
@property (nonatomic, readonly) BOOL majorUpgrade;
|
||||
@property (nonatomic, readonly) BOOL criticalUpdate;
|
||||
@property (nonatomic, readonly) BOOL informationalUpdate;
|
||||
@property (nonatomic, readonly) BOOL minimumUpdateVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL arm64HardwareRequirementIsOK;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -14,8 +14,10 @@
|
||||
#define SPUAppcastItemStateMajorUpgradeKey @"SPUAppcastItemStateMajorUpgrade"
|
||||
#define SPUAppcastItemStateCriticalUpdateKey @"SPUAppcastItemStateCriticalUpdate"
|
||||
#define SPUAppcastItemStateInformationalUpdateKey @"SPUAppcastItemStateInformationalUpdate"
|
||||
#define SPUAppcastItemStateUpdateMinimumVersionIsOKKey @"SPUAppcastItemStateMinimumUpdateVersionIsOK"
|
||||
#define SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMinimumOperatingSystemVersionIsOK"
|
||||
#define SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMaximumOperatingSystemVersionIsOK"
|
||||
#define SPUAppcastItemStateArm64HardwareRequirementIsOKKey @"SPUAppcastItemStateArm64HardwareRequirementIsOK"
|
||||
|
||||
@interface SPUAppcastItemState () <NSSecureCoding>
|
||||
@end
|
||||
@@ -25,18 +27,22 @@
|
||||
@synthesize majorUpgrade = _majorUpgrade;
|
||||
@synthesize criticalUpdate = _criticalUpdate;
|
||||
@synthesize informationalUpdate = _informationalUpdate;
|
||||
@synthesize minimumUpdateVersionIsOK = _minimumUpdateVersionIsOK;
|
||||
@synthesize minimumOperatingSystemVersionIsOK = _minimumOperatingSystemVersionIsOK;
|
||||
@synthesize maximumOperatingSystemVersionIsOK = _maximumOperatingSystemVersionIsOK;
|
||||
@synthesize arm64HardwareRequirementIsOK = _arm64HardwareRequirementIsOK;
|
||||
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumUpdateVersionIsOK:(BOOL)minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:(BOOL)arm64HardwareRequirementIsOK
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_majorUpgrade = majorUpgrade;
|
||||
_criticalUpdate = criticalUpdate;
|
||||
_informationalUpdate = informationalUpdate;
|
||||
_minimumUpdateVersionIsOK = minimumUpdateVersionIsOK;
|
||||
_minimumOperatingSystemVersionIsOK = minimumOperatingSystemVersionIsOK;
|
||||
_maximumOperatingSystemVersionIsOK = maximumOperatingSystemVersionIsOK;
|
||||
_arm64HardwareRequirementIsOK = arm64HardwareRequirementIsOK;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
@@ -51,8 +57,10 @@
|
||||
[encoder encodeBool:_majorUpgrade forKey:SPUAppcastItemStateMajorUpgradeKey];
|
||||
[encoder encodeBool:_criticalUpdate forKey:SPUAppcastItemStateCriticalUpdateKey];
|
||||
[encoder encodeBool:_informationalUpdate forKey:SPUAppcastItemStateInformationalUpdateKey];
|
||||
[encoder encodeBool:_minimumUpdateVersionIsOK forKey:SPUAppcastItemStateUpdateMinimumVersionIsOKKey];
|
||||
[encoder encodeBool:_minimumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey];
|
||||
[encoder encodeBool:_maximumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey];
|
||||
[encoder encodeBool:_arm64HardwareRequirementIsOK forKey:SPUAppcastItemStateArm64HardwareRequirementIsOKKey];
|
||||
}
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)decoder
|
||||
@@ -60,10 +68,12 @@
|
||||
BOOL majorUpgrade = [decoder decodeBoolForKey:SPUAppcastItemStateMajorUpgradeKey];
|
||||
BOOL criticalUpdate = [decoder decodeBoolForKey:SPUAppcastItemStateCriticalUpdateKey];
|
||||
BOOL informationalUpdate = [decoder decodeBoolForKey:SPUAppcastItemStateInformationalUpdateKey];
|
||||
BOOL minimumUpdateVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateUpdateMinimumVersionIsOKKey];
|
||||
BOOL minimumOperatingSystemVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey];
|
||||
BOOL maximumOperatingSystemVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey];
|
||||
BOOL arm64HardwareRequirementIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateArm64HardwareRequirementIsOKKey];
|
||||
|
||||
return [self initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK];
|
||||
return [self initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumUpdateVersionIsOK:minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:arm64HardwareRequirementIsOK];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface SPUAppcastItemStateResolver ()
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary;
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumUpdateVersion:(NSString * _Nullable)minimumUpdateVersion minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary hardwareRequirements:(NSSet<NSString *> *)hardwareRequirements;
|
||||
|
||||
+ (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator;
|
||||
|
||||
|
||||
@@ -13,7 +13,11 @@
|
||||
#import "SUStandardVersionComparator.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SUOperatingSystem.h"
|
||||
#import "SULog.h"
|
||||
|
||||
#import <TargetConditionals.h>
|
||||
#import <sys/types.h>
|
||||
#import <sys/sysctl.h>
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@@ -35,7 +39,18 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumOperatingSystemVersionOK:(NSString * _Nullable)minimumSystemVersion
|
||||
- (BOOL)isMinimumUpdateVersionOK:(NSString * _Nullable)minimumUpdateVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
NSString *hostVersion = _hostVersion;
|
||||
|
||||
BOOL minimumVersionOK = YES;
|
||||
if (minimumUpdateVersion != nil && ![minimumUpdateVersion isEqualToString:@""]) {
|
||||
minimumVersionOK = [_applicationVersionComparator compareVersion:(NSString * _Nonnull)minimumUpdateVersion toVersion:hostVersion] != NSOrderedDescending;
|
||||
}
|
||||
return minimumVersionOK;
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumOperatingSystemVersionOK:(NSString * _Nullable)minimumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL minimumVersionOK = YES;
|
||||
if (minimumSystemVersion != nil && ![minimumSystemVersion isEqualToString:@""]) {
|
||||
@@ -44,7 +59,7 @@
|
||||
return minimumVersionOK;
|
||||
}
|
||||
|
||||
- (BOOL)isMaximumOperatingSystemVersionOK:(NSString * _Nullable)maximumSystemVersion
|
||||
- (BOOL)isMaximumOperatingSystemVersionOK:(NSString * _Nullable)maximumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL maximumVersionOK = YES;
|
||||
if (maximumSystemVersion != nil && ![maximumSystemVersion isEqualToString:@""]) {
|
||||
@@ -58,12 +73,12 @@
|
||||
return (minimumAutoupdateVersion.length == 0 || ([versionComparator compareVersion:hostVersion toVersion:(NSString * _Nonnull)minimumAutoupdateVersion] != NSOrderedAscending));
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion
|
||||
- (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
return [[self class] isMinimumAutoupdateVersionOK:minimumAutoupdateVersion hostVersion:_hostVersion versionComparator:_applicationVersionComparator];
|
||||
}
|
||||
|
||||
- (BOOL)isCriticalUpdateWithCriticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
|
||||
- (BOOL)isCriticalUpdateWithCriticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary SPU_OBJC_DIRECT
|
||||
{
|
||||
// Check if any critical update info is provided
|
||||
if (criticalUpdateDictionary == nil) {
|
||||
@@ -80,7 +95,7 @@
|
||||
return ([_applicationVersionComparator compareVersion:_hostVersion toVersion:criticalVersion] == NSOrderedAscending);
|
||||
}
|
||||
|
||||
- (BOOL)isInformationalUpdateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions
|
||||
- (BOOL)isInformationalUpdateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions SPU_OBJC_DIRECT
|
||||
{
|
||||
if (informationalUpdateVersions == nil) {
|
||||
return NO;
|
||||
@@ -109,19 +124,59 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
|
||||
- (BOOL)isArm64HardwareRequirementOK:(NSSet<NSString *> *)hardwareRequirements minimumSystemVersion:(NSString *_Nullable )minimumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
#if TARGET_CPU_X86_64
|
||||
// macOS 27+ will no longer support Intel Macs
|
||||
BOOL hasARM64Requirement;
|
||||
if (minimumSystemVersion.length > 0 && [_standardVersionComparator compareVersion:(NSString * _Nonnull)minimumSystemVersion toVersion:@"27.0"] != NSOrderedAscending) {
|
||||
hasARM64Requirement = YES;
|
||||
} else {
|
||||
hasARM64Requirement = [hardwareRequirements containsObject:SUAppcastElementHardwareRequirementARM64];
|
||||
}
|
||||
|
||||
if (!hasARM64Requirement) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
// If the process is run under Rosetta, then the hardware is compatible
|
||||
// https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment
|
||||
int translatedResult = 0;
|
||||
size_t translatedResultSize = sizeof(translatedResult);
|
||||
if (sysctlbyname("sysctl.proc_translated", &translatedResult, &translatedResultSize, NULL, 0) == -1) {
|
||||
if (errno == ENOENT) {
|
||||
// Native x86_64 process
|
||||
return NO;
|
||||
}
|
||||
|
||||
// An error occured
|
||||
SULog(SULogLevelError, @"Error: failed to detect if process is running under rosetta with error: %d", errno);
|
||||
return YES;
|
||||
}
|
||||
|
||||
return (translatedResult == 1);
|
||||
#else
|
||||
return YES;
|
||||
#endif
|
||||
}
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumUpdateVersion:(NSString * _Nullable)minimumUpdateVersion minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary hardwareRequirements:(NSSet<NSString *> *)hardwareRequirements
|
||||
{
|
||||
BOOL informationalUpdate = [self isInformationalUpdateWithInformationalUpdateVersions:informationalUpdateVersions];
|
||||
|
||||
BOOL minimumUpdateVersionIsOK = [self isMinimumUpdateVersionOK:minimumUpdateVersion];
|
||||
|
||||
BOOL minimumOperatingSystemVersionIsOK = [self isMinimumOperatingSystemVersionOK:minimumOperatingSystemVersion];
|
||||
|
||||
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];;
|
||||
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];
|
||||
|
||||
BOOL majorUpgrade = ![self isMinimumAutoupdateVersionOK:minimumAutoupdateVersion];
|
||||
|
||||
BOOL criticalUpdate = [self isCriticalUpdateWithCriticalUpdateDictionary:criticalUpdateDictionary];
|
||||
|
||||
return [[SPUAppcastItemState alloc] initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK];
|
||||
BOOL arm64HardwareRequirementIsOK = [self isArm64HardwareRequirementOK:hardwareRequirements minimumSystemVersion:minimumOperatingSystemVersion];
|
||||
|
||||
return [[SPUAppcastItemState alloc] initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumUpdateVersionIsOK:minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:arm64HardwareRequirementIsOK];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,32 @@
|
||||
//
|
||||
// SPUAppcastSigningValidationStatus.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/30/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef SPUAppcastSigningValidationStatus_h
|
||||
#define SPUAppcastSigningValidationStatus_h
|
||||
|
||||
typedef NS_ENUM(NSInteger, SPUAppcastSigningValidationStatus)
|
||||
{
|
||||
/**
|
||||
The bundle does not opt into requiring appcast signing and no validation of the appcast feed is done.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusSkipped = 0,
|
||||
|
||||
/**
|
||||
The appcast is signed and validation has passed succesfully.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusSucceeded,
|
||||
|
||||
/**
|
||||
The appcast is signed and validation has failed. In this case, appcast items operate in a 'safe' fallback mode
|
||||
meaning that they cannot be marked as a critical update, cannot be marked as informational update,
|
||||
and will not have any release note or link references.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusFailed,
|
||||
};
|
||||
|
||||
#endif /* SPUAppcastSigningValidationStatus_h */
|
||||
@@ -31,7 +31,7 @@
|
||||
__weak id<SPUUserDriver> _userDriver;
|
||||
__weak id _updaterDelegate;
|
||||
|
||||
BOOL _willInstallSilently;
|
||||
BOOL _installerDidFinishPreparation;
|
||||
}
|
||||
|
||||
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
|
||||
@@ -78,11 +78,17 @@
|
||||
SULog(SULogLevelError, @"Error: resumeDownloadedUpdate: called on SPUAutomaticUpdateDriver");
|
||||
}
|
||||
|
||||
// Note: critical updates can be downloaded automatically first before needing user attention
|
||||
static BOOL SPUUpdateRequiresUserAttentionBeforeDownloading(SUAppcastItem *updateItem)
|
||||
{
|
||||
return (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade || updateItem.signingValidationStatus == SPUAppcastSigningValidationStatusFailed);
|
||||
}
|
||||
|
||||
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
|
||||
{
|
||||
_updateItem = updateItem;
|
||||
|
||||
if (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade) {
|
||||
if (SPUUpdateRequiresUserAttentionBeforeDownloading(updateItem)) {
|
||||
[_coreDriver deferInformationalUpdate:updateItem secondaryUpdate:secondaryUpdateItem];
|
||||
[self abortUpdate];
|
||||
} else {
|
||||
@@ -95,14 +101,14 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
_willInstallSilently = willInstallSilently;
|
||||
_installerDidFinishPreparation = YES;
|
||||
|
||||
if (!willInstallImmediately) {
|
||||
BOOL installationHandledByDelegate = NO;
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
if (_willInstallSilently && [updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)]) {
|
||||
if ([updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)]) {
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
installationHandledByDelegate = [updaterDelegate updater:_updater willInstallUpdateOnQuit:_updateItem immediateInstallationBlock:^{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -139,7 +145,9 @@
|
||||
|
||||
- (void)abortUpdateWithError:(NSError *)error
|
||||
{
|
||||
BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!_willInstallSilently || _updateItem.criticalUpdate || _updateItem.isInformationOnlyUpdate);
|
||||
// It should not be necessary to include properties from SPUUpdateRequiresUserAttentionBeforeDownloading() because _installerDidFinishPreparation should be NO in those cases,
|
||||
// but we'll include the check anyway
|
||||
BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!_installerDidFinishPreparation || _updateItem.criticalUpdate || SPUUpdateRequiresUserAttentionBeforeDownloading(_updateItem));
|
||||
|
||||
[_coreDriver abortUpdateAndShowNextUpdateImmediately:showNextUpdateImmediately error:error];
|
||||
}
|
||||
|
||||
@@ -148,21 +148,12 @@
|
||||
id updater = _updater;
|
||||
|
||||
if (!resuming) {
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
// interactive pkg based updates are not supported under root user
|
||||
if ([updateItem.installationType isEqualToString:SPUInstallationTypeInteractivePackage] && geteuid() == 0) {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationRootInteractiveError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"Interactive based packages cannot be installed as the root user.", SPARKLE_TABLE, SUSparkleBundle(), nil) }]];
|
||||
// Give the delegate a chance to bail
|
||||
|
||||
NSError *shouldNotProceedError = nil;
|
||||
if ([updaterDelegate respondsToSelector:@selector(updater:shouldProceedWithUpdate:updateCheck:error:)] && ![updaterDelegate updater:updater shouldProceedWithUpdate:updateItem updateCheck:_updateCheck error:&shouldNotProceedError]) {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:shouldNotProceedError];
|
||||
return;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
// Give the delegate a chance to bail
|
||||
|
||||
NSError *shouldNotProceedError = nil;
|
||||
if ([updaterDelegate respondsToSelector:@selector(updater:shouldProceedWithUpdate:updateCheck:error:)] && ![updaterDelegate updater:updater shouldProceedWithUpdate:updateItem updateCheck:_updateCheck error:&shouldNotProceedError]) {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:shouldNotProceedError];
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,8 +202,13 @@
|
||||
break;
|
||||
case NSOrderedAscending:
|
||||
// A new update is available but cannot be installed
|
||||
// More detailed recovery suggestions are in SPUNoUpdateFoundRecoverySuggestion()
|
||||
|
||||
if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
|
||||
if (!latestAppcastItem.arm64HardwareRequirementIsOK) {
|
||||
localizedDescription = SULocalizedStringFromTableInBundle(@"Your Mac is too old", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
|
||||
reason = SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64;
|
||||
} else if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
|
||||
localizedDescription = SULocalizedStringFromTableInBundle(@"Your macOS version is too old", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
|
||||
reason = SPUNoUpdateFoundReasonSystemIsTooOld;
|
||||
|
||||
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
|
||||
|
||||
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
|
||||
|
||||
|
||||
@@ -198,9 +198,13 @@
|
||||
- (void)clearDownloadedUpdate
|
||||
{
|
||||
id<NSObject> downloadedUpdateObject = (_resumableUpdate != nil) ? _resumableUpdate : _downloadedUpdateForRemoval;
|
||||
assert(downloadedUpdateObject != nil);
|
||||
|
||||
if (downloadedUpdateObject != nil && [downloadedUpdateObject isKindOfClass:[SPUDownloadedUpdate class]]) {
|
||||
|
||||
if (downloadedUpdateObject == nil) {
|
||||
SULog(SULogLevelError, @"Warning: clearDownloadedUpdate called but no downloaded update is tracked");
|
||||
return;
|
||||
}
|
||||
|
||||
if ([downloadedUpdateObject isKindOfClass:[SPUDownloadedUpdate class]]) {
|
||||
if (_downloadDriver == nil) {
|
||||
_downloadDriver = [[SPUDownloadDriver alloc] initWithHost:_host];
|
||||
}
|
||||
@@ -295,9 +299,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately silently:willInstallSilently];
|
||||
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately];
|
||||
}
|
||||
|
||||
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)response displayingUserInterface:(BOOL)displayingUserInterface
|
||||
|
||||
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
* A class for containing downloaded data along with some information about it.
|
||||
*/
|
||||
SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SPUDownloadData : NSObject <NSSecureCoding>
|
||||
|
||||
/**
|
||||
* The raw data that was downloaded.
|
||||
|
||||
@@ -81,13 +81,20 @@
|
||||
if (strongSelf != nil && !strongSelf->_retrievedDownloadResult && !strongSelf->_cleaningUp) {
|
||||
strongSelf->_downloader = nil;
|
||||
|
||||
// We can't enforce com.apple.security.network.client == NO or it being absent for sandboxed clients,
|
||||
// but we should warn about it anyway
|
||||
SULog(SULogLevelError, @"Error: Connection to update downloader was invalidated. If your app is not sandboxed or has com.apple.security.network.client set to YES, please remove %@ from your Info.plist. Otherwise please check Console logs for "@DOWNLOADER_NAME" if there are any additional details.", SUEnableDownloaderServiceKey);
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUXPCServiceHasExecutablePermission(@DOWNLOADER_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = [NSString stringWithFormat:@" %@", executableFailureReason];
|
||||
} else {
|
||||
additionalFailureReason = @"";
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *userInfo =
|
||||
@{
|
||||
NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while downloading the update. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed or has com.apple.security.network.client set to YES, please remove %@ from your Info.plist. Please also check Console logs for "@DOWNLOADER_NAME" if there are any additional details.%@", SUEnableDownloaderServiceKey, additionalFailureReason]
|
||||
};
|
||||
|
||||
NSError *downloadError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo];
|
||||
@@ -115,6 +122,10 @@
|
||||
_inBackground = background;
|
||||
|
||||
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
|
||||
// Note the cachePolicy has no effect on persistent downloads on disk (i.e downloading update archives)
|
||||
// It impacts temporary in-memory downloads such as appcast feeds and release notes.
|
||||
// For now we don't use caching, but with more testing/experimenting that could change
|
||||
// (e.g. not downloading same feed unmodified from previous request).
|
||||
request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
|
||||
|
||||
if (userAgent != nil) {
|
||||
@@ -150,6 +161,8 @@
|
||||
|
||||
- (void)downloadFile
|
||||
{
|
||||
assert(NSThread.isMainThread);
|
||||
|
||||
id<SPUDownloadDriverDelegate> delegate = _delegate;
|
||||
if ([delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)]) {
|
||||
[delegate downloadDriverWillBeginDownload];
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
//
|
||||
// SPUExtractSignedFeed.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/25/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
// Extracts content from an appcast without the signing block, optionally returning back the signed signature & expected content length
|
||||
NSData *SPUExtractAppcastContent(NSData *appcastData, NSString * _Nullable __autoreleasing * _Nullable outEdSignatureBase64, uint64_t * _Nullable outContentLength);
|
||||
|
||||
// Extracts HTML or markdown release notes data without the beginning sign warning comment
|
||||
NSData *SPUExtractReleaseNotesContent(NSData *data);
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -0,0 +1,95 @@
|
||||
//
|
||||
// SPUExtractSignedFeed.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/25/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SPUExtractSignedFeed.h"
|
||||
|
||||
NSData *SPUExtractAppcastContent(NSData *appcastData, NSString * _Nullable __autoreleasing * _Nullable outEdSignatureBase64, uint64_t * _Nullable outContentLength)
|
||||
{
|
||||
static char feedSigningPrefix[] = "<!-- sparkle-signatures:\n";
|
||||
static char feedSigningSuffix[] = "-->";
|
||||
|
||||
NSUInteger appcastDataLength = appcastData.length;
|
||||
|
||||
NSRange prefixRange = [appcastData rangeOfData:[NSData dataWithBytesNoCopy:feedSigningPrefix length:sizeof(feedSigningPrefix) - 1 freeWhenDone:NO] options:NSDataSearchBackwards range:NSMakeRange(0, appcastDataLength)];
|
||||
|
||||
if (prefixRange.location == NSNotFound) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
NSData *contentFeedData = [appcastData subdataWithRange:NSMakeRange(0, prefixRange.location)];
|
||||
|
||||
NSRange suffixRange = [appcastData rangeOfData:[NSData dataWithBytesNoCopy:feedSigningSuffix length:sizeof(feedSigningSuffix) - 1 freeWhenDone:NO] options:(NSDataSearchOptions)0 range:NSMakeRange(NSMaxRange(prefixRange), appcastDataLength - NSMaxRange(prefixRange))];
|
||||
|
||||
if (suffixRange.location == NSNotFound) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
NSData *signingBlockData = [appcastData subdataWithRange:NSMakeRange(NSMaxRange(prefixRange), suffixRange.location - NSMaxRange(prefixRange))];
|
||||
|
||||
NSString *signingBlockString = [[NSString alloc] initWithData:signingBlockData encoding:NSUTF8StringEncoding];
|
||||
if (signingBlockString == nil) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
__block NSString *edSignatureBase64 = nil;
|
||||
__block uint64_t contentLength = 0;
|
||||
static NSString *edSignatureKey = @"edSignature:";
|
||||
static NSString *lengthKey = @"length:";
|
||||
[signingBlockString enumerateLinesUsingBlock:^(NSString * _Nonnull line, BOOL * _Nonnull __unused stop) {
|
||||
if ([line hasPrefix:edSignatureKey]) {
|
||||
edSignatureBase64 = [[line substringFromIndex:edSignatureKey.length] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
|
||||
} else if ([line hasPrefix:lengthKey]) {
|
||||
contentLength = (uint64_t)[[[line substringFromIndex:lengthKey.length] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet] longLongValue];
|
||||
}
|
||||
}];
|
||||
|
||||
if (outEdSignatureBase64 != nil) {
|
||||
*outEdSignatureBase64 = [edSignatureBase64 copy];
|
||||
}
|
||||
|
||||
if (outContentLength != NULL) {
|
||||
*outContentLength = contentLength;
|
||||
}
|
||||
|
||||
return contentFeedData;
|
||||
}
|
||||
|
||||
NSData *SPUExtractReleaseNotesContent(NSData *data)
|
||||
{
|
||||
NSData *signWarningCommentPrefix = [@"<!-- sparkle-sign-warning:" dataUsingEncoding:NSUTF8StringEncoding];
|
||||
NSData *signWarningComment = [@"-->" dataUsingEncoding:NSUTF8StringEncoding];
|
||||
|
||||
if (signWarningCommentPrefix.length == 0 || signWarningComment.length == 0) {
|
||||
return data;
|
||||
}
|
||||
|
||||
if (data.length < signWarningCommentPrefix.length + signWarningComment.length) {
|
||||
return data;
|
||||
}
|
||||
|
||||
if (![[data subdataWithRange:NSMakeRange(0, signWarningCommentPrefix.length)] isEqualToData:signWarningCommentPrefix]) {
|
||||
return data;
|
||||
}
|
||||
|
||||
NSRange commentSuffixRange = [data rangeOfData:signWarningComment options:(NSDataSearchOptions)0 range:NSMakeRange(signWarningCommentPrefix.length, data.length - signWarningCommentPrefix.length)];
|
||||
|
||||
if (commentSuffixRange.location == NSNotFound) {
|
||||
return data;
|
||||
}
|
||||
|
||||
// A newline is usually inserted after the signing warning comment
|
||||
// Ignore that character too if present
|
||||
NSUInteger endOfCommentSuffix = NSMaxRange(commentSuffixRange);
|
||||
NSUInteger endOfCommentSuffixAccountingForNewline =
|
||||
(data.length > endOfCommentSuffix && *((const uint8_t *)data.bytes + endOfCommentSuffix) == '\n') ?
|
||||
(endOfCommentSuffix + 1) :
|
||||
endOfCommentSuffix;
|
||||
|
||||
NSData *contentData = [data subdataWithRange:NSMakeRange(endOfCommentSuffixAccountingForNewline, data.length - endOfCommentSuffixAccountingForNewline)];
|
||||
return contentData;
|
||||
}
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
#define SPUInstallationTypeApplication @"application" // the default installation type for ordinary application updates
|
||||
#define SPUInstallationTypeGuidedPackage @"package" // the preferred installation type for package installations
|
||||
#define SPUInstallationTypeInteractivePackage @"interactive-package" // the deprecated installation type; use guided package instead
|
||||
#define SPUInstallationTypeInteractivePackage @"interactive-package" // removed installation type; use guided package instead
|
||||
|
||||
#define SPUInstallationTypesArray (@[SPUInstallationTypeApplication, SPUInstallationTypeGuidedPackage, SPUInstallationTypeInteractivePackage])
|
||||
#define SPUInstallationTypesArray (@[SPUInstallationTypeApplication, SPUInstallationTypeGuidedPackage])
|
||||
#define SPUValidInstallationType(x) ((x != nil) && [SPUInstallationTypesArray containsObject:(NSString * _Nonnull)x])
|
||||
|
||||
#endif /* SPUInstallationType_h */
|
||||
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
|
||||
- (void)installerDidStartExtracting;
|
||||
- (void)installerDidExtractUpdateWithProgress:(double)progress;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
|
||||
- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch;
|
||||
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunch acknowledgement:(void(^)(void))acknowledgement;
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#import "SPUDownloadedUpdate.h"
|
||||
#import "SPUInstallationType.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SPUProbeInstallStatus.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -40,17 +41,6 @@
|
||||
@end
|
||||
#endif
|
||||
|
||||
// Note: we don't want to directly pull in AppKit here especially if the main application does not need it
|
||||
@interface NSObject (ActivationAPIs)
|
||||
// NSApplication
|
||||
+ (id)sharedApplication;
|
||||
- (void)yieldActivationToApplication:(id)application;
|
||||
|
||||
// NSRunningApplication
|
||||
+ (NSArray *)runningApplicationsWithBundleIdentifier:(NSString *)bundleIdentifier;
|
||||
- (NSURL *)bundleURL;
|
||||
@end
|
||||
|
||||
@interface SPUInstallerDriver () <SUInstallerCommunicationProtocol>
|
||||
@end
|
||||
|
||||
@@ -186,9 +176,19 @@
|
||||
if (strongSelf != nil && strongSelf->_installerConnection != nil && !strongSelf->_aborted) {
|
||||
NSString *impactedTools = usingInstallerService ? (@SPARKLE_RELAUNCH_TOOL_NAME" and "@INSTALLER_LAUNCHER_NAME) : @SPARKLE_RELAUNCH_TOOL_NAME;
|
||||
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUHelperHasExecutablePermission(@SPARKLE_RELAUNCH_TOOL_NAME, &executableFailureReason) || !SPUHelperHasExecutablePermission(@SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app/Contents/MacOS/"@SPARKLE_INSTALLER_PROGRESS_TOOL_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = executableFailureReason;
|
||||
} else {
|
||||
additionalFailureReason = [NSString stringWithFormat:@"If your application is sandboxed, please ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/ . Otherwise if %@ %@ not adhoc signed, your app must be signed with a matching team ID", impactedTools, (usingInstallerService ? @"are" : @"is")];
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *genericUserInfo = @{
|
||||
NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while running the updater. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey:[NSString stringWithFormat:@"The remote port connection was invalidated from the updater. If your application is sandboxed, please ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/ . Otherwise if %@ %@ not adhoc signed, your app must be signed with a matching team ID. For additional details, check Console logs for %@", impactedTools, (usingInstallerService ? @"are" : @"is"), impactedTools]
|
||||
NSLocalizedFailureReasonErrorKey:[NSString stringWithFormat:@"The remote port connection was invalidated from the updater. %@. For additional details, check Console logs for %@", additionalFailureReason, impactedTools]
|
||||
};
|
||||
|
||||
[strongSelf _reportInstallerError:strongSelf->_installerError genericErrorCode:SUInstallationError genericUserInfo:genericUserInfo];
|
||||
@@ -286,7 +286,7 @@
|
||||
|
||||
- (void)_handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data SPU_OBJC_DIRECT
|
||||
{
|
||||
if (!SPUInstallerMessageTypeIsLegal(_currentStage, identifier)) {
|
||||
if (!SPUInstallerMessageTypeIsLegal(_currentStage, (SPUInstallerMessageType)identifier)) {
|
||||
SULog(SULogLevelError, @"Error: received out of order message with current stage: %d, requested stage: %d", _currentStage, identifier);
|
||||
return;
|
||||
}
|
||||
@@ -295,14 +295,14 @@
|
||||
|
||||
if (identifier == SPUExtractionStarted) {
|
||||
_extractionAttempts++;
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
[delegate installerDidStartExtracting];
|
||||
} else if (identifier == SPUExtractedArchiveWithProgress) {
|
||||
if (data.length == sizeof(double) && sizeof(double) == sizeof(uint64_t)) {
|
||||
uint64_t progressValue = CFSwapInt64LittleToHost(*(const uint64_t *)data.bytes);
|
||||
double progress = *(double *)&progressValue;
|
||||
[delegate installerDidExtractUpdateWithProgress:progress];
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
}
|
||||
} else if (identifier == SPUArchiveExtractionFailed) {
|
||||
// If this is a delta update, there must be a regular update we can fall back to
|
||||
@@ -316,11 +316,11 @@
|
||||
[self _reportInstallerError:unarchivedError genericErrorCode:SUUnarchivingError genericUserInfo:genericUserInfo];
|
||||
}
|
||||
} else if (identifier == SPUValidationStarted) {
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
} else if (identifier == SPUInstallationStartedStage1) {
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
} else if (identifier == SPUInstallationFinishedStage1) {
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
|
||||
// Let the installer keep a copy of the appcast item data
|
||||
// We may want to ask for it later (note the updater can relaunch without the app necessarily having relaunched)
|
||||
@@ -332,19 +332,14 @@
|
||||
SULog(SULogLevelError, @"Error: Archived data to send for appcast item is nil");
|
||||
}
|
||||
|
||||
BOOL canInstallSilently = NO;
|
||||
if (data.length >= sizeof(uint8_t)) {
|
||||
canInstallSilently = (BOOL)*(const uint8_t *)data.bytes;
|
||||
}
|
||||
|
||||
BOOL hasTargetTerminated = NO;
|
||||
if (data.length >= sizeof(uint8_t) * 2) {
|
||||
hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes + 1);
|
||||
if (data.length >= sizeof(uint8_t)) {
|
||||
hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes);
|
||||
}
|
||||
|
||||
[delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated silently:canInstallSilently];
|
||||
[delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated];
|
||||
} else if (identifier == SPUInstallationFinishedStage2) {
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
|
||||
BOOL hasTargetTerminated = NO;
|
||||
if (data.length >= sizeof(uint8_t)) {
|
||||
@@ -361,7 +356,7 @@
|
||||
|
||||
[delegate installerDidStartInstallingWithApplicationTerminated:hasTargetTerminated];
|
||||
} else if (identifier == SPUInstallationFinishedStage3) {
|
||||
_currentStage = identifier;
|
||||
_currentStage = (SPUInstallerMessageType)identifier;
|
||||
|
||||
[_installerConnection invalidate];
|
||||
_installerConnection = nil;
|
||||
@@ -412,9 +407,19 @@
|
||||
#endif
|
||||
if (!retrievedLaunchStatus) {
|
||||
#pragma clang diagnostic pop
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUXPCServiceHasExecutablePermission(@INSTALLER_LAUNCHER_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = [NSString stringWithFormat:@" %@", executableFailureReason];
|
||||
} else {
|
||||
additionalFailureReason = @"";
|
||||
}
|
||||
}
|
||||
|
||||
NSError *error =
|
||||
[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while connecting to the installer. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed, please remove or disable %@ in your app's Info.plist. Otherwise please check Console logs for "@INSTALLER_LAUNCHER_NAME" and "@SPARKLE_RELAUNCH_TOOL_NAME" processes if there are additional details.", SUEnableInstallerLauncherServiceKey]}];
|
||||
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed, please remove or disable %@ in your app's Info.plist. Please also check Console logs for "@INSTALLER_LAUNCHER_NAME" and "@SPARKLE_RELAUNCH_TOOL_NAME" processes if there are additional details.%@", SUEnableInstallerLauncherServiceKey, additionalFailureReason]}];
|
||||
|
||||
completionHandler(error);
|
||||
|
||||
@@ -444,21 +449,12 @@
|
||||
NSString *hostBundlePath = _host.bundle.bundlePath;
|
||||
assert(hostBundlePath != nil);
|
||||
|
||||
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
|
||||
|
||||
NSString *installationType = _updateItem.installationType;
|
||||
assert(installationType != nil);
|
||||
|
||||
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:[NSBundle mainBundle]];
|
||||
// We use SUHost.name property, so an application
|
||||
// or Sparkle helper application can override its name with SUBundleName key
|
||||
NSString *mainBundleName = mainBundleHost.name;
|
||||
|
||||
NSString *mainBundleIdentifier;
|
||||
{
|
||||
NSString *bundleIdentifier = mainBundleHost.bundle.bundleIdentifier;
|
||||
mainBundleIdentifier = (bundleIdentifier == nil) ? mainBundleName : bundleIdentifier;
|
||||
}
|
||||
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath updaterIdentifier:mainBundleIdentifier mainBundleName:mainBundleName installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath mainBundlePath:NSBundle.mainBundle.bundlePath installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
#if INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED
|
||||
retrievedLaunchStatus = YES;
|
||||
@@ -480,7 +476,24 @@
|
||||
self->_systemDomain = systemDomain;
|
||||
[self setUpConnection];
|
||||
[self sendInstallationData];
|
||||
|
||||
// Complete immediately so the caller can set up state (e.g., _downloadedUpdateForRemoval)
|
||||
// before installer messages arrive on the main queue.
|
||||
// Previously, completionHandler was called inside the probe callback, which meant
|
||||
// installer messages (SPUExtractionStarted, SPUArchiveExtractionFailed) could be
|
||||
// processed before the completion handler fired, leaving _downloadedUpdateForRemoval
|
||||
// unset and causing an assertion crash in clearDownloadedUpdate.
|
||||
completionHandler(nil);
|
||||
|
||||
// Send a probe/ping to the status service, which should boost/prioritize its startup
|
||||
if (hostBundleIdentifier != nil) {
|
||||
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL stausServiceIsRunning) {
|
||||
if (!stausServiceIsRunning) {
|
||||
SULog(SULogLevelError, @"Error: failed to probe status service for %@ from the framework", hostBundleIdentifier);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
});
|
||||
@@ -533,46 +546,6 @@
|
||||
|
||||
_relaunch = relaunch;
|
||||
|
||||
// If AppKit is loaded, we will yield to our Sparkle progress app
|
||||
// This will let the system know it should be okay for the progress agent to activate itself (if necessary)
|
||||
// Note we don't want to directly pull in AppKit here especially if the main application does not need it
|
||||
if (showUI) {
|
||||
if (@available(macOS 14, *)) {
|
||||
// Make sure we are not root before using AppKit API
|
||||
if (geteuid() != 0) {
|
||||
Class applicationClass = NSClassFromString(@"NSApplication");
|
||||
if ([applicationClass respondsToSelector:@selector(sharedApplication)]) {
|
||||
NSObject *application = [applicationClass sharedApplication];
|
||||
|
||||
if ([application respondsToSelector:@selector(yieldActivationToApplication:)]) {
|
||||
Class runningApplicationClass = NSClassFromString(@"NSRunningApplication");
|
||||
if ([runningApplicationClass respondsToSelector:@selector(runningApplicationsWithBundleIdentifier:)]) {
|
||||
NSArray *runningApplications = [runningApplicationClass runningApplicationsWithBundleIdentifier:@SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID];
|
||||
|
||||
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
|
||||
|
||||
id targetRunningApplication = nil;
|
||||
for (id runningApplication in runningApplications) {
|
||||
if ([(NSObject *)runningApplication respondsToSelector:@selector(bundleURL)]) {
|
||||
NSURL *bundleURL = [(NSObject *)runningApplication bundleURL];
|
||||
|
||||
if (hostBundleIdentifier != nil && [bundleURL.pathComponents containsObject:hostBundleIdentifier]) {
|
||||
targetRunningApplication = runningApplication;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (targetRunningApplication != nil) {
|
||||
[application yieldActivationToApplication:targetRunningApplication];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The user can request trying to relaunch/quit the app multiple times
|
||||
// Avoid re-notifying the delegate twice
|
||||
if (!_notifiedDelegateInstallationWillFinish) {
|
||||
|
||||
@@ -21,10 +21,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
|
||||
// and then create a unique temporary directory inside it (using +createUniqueDirectoryInDirectory:)
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier;
|
||||
|
||||
// Variant of cachePathForBundleIdentifier: that specifies a userName to create the cache path for
|
||||
// Only use this when running from as root
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName;
|
||||
|
||||
// Remove old files inside a directory
|
||||
// A caller may want to invoke this on a directory they own rather than remove and re-create an entire directory
|
||||
// This does nothing if the supplied directory does not exist yet
|
||||
@@ -33,7 +29,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
|
||||
// Create a unique directory inside a parent directory
|
||||
// The parent directory doesn't have to exist yet. If it doesn't exist, intermediate directories will be created.
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory;
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(nullable NSDictionary<NSFileAttributeKey, id> *)attributes;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -18,7 +18,27 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
|
||||
+ (NSString *)_cachePathForCacheDirectory:(NSURL *)cacheURL bundleIdentifier:(NSString *)bundleIdentifier SPU_OBJC_DIRECT
|
||||
{
|
||||
NSString *resultPath = [[[cacheURL URLByAppendingPathComponent:bundleIdentifier isDirectory:YES] URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER isDirectory:YES] path];
|
||||
NSString *appCacheIdentifier = bundleIdentifier;
|
||||
{
|
||||
// If an app has an ill-formed bundle identifier that ends with ".app" or ".service"
|
||||
// or anything similarly problematic, we will append ".sparkle" to it
|
||||
// so that the cache directory doesn't look like a protected bundle directory,
|
||||
// which can cause other systematic issues
|
||||
// https://github.com/sparkle-project/Sparkle/discussions/2881
|
||||
NSArray<NSString *> *problematicBundleIdentifierExtensions = @[@".app", @".service", @".xpc", @".appex", @".bundle", @".plugin", @".saver", @".kext"];
|
||||
|
||||
// Transforming the bundle identifier into a lowercased variant for suffix comparison
|
||||
// rather than case-insensitive comparing the pathExtension (which may return "" for ".app")
|
||||
NSString *lowercasedBundleIdentifier = bundleIdentifier.lowercaseString;
|
||||
for (NSString *badExtension in problematicBundleIdentifierExtensions) {
|
||||
if ([lowercasedBundleIdentifier hasSuffix:badExtension]) {
|
||||
appCacheIdentifier = [bundleIdentifier stringByAppendingString:@".sparkle"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NSString *resultPath = [[[cacheURL URLByAppendingPathComponent:appCacheIdentifier isDirectory:YES] URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER isDirectory:YES] path];
|
||||
assert(resultPath != nil);
|
||||
|
||||
return resultPath;
|
||||
@@ -34,19 +54,6 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
|
||||
}
|
||||
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName
|
||||
{
|
||||
NSString *homeDirectory = NSHomeDirectoryForUser(userName);
|
||||
assert(homeDirectory != nil);
|
||||
|
||||
NSURL *homeDirectoryURL = [NSURL fileURLWithPath:homeDirectory isDirectory:YES];
|
||||
|
||||
NSURL *cacheURL = [[homeDirectoryURL URLByAppendingPathComponent:@"Library" isDirectory:YES] URLByAppendingPathComponent:@"Caches" isDirectory:YES];
|
||||
assert(cacheURL != nil);
|
||||
|
||||
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
|
||||
}
|
||||
|
||||
+ (void)removeOldItemsInDirectory:(NSString *)directory
|
||||
{
|
||||
NSMutableArray<NSString *> *filePathsToRemove = [NSMutableArray array];
|
||||
@@ -76,11 +83,11 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(NSDictionary<NSFileAttributeKey, id> *)intermediateDirectoryFileAttributes
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
|
||||
{
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
NSError *createError = nil;
|
||||
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:intermediateDirectoryFileAttributes error:&createError]) {
|
||||
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:&createError]) {
|
||||
SULog(SULogLevelError, @"Failed to create directory with intermediate components at %@ with error %@", directory, createError);
|
||||
return nil;
|
||||
}
|
||||
@@ -90,14 +97,11 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
if ([templateString getFileSystemRepresentation:buffer maxLength:sizeof(buffer)]) {
|
||||
if (mkdtemp(buffer) != NULL) {
|
||||
return [[NSString alloc] initWithUTF8String:buffer];
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Failed to create templated intermediate cache directory using mkdtemp() with error: %d", errno);
|
||||
}
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
|
||||
{
|
||||
return [self createUniqueDirectoryInDirectory:directory intermediateDirectoryFileAttributes:nil];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -39,6 +39,7 @@ NSString *SPUNoUpdateFoundRecoverySuggestion(SPUNoUpdateFoundReason reason, SUAp
|
||||
case SPUNoUpdateFoundReasonOnNewerThanLatestVersion:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooOld:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
assert(latestAppcastItem != nil);
|
||||
|
||||
hostDisplayVersion = host.displayVersion;
|
||||
@@ -68,6 +69,9 @@ NSString *SPUNoUpdateFoundRecoverySuggestion(SPUNoUpdateFoundReason reason, SUAp
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
recoverySuggestion = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@.", SPARKLE_TABLE, sparkleBundle, nil), host.name, latestAppcastItemDisplayVersion, latestAppcastItem.maximumSystemVersion];
|
||||
break;
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
recoverySuggestion = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ %2$@ is available but this update requires a new Apple silicon Mac.", SPARKLE_TABLE, sparkleBundle, nil), host.name, latestAppcastItemDisplayVersion];
|
||||
break;
|
||||
}
|
||||
return recoverySuggestion;
|
||||
}
|
||||
@@ -35,9 +35,9 @@
|
||||
|
||||
+ (nullable SPUSkippedUpdate *)skippedUpdateForHost:(SUHost *)host
|
||||
{
|
||||
NSString *minorVersion = [host objectForUserDefaultsKey:SUSkippedMinorVersionKey];
|
||||
NSString *majorVersion = [host objectForUserDefaultsKey:SUSkippedMajorVersionKey];
|
||||
NSString *majorSubreleaseVersion = [host objectForUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey];
|
||||
NSString *minorVersion = [host objectForUserDefaultsKey:SUSkippedMinorVersionKey ofClass:NSString.class];
|
||||
NSString *majorVersion = [host objectForUserDefaultsKey:SUSkippedMajorVersionKey ofClass:NSString.class];
|
||||
NSString *majorSubreleaseVersion = [host objectForUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey ofClass:NSString.class];
|
||||
|
||||
if (minorVersion != nil || majorVersion != nil) {
|
||||
return [[SPUSkippedUpdate alloc] initWithMinorVersion:minorVersion majorVersion:majorVersion majorSubreleaseVersion:majorSubreleaseVersion];
|
||||
|
||||
@@ -37,8 +37,10 @@ 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
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUStandardUpdaterController : NSObject
|
||||
{
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wobjc-interface-ivars"
|
||||
@@ -79,6 +81,8 @@ SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
Create a new `SPUStandardUpdaterController` programmatically.
|
||||
|
||||
The updater is started automatically. See `-startUpdater` for more information.
|
||||
|
||||
Note the `updaterDelegate` and `userDriverDelegate` are weakly referenced, so you are responsible for keeping them alive.
|
||||
*/
|
||||
- (instancetype)initWithUpdaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
|
||||
|
||||
@@ -87,6 +91,8 @@ SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
|
||||
You can specify whether or not you want to start the updater immediately.
|
||||
If you do not start the updater, you must invoke `-startUpdater` at a later time to start it.
|
||||
|
||||
Note the `updaterDelegate` and `userDriverDelegate` are weakly referenced, so you are responsible for keeping them alive.
|
||||
*/
|
||||
- (instancetype)initWithStartingUpdater:(BOOL)startUpdater updaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
|
||||
|
||||
|
||||
@@ -81,15 +81,21 @@
|
||||
if (![_updater startUpdater:&updaterError]) {
|
||||
SULog(SULogLevelError, @"Fatal updater error (%ld): %@", updaterError.code, updaterError.localizedDescription);
|
||||
|
||||
// Delay the alert four seconds so it doesn't show RIGHT as the app launches, but also doesn't interrupt the user once they really get to work.
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
// Delay the alert a bit to allow other start-up actions
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
NSBundle *hostBundle = [NSBundle mainBundle];
|
||||
SUHost *host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
// This is a developer facing error message which is never actually meant to occur in production
|
||||
// Feel free to provide localizations if you want, but it is not strictly necessary.
|
||||
// Previously, this code path used to be an abort()
|
||||
NSAlert *alert = [[NSAlert alloc] init];
|
||||
alert.messageText = SULocalizedStringFromTableInBundle(@"Unable to Check For Updates", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = SULocalizedStringFromTableInBundle(@"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.", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information.", SPARKLE_TABLE, sparkleBundle, nil), host.name];
|
||||
[alert runModal];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -27,13 +27,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Sparkle's standard built-in user driver for updater interactions
|
||||
*/
|
||||
SU_EXPORT @interface SPUStandardUserDriver : NSObject <SPUUserDriver>
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUStandardUserDriver : NSObject <SPUUserDriver>
|
||||
|
||||
/**
|
||||
Initializes a Sparkle's standard user driver for user update interactions
|
||||
|
||||
@param hostBundle The target bundle of the host that is being updated.
|
||||
@param delegate The optional delegate to this user driver.
|
||||
@param delegate The optional delegate to this user driver. Note the standard user driver weakly references the delegate, so you are responsible for keeping it alive.
|
||||
*/
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle delegate:(nullable id<SPUStandardUserDriverDelegate>)delegate;
|
||||
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
#import "SPUStandardVersionDisplay.h"
|
||||
#import "SULog.h"
|
||||
#import "SPUNoUpdateFoundInfo.h"
|
||||
#import "SPUUpdaterSettings.h"
|
||||
#import "SPUUpdaterSettings+Debug.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <mach/mach_time.h>
|
||||
#import <IOKit/pwr_mgt/IOPMLib.h>
|
||||
@@ -38,9 +41,6 @@
|
||||
@end
|
||||
#endif
|
||||
|
||||
// The amount of time the app is allowed to be idle for us to consider showing an update prompt right away when the app is active
|
||||
static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 30.0 : 5 * 60.0;
|
||||
|
||||
@interface SPUStandardUserDriver () <SPUGentleUserDriverReminders>
|
||||
|
||||
// Note: we expose a private interface for activeUpdateAlert property in SPUStandardUserDriver+Private.h as NSWindowController
|
||||
@@ -65,6 +65,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
SUStatusController *_checkingController;
|
||||
|
||||
SUUpdateAlert *_activeUpdateAlert;
|
||||
SPUUpdaterSettings *_updaterSettings;
|
||||
|
||||
SUStatusController *_statusController;
|
||||
SUUpdatePermissionPrompt *_permissionPrompt;
|
||||
@@ -92,6 +93,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
_updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:hostBundle];
|
||||
_oldHostName = _host.name;
|
||||
_oldHostBundleURL = hostBundle.bundleURL;
|
||||
_delegate = delegate;
|
||||
@@ -110,7 +112,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
- (double)currentTime SPU_OBJC_DIRECT
|
||||
{
|
||||
if (_timebaseInfo.denom > 0) {
|
||||
return (1.0 * mach_absolute_time() * _timebaseInfo.numer / _timebaseInfo.denom);
|
||||
return (double)(mach_absolute_time() * _timebaseInfo.numer) / (double)_timebaseInfo.denom;
|
||||
} else {
|
||||
return 0.0;
|
||||
}
|
||||
@@ -126,11 +128,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
- (void)_activateApplication SPU_OBJC_DIRECT
|
||||
{
|
||||
if (@available(macOS 14, *)) {
|
||||
[NSApp activate];
|
||||
} else {
|
||||
[NSApp activateIgnoringOtherApps:YES];
|
||||
}
|
||||
// -[NSApp activate] does not always work reliably from backgrounded apps when the user initiates checks for updates
|
||||
// from e.g. a menu bar. The OS should grant active focus to the appliation, but it is inconsistent (last tested on 26.5.1).
|
||||
// For now we will prefer the deprecated more reliant API
|
||||
[NSApp activateIgnoringOtherApps:YES];
|
||||
}
|
||||
|
||||
- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply
|
||||
@@ -218,7 +219,9 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
if (!appNearUpdaterInitialization && !backgroundApp) {
|
||||
timeSinceLastEvent = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateHIDSystemState, kCGAnyInputEventType);
|
||||
|
||||
if (timeSinceLastEvent >= SUScheduledUpdateIdleEventLeewayInterval) {
|
||||
NSTimeInterval scheduledUpdateIdleEventLeewayInterval = _updaterSettings.standardUIScheduledUpdateIdleEventLeewayInterval;
|
||||
|
||||
if (timeSinceLastEvent >= scheduledUpdateIdleEventLeewayInterval) {
|
||||
// Make sure there's no active power management assertions preventing
|
||||
// the display from sleeping by the current application.
|
||||
// If there is, then the app may still actively be in use
|
||||
@@ -350,6 +353,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[self closeCheckingWindow];
|
||||
|
||||
if (_activeUpdateAlert != nil) {
|
||||
SULog(SULogLevelError, @"Error: -[%@ %@] should not be called when _activeUpdateAlert != nil:\n%@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSThread.callStackSymbols);
|
||||
}
|
||||
|
||||
id<SPUStandardUserDriverDelegate> delegate = _delegate;
|
||||
id<SUVersionDisplay> customVersionDisplayer = nil;
|
||||
|
||||
@@ -363,7 +370,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
__weak id<SPUStandardUserDriverDelegate> weakDelegate = delegate;
|
||||
_activeUpdateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:appcastItem state:state host:_host versionDisplayer:versionDisplayer completionBlock:^(SPUUserUpdateChoice choice, NSRect windowFrame, BOOL wasKeyWindow) {
|
||||
_activeUpdateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:appcastItem state:state host:_host versionDisplayer:versionDisplayer updaterSettings:_updaterSettings delegate:delegate completionBlock:^(SPUUserUpdateChoice choice, NSRect windowFrame, BOOL wasKeyWindow) {
|
||||
reply(choice);
|
||||
|
||||
__typeof__(self) strongSelf = weakSelf;
|
||||
@@ -453,7 +460,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
// I don't want to expose SULog here because it's more of a user driver facing error
|
||||
// For our purposes we just ignore it and continue on..
|
||||
NSLog(@"Failed to download release notes with error: %@", error);
|
||||
[_activeUpdateAlert showReleaseNotesFailedToDownload];
|
||||
[_activeUpdateAlert showReleaseNotesFailedToDownloadWithError:error];
|
||||
}
|
||||
|
||||
- (void)showUpdateInFocus
|
||||
@@ -497,7 +504,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 +545,9 @@ 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 window] center]; // Force the checking controller to load its window.
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil) centerPointValue:nil minimizable:NO closable:NO];
|
||||
[_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.
|
||||
@@ -601,7 +607,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
alert.informativeText = error.localizedDescription;
|
||||
}
|
||||
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, nil)];
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, @"Run generate_progress_tool_localizations.py after updating.")];
|
||||
[self showAlert:alert secondaryAction:nil];
|
||||
|
||||
acknowledgement();
|
||||
@@ -691,6 +697,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
}
|
||||
case SPUNoUpdateFoundReasonSystemIsTooOld:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
if (latestAppcastItem.infoURL != nil) {
|
||||
// Show the user the product's link if available
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, sparkleBundle, nil)];
|
||||
@@ -757,7 +764,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
centerPointValue = nil;
|
||||
}
|
||||
|
||||
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), nil), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
|
||||
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating."), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
|
||||
|
||||
if (_updateAlertWindowWasInactive) {
|
||||
[_statusController.window orderFront:nil];
|
||||
@@ -781,7 +788,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;
|
||||
}
|
||||
@@ -817,7 +824,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
if (_expectedContentLength > 0.0) {
|
||||
if (_expectedContentLength > 0) {
|
||||
double newProgressValue = (double)_bytesDownloaded / (double)_expectedContentLength;
|
||||
|
||||
[_statusController setProgressValue:MIN(newProgressValue, 1.0)];
|
||||
@@ -841,7 +848,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];
|
||||
}
|
||||
|
||||
@@ -858,7 +865,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
if (applicationTerminated) {
|
||||
// Note this will only show up if -showReadyToInstallAndRelaunch: was called beforehand
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil];
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating.") maxProgressValue:0.0 statusText:nil];
|
||||
[_statusController setButtonEnabled:NO];
|
||||
} else {
|
||||
// The "quit" event can always be canceled or delayed by the application we're updating
|
||||
|
||||
@@ -188,6 +188,22 @@ SU_EXPORT @protocol SPUStandardUserDriverDelegate <NSObject>
|
||||
*/
|
||||
- (void)standardUserDriverWillFinishUpdateSession;
|
||||
|
||||
/**
|
||||
Called before the standard user driver shows plain-text or markdown release notes text to the user.
|
||||
|
||||
The delegate has the opportunity to return a new attributed string for the release notes text that will be shown to the user.
|
||||
The `bundleDisplayVersion` and `bundleVersion` are supplied in case they're useful for creating a new attributed string.
|
||||
|
||||
This method will not be invoked for HTML release notes. It is only applicable to plain-text and markdown release notes.
|
||||
|
||||
@param releaseNotesAttributedString The release notes text that the standard user driver wants to show to the user.
|
||||
@param update The new update the release notes will be shown for.
|
||||
@param bundleDisplayVersion The current display version (or `CFBundleShortVersionString`) of the bundle that is being updated.
|
||||
@param bundleVersion The current version (or `CFBundleVersion`) of the bundle that is being updated.
|
||||
@return A new attributed string for the release notes text to show, or @c nil if the `releaseNotesAttributedString` should still be used.
|
||||
*/
|
||||
- (NSAttributedString * _Nullable)standardUserDriverWillShowReleaseNotesText:(NSAttributedString *)releaseNotesAttributedString forUpdate:(SUAppcastItem *)update withBundleDisplayVersion:(NSString *)bundleDisplayVersion bundleVersion:(NSString *)bundleVersion;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -15,10 +15,17 @@
|
||||
#import "SUAppcastItem.h"
|
||||
#import "SUErrors.h"
|
||||
#import "SPUDownloadData.h"
|
||||
#import "SPUDownloadDataPrivate.h"
|
||||
#import "SPUExtractSignedFeed.h"
|
||||
#import "SPUResumableUpdate.h"
|
||||
#import "SPUDownloadDriver.h"
|
||||
#import "SPUSkippedUpdate.h"
|
||||
#import "SPUUserUpdateState+Private.h"
|
||||
#import "SUAppcastItem+Private.h"
|
||||
#import "SUSignatures.h"
|
||||
#import "SUSignatureVerifier.h"
|
||||
#import "SPUVerifierInformation.h"
|
||||
#import "SULocalizations.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -30,14 +37,21 @@
|
||||
@implementation SPUReleaseNotesDriver
|
||||
{
|
||||
SPUDownloadDriver *_downloadDriver;
|
||||
SUHost *_host;
|
||||
SUSignatures *_signatures;
|
||||
|
||||
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
|
||||
|
||||
uint64_t _contentLength;
|
||||
}
|
||||
|
||||
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
|
||||
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_host = host;
|
||||
_signatures = signatures;
|
||||
_contentLength = contentLength;
|
||||
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO delegate:self];
|
||||
_completionHandler = [completionHandler copy];
|
||||
} else {
|
||||
@@ -51,10 +65,49 @@
|
||||
[_downloadDriver downloadFile];
|
||||
}
|
||||
|
||||
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
|
||||
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
|
||||
{
|
||||
if (_completionHandler != nil) {
|
||||
_completionHandler(downloadData, nil);
|
||||
SPUDownloadData *downloadDataToPassToUserDriver;
|
||||
|
||||
// Strip out any sign warning comment prefix for markdown data so that user drivers
|
||||
// will not have to deal with parsing them (if their markdown parsers don't handle decoding HTML)
|
||||
NSString *MIMEType = downloadDataToValidate.MIMEType;
|
||||
NSString *pathExtension = _downloadDriver.request.URL.pathExtension;
|
||||
if ([MIMEType isEqualToString:@"text/markdown"] || [MIMEType isEqualToString:@"text/x-markdown"] ||
|
||||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame || [pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
|
||||
|
||||
NSData *contentData = SPUExtractReleaseNotesContent(downloadDataToValidate.data);
|
||||
if (contentData.length != downloadDataToValidate.data.length) {
|
||||
downloadDataToPassToUserDriver = [[SPUDownloadData alloc] initWithData:contentData URL:downloadDataToValidate.URL textEncodingName:downloadDataToValidate.textEncodingName MIMEType:downloadDataToValidate.MIMEType];
|
||||
} else {
|
||||
downloadDataToPassToUserDriver = downloadDataToValidate;
|
||||
}
|
||||
} else {
|
||||
downloadDataToPassToUserDriver = downloadDataToValidate;
|
||||
}
|
||||
|
||||
if (_host.requiresSignedAppcast) {
|
||||
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
|
||||
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:_contentLength];
|
||||
verifierInformation.actualContentLength = downloadDataToValidate.data.length;
|
||||
|
||||
NSError *verifierError = nil;
|
||||
if (![signatureVerifier verifyData:downloadDataToValidate.data signatures:_signatures fileKind:@"release notes" verifierInformation:verifierInformation error:&verifierError]) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"The release notes is improperly signed and could not be validated. Please contact the app developer for more information.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
|
||||
|
||||
if (verifierError != nil) {
|
||||
[userInfo setObject:verifierError forKey:NSUnderlyingErrorKey];
|
||||
}
|
||||
|
||||
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
|
||||
} else {
|
||||
_completionHandler(downloadDataToPassToUserDriver, nil);
|
||||
}
|
||||
} else {
|
||||
_completionHandler(downloadDataToPassToUserDriver, nil);
|
||||
}
|
||||
|
||||
_completionHandler = nil;
|
||||
}
|
||||
}
|
||||
@@ -62,7 +115,13 @@
|
||||
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
|
||||
{
|
||||
if (_completionHandler != nil) {
|
||||
_completionHandler(nil, error);
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while downloading the release notes.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
|
||||
|
||||
if (error != nil) {
|
||||
[userInfo setObject:error forKey:NSUnderlyingErrorKey];
|
||||
}
|
||||
|
||||
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
|
||||
_completionHandler = nil;
|
||||
}
|
||||
}
|
||||
@@ -171,8 +230,8 @@
|
||||
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
|
||||
|
||||
SPUUserUpdateStage stage;
|
||||
// Major upgrades and information only updates are not downloaded automatically
|
||||
if (_resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate) {
|
||||
// Major upgrades and information only updates are not downloaded automatically, as well as feeds that failed signing validation
|
||||
if (_resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate && updateItem.signingValidationStatus != SPUAppcastSigningValidationStatusFailed) {
|
||||
stage = SPUUserUpdateStageDownloaded;
|
||||
} else if (_resumingInstallingUpdate) {
|
||||
stage = SPUUserUpdateStageInstalling;
|
||||
@@ -268,7 +327,7 @@
|
||||
if (updateItem.releaseNotesURL != nil && (![updaterDelegate respondsToSelector:@selector(updater:shouldDownloadReleaseNotesForUpdate:)] || [updaterDelegate updater:_updater shouldDownloadReleaseNotesForUpdate:updateItem])) {
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
_releaseNotesDriver = [[SPUReleaseNotesDriver alloc] initWithReleaseNotesURL:updateItem.releaseNotesURL httpHeaders:_httpHeaders userAgent:_userAgent host:_host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
|
||||
_releaseNotesDriver = [[SPUReleaseNotesDriver alloc] initWithReleaseNotesURL:updateItem.releaseNotesURL contentLength:updateItem.releaseNotesContentLength signatures:updateItem.releaseNotesSignatures httpHeaders:_httpHeaders userAgent:_userAgent host:_host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
|
||||
__typeof__(self) strongSelf = weakSelf;
|
||||
if (strongSelf != nil) {
|
||||
id <SPUUserDriver> userDriver = strongSelf->_userDriver;
|
||||
@@ -355,7 +414,7 @@
|
||||
[_userDriver showExtractionReceivedProgress:progress];
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)__unused willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
if (!willInstallImmediately) {
|
||||
[_userDriver showReadyToInstallAndRelaunch:^(SPUUserUpdateChoice choice) {
|
||||
|
||||