Permalink
Browse files

Merge branch 'master' into lapcat/master

  • Loading branch information...
2 parents ef9be0b + 14cbafa commit e68d0351b3233cacf73b207f0c34caf43dc11f5d @rentzsch committed Sep 14, 2009
@@ -47,6 +47,7 @@
69A26D0C0F302C10006648BC /* NSBezierPath-RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = 69A26D0B0F302C10006648BC /* NSBezierPath-RoundedRectangle.m */; };
79166CBD0FF69E1800B1F69B /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 79166CBB0FF69E1800B1F69B /* CTGradient.m */; };
79A21C4D0F30B735009424B8 /* CTFWhitelistWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */; };
+ 79B1F5C0105D9CEE0081D0B0 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */; };
79C040700FF1CCE6002DA6A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 79A060EB0FF1CBF50035F03A /* Sparkle.framework */; };
79E2EB930F86AAD3005CF170 /* SparkleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 79E2EB920F86AAD3005CF170 /* SparkleManager.m */; };
844695F70F470D1F00DC783A /* CTFsIFRSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 844695910F46FC6600DC783A /* CTFsIFRSupport.m */; };
@@ -147,6 +148,7 @@
79475E0C0F658D9A00FD82E3 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Plugin/Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; };
79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTFWhitelistWindowController.m; path = Plugin/CTFWhitelistWindowController.m; sourceTree = "<group>"; };
79A21C4A0F30B735009424B8 /* CTFWhitelistWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFWhitelistWindowController.h; path = Plugin/CTFWhitelistWindowController.h; sourceTree = "<group>"; };
+ 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Plugin/dsa_pub.pem; sourceTree = "<group>"; };
79E2EB910F86AAD3005CF170 /* SparkleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparkleManager.h; path = Plugin/SparkleManager.h; sourceTree = "<group>"; };
79E2EB920F86AAD3005CF170 /* SparkleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SparkleManager.m; path = Plugin/SparkleManager.m; sourceTree = "<group>"; };
844695900F46FC6600DC783A /* CTFsIFRSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFsIFRSupport.h; path = Plugin/CTFsIFRSupport.h; sourceTree = "<group>"; };
@@ -225,6 +227,7 @@
072189BA0F30D9C3008C8944 /* ContextualMenu.xib */,
072189BC0F30D9C3008C8944 /* WhitelistPanel.xib */,
A494CC2B0F9F2446007D5EEB /* ctf.icns */,
+ 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */,
D9566C2B0F37EA0800358646 /* deSIFR Resources */,
);
indentWidth = 4;
@@ -368,6 +371,7 @@
6953E43C0F3EDEB50014ECF7 /* MenubarMenu.xib in Resources */,
A494CC2C0F9F2446007D5EEB /* ctf.icns in Resources */,
00FBE92F0FCD68CE00BC0995 /* NSActionTemplate.png in Resources */,
+ 79B1F5C0105D9CEE0081D0B0 /* dsa_pub.pem in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -492,7 +496,7 @@
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_SIGN_COMPARE = YES;
- PRODUCT_VERSION = 1.5fc2;
+ PRODUCT_VERSION = 1.5.2;
WARNING_CFLAGS = "-Wall";
};
name = Debug;
@@ -505,7 +509,7 @@
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_SIGN_COMPARE = YES;
- PRODUCT_VERSION = 1.5fc2;
+ PRODUCT_VERSION = 1.5.2;
WARNING_CFLAGS = "-Wall";
};
name = Release;
View
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0" xmlns:dc="http://www.w3.org/2005/Atom">
- <channel>
- <title>ClickToFlash Appcast</title>
- <link>https://s3.amazonaws.com/clicktoflash/appcast.xml</link>
- <language>en</language>
- <description>Most recent changes with links to updates</description>
- <item>
- <title>version 1.4.2</title>
- <pubDate>Wed, 20 May 2009 22:02:03 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4.2.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4.2" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4.2.zip"/>
- </item>
- <item>
- <title>version 1.4.1</title>
- <pubDate>Wed, 13 May 2009 20:22:43 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4.1.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4.1" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4.1.zip"/>
- </item>
- <item>
- <title>version 1.4</title>
- <pubDate>Tue, 12 May 2009 21:47:39 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4.zip"/>
- </item>
- <item>
- <title>version 1.4fc6</title>
- <pubDate>Mon, 4 May 2009 00:28:08 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc6.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc6" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc6.zip"/>
- </item>
- <item>
- <title>version 1.4fc5</title>
- <pubDate>Thu, 2 Apr 2009 00:07:40 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc5.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc5" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc5.zip"/>
- </item>
- <item>
- <title>version 1.4fc4</title>
- <pubDate>Tue, 10 Mar 2009 15:25:24 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc4.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc4" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc4.zip"/>
- </item>
- <item>
- <title>version 1.4fc3</title>
- <pubDate>Tue, 10 Mar 2009 15:25:24 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc3.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc3" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc3.zip"/>
- </item>
- <item>
- <title>version 1.4fc2</title>
- <pubDate>Tue, 10 Mar 2009 14:25:24 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc2.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc2" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc2.zip"/>
- </item>
- <item>
- <title>version 1.4fc1</title>
- <pubDate>Tue, 10 Mar 2009 02:03:42 -0500</pubDate>
- <sparkle:releaseNotesLink>http://rentzsch.github.com/clicktoflash/release_notes/1.4fc1.html</sparkle:releaseNotesLink>
- <enclosure type="application/zip" sparkle:version="1.4fc1" url="https://s3.amazonaws.com/clicktoflash/ClickToFlash-1.4fc1.zip"/>
- </item>
- </channel>
-</rss>
@@ -52,6 +52,10 @@ cp -R "$BUILT_PLUGIN" "$MY_INSTALLER_ROOT"
# Stuff it into a .zip.
cd "$BUILT_PRODUCTS_DIR"
zip -r "$VERSIONED_NAME.zip" "ClickToFlash.pkg"
-cd $SCRIPT_WD
+
+if [ -f "$HOME/Documents/releases/ClickToFlash/dsa_priv.pem" ]; then
+ `openssl dgst -sha1 -binary < "$VERSIONED_NAME.zip" | openssl dgst -dss1 -sign "$HOME/Documents/releases/ClickToFlash/dsa_priv.pem" | openssl enc -base64 > $VERSIONED_NAME.dsaSignature`
+fi
+cd "$SCRIPT_WD"
rm -rf "$MY_INSTALLER_ROOT"
@@ -24,8 +24,11 @@
<string>${PRODUCT_VERSION}</string>
<key>NSPrincipalClass</key>
<string>CTFClickToFlashPlugin</string>
+ <key>SUPublicDSAKeyFile</key>
+ <string>dsa_pub.pem</string>
<key>SUFeedURL</key>
- <string>https://s3.amazonaws.com/clicktoflash/appcast.xml</string>
+ <string>http://rentzsch.github.com/clicktoflash/release_notes/appcast.xml</string>
+ <!--<string>http://rentzsch.github.com/clicktoflash/release_notes/appcast_distantfuture.xml</string>-->
<key>WebPluginDescription</key>
<string>Shockwave Flash 10.0 r22</string>
<key>WebPluginMIMETypes</key>
@@ -112,8 +112,12 @@ - (void)startAutomaticallyCheckingForUpdates {
SUUpdater *updater = [self _updater];
if (_canUpdate) {
if ([[CTFUserDefaultsController standardUserDefaults] boolForKey:sAutomaticallyCheckForUpdates]) {
- [updater checkForUpdatesInBackground];
[updater setAutomaticallyChecksForUpdates:YES];
+ static BOOL calledUpdaterApplicationDidFinishLaunching = NO;
+ if (!calledUpdaterApplicationDidFinishLaunching) {
+ calledUpdaterApplicationDidFinishLaunching = YES;
+ [updater applicationDidFinishLaunching:nil];
+ }
} else {
[updater setAutomaticallyChecksForUpdates:NO];
}
View
@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQCMqjpsWIy6jB/a4+NBg4hA8m7Fz7de
+Z8S2RNqurpTldAjpN/0WDjKZkpKglqox4IZnwdkFACacvkEIX86JbOTvfy4+6fW8
+jquM7h0ZrBoBDkh9uEHHaZg/qPIdwFdc8kA+s8pPPsirDiGEPp+pa0APlWqL3hjs
+aCmy28J5EffmOQ5bf9O7H+n6CPl4faYWFqz8gmTlSp+whabPfN0BFLeikqK9h+dJ
+Al9KJcSZVCX/sI9E2/hu9mL9clrQrWFPy9FcD0cHB8uFczK21FUKDLCPer4gXkOp
+mG7Prda/j/DSz0/yd6CzRAsF3PiM0pQep0aYAJrLAZSY8+cwymVQKYIxAhUA8V+G
+B0YwsVc0HAUt/2lSiZBIYgkCggEAN2bDOjTJBykYVnIVfuomrjXsVMe0T/1LD7F8
+cE/XzUUMhYUD0t9Nu5kupRy/0mWJ56Sgy3Jdl/Oh+AQ18BkuX2j9+W6JR8NDCAfD
+N/mKq+2teomTRc04q9iQnPmKHE+cctSU8peYXOIFvywGZNFwfLlrgMboiHcAU442
+7eFITWSZ7/ZG2IXmuMRpTON+7CVGmgRJTgUNh295FFLSUPgor3ptmmSoO9yiKX1s
++yPbnAYrgRfyY8TfizvmBCuBctt6y+unajMDKVn7wtCveUyP10zO4UW3hr53Nue/
+TY4jRWhHT4UZDeQask6T2yW3X3dYI4JbpkADiBDExbiJhcwpmAOCAQUAAoIBADT7
+Hfvhdn5krZ4sNqdkrU+Uuj31Q7Kj2dPu8bqCCPBt/E/cozKPan1NIxNKEnjRAEYE
+lKE+jPAcghMl7cOpe1ngM/IZBp4pb/ddRtH1VsHrnmL8q573+ZRb3oF/I7FyMXKj
+D0YQO/Ml8ZNPaOehaq2EF0lyLpBKnSY4Ej5UoxivpKG582oiEVQ1+DgKLRHQENXp
+u1B/ryFyWer+9QvcOITbBFrd56le6kQHFOyURuRJ0L834e3xH8bwI8G3U/PT4nI8
+qmXSSH1VixBQ2TeXR4CKlcl4d+uE1ZOPU2J6ovo3RBkTvHxgvWWDD2ji0MzuQCee
+XxnQylaLLkDrk25fZBo=
+-----END PUBLIC KEY-----
View
@@ -1,4 +1,6 @@
-This page only hosts the source code for ClickToFlash. To download ClickToFlash, learn how to use it, solve installation problems, fix a PandoraJam incompatibility issue, and more, please visit the [ClickToFlash website](http://rentzsch.github.com/clicktoflash/).
+# Visit the [Official ClickToFlash Site Here](http://rentzsch.github.com/clicktoflash/)
+
+This is the ClickToFlash developer site.
##Version History

0 comments on commit e68d035

Please sign in to comment.