Commit 43375a49 authored by Rafaël Carré's avatar Rafaël Carré Committed by Felix Paul Kühne

contrib: sparkle: update snow leopard patch

(cherry picked from commit b88ae64d8e0b3b971d5eda00a0ac938a8d39544e)
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 49a382da
diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m diff -ru sparkle/Sparkle/SUAppcast.m sparkle-fixed/Sparkle/SUAppcast.m
--- sparkle/SUAppcast.m 2013-12-09 15:23:42.000000000 +0100 --- sparkle/Sparkle/SUAppcast.m 2013-12-09 15:23:42.000000000 +0100
+++ sparkle-fixed/SUAppcast.m 2014-01-31 13:23:11.000000000 +0100 +++ sparkle-fixed/Sparkle/SUAppcast.m 2014-01-31 13:23:11.000000000 +0100
@@ -15,6 +15,12 @@ @@ -15,6 +15,12 @@
#import "SUConstants.h" #import "SUConstants.h"
#import "SULog.h" #import "SULog.h"
...@@ -12,7 +12,7 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m ...@@ -12,7 +12,7 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m
+#endif +#endif
+ +
@interface NSXMLElement (SUAppcastExtensions) @interface NSXMLElement (SUAppcastExtensions)
- (NSDictionary *)attributesAsDictionary; @property (readonly, copy) NSDictionary *attributesAsDictionary;
@end @end
@@ -32,7 +38,7 @@ @@ -32,7 +38,7 @@
} }
...@@ -20,33 +20,12 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m ...@@ -20,33 +20,12 @@ diff -ru sparkle/SUAppcast.m sparkle-fixed/SUAppcast.m
-@interface SUAppcast () <NSURLDownloadDelegate> -@interface SUAppcast () <NSURLDownloadDelegate>
+@interface SUAppcast () // implicit NSURLDownloadDelegate +@interface SUAppcast () // implicit NSURLDownloadDelegate
- (void)reportError:(NSError *)error; @property (copy) NSString *downloadFilename;
- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes; @property (strong) NSURLDownload *download;
@end @property (copy) NSArray *items;
@@ -95,7 +101,7 @@ diff -ru sparkle/Sparkle/SUDiskImageUnarchiver.m sparkle-fixed/Sparkle/SUDiskImageUnarchiver.m
if (downloadFilename) --- sparkle/Sparkle/SUDiskImageUnarchiver.m 2013-12-09 15:23:42.000000000 +0100
{ +++ sparkle-fixed/Sparkle/SUDiskImageUnarchiver.m 2014-01-31 13:25:58.000000000 +0100
NSUInteger options = 0;
- if (NSAppKitVersionNumber < NSAppKitVersionNumber10_7) {
+ if (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber > 1038) { // Snow Leopard
// In order to avoid including external entities when parsing the appcast (a potential security vulnerability; see https://github.com/andymatuschak/Sparkle/issues/169), we ask NSXMLDocument to "tidy" the XML first. This happens to remove these external entities; it wouldn't be a future-proof approach, but it worked in these historical versions of OS X, and we have a more rigorous approach for 10.7+.
options = NSXMLDocumentTidyXML;
} else {
diff -ru sparkle/SUBasicUpdateDriver.m sparkle-fixed/SUBasicUpdateDriver.m
--- sparkle/SUBasicUpdateDriver.m 2013-12-09 15:23:42.000000000 +0100
+++ sparkle-fixed/SUBasicUpdateDriver.m 2014-01-31 13:23:36.000000000 +0100
@@ -21,7 +21,7 @@
#import "SUCodeSigningVerifier.h"
#import "SUUpdater_Private.h"
-@interface SUBasicUpdateDriver () <NSURLDownloadDelegate>; @end
+@interface SUBasicUpdateDriver (); @end // implicit NSURLDownloadDelegate
@implementation SUBasicUpdateDriver
diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m
--- sparkle/SUDiskImageUnarchiver.m 2013-12-09 15:23:42.000000000 +0100
+++ sparkle-fixed/SUDiskImageUnarchiver.m 2014-01-31 13:25:58.000000000 +0100
@@ -12,6 +12,13 @@ @@ -12,6 +12,13 @@
#import "SULog.h" #import "SULog.h"
#import <CoreServices/CoreServices.h> #import <CoreServices/CoreServices.h>
...@@ -61,19 +40,3 @@ diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m ...@@ -61,19 +40,3 @@ diff -ru sparkle/SUDiskImageUnarchiver.m sparkle-fixed/SUDiskImageUnarchiver.m
@implementation SUDiskImageUnarchiver @implementation SUDiskImageUnarchiver
+ (BOOL)canUnarchivePath:(NSString *)path + (BOOL)canUnarchivePath:(NSString *)path
diff -ru sparkle/SUPasswordPrompt.m sparkle-fixed/SUPasswordPrompt.m
--- sparkle/SUPasswordPrompt.m 2013-12-09 15:23:42.000000000 +0100
+++ sparkle-fixed/SUPasswordPrompt.m 2014-01-31 13:27:58.000000000 +0100
@@ -8,6 +8,12 @@
#import "SUPasswordPrompt.h"
+@interface SUPasswordPrompt ()
+- (void)setName:(NSString*)name;
+- (void)setIcon:(NSImage*)icon;
+- (NSImage *)icon;
+- (void)setPassword:(NSString*)password;
+@end
@implementation SUPasswordPrompt
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment