diff options
Diffstat (limited to 'WebKitTools/WebKitLauncher')
| -rw-r--r-- | WebKitTools/WebKitLauncher/Info.plist | 2 | ||||
| -rw-r--r-- | WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | WebKitTools/WebKitLauncher/WebKitNightlyEnablerSparkle.m | 10 | ||||
| -rw-r--r-- | WebKitTools/WebKitLauncher/nightly.webkit.org.public.pem | 20 | ||||
| -rw-r--r-- | WebKitTools/WebKitLauncher/webkit.icns | bin | 56937 -> 319035 bytes |
5 files changed, 27 insertions, 11 deletions
diff --git a/WebKitTools/WebKitLauncher/Info.plist b/WebKitTools/WebKitLauncher/Info.plist index 1eba038..83564a7 100644 --- a/WebKitTools/WebKitLauncher/Info.plist +++ b/WebKitTools/WebKitLauncher/Info.plist @@ -441,6 +441,8 @@ <false/> <key>SUAllowsAutomaticUpdates</key> <false/> + <key>SUPublicDSAKeyFile</key> + <string>nightly.webkit.org.public.pem</string> <key>NSPrincipalClass</key> <string>BrowserApplication</string> <key>CFBundleHelpBookFolder</key> diff --git a/WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj b/WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj index b8d7a6d..36eacc5 100644 --- a/WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj +++ b/WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj @@ -23,6 +23,7 @@ /* Begin PBXBuildFile section */ 5D1067640FE63758002A2868 /* WebKitLauncherURLProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D1067620FE63758002A2868 /* WebKitLauncherURLProtocol.h */; }; 5D1067650FE63758002A2868 /* WebKitLauncherURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D1067630FE63758002A2868 /* WebKitLauncherURLProtocol.m */; }; + 5D18A1FF103FE255006CA7C7 /* nightly.webkit.org.public.pem in Resources */ = {isa = PBXBuildFile; fileRef = 5D18A1FE103FE255006CA7C7 /* nightly.webkit.org.public.pem */; }; 5D41141C0A50A9DE00C84CF0 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 5D41141B0A50A9DE00C84CF0 /* VERSION */; }; 5D4DF982097F89FB0083D5E5 /* start.html in Resources */ = {isa = PBXBuildFile; fileRef = 5D4DF981097F89FB0083D5E5 /* start.html */; }; 5D650F3609DB8B370075E9A8 /* WebKitNightlyEnabler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D650F3509DB8B370075E9A8 /* WebKitNightlyEnabler.m */; }; @@ -65,6 +66,7 @@ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 5D1067620FE63758002A2868 /* WebKitLauncherURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLauncherURLProtocol.h; sourceTree = "<group>"; }; 5D1067630FE63758002A2868 /* WebKitLauncherURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLauncherURLProtocol.m; sourceTree = "<group>"; }; + 5D18A1FE103FE255006CA7C7 /* nightly.webkit.org.public.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nightly.webkit.org.public.pem; sourceTree = "<group>"; }; 5D41141B0A50A9DE00C84CF0 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; }; 5D4DF981097F89FB0083D5E5 /* start.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = start.html; sourceTree = "<group>"; }; 5D650F3409DB8B280075E9A8 /* WebKitNightlyEnabler.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = WebKitNightlyEnabler.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -148,9 +150,10 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 5D41141B0A50A9DE00C84CF0 /* VERSION */, 8D1107310486CEB800E47090 /* Info.plist */, + 5D18A1FE103FE255006CA7C7 /* nightly.webkit.org.public.pem */, 5D4DF981097F89FB0083D5E5 /* start.html */, + 5D41141B0A50A9DE00C84CF0 /* VERSION */, 5DB70524097B94CD009875EC /* webkit.icns */, ); name = Resources; @@ -257,6 +260,7 @@ 5D41141C0A50A9DE00C84CF0 /* VERSION in Resources */, 5DB70525097B94CD009875EC /* webkit.icns in Resources */, 5D650F3A09DB8B410075E9A8 /* WebKitNightlyEnabler.dylib in Resources */, + 5D18A1FF103FE255006CA7C7 /* nightly.webkit.org.public.pem in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WebKitTools/WebKitLauncher/WebKitNightlyEnablerSparkle.m b/WebKitTools/WebKitLauncher/WebKitNightlyEnablerSparkle.m index 3927131..8b13ab8 100644 --- a/WebKitTools/WebKitLauncher/WebKitNightlyEnablerSparkle.m +++ b/WebKitTools/WebKitLauncher/WebKitNightlyEnablerSparkle.m @@ -43,13 +43,6 @@ static NSString* updatePermissionPromptDescription(id self, SEL _cmd) return @"Should WebKit automatically check for updates? You can always check for updates manually from the Safari menu."; } -// -[SUBasicUpdateDriver downloadDidFinish:] requires that the download be served over SSL or signed -// using a public key. We're not interested in dealing with that hassle just at the moment. -static void skipSignatureVerificationInDownloadDidFinish(id self, SEL _cmd, id download) -{ - objc_msgSend(self, @selector(extractUpdate)); -} - static NSPanel *updateAlertPanel(id updateItem, id host) { NSString *hostName = objc_msgSend(host, @selector(name)); @@ -139,9 +132,6 @@ void initializeSparkle() Method methodToPatch = class_getInstanceMethod(objc_getRequiredClass("SUUpdatePermissionPrompt"), @selector(promptDescription)); setMethodImplementation(methodToPatch, (IMP)updatePermissionPromptDescription); - methodToPatch = class_getInstanceMethod(objc_getRequiredClass("SUBasicUpdateDriver"), @selector(downloadDidFinish:)); - setMethodImplementation(methodToPatch, (IMP)skipSignatureVerificationInDownloadDidFinish); - methodToPatch = class_getInstanceMethod(objc_getRequiredClass("SUUpdateAlert"), @selector(initWithAppcastItem:host:)); setMethodImplementation(methodToPatch, (IMP)updateAlertInitForAlertPanel); diff --git a/WebKitTools/WebKitLauncher/nightly.webkit.org.public.pem b/WebKitTools/WebKitLauncher/nightly.webkit.org.public.pem new file mode 100644 index 0000000..174c1e4 --- /dev/null +++ b/WebKitTools/WebKitLauncher/nightly.webkit.org.public.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQCkQLoVjuu3dPn1dO8N6xIFf4riPVuJ +XOVpx+QlFMno+qzqGJcJxqhfqZhIRwLq62eHpeuYKIuuPG8fqXY/hquHQIjrtEFZ +euCW8cxqC7iBg3PlX6RsKUXHD+WY82HJ5Hdkd+5G3jD9qO+Ka7RXgOnL7fTRcbkW +rtBjL7lVAlMBSVG54+zvti/h1CmdfpO83JAnoGl8c+WGgKlwt5nR7jxp4PgBdAw2 +aJt+UqrMkZOr4Npik1a8IzW+KTlBn96DbF5M6PP6Uh9TblnYtt0ic/Vnr6MKS60X +WNCb/2/HFjQYaINYtJfXpBaGUMZ0dsAyMxn/Sf1vApmVWh2t0TRMgI4JAhUAtL7E +pauM+spqaZnAxcMNMP0uFaECggEAe1lF6yZHJh89QdPQvmwROKFHOXYvEX5/IFRw +pFJDdJJdw53nS/yXWKy8o/wBqESzeVCbktYRqQE84ApO/KJs4KdwiL2LU32FiMD0 +c4UCkRf/RxSLxE4/FGKQzTaBB5TGMfuNLn6C/4aoNXnxcB399QxKF2slBp1GQgsC +6/4KZZYN+kxGxqAfA1UqrleVtv9OwmaCJwMYYqq20zxYhryuBjTSAD+VN6ncerUf +IxUceX83mWriBMtXHHR0x12WUDfnFQZg583MeMguFc8qESqZX7mWtzSnblsGmez3 +pD028APHFWJSdruT2YI1NJf08S7A9GLdkLRaUNQTABygANviQwOCAQUAAoIBAGDn +SFRJ3o/wKBm1PwQyaMfE8dtFt1NVOqTA2/VL3CVfqPV6tizRSvto45HSBn96R6nC +cxZCi3knJy/9V9ITtlCw1UtqeYOW7sp0PRAgct93XuzlMpOFQr5Q8jydvqMEymOD +c55QE2vbSgHYbQH362uNXsyMWN1xRVSlT13MBi+fmZ86Z5CkRWvIPWg2NRO16bnx +jK6l0LGvBKiU79HIrH7DlEfX0zVJBYi6NnJqvFSDeoKyiOMWaCAquWDgu00k3NOl +gndPnl+mVzEEgNvvN0H6KGVTf55H7KR1LqtWFWCw0VXy5oFgRB359hrLvxe91U4M +iN3jD7YxuENTOTefu9c= +-----END PUBLIC KEY----- diff --git a/WebKitTools/WebKitLauncher/webkit.icns b/WebKitTools/WebKitLauncher/webkit.icns Binary files differindex bf629bf..b1e1017 100644 --- a/WebKitTools/WebKitLauncher/webkit.icns +++ b/WebKitTools/WebKitLauncher/webkit.icns |