Compare commits

...
6 Commits
Author SHA1 Message Date
Sparkle-Bot 21d8df8044 Update Package management files for version 2.9.0 2026-02-22 02:28:35 +00:00
Zorg cb33faafa2 Update change log for 2.9.0 2026-02-21 15:21:25 -08:00
Nathan Manceaux-Panot 79475ea34a Make generate_appcast deltas order stable and thread-safe (#2848) 2026-02-21 10:45:12 -08:00
Zorg aa42f7a020 Probe agent & status service as soon as we launch it (#2852)
Hopefully this fixes potential issues like #2851 for the last time.
2026-02-21 09:45:21 -08:00
Zorg a3f136022a Fix Xcode 26.4 beta compiler warnings (#2850) 2026-02-20 20:58:32 -08:00
Marco Hillger 192dce5f72 Improve German localization (#2847)
- Fix typo: "Downloads-Order" → "Downloads-Ordner"
- Clarify "Install and Relaunch": "neu starten" (ambiguous, sounds
  like system reboot) → "App neu starten"
- Simplify downloaded-update prompts: replace verbose "durch die neue
  Version ersetzen und neu starten" with "jetzt aktualisieren"
- Fix "Learn More…" translation: "Mehr über …" (fragment) →
  "Mehr erfahren …"
- Use more natural Perfekt tense: "ist aktualisiert" → "wurde
  aktualisiert"
- Fix "App Management" translation: "hinzufügen" (add) →
  "Änderungen von … erlauben" (allow modifications from), matching
  the English source string
2026-02-18 20:53:57 -08:00
43 changed files with 195 additions and 165 deletions

No files matched your search

+8 -8
View File
@@ -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;
}
@@ -715,14 +715,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 +1259,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);
+3 -3
View File
@@ -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;
+2 -2
View File
@@ -41,7 +41,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;
@@ -444,7 +444,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;
}
+10 -10
View File
@@ -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");
@@ -149,7 +149,7 @@ NSString *temporaryDirectory(NSString *base)
NSMutableData *data = [NSMutableData data];
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
char *buffer = data.mutableBytes;
char *buffer = (char *)data.mutableBytes;
char *templateResult = mkdtemp(buffer);
if (templateResult == NULL) {
perror("mkdtemp");
@@ -180,12 +180,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 +204,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 +337,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 +378,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 +393,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 +410,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;
+1 -1
View File
@@ -133,7 +133,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);
+5 -6
View File
@@ -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) {
+3 -2
View File
@@ -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";
@@ -269,7 +271,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 +288,6 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[notifier notifyProgress:1.0];
BOOL success = YES;
goto finally;
reportError:
+1 -1
View File
@@ -172,7 +172,7 @@
}
case SUSigningInputStatusPresent: {
assert(data != nil);
if (ed25519_verify(signatures.ed25519Signature, data.bytes, data.length, _pubKeys.ed25519PubKey)) {
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
+4
View File
@@ -8,12 +8,16 @@
* 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
+1 -1
View File
@@ -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", "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
{"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
+2 -2
View File
@@ -98,8 +98,8 @@ 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 = -beta.2
CURRENT_PROJECT_VERSION = 2052
SPARKLE_VERSION_SUFFIX =
CURRENT_PROJECT_VERSION = 2053
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
+1 -1
View File
@@ -286,7 +286,7 @@ static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable resp
NSURL *downloadURL = [NSURL fileURLWithPath:toPath isDirectory:NO];
NSError *bookmarkError = nil;
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:(NSURLBookmarkCreationOptions)0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
if (bookmarkData == nil) {
[_delegate downloaderDidFailWithError:bookmarkError];
} else {
+1 -1
View File
@@ -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)];
+1 -1
View File
@@ -206,7 +206,7 @@
[NSGraphicsContext saveGraphicsState];
NSGraphicsContext.currentContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:iconBitmapRep];
[icon drawInRect:NSMakeRect(0, 0, imageDimensions, imageDimensions)];
[icon drawInRect:NSMakeRect(0.0, 0.0, (CGFloat)imageDimensions, (CGFloat)imageDimensions)];
[NSGraphicsContext restoreGraphicsState];
+3 -3
View File
@@ -2,10 +2,10 @@
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.9.0-beta.2"
let version = "2.9.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.9.0-beta.2"
let checksum = "b0188e8e2a7967cb3500e4d138c669630620bcdd1abf079c6769422983bbb5f3"
let tag = "2.9.0"
let checksum = "44a0d5a00d5bfb6c2ad1755a92b694d948876d61ad44f35a0119eb0e7ace4b65"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "2.9.0-beta.2"
s.version = "2.9.0"
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"
+1 -1
View File
@@ -102,7 +102,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];
+1 -1
View File
@@ -168,7 +168,7 @@
BOOL minimumOperatingSystemVersionIsOK = [self isMinimumOperatingSystemVersionOK:minimumOperatingSystemVersion];
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];;
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];
BOOL majorUpgrade = ![self isMinimumAutoupdateVersionOK:minimumAutoupdateVersion];
+2 -2
View File
@@ -23,7 +23,7 @@ NSData *SPUExtractAppcastContent(NSData *appcastData, NSString * _Nullable __aut
NSData *contentFeedData = [appcastData subdataWithRange:NSMakeRange(0, prefixRange.location)];
NSRange suffixRange = [appcastData rangeOfData:[NSData dataWithBytesNoCopy:feedSigningSuffix length:sizeof(feedSigningSuffix) - 1 freeWhenDone:NO] options:0 range:NSMakeRange(NSMaxRange(prefixRange), appcastDataLength - NSMaxRange(prefixRange))];
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;
@@ -76,7 +76,7 @@ NSData *SPUExtractReleaseNotesContent(NSData *data)
return data;
}
NSRange commentSuffixRange = [data rangeOfData:signWarningComment options:0 range:NSMakeRange(signWarningCommentPrefix.length, data.length - signWarningCommentPrefix.length)];
NSRange commentSuffixRange = [data rangeOfData:signWarningComment options:(NSDataSearchOptions)0 range:NSMakeRange(signWarningCommentPrefix.length, data.length - signWarningCommentPrefix.length)];
if (commentSuffixRange.location == NSNotFound) {
return data;
+25 -9
View File
@@ -26,6 +26,7 @@
#import "SPUDownloadedUpdate.h"
#import "SPUInstallationType.h"
#import "SUConstants.h"
#import "SPUProbeInstallStatus.h"
#include "AppKitPrevention.h"
@@ -296,7 +297,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;
}
@@ -305,14 +306,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
@@ -326,11 +327,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)
@@ -349,7 +350,7 @@
[delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated];
} else if (identifier == SPUInstallationFinishedStage2) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
BOOL hasTargetTerminated = NO;
if (data.length >= sizeof(uint8_t)) {
@@ -366,7 +367,7 @@
[delegate installerDidStartInstallingWithApplicationTerminated:hasTargetTerminated];
} else if (identifier == SPUInstallationFinishedStage3) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
[_installerConnection invalidate];
_installerConnection = nil;
@@ -459,6 +460,8 @@
NSString *hostBundlePath = _host.bundle.bundlePath;
assert(hostBundlePath != nil);
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
NSString *installationType = _updateItem.installationType;
assert(installationType != nil);
@@ -484,7 +487,20 @@
self->_systemDomain = systemDomain;
[self setUpConnection];
[self sendInstallationData];
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);
}
completionHandler(nil);
}];
} else {
completionHandler(nil);
}
break;
}
});
+2 -2
View File
@@ -112,7 +112,7 @@
- (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;
}
@@ -826,7 +826,7 @@
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
if (_expectedContentLength > 0.0) {
if (_expectedContentLength > 0) {
double newProgressValue = (double)_bytesDownloaded / (double)_expectedContentLength;
[_statusController setProgressValue:MIN(newProgressValue, 1.0)];
+1 -1
View File
@@ -40,7 +40,7 @@
- (instancetype)initWithCoder:(NSCoder *)decoder
{
SPUUserUpdateStage stage = [decoder decodeIntegerForKey:SPUUserUpdateStateStageKey];
SPUUserUpdateStage stage = (SPUUserUpdateStage)[decoder decodeIntegerForKey:SPUUserUpdateStateStageKey];
BOOL userInitiated = [decoder decodeBoolForKey:SPUUserUpdateStateUserInitiatedKey];
return [self initWithStage:stage userInitiated:userInitiated];
+1 -1
View File
@@ -80,7 +80,7 @@
return nil;
}
NSUInteger options = NSXMLNodeLoadExternalEntitiesNever; // Prevent inclusion from file://
NSXMLNodeOptions options = NSXMLNodeLoadExternalEntitiesNever; // Prevent inclusion from file://
NSXMLDocument *document = [[NSXMLDocument alloc] initWithData:appcastData options:options error:errorp];
if (nil == document) {
return nil;
+2 -2
View File
@@ -274,7 +274,7 @@
if (notFoundPrimaryItem != nil) {
hostToLatestAppcastItemComparisonResult = [applicationVersionComparator compareVersion:_host.version toVersion:notFoundPrimaryItem.versionString];
} else {
hostToLatestAppcastItemComparisonResult = 0;
hostToLatestAppcastItemComparisonResult = NSOrderedSame;
}
[delegate didNotFindUpdateWithLatestAppcastItem:notFoundPrimaryItem hostToLatestAppcastItemComparisonResult:hostToLatestAppcastItemComparisonResult background:background];
@@ -619,7 +619,7 @@ SPU_OBJC_DIRECT
NSTimeInterval timeSinceRelease = [currentDate timeIntervalSinceDate:itemReleaseDate];
NSTimeInterval phasedRolloutInterval = [phasedRolloutIntervalObject doubleValue];
NSTimeInterval timeToWaitForGroup = phasedRolloutInterval * phasedUpdateGroup.unsignedIntegerValue;
NSTimeInterval timeToWaitForGroup = phasedRolloutInterval * (NSTimeInterval)(phasedUpdateGroup.unsignedIntegerValue);
if (timeSinceRelease >= timeToWaitForGroup) {
return YES;
+1 -1
View File
@@ -176,7 +176,7 @@ static NSString *SUAppcastItemSigningValidationStatusKey = @"SUAppcastItemSignin
case SPUAppcastSigningValidationStatusSkipped:
case SPUAppcastSigningValidationStatusSucceeded:
case SPUAppcastSigningValidationStatusFailed:
_signingValidationStatus = decodedSigningValidationStatus;
_signingValidationStatus = (SPUAppcastSigningValidationStatus)decodedSigningValidationStatus;
break;
default:
// This shouldn't be reached, skipped == 0 matches an old encoder that doesn't encode this enum.
+1 -1
View File
@@ -415,7 +415,7 @@ SPU_OBJC_DIRECT
// Preserve the modification time
struct timeval modTime;
TIMESPEC_TO_TIMEVAL(&modTime, &statInfo.st_mtimespec);
TIMESPEC_TO_TIMEVAL(&modTime, &statInfo.st_mtimespec)
const struct timeval timeInputs[] = {accessTime, modTime};
+1 -1
View File
@@ -37,7 +37,7 @@ static SUSigningInputStatus decode(NSString *str, NSData * __strong *outData) {
}
NSString *stripped = [str stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
NSData *result = [[NSData alloc] initWithBase64EncodedString:stripped options:0];
NSData *result = [[NSData alloc] initWithBase64EncodedString:stripped options:(NSDataBase64DecodingOptions)0];
if (!result) {
return SUSigningInputStatusInvalid;
}
+1 -1
View File
@@ -171,7 +171,7 @@ typedef NS_ENUM(NSInteger, SUCharacterType) {
- (void)balanceVersionPartsA:(NSMutableArray<NSString *> *)partsA partsB:(NSMutableArray<NSString *> *)partsB SPU_OBJC_DIRECT
{
NSUInteger partANumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsA];
NSUInteger partBNumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsB];;
NSUInteger partBNumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsB];
if (partANumberAndPeriodPartsCount > partBNumberAndPeriodPartsCount) {
[self addNumberAndPeriodPartsToParts:partsB toNumberAndPeriodPartsCount:partBNumberAndPeriodPartsCount fromParts:partsA fromNumberAndPeriodPartsCount:partANumberAndPeriodPartsCount];
+2 -2
View File
@@ -80,10 +80,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
}
if (_minimizable) {
window.styleMask |= NSWindowStyleMaskMiniaturizable;
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskMiniaturizable);
}
if (_closable) {
window.styleMask |= NSWindowStyleMaskClosable;
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskClosable);
}
[_progressBar setUsesThreadedAnimation:YES];
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
+1 -1
View File
@@ -157,7 +157,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
unsigned long bytes;
size_t bytes_size = sizeof(unsigned long);
if (sysctlbyname("hw.memsize", &bytes, &bytes_size, NULL, 0) == 0) {
double megabytes = bytes / (1024. * 1024.);
double megabytes = (double)bytes / (1024. * 1024.);
NSString *stringValue = [NSString stringWithFormat:@"%lu", (unsigned long)megabytes];
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerMemoryKey, SULocalizedStringFromTableInBundle(@"Memory (MB)", SPARKLE_TABLE, sparkleBundle, nil), stringValue, stringValue] forKeys:profileDictKeys]];
}
+2 -2
View File
@@ -182,7 +182,7 @@ static void processMarkdownFragmentAttributedString(NSAttributedString *fragment
// to avoid outputting multiple list bullets
// Also avoid processing list items that were processed from previous passes / fragments
if (canProcessListItem) {
CGFloat firstLineIdentation = intent.indentationLevel * (font.pointSize * 1.5);
CGFloat firstLineIdentation = (CGFloat)intent.indentationLevel * (font.pointSize * 1.5);
paragraphStyle.firstLineHeadIndent += firstLineIdentation;
// Advance subsequent lines and text that wraps to next line by next tab interval past the firstLineIdentation
@@ -288,7 +288,7 @@ static NSAttributedString *formatMarkdownAttributedString(NSAttributedString *or
// Enumerate through every presentation intent fragment and create a new attributed string that we append to the output
// Foundation handles formatting some things for us already in the attributed string such as bold/itatlics and hyperlinks,
// but we need to handle formatting paragraphs, headers, lists, block quotes, etc in the attributed string.
[originalAttributedString enumerateAttribute:NSPresentationIntentAttributeName inRange:NSMakeRange(0, originalAttributedString.length) options:0 usingBlock:^(NSPresentationIntent *intent, NSRange presentationIntentRange, BOOL * _Nonnull __unused stopPresentationIntentEnumeration) {
[originalAttributedString enumerateAttribute:NSPresentationIntentAttributeName inRange:NSMakeRange(0, originalAttributedString.length) options:(NSAttributedStringEnumerationOptions)0 usingBlock:^(NSPresentationIntent *intent, NSRange presentationIntentRange, BOOL * _Nonnull __unused stopPresentationIntentEnumeration) {
// Split the presentation intent by lines so we treat every line as a separate paragraph so we present them properly (with correct indentation / tabs)
// Normally multiple lines aren't in the same paragraph, but this can happen in some cases like code blocks
+3 -3
View File
@@ -375,7 +375,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
[_releaseNotesContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
_releaseNotesView.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
_releaseNotesView.view.autoresizingMask = (NSAutoresizingMaskOptions)(NSViewWidthSizable | NSViewHeightSizable);
if (@available(macOS 10.14, *)) {
// We need a transparent background
@@ -443,7 +443,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
window.frameAutosaveName = @"SUUpdateAlert2";
} else {
// Update alert should not be resizable when no release notes are available
window.styleMask &= ~NSWindowStyleMaskResizable;
window.styleMask = (NSWindowStyleMask)(window.styleMask & ~NSWindowStyleMaskResizable);
}
_windowLoadedAndShowsReleaseNotes = showReleaseNotes;
@@ -463,7 +463,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
// NOTE: The code below for deciding what buttons to hide is complex! Due to array of feature configurations :)
[_updaterSettings addObserver:self forKeyPath:SUAllowsAutomaticUpdatesKeyPath options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:NULL];
[_updaterSettings addObserver:self forKeyPath:SUAllowsAutomaticUpdatesKeyPath options:(NSKeyValueObservingOptions)(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:NULL];
if (_state.stage == SPUUserUpdateStageInstalling) {
// We're going to be relaunching pretty instantaneously
+8 -8
View File
@@ -17,19 +17,19 @@
"%@ downloaded" = "%@ geladen";
/* No comment provided by engineer. */
"%@ is now updated to version %@!" = "%@ ist aktualisiert auf Version %@!";
"%@ is now updated to version %@!" = "%@ wurde auf Version %@ aktualisiert!";
/* No comment provided by engineer. */
"%@ is now updated!" = "%@ ist aktualisiert!";
"%@ is now updated!" = "%@ wurde aktualisiert!";
/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
"%@ of %@" = "%1$@ von %2$@";
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Dies ist ein wichtiges Update. Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Dies ist ein wichtiges Update. Möchtest du %1$@ jetzt aktualisieren?";
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Möchtest du %1$@ jetzt aktualisieren?";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ ist verfügbar, aber deine Version von macOS ist zu neu für dieses Update. Das Update unterstützt nur bis macOS %3$@.";
@@ -41,7 +41,7 @@
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "„%1$@“ kann nicht aktualisiert werden, wenn das Programm von dem Ort ausgeführt wird, an den es heruntergeladen wurde.";
/* No comment provided by engineer. */
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ kann nicht aktualisiert werden, da es aus dem Downloads-Order, oder von einer DMG-Datei oder einem Laufwerk ohne Schreibzugriff gestartet wurde.";
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "%1$@ kann nicht aktualisiert werden, da es aus dem Downloads-Ordner, oder von einer DMG-Datei oder einem Laufwerk ohne Schreibzugriff gestartet wurde.";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "Eine neue Version von %@ ist verfügbar!";
@@ -113,7 +113,7 @@
"Failed to resume installing update." = "Das Fortsetzen der Installation ist fehlgeschlagen.";
/* No comment provided by engineer. */
"Install and Relaunch" = "Installieren und neu starten";
"Install and Relaunch" = "Installieren und App neu starten";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Installieren beim Beenden";
@@ -122,7 +122,7 @@
"Installing update…" = "Update installieren …";
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
"Learn More…" = "Mehr über …";
"Learn More…" = "Mehr erfahren …";
/* No comment provided by engineer. */
"Mac Model" = "Mac-Modell";
@@ -182,7 +182,7 @@
"Yes" = "Ja";
/* No comment provided by engineer. */
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Du musst möglicherweise %1$@ in den Systemeinstellungen unter „Datenschutz & Sicherheit“ und „App-Verwaltung“ hinzufügen, um künftige Updates zu installieren.";
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Du musst möglicherweise in den Systemeinstellungen unter „Datenschutz & Sicherheit“ und „App-Verwaltung“ Änderungen von %1$@ erlauben, um künftige Updates zu installieren.";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Du bist auf dem neuesten Stand!";
+1 -1
View File
@@ -230,7 +230,7 @@
}
if (_expectedContentLength > 0) {
double progress = (double)_contentLengthDownloaded / _expectedContentLength;
double progress = (double)_contentLengthDownloaded / (double)_expectedContentLength;
[self addUpdateButtonWithTitle:[NSString stringWithFormat:@"Downloading (%0.0f%%)", progress * 100] action:nil];
}
}
+8 -8
View File
@@ -191,9 +191,9 @@
NSData *archive = [NSData dataWithContentsOfURL:patchURL];
assert(archive != nil);
ed25519_sign(signature, archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
ed25519_sign(signature, (const unsigned char *)archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
NSString *signatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:0];
NSString *signatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
// Obtain the file attributes to get the file size of our update later
NSError *fileAttributesError = nil;
@@ -214,12 +214,12 @@
NSUInteger numberOfFromVersionReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_DELTA_FROM_VERSION" withString:mainBundleVersion options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfFromVersionReplacements == 1);
NSRange feedSignaturesPrefixRange = [appcastContents rangeOfString:@"<!-- sparkle-signatures:\n" options:(NSLiteralSearch | NSBackwardsSearch)];
NSRange feedSignaturesPrefixRange = [appcastContents rangeOfString:@"<!-- sparkle-signatures:\n" options:(NSStringCompareOptions)(NSLiteralSearch | NSBackwardsSearch)];
assert(feedSignaturesPrefixRange.location != NSNotFound);
ed25519_sign(signature, (const unsigned char *)appcastContents.UTF8String, feedSignaturesPrefixRange.location, public_key, self_sign_demo_only_insecure_hack);
NSString *feedSignatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:0];
NSString *feedSignatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
NSUInteger numberOfFeedSignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_EDDSA_FEED_SIGNATURE" withString:feedSignatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfFeedSignatureReplacements == 1);
@@ -248,9 +248,9 @@
NSData *archive = [NSData dataWithContentsOfURL:archiveURL];
assert(archive != nil);
ed25519_sign(signature, archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
ed25519_sign(signature, (const unsigned char *)archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
NSString *signatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:0];
NSString *signatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
// Obtain the file attributes to get the file size of our update later
NSError *fileAttributesError = nil;
@@ -268,12 +268,12 @@
NSUInteger numberOfSignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_EDDSA_SIGNATURE" withString:signatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfSignatureReplacements == 2);
NSRange feedSignaturesPrefixRange = [appcastContents rangeOfString:@"<!-- sparkle-signatures:\n" options:(NSLiteralSearch | NSBackwardsSearch)];
NSRange feedSignaturesPrefixRange = [appcastContents rangeOfString:@"<!-- sparkle-signatures:\n" options:(NSStringCompareOptions)(NSLiteralSearch | NSBackwardsSearch)];
assert(feedSignaturesPrefixRange.location != NSNotFound);
ed25519_sign(signature, (const unsigned char *)appcastContents.UTF8String, feedSignaturesPrefixRange.location, public_key, self_sign_demo_only_insecure_hack);
NSString *feedSignatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:0];
NSString *feedSignatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
NSUInteger numberOfFeedSignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_EDDSA_FEED_SIGNATURE" withString:feedSignatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfFeedSignatureReplacements == 1);
+5 -5
View File
@@ -388,7 +388,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
- (NSData *)bigData1
{
const size_t bufferSize = 4096*32;
uint8_t *buffer = calloc(1, bufferSize);
uint8_t *buffer = (uint8_t *)calloc(1, bufferSize);
XCTAssertTrue(buffer != NULL);
return [NSData dataWithBytesNoCopy:buffer length:bufferSize];
@@ -397,7 +397,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
- (NSData *)bigData2
{
const size_t bufferSize = 4096*32;
uint8_t *buffer = calloc(1, bufferSize);
uint8_t *buffer = (uint8_t *)calloc(1, bufferSize);
XCTAssertTrue(buffer != NULL);
for (size_t bufferIndex = 0; bufferIndex < bufferSize; ++bufferIndex) {
@@ -2172,7 +2172,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
NSImage *iconImage = [NSImage imageNamed:NSImageNameAdvanced];
XCTAssertNotNil(iconImage);
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:sourceDirectory options:0];
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:sourceDirectory options:(NSWorkspaceIconCreationOptions)0];
XCTAssertTrue(setIcon);
} afterDiffHandler:nil afterPatchHandler:nil];
XCTAssertFalse(success);
@@ -2190,7 +2190,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
NSImage *iconImage = [NSImage imageNamed:NSImageNameAdvanced];
XCTAssertNotNil(iconImage);
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:destinationDirectory options:0];
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:destinationDirectory options:(NSWorkspaceIconCreationOptions)0];
XCTAssertTrue(setIcon);
} afterDiffHandler:nil afterPatchHandler:nil];
XCTAssertFalse(success);
@@ -2208,7 +2208,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
NSImage *iconImage = [NSImage imageNamed:NSImageNameAdvanced];
XCTAssertNotNil(iconImage);
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:sourceDirectory options:0];
BOOL setIcon = [[NSWorkspace sharedWorkspace] setIcon:iconImage forFile:sourceDirectory options:(NSWorkspaceIconCreationOptions)0];
XCTAssertTrue(setIcon);
} afterPatchHandler:nil];
XCTAssertTrue(success);
+15 -15
View File
@@ -143,7 +143,7 @@
return [v verifyFileAtPath:aFile signatures:sig verifierInformation:nil error:error];
}
static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
static SUSignatures *createSignatures(NSString *edString, NSString *dsaString)
{
#if !SPARKLE_BUILD_LEGACY_DSA_SUPPORT
(void)dsaString;
@@ -165,7 +165,7 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
SUSignatureVerifier *v = [[SUSignatureVerifier alloc] initWithPublicKeys:pubKeys];
SUSignatures *sig = _createSignatures(sigString, nil);
SUSignatures *sig = createSignatures(sigString, nil);
return [v verifyFileAtPath:aFile signatures:sig verifierInformation:nil error:error];
}
@@ -180,10 +180,10 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
NSError *error = nil;
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(nil, nil) verifierInformation:nil error:&error],
signatures:createSignatures(nil, nil) verifierInformation:nil error:&error],
@"Fail if no signatures are provided: %@", error);
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(@"lol", @"lol") verifierInformation:nil error:&error],
signatures:createSignatures(@"lol", @"lol") verifierInformation:nil error:&error],
@"Fail if both signatures are invalid: %@", error);
NSString *dsaSig = @"MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ==";
@@ -192,36 +192,36 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
NSString *wrongEdSig = @"wTcpXCgWoa4NrJpsfzS61FXJIbv963//12U2ef9xstzVOLPHYK2N4/ojgpDV5N1/NGG1uWMBgK+kEWp0Z5zMDQ==";
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(nil, dsaSig) verifierInformation:nil error:&error],
signatures:createSignatures(nil, dsaSig) verifierInformation:nil error:&error],
@"EdDSA signature must be present if app has EdDSA key: %@", error);
XCTAssertTrue([v verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, nil) verifierInformation:nil error:&error],
signatures:createSignatures(edSig, nil) verifierInformation:nil error:&error],
@"Allow just an EdDSA signature if that's all that's available: %@", error);
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(wrongEdSig, dsaSig) verifierInformation:nil error:&error],
signatures:createSignatures(wrongEdSig, dsaSig) verifierInformation:nil error:&error],
@"Fail on a bad Ed25519 signature regardless: %@", error);
XCTAssertTrue([v verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, wrongDSASig) verifierInformation:nil error:&error],
signatures:createSignatures(edSig, wrongDSASig) verifierInformation:nil error:&error],
@"Allow bad DSA signature if EdDSA signature is good: %@", error);
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(@"lol", dsaSig) verifierInformation:nil error:&error],
signatures:createSignatures(@"lol", dsaSig) verifierInformation:nil error:&error],
@"Fail if the Ed25519 signature is invalid: %@", error);
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
XCTAssertFalse([v verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, @"lol") verifierInformation:nil error:&error],
signatures:createSignatures(edSig, @"lol") verifierInformation:nil error:&error],
@"Fail if invalid DSA signature is used even if EdDSA signature is good: %@", error);
#else
XCTAssertTrue([v verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, @"lol") error:&error],
signatures:createSignatures(edSig, @"lol") error:&error],
@"Allow invalid DSA signature if EdDSA signature is good: %@", error);
#endif
XCTAssertTrue([v verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, dsaSig) verifierInformation:nil error:&error],
signatures:createSignatures(edSig, dsaSig) verifierInformation:nil error:&error],
@"Pass if both are valid: %@", error);
}
@@ -239,7 +239,7 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
SUSignatureVerifier *dsaOnlyVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:dsaOnlyKeys];
XCTAssertFalse([dsaOnlyVerifier verifyFileAtPath:_testFile
signatures:_createSignatures(edSig, nil) verifierInformation:nil error:&error],
signatures:createSignatures(edSig, nil) verifierInformation:nil error:&error],
@"DSA cannot verify an Ed signature: %@", error);
SUPublicKeys *edOnlyKeys = [[SUPublicKeys alloc] initWithEd:_pubEdKey
@@ -247,7 +247,7 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
SUSignatureVerifier *edOnlyVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:edOnlyKeys];
{
SUSignatures *signatures = _createSignatures(nil, dsaSig);
SUSignatures *signatures = createSignatures(nil, dsaSig);
XCTAssertFalse([edOnlyVerifier verifyFileAtPath:_testFile
signatures:signatures
verifierInformation:nil
@@ -265,7 +265,7 @@ static SUSignatures *_createSignatures(NSString *edString, NSString *dsaString)
XCTAssertNotNil(pubkeys);
XCTAssertNotNil(pubkeys.dsaPubKey);
SUSignatures *sig = _createSignatures(nil, @"MC0CFFMF3ha5kjvrJ9JTpTR8BenPN9QUAhUAzY06JRdtP17MJewxhK0twhvbKIE=");
SUSignatures *sig = createSignatures(nil, @"MC0CFFMF3ha5kjvrJ9JTpTR8BenPN9QUAhUAzY06JRdtP17MJewxhK0twhvbKIE=");
XCTAssertNotNil(sig);
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
XCTAssertNotNil(sig.dsaSignature);
+5 -3
View File
@@ -12,6 +12,8 @@ u_char *readfile(const char *filename, off_t *outSize)
{
int success = -1;
u_char *buffer = NULL;
long offset = 0;
size_t size = 0;
FILE *file = fopen(filename, "r");
if (file == NULL) {
@@ -22,12 +24,12 @@ u_char *readfile(const char *filename, off_t *outSize)
goto cleanup;
}
long offset = ftell(file);
offset = ftell(file);
if (offset == -1) {
goto cleanup;
}
size_t size = (size_t)offset;
size = (size_t)offset;
if (outSize != NULL) {
*outSize = (off_t)size;
@@ -35,7 +37,7 @@ u_char *readfile(const char *filename, off_t *outSize)
/* Allocate size + 1 bytes instead of newsize bytes to ensure
that we never try to malloc(0) and get a NULL pointer */
buffer = malloc(size + 1);
buffer = (u_char *)malloc(size + 1);
if (buffer == NULL) {
goto cleanup;
}
+26 -26
View File
@@ -45,13 +45,13 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c, v 1.1 2005/08/06 01:59:0
/* matchlen(old, oldsize, new, newsize)
*
* Returns the length of the longest common prefix between 'old' and 'new'. */
static off_t matchlen(u_char *old, off_t oldsize, u_char *new, off_t newsize)
static off_t matchlen(u_char *old, off_t oldsize, u_char *newp, off_t newsize)
{
off_t i;
for (i = 0; (i < oldsize) && (i < newsize); i++)
{
if (old[i] != new[i])
if (old[i] != newp[i])
break;
}
@@ -66,13 +66,13 @@ static off_t matchlen(u_char *old, off_t oldsize, u_char *new, off_t newsize)
* sort to consider. If you're searching all suffixes, 'st = 0' and 'en =
* oldsize - 1'. */
static off_t search(off_t *I, u_char *old, off_t oldsize,
u_char *new, off_t newsize, off_t st, off_t en, off_t *pos)
u_char *newp, off_t newsize, off_t st, off_t en, off_t *pos)
{
off_t x, y;
if (en - st < 2) {
x = matchlen(old + I[st], oldsize - I[st], new, newsize);
y = matchlen(old + I[en], oldsize - I[en], new, newsize);
x = matchlen(old + I[st], oldsize - I[st], newp, newsize);
y = matchlen(old + I[en], oldsize - I[en], newp, newsize);
if (x > y) {
*pos = I[st];
@@ -86,11 +86,11 @@ static off_t search(off_t *I, u_char *old, off_t oldsize,
x = st + (en - st)/2;
/* Modification ported from ChromiumOS project:
* https://chromium.googlesource.com/chromiumos/third_party/bsdiff/+/58146f74abd6b1b69693943195f37f4ac6a6acef%5E%21/#F0 */
if (memcmp(old + I[x], new, (size_t)(MIN(oldsize - I[x], newsize))) <= 0) {
return search(I, old, oldsize, new, newsize, x, en, pos);
if (memcmp(old + I[x], newp, (size_t)(MIN(oldsize - I[x], newsize))) <= 0) {
return search(I, old, oldsize, newp, newsize, x, en, pos);
} else {
return search(I, old, oldsize, new, newsize, st, x, pos);
};
return search(I, old, oldsize, newp, newsize, st, x, pos);
}
}
/* offtout(x, buf)
@@ -123,7 +123,7 @@ int bsdiff(int argc, char *argv[]); // Added by AMM: suppresses a warning about
int bsdiff(int argc, char *argv[])
{
u_char *old = NULL,*new = NULL; /* contents of old, new files */
u_char *old = NULL,*newp = NULL; /* contents of old, new files */
off_t oldsize = 0, newsize = 0; /* length of old, new files */
off_t *I = NULL,*V = NULL; /* arrays used for suffix sort; I is ordering */
off_t scan = 0; /* position of current match in old file */
@@ -154,8 +154,8 @@ int bsdiff(int argc, char *argv[])
goto cleanup;
}
if (((I = malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL) ||
((V = malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL)) {
if (((I = (off_t *)malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL) ||
((V = (off_t *)malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL)) {
warn("Failed to allocate memory for I or V");
goto cleanup;
}
@@ -167,14 +167,14 @@ int bsdiff(int argc, char *argv[])
free(V);
V = NULL;
new = readfile(argv[2], &newsize);
if (new == NULL) {
newp = readfile(argv[2], &newsize);
if (newp == NULL) {
warn("new file error: %s", argv[2]);
goto cleanup;
}
if (((db = malloc((size_t)newsize + 1)) == NULL) ||
((eb = malloc((size_t)newsize + 1)) == NULL)) {
if (((db = (u_char *)malloc((size_t)newsize + 1)) == NULL) ||
((eb = (u_char *)malloc((size_t)newsize + 1)) == NULL)) {
warn("Failed to allocate memory for db or eb");
goto cleanup;
}
@@ -229,14 +229,14 @@ int bsdiff(int argc, char *argv[])
/* 'oldscore' is the number of characters that match between the
* substrings 'old[lastoffset + scan:lastoffset + scsc]' and
* 'new[scan:scsc]'. */
len = search(I, old, oldsize, new + scan, newsize - scan,
len = search(I, old, oldsize, newp + scan, newsize - scan,
0, oldsize, &pos);
/* If this match extends further than the last one, add any new
* matching characters to 'oldscore'. */
for (; scsc < scan + len; scsc++) {
if ((scsc + lastoffset < oldsize) &&
(old[scsc + lastoffset] == new[scsc]))
(old[scsc + lastoffset] == newp[scsc]))
oldscore++;
}
@@ -250,7 +250,7 @@ int bsdiff(int argc, char *argv[])
/* Since we're advancing 'scan' by 1, remove the character under it
* from 'oldscore' if it matches. */
if ((scan + lastoffset < oldsize) &&
(old[scan + lastoffset] == new[scan]))
(old[scan + lastoffset] == newp[scan]))
oldscore--;
/* Modification ported from ChromiumOS project:
@@ -276,7 +276,7 @@ int bsdiff(int argc, char *argv[])
Sf = 0;
lenf = 0;
for (i = 0; (lastscan + i < scan) && (lastpos + i < oldsize);) {
if (old[lastpos + i] == new[lastscan + i])
if (old[lastpos + i] == newp[lastscan + i])
s++;
i++;
if (s * 2 - i > Sf * 2 - lenf) {
@@ -291,7 +291,7 @@ int bsdiff(int argc, char *argv[])
s = 0;
Sb = 0;
for (i = 1; (scan >= lastscan + i) && (pos >= i); i++) {
if (old[pos - i] == new[scan - i])
if (old[pos - i] == newp[scan - i])
s++;
if (s * 2 - i > Sb * 2 - lenb) {
Sb = s;
@@ -309,10 +309,10 @@ int bsdiff(int argc, char *argv[])
Ss = 0;
lens = 0;
for (i = 0; i < overlap; i++) {
if (new[lastscan + lenf - overlap + i] ==
if (newp[lastscan + lenf - overlap + i] ==
old[lastpos + lenf - overlap + i])
s++;
if (new[scan - lenb + i] == old[pos - lenb + i])
if (newp[scan - lenb + i] == old[pos - lenb + i])
s--;
if (s > Ss) {
Ss = s;
@@ -326,11 +326,11 @@ int bsdiff(int argc, char *argv[])
/* Write the diff data for the last match to the diff section... */
for (i = 0; i < lenf; i++)
db[dblen + i] = new[lastscan + i] - old[lastpos + i];
db[dblen + i] = newp[lastscan + i] - old[lastpos + i];
/* ... and, if there's a gap between the extensions just
* calculated, write the data in that gap to the extra section. */
for (i = 0; i< (scan - lenb) - (lastscan + lenf); i++)
eb[eblen + i] = new[lastscan + lenf + i];
eb[eblen + i] = newp[lastscan + lenf + i];
/* Update the diff and extra section lengths accordingly. */
dblen += lenf;
@@ -425,7 +425,7 @@ cleanup:
free(I);
free(V);
free(old);
free(new);
free(newp);
return exitstatus;
}
+11 -10
View File
@@ -135,13 +135,14 @@ int bspatch(int argc,const char * const argv[])
ssize_t oldsize = 0,newsize = 0;
ssize_t bzctrllen = 0,bzdatalen = 0;
u_char header[32] = {0},buf[8] = {0};
u_char *old = NULL, *new = NULL;
u_char *old = NULL, *newp = NULL;
off_t oldpos = 0,newpos = 0;
off_t ctrl[3] = {0};
off_t lenread = 0;
off_t i = 0;
io_funcs_t * io = NULL;
int exitstatus = -1;
off_t size = 0;
if(argc!=4) {
warnx("usage: %s oldfile newfile patchfile\n",argv[0]);
@@ -247,7 +248,7 @@ int bspatch(int argc,const char * const argv[])
warn("estream open");
goto cleanup;
}
off_t size = 0;
old = readfile(argv[1], &size);
if (old == NULL) {
warn("old file: %s", argv[1]);
@@ -256,7 +257,7 @@ int bspatch(int argc,const char * const argv[])
oldsize = size;
if((new=malloc((size_t)newsize+1))==NULL) {
if((newp=(u_char *)malloc((size_t)newsize+1))==NULL) {
warn("Failed to allocate memory for new");
goto cleanup;
}
@@ -271,7 +272,7 @@ int bspatch(int argc,const char * const argv[])
goto cleanup;
}
ctrl[i]=offtin(buf);
};
}
/* Sanity-check */
if(newpos+ctrl[0]>newsize) {
@@ -280,7 +281,7 @@ int bspatch(int argc,const char * const argv[])
}
/* Read diff string */
lenread = io->read(dstream, new + newpos, ctrl[0]);
lenread = io->read(dstream, newp + newpos, ctrl[0]);
if (lenread < 0 || lenread < ctrl[0]) {
warnx("Corrupt patch\n");
goto cleanup;
@@ -289,7 +290,7 @@ int bspatch(int argc,const char * const argv[])
/* Add old data to diff string */
for(i=0;i<ctrl[0];i++)
if((oldpos+i>=0) && (oldpos+i<oldsize))
new[newpos+i]+=old[oldpos+i];
newp[newpos+i]+=old[oldpos+i];
/* Adjust pointers */
newpos+=ctrl[0];
@@ -302,7 +303,7 @@ int bspatch(int argc,const char * const argv[])
}
/* Read extra string */
lenread = io->read(estream, new + newpos, ctrl[1]);
lenread = io->read(estream, newp + newpos, ctrl[1]);
if (lenread < 0 || lenread < ctrl[1]) {
warnx("Corrupt patch\n");
goto cleanup;
@@ -311,7 +312,7 @@ int bspatch(int argc,const char * const argv[])
/* Adjust pointers */
newpos+=ctrl[1];
oldpos+=ctrl[2];
};
}
/* Clean up the bzip2 reads */
io->close(cstream);
@@ -349,7 +350,7 @@ int bspatch(int argc,const char * const argv[])
goto cleanup;
}
if (fwrite(new, 1, (size_t)newsize, f) < (size_t)newsize) {
if (fwrite(newp, 1, (size_t)newsize, f) < (size_t)newsize) {
warn("failed to write to new file: %s", argv[2]);
goto cleanup;
}
@@ -363,7 +364,7 @@ int bspatch(int argc,const char * const argv[])
exitstatus = 0;
cleanup:
free(new);
free(newp);
free(old);
if (f != NULL) {
+11 -11
View File
@@ -100,7 +100,7 @@ static int sha512_compress(sha512_context *md, unsigned char *buf)
/* copy the state into 1024-bits into W[0..15] */
for (i = 0; i < 16; i++) {
LOAD64H(W[i], buf + (8*i));
LOAD64H(W[i], buf + (8*i))
}
/* fill W[16..79] */
@@ -116,14 +116,14 @@ static int sha512_compress(sha512_context *md, unsigned char *buf)
h = t0 + t1;
for (i = 0; i < 80; i += 8) {
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i+0);
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],i+1);
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],i+2);
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],i+3);
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],i+4);
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],i+5);
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],i+6);
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],i+7);
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i+0)
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],i+1)
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],i+2)
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],i+3)
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],i+4)
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],i+5)
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],i+6)
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],i+7)
}
#undef RND
@@ -253,12 +253,12 @@ while (md->curlen < 120) {
}
/* store length */
STORE64H(md->length, md->buf+120);
STORE64H(md->length, md->buf+120)
sha512_compress(md, md->buf);
/* copy output */
for (i = 0; i < 8; i++) {
STORE64H(md->state[i], out+(8*i));
STORE64H(md->state[i], out+(8*i))
}
return 0;
+10 -3
View File
@@ -227,6 +227,7 @@ func makeAppcasts(archivesSourceDir: URL, outputPathURL: URL?, cacheDirectory ca
// but we still wanted to record the used delta updates for a batch of recent updates
// This is to support rollback in case the top newly generated update isn't exactly what the user wants
let generatingDeltas = latestVersionPerBranch.contains(version)
let itemDeltasLock = NSLock()
var numDeltas = 0
let appBaseName = latestItem.appPath.deletingPathExtension().lastPathComponent
for item in updates {
@@ -354,6 +355,10 @@ func makeAppcasts(archivesSourceDir: URL, outputPathURL: URL?, cacheDirectory ca
markDeltaAsIgnored(delta: delta, markerPath: ignoreMarkerPath)
continue
}
itemDeltasLock.lock()
latestItem.deltas.append(delta)
itemDeltasLock.unlock()
group.enter()
DispatchQueue.global().async {
@@ -378,11 +383,13 @@ func makeAppcasts(archivesSourceDir: URL, outputPathURL: URL?, cacheDirectory ca
#if GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT
hasAnyDSASignature = hasAnyDSASignature || (delta.dsaSignature != nil)
#endif
if hasAnyDSASignature {
latestItem.deltas.append(delta)
} else {
if !hasAnyDSASignature {
markDeltaAsIgnored(delta: delta, markerPath: ignoreMarkerPath)
print("Delta \(delta.archivePath.path) ignored, because it could not be signed")
itemDeltasLock.lock()
latestItem.deltas.removeAll { $0 === delta }
itemDeltasLock.unlock()
}
}
group.leave()
+1 -1
View File
@@ -189,7 +189,7 @@
}
if (_bytesToDownload > 0 && _verbose) {
NSString *currentProgressPercentage = [NSString stringWithFormat:@"%.0f%%", (_bytesDownloaded * 100.0 / _bytesToDownload)];
NSString *currentProgressPercentage = [NSString stringWithFormat:@"%.0f%%", ((double)_bytesDownloaded * 100.0 / (double)_bytesToDownload)];
// Only report progress advancement when percentage significantly advances
if (_lastProgressReported == nil || ![_lastProgressReported isEqualToString:currentProgressPercentage]) {