Permalink
Browse files

Update to latest Sparkle, plus a few configuration changes.

Previously we were using an old version, which had a bug that broke updates with recent Apple-supplied OpenSSL versions:

nriley/Sparkle@66ed364

The current Sparkle uses CDSA instead of OpenSSL and is careful to normalize newlines (CDSA wants no newline versus OpenSSL wanting one, of course).
  • Loading branch information...
1 parent 4bc990a commit 97233a1ad7b57457eba62df0af13e4203495d2bd @nriley committed Jul 24, 2012
Showing with 31 additions and 21 deletions.
  1. +15 −15 Source/Pester.xcodeproj/project.pbxproj
  2. +1 −1 Source/Sparkle
  3. +15 −5 Updates/release-notes.html
@@ -136,13 +136,6 @@
remoteGlobalIDString = 61B5F90209C4CEE200B25A18;
remoteInfo = "Sparkle Test App";
};
- 722B9F5A13DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = DAAEFC960DA571DF0051E0D0;
- remoteInfo = "relaunch tool";
- };
722B9F5C13DCF2B6000E0C3D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
@@ -164,6 +157,13 @@
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
remoteInfo = Sparkle;
};
+ E123AD2915BF1AA00041C569 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 722B9F4913DCF2B6000E0C3D /* Sparkle.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 55C14BB7136EEF1500649790;
+ remoteInfo = finish_installation;
+ };
E19857A0104F69150082AC3E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -542,9 +542,9 @@
children = (
722B9F5713DCF2B6000E0C3D /* Sparkle.framework */,
722B9F5913DCF2B6000E0C3D /* Sparkle Test App.app */,
- 722B9F5B13DCF2B6000E0C3D /* relaunch */,
722B9F5D13DCF2B6000E0C3D /* Sparkle Unit Tests.octest */,
722B9F5F13DCF2B6000E0C3D /* BinaryDelta */,
+ E123AD2A15BF1AA00041C569 /* finish_installation.app */,
);
name = Products;
sourceTree = "<group>";
@@ -890,13 +890,6 @@
remoteRef = 722B9F5813DCF2B6000E0C3D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 722B9F5B13DCF2B6000E0C3D /* relaunch */ = {
- isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = relaunch;
- remoteRef = 722B9F5A13DCF2B6000E0C3D /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
722B9F5D13DCF2B6000E0C3D /* Sparkle Unit Tests.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
@@ -911,6 +904,13 @@
remoteRef = 722B9F5E13DCF2B6000E0C3D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
+ E123AD2A15BF1AA00041C569 /* finish_installation.app */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.application;
+ path = finish_installation.app;
+ remoteRef = E123AD2915BF1AA00041C569 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
Submodule Sparkle updated 365 files
View
@@ -8,19 +8,26 @@
<link href="release-notes.css" type="text/css" rel="stylesheet" media="all" />
<script type="text/javascript">
window.onload = function() {
- if (/#(.*)/.exec(location.href)[1] == 'sparkle') {
+ if (location.hash == '#sparkle')
document.getElementById('sparkle-note').style.cssText = '';
- }
}
</script>
</head>
<body>
<table class="note" id="sparkle-note" style="display: none">
- <tr><th>If you’re updating from 1.1 beta 7 or earlier</th></tr>
+ <tr><th>Important: do not click “Install Update”</th></tr>
<tr><td>
- <p>You may update through this window, but the updater will become stuck at “Installing Update...”.</p>
- <p>If this occurs, quit and reopen Pester; the new version will open.</p>
+ <p>A recent Apple security update causes updates through
+ this window to fail.</p>
+ <p>To update, please download Pester 1.1b15 <a
+ href="http://sabi.net/nriley/software/Pester-1.1b15.dmg">here</a>
+ and replace this copy of Pester with the updated version.</p>
+ <p><b>You must update Pester if you are using OS X Mountain
+ Lion (10.8): versions 1.1b14 and earlier will not work
+ properly.</b></p>
+ <p>Pester 1.1b15 is again able to update through this
+ window.</p>
</td></tr>
</table>
<p />
@@ -47,6 +54,9 @@
href="http://codykrieger.com/gfxCardStatus">gfxCardStatus</a>
helpful as a workaround.</li>
<li>Update Growl framework to 1.2.3.</li>
+ <li>Update Sparkle to work around a problem with update
+ verification that only occurred after recent OS X security
+ updates.</li>
<li>Sign with Developer ID for Gatekeeper on OS X Mountain
Lion (10.8).</li>
</ul></td></tr>

0 comments on commit 97233a1

Please sign in to comment.