Merge pull request #497 from radiant-player/upgrade-sparkle

Update Sparkle to v1.13.1

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Various legacy code cleanup / removal ([#465](https://github.com/radiant-player/radiant-player-mac/pull/465))
 
 ### Fixed
+* Fixed a [vulnerability](https://vulnsec.com/2016/osx-apps-vulnerabilities/) in the updater framework ([#497](https://github.com/radiant-player/radiant-player-mac/pull/497))
 * Fixed player randomly freezing after minimizing ([#480](https://github.com/radiant-player/radiant-player-mac/pull/480))
 * Fixed choppiness/lag when dragging the player ([#480](https://github.com/radiant-player/radiant-player-mac/pull/480))
 * Fixed main window hiding on close ([#481](https://github.com/radiant-player/radiant-player-mac/pull/481), [@Sidnicious](https://github.com/Sidnicious))

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -32,6 +32,7 @@ SU_EXPORT @interface SUAppcastItem : NSObject
 
 @property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
 @property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
 
 // Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
 @property (readonly, copy) NSDictionary *propertiesDictionary;

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Headers/SUErrors.h

@@ -38,7 +38,10 @@ typedef NS_ENUM(OSStatus, SUError) {
     SUMissingInstallerToolError = 4003,
     SURelaunchError = 4004,
     SUInstallationError = 4005,
-    SUDowngradeError = 4006
+    SUDowngradeError = 4006,
+
+    // System phase errors
+    SUSystemPowerOffError = 5000
 };
 
 #endif

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h

@@ -77,6 +77,16 @@ SU_EXPORT @interface SUUpdater : NSObject
  */
 - (void)checkForUpdatesInBackground;
 
+/*!
+    Checks for updates and, if available, immediately downloads and installs them.
+    A progress dialog is shown but the user will never be prompted to read the
+    release notes.
+    
+    You may want to respond to the userDidCancelDownload delegate method in case
+    the user clicks the "Cancel" button while the update is downloading.
+ */
+- (void)installUpdatesIfAvailable;
+
 /*!
     Returns the date of last update check.
 
@@ -228,6 +238,13 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
  */
 - (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
 
+/*!
+    Called when the user clicks the cancel button while and update is being downloaded.
+
+    \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
 /*!
     Called immediately before installing the specified update.
 

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h

@@ -14,12 +14,12 @@
 // This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
 // there are name-space collisions) so we can list all of them to start with:
 
-#import <Sparkle/SUAppcast.h>
-#import <Sparkle/SUAppcastItem.h>
-#import <Sparkle/SUStandardVersionComparator.h>
-#import <Sparkle/SUUpdater.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
-#import <Sparkle/SUVersionDisplayProtocol.h>
-#import <Sparkle/SUErrors.h>
+#import "SUAppcast.h"
+#import "SUAppcastItem.h"
+#import "SUStandardVersionComparator.h"
+#import "SUUpdater.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUVersionDisplayProtocol.h"
+#import "SUErrors.h"
 
 #endif

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15A244d</string>
+	<string>15E27e</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,29 +17,29 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.11.0</string>
+	<string>1.13.1 git-2afc553</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.11.0</string>
+	<string>1.13.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7A176x</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A244e</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0700</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7A176x</string>
+	<string>7C68</string>
 	<key>LSBackgroundOnly</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist

@@ -3,42 +3,42 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15A244d</string>
+	<string>15E27e</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>Sparkle</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.andymatuschak.Sparkle</string>
+	<string>org.sparkle-project.Sparkle</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>Sparkle</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.11.0</string>
+	<string>1.13.1 git-2afc553</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.11.0</string>
+	<string>1.13.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7A176x</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A244e</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0700</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7A176x</string>
+	<string>7C68</string>
 </dict>
 </plist>

radiant-player-mac/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist

@@ -16,6 +16,8 @@
 	<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
 	<key>iMac6,1</key>
 	<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
+	<key>iMac7,1</key>
+	<string>iMac Intel Core 2 Duo (aluminum enclosure)</string>
 	<key>iMac8,1</key>
 	<string>iMac (Core 2 Duo, 20 or 24 inch, Early 2008 )</string>
 	<key>iMac9,1</key>
@@ -25,7 +27,7 @@
 	<key>iMac11,1</key>
 	<string>iMac (Core i5 or i7, 27 inch Late 2009)</string>
 	<key>iMac11,2</key>
-	<string>iMac (Core i3 or i5, 27 inch Mid 2010)</string>
+	<string>21.5&quot; iMac (mid 2010)</string>
 	<key>iMac11,3</key>
 	<string>iMac (Core i5 or i7, 27 inch Mid 2010)</string>
 	<key>iMac12,1</key>
@@ -42,6 +44,16 @@
 	<string>iMac (Core i5 or i7, 27 inch Late 2013)</string>
 	<key>iMac14,3</key>
 	<string>iMac (Core i5 or i7, 21.5 inch Late 2013)</string>
+	<key>iMac14,4</key>
+	<string>iMac (Core i5, 21.5 inch Mid 2014)</string>
+	<key>iMac15,1</key>
+	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015)</string>
+	<key>iMac16,1</key>
+	<string>iMac (Core i5, 21,5 inch Late 2015)</string>
+	<key>iMac16,2</key>
+	<string>iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015)</string>
+	<key>iMac17,1</key>
+	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2015)</string>
 	<key>MacBook1,1</key>
 	<string>MacBook (Core Duo)</string>
 	<key>MacBook2,1</key>
@@ -56,6 +68,8 @@
 	<string>MacBook (Core 2 Duo, Late 2009, Unibody)</string>
 	<key>MacBook7,1</key>
 	<string>MacBook (Core 2 Duo, Mid 2010, White)</string>
+	<key>MacBook8,1</key>
+	<string>MacBook (Core M, 12 inch, Early 2015)</string>
 	<key>MacBookAir1,1</key>
 	<string>MacBook Air (Core 2 Duo, 13 inch, Early 2008)</string>
 	<key>MacBookAir2,1</key>
@@ -76,6 +90,10 @@
 	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014)</string>
 	<key>MacBookAir6,2</key>
 	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014)</string>
+	<key>MacBookAir7,1</key>
+	<string>MacBook Air (Core i5 or i7, 11 inch, Early 2015)</string>
+	<key>MacBookAir7,2</key>
+	<string>MacBook Air (Core i5 or i7, 13 inch, Early 2015)</string>
 	<key>MacBookPro1,1</key>
 	<string>MacBook Pro Core Duo (15-inch)</string>
 	<key>MacBookPro1,2</key>
@@ -90,8 +108,70 @@
 	<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
 	<key>MacBookPro4,1</key>
 	<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
+	<key>MacBookPro5,1</key>
+	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+	<key>MacBookPro5,2</key>
+	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+	<key>MacBookPro5,3</key>
+	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+	<key>MacBookPro5,4</key>
+	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+	<key>MacBookPro5,5</key>
+	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+	<key>MacBookPro6,1</key>
+	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
+	<key>MacBookPro6,2</key>
+	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
+	<key>MacBookPro7,1</key>
+	<string>MacBook Pro Intel Core 2 Duo (mid 2010)</string>
+	<key>MacBookPro8,1</key>
+	<string>MacBook Pro Intel Core i5, Intel Core i7, 13&quot; (early 2011)</string>
+	<key>MacBookPro8,2</key>
+	<string>MacBook Pro Intel Core i7, 15&quot; (early 2011)</string>
+	<key>MacBookPro8,3</key>
+	<string>MacBook Pro Intel Core i7, 17&quot; (early 2011)</string>
+	<key>MacBookPro9,1</key>
+	<string>MacBook Pro (15-inch, Mid 2012)</string>
+	<key>MacBookPro9,2</key>
+	<string>MacBook Pro (13-inch, Mid 2012)</string>
+	<key>MacBookPro10,1</key>
+	<string>MacBook Pro (Retina, Mid 2012)</string>
+	<key>MacBookPro10,2</key>
+	<string>MacBook Pro (Retina, 13-inch, Late 2012)</string>
+	<key>MacBookPro11,1</key>
+	<string>MacBook Pro (Retina, 13-inch, Late 2013)</string>
+	<key>MacBookPro11,2</key>
+	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
+	<key>MacBookPro11,3</key>
+	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
+	<key>MacbookPro11,4</key>
+	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
+	<key>MacbookPro11,5</key>
+	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
+	<key>MacbookPro12,1 </key>
+	<string>MacBook Pro (Retina, 13-inch, Early 2015)</string>
 	<key>Macmini1,1</key>
 	<string>Mac Mini (Core Solo/Duo)</string>
+	<key>Macmini2,1</key>
+	<string>Mac mini Intel Core</string>
+	<key>Macmini3,1</key>
+	<string>Mac mini Intel Core</string>
+	<key>Macmini4,1</key>
+	<string>Mac mini Intel Core (Mid 2010)</string>
+	<key>Macmini5,1</key>
+	<string>Mac mini (Core i5, Mid 2011)</string>
+	<key>Macmini5,2</key>
+	<string>Mac mini (Core i5 or Core i7, Mid 2011)</string>
+	<key>Macmini5,3</key>
+	<string>Mac mini (Core i7, Server, Mid 2011)</string>
+	<key>Macmini6,1</key>
+	<string>Mac mini (Core i5, Late 2012)</string>
+	<key>Macmini6,2</key>
+	<string>Mac mini (Core i7, Normal or Server, Late 2012)</string>
+	<key>Macmini7,1</key>
+	<string>Mac mini (Core i5 or Core i7, Late 2014)</string>
+	<key>MacPro1,1,Quad</key>
+	<string>Mac Pro</string>
 	<key>MacPro1,1</key>
 	<string>Mac Pro (four-core)</string>
 	<key>MacPro2,1</key>
@@ -101,7 +181,9 @@
 	<key>MacPro4,1</key>
 	<string>Mac Pro (March 2009)</string>
 	<key>MacPro5,1</key>
-	<string>Mac Pro (August 2010)</string>
+	<string>Mac Pro (2010 or 2012)</string>
+	<key>MacPro6,1</key>
+	<string>Mac Pro (Late 2013)</string>
 	<key>PowerBook1,1</key>
 	<string>PowerBook G3</string>
 	<key>PowerBook2,1</key>
@@ -164,14 +246,6 @@
 	<string>Power Macintosh G3 (Blue &amp; White)</string>
 	<key>PowerMac1,2</key>
 	<string>Power Macintosh G4 (PCI Graphics)</string>
-	<key>PowerMac10,1</key>
-	<string>Mac Mini G4</string>
-	<key>PowerMac10,2</key>
-	<string>Mac Mini (Late 2005)</string>
-	<key>PowerMac11,2</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac12,1</key>
-	<string>iMac G5 (iSight)</string>
 	<key>PowerMac2,1</key>
 	<string>iMac G3 (Slot-loading CD-ROM)</string>
 	<key>PowerMac2,2</key>
@@ -198,6 +272,8 @@
 	<string>iMac G4 (17-inch Flat Panel)</string>
 	<key>PowerMac5,1</key>
 	<string>Power Macintosh G4 Cube</string>
+	<key>PowerMac5,2</key>
+	<string>Power Mac G4 Cube</string>
 	<key>PowerMac6,1</key>
 	<string>iMac G4 (USB 2.0)</string>
 	<key>PowerMac6,3</key>
@@ -214,6 +290,14 @@
 	<string>iMac G5 (Ambient Light Sensor)</string>
 	<key>PowerMac9,1</key>
 	<string>Power Macintosh G5 (Late 2005)</string>
+	<key>PowerMac10,1</key>
+	<string>Mac Mini G4</string>
+	<key>PowerMac10,2</key>
+	<string>Mac Mini (Late 2005)</string>
+	<key>PowerMac11,2</key>
+	<string>Power Macintosh G5 (Late 2005)</string>
+	<key>PowerMac12,1</key>
+	<string>iMac G5 (iSight)</string>
 	<key>RackMac1,1</key>
 	<string>Xserve G4</string>
 	<key>RackMac1,2</key>
@@ -224,5 +308,7 @@
 	<string>Xserve (Intel Xeon)</string>
 	<key>Xserve2,1</key>
 	<string>Xserve (January 2008 quad-core)</string>
+	<key>Xserve3,1</key>
+	<string>Xserve (early 2009)</string>
 </dict>
 </plist>

radiant-player-mac/en.lproj/MainMenu.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="9532"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">