<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0d815911494de47fa059a9920c14b1ba04fe4fb1">https://github.com/macports/macports-ports/commit/0d815911494de47fa059a9920c14b1ba04fe4fb1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d815911494de47fa059a9920c14b1ba04fe4fb1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 28 21:22:23 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> arq_restore: Fix bool conversion build failure
</span>---
sysutils/arq_restore/Portfile | 2 +
sysutils/arq_restore/files/nil.patch | 299 +++++++++++++++++++++++++++++++++++
2 files changed, 301 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/arq_restore/Portfile b/sysutils/arq_restore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cc389d3c7b..4411cb68f19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/arq_restore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/arq_restore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ github.tarball_from archive
</span>
openssl.branch 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles nil.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|/usr/local/ssl|[openssl::install_area]|g" ${worksrcpath}/arq_restore.xcodeproj/project.pbxproj
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/arq_restore/files/nil.patch b/sysutils/arq_restore/files/nil.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..de7aabe823c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/arq_restore/files/nil.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,299 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Return nil instead of NO.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: initialization of pointer of type 'ArrayNode *' to null from a constant boolean expression [-Werror,-Wbool-conversion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/arqbackup/arq_restore/commit/0f0c956e1636ee501369cc04f59f2075b709e0e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ArqRestoreCommand.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ArqRestoreCommand.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -610,7 +610,7 @@ - (BOOL)clearCache:(NSArray *)args error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (BackupSet *)backupSetForTarget:(Target *)theInitialTarget computerUUID:(NSString *)theComputerUUID error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *expandedTargetList = [self expandedTargetListForTarget:theInitialTarget error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (expandedTargetList == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (Target *theTarget in expandedTargetList) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -622,7 +622,7 @@ - (BackupSet *)backupSetForTarget:(Target *)theInitialTarget computerUUID:(NSStr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error getting backup sets for %@: %@", theTarget, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (BackupSet *backupSet in backupSets) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cocoastack/crypto/SHA1Hash.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cocoastack/crypto/SHA1Hash.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@ + (NSString *)hashFile:(NSString *)path error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int errnum = errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"lstat(%@) error %d: %s", path, errnum, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"UnixErrorDomain", errnum, @"%@: %s", path, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long long length = (unsigned long long)st.st_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FileInputStream *fis = [[FileInputStream alloc] initWithPath:path offset:0 length:length];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cocoastack/plist/XMLPListReader.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cocoastack/plist/XMLPListReader.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@ - (ArrayNode *)readArray:(NSXMLNode *)elem error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ id <PListNode> node = [self makeNode:childNode error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!node) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [nodes release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [nodes addObject:node];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,7 +134,7 @@ - (DictNode *)readDict:(NSXMLNode *)elem error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ id <PListNode> node = [self makeNode:childNode error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!node) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAssert(key != nil, @"must have key before adding value");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [dn put:node forKey:key];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cocoastack/remotefs/LocalItemFS.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cocoastack/remotefs/LocalItemFS.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,7 @@ - (Item *)createDirectoryWithName:(NSString *)theName inDirectoryItem:(Item *)th
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int errnum = errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"chown(%@) error %d: %s", thePath, errnum, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"UnixErrorDomain", errnum, @"failed to change ownership of %@: %s", thePath, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,14 +200,14 @@ - (Item *)createFileWithData:(NSData *)theData name:(NSString *)theName inDirect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![self ensureTempDirExists:&myError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error ensuring temp dir %@ exists: %@", tempDir, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *tempPath = [tempDir stringByAppendingPathComponent:[NSString stringWithRandomUUID]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![theData writeToFile:tempPath options:NSAtomicWrite error:&myError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error creating temp file %@: %@", tempPath, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![[NSFileManager defaultManager] ensureParentPathExistsForPath:theFullPath targetUID:[[CacheOwnership sharedCacheOwnership] uid] targetGID:[[CacheOwnership sharedCacheOwnership] gid] error:error]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,21 +217,21 @@ - (Item *)createFileWithData:(NSData *)theData name:(NSString *)theName inDirect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![myError isErrorWithDomain:NSCocoaErrorDomain code:NSFileWriteFileExistsError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error renaming %@ to %@: %@", tempPath, theFullPath, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Delete the file that's in the way.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogDebug(@"deleting existing file before overwriting: %@", theFullPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![[NSFileManager defaultManager] removeItemAtPath:theFullPath error:&myError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error removing a file that's in the way (%@): %@", theFullPath, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Try again.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![[NSFileManager defaultManager] moveItemAtPath:tempPath toPath:theFullPath error:&myError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![myError isErrorWithDomain:NSCocoaErrorDomain code:NSFileWriteFileExistsError]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error renaming %@ to %@: %@", tempPath, theFullPath, myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +246,7 @@ - (Item *)createFileWithData:(NSData *)theData name:(NSString *)theName inDirect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int errnum = errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"chown(%@) error %d: %s", theFullPath, errnum, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"UnixErrorDomain", errnum, @"failed to change ownership of %@: %s", theFullPath, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Item *item = [[[Item alloc] init] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cocoastack/s3/S3Lister.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cocoastack/s3/S3Lister.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,14 +237,14 @@ - (NSArray *)parseXMLResponse:(NSData *)response foundPrefixes:(NSArray **)found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!xmlDoc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogDebug(@"list Objects XML data: %@", [[[NSString alloc] initWithData:response encoding:NSUTF8StringEncoding] autorelease]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([S3Service errorDomain], [myError code], @"error parsing List Objects XML response: %@", myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSXMLElement *rootElement = [xmlDoc rootElement];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *isTruncatedNodes = [rootElement nodesForXPath:@"//ListBucketResult/IsTruncated" error:&myError];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isTruncatedNodes == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"nodesForXPath: %@", myError);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETERRORFROMMYERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([isTruncatedNodes count] == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isTruncated = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,7 +256,7 @@ - (NSArray *)parseXMLResponse:(NSData *)response foundPrefixes:(NSArray **)found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"error getting //ListBucketResult/CommonPrefixes/Prefix nodes: %@", *error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableArray *theFoundPrefixes = [NSMutableArray array];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (NSXMLNode *prefixNode in prefixNodes) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cocoastack/shared/LZ4Compressor.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cocoastack/shared/LZ4Compressor.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ - (NSData *)lz4Inflate:(NSData *)data error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSData *)lockedLZ4Deflate:(NSData *)data error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([data length] > (NSUInteger)INT_MAX) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([self errorDomain], -1, @"length larger than INT_MAX");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int originalSize = (int)[data length];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@ - (NSData *)lockedLZ4Deflate:(NSData *)data error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (compressed == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([self errorDomain], -1, @"LZ4_compress_default failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(outBuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t nboSize = OSSwapHostToBigInt32(originalSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(outBuf, &nboSize, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glacierrestore/GlacierPackIndex.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glacierrestore/GlacierPackIndex.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +327,7 @@ - (PackIndexEntry *)doEntryForSHA1:(NSString *)sha1 error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (endIndex == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"PacksErrorDomain", ERROR_NOT_FOUND, @"sha1 %@ not found in pack", sha1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd = open([localPath fileSystemRepresentation], O_RDONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fd == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,7 +352,7 @@ - (PackIndexEntry *)findEntryForSHA1:(NSString *)sha1 fd:(int)fd betweenStartInd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int errnum = errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HSLogError(@"mmap(%@) error %d: %s", localPath, errnum, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"UnixErrorDomain", errnum, @"error mapping %@ to memory: %s", localPath, strerror(errnum));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64_t left = startIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64_t right = endIndex - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glacierrestore/GlacierPackSet.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glacierrestore/GlacierPackSet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@ - (GlacierPackIndex *)glacierPackIndexForObjectSHA1:(NSString *)theObjectSHA1 ta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (PackIndexEntry *)packIndexEntryForObjectSHA1:(NSString *)theSHA1 targetConnectionDelegate:(id <TargetConnectionDelegate>)theTCD error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!loadedPIEs && ![self loadPackIndexEntriesWithTargetConnectionDelegate:theTCD error:error]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PackIndexEntry *ret = [packIndexEntriesByObjectSHA1 objectForKey:theSHA1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glacierrestore/GlacierRestorer.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glacierrestore/GlacierRestorer.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -922,12 +922,12 @@ - (NSString *)completedJobIdForArchiveId:(NSString *)theArchiveId error:(NSError
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([[NSFileManager defaultManager] fileExistsAtPath:statusPath]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSDictionary *attribs = [[NSFileManager defaultManager] attributesOfItemAtPath:statusPath error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (attribs == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([[attribs objectForKey:NSFileSize] unsignedLongLongValue] > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSData *jobIdData = [NSData dataWithContentsOfFile:statusPath options:NSUncachedRead error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (jobIdData == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = [[[NSString alloc] initWithData:jobIdData encoding:NSUTF8StringEncoding] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- repo/ObjectEncryptorV1.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ repo/ObjectEncryptorV1.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,7 @@ - (NSString *)sha1HashForV2Data:(NSData *)theData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSData *)v2EncryptedObjectFromData:(NSData *)theData masterIV:(NSData *)theMasterIV dataIVAndSymmetricKey:(NSData *)theDataIVAndSymmetricKey error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"ObjectEncryptorV1", -1, @"writeV2EncryptedObjectFromData not supported");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //- (NSString *)sha1HashForData:(NSData *)theData error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- repo/ObjectEncryptorV2.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ repo/ObjectEncryptorV2.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@ - (BOOL)ensureDatFileExistsAtTargetWithEncryptionPassword:(NSString *)theEncrypt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSData *)encryptV1Data:(NSData *)theData error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR(@"ObjectEncryptorV2ErrorDomain", -1, @"encryptV1Data not supported");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSString *)sha1HashForV2Data:(NSData *)theData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Calculate SHA1 hash of computerUUID+plaintext.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +157,7 @@ - (NSData *)v2EncryptedObjectFromData:(NSData *)theData masterIV:(NSData *)theMa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (theDataIVAndSymmetricKey != nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([theDataIVAndSymmetricKey length] < DATA_IV_AND_SYMMETRIC_KEY_LEN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([ObjectEncryptor errorDomain], -1, @"given dataIVAndSymmetricKey is less than %d bytes", DATA_IV_AND_SYMMETRIC_KEY_LEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(dataIVAndSymmetricKey, [theDataIVAndSymmetricKey bytes], DATA_IV_AND_SYMMETRIC_KEY_LEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(mySymmetricKey, [theDataIVAndSymmetricKey bytes] + IV_LEN, SYMMETRIC_KEY_LEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +202,7 @@ - (NSData *)v2EncryptedObjectFromData:(NSData *)theData masterIV:(NSData *)theMa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != kCCSuccess) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([ObjectEncryptor errorDomain], -1, @"encrypt: %@", [self errorMessageForStatus:status]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(outbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Reset theOutBuffer's length.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,7 +213,7 @@ - (NSData *)v2EncryptedObjectFromData:(NSData *)theData masterIV:(NSData *)theMa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([theMasterIV length] != IV_LEN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([ObjectEncryptor errorDomain], -1, @"invalid masterIV length");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(outbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(masterIV, [theMasterIV bytes], IV_LEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,12 +241,12 @@ - (NSData *)v2EncryptedObjectFromData:(NSData *)theData masterIV:(NSData *)theMa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != kCCSuccess) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([ObjectEncryptor errorDomain], -1, @"encrypt: %@", [self errorMessageForStatus:status]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(outbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (encryptedMetadataActualLen != ENCRYPTED_DATA_IV_AND_SYMMETRIC_KEY_LEN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETNSERROR([ObjectEncryptor errorDomain], -1, @"unexpected encrypted metadata length");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(outbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Calculate HMACSHA256 of (master IV + encryptedMetadata + ciphertext) using second half of master key.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- repo/PackSet.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ repo/PackSet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@ - (BOOL)restorePackForBlobWithSHA1:(NSString *)theSHA1 forDays:(NSUInteger)theDa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSNumber *)isObjectDownloadableForSHA1:(NSString *)theSHA1 error:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PackIndexEntry *pie = [self packIndexEntryForSHA1:theSHA1 error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (pie == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [fark isPackDownloadableWithId:[pie packId] storageType:storageType error:error];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- repo/PackSetDB.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ repo/PackSetDB.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,7 +387,7 @@ - (FMDatabaseQueue *)initDB:(NSError **)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FlockFile *ff = [[[FlockFile alloc] initWithPath:lockFilePath] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __block FMDatabaseQueue *ret = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![ff lockAndExecute:^void() { ret = [self lockedInitDB:error]; } error:error]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>