Fixed sparkle signing

Makefile

@@ -43,9 +43,12 @@ archives:
 	@echo "Creating source archive ${APP_SRC_ZIP_NAME}..."
 	@cd $(BUILD_DIR); zip -q --symlinks -r "${APP_SRC_ZIP_NAME}" ".." -x \*.git\* -x \*.zip\* -x \*.DS_Store\* -x \*dsa_priv.pem\* -x \*Sparkle/dsa_priv.pem\* -x \*products/\* -x \*build/\* -x \*xcuserdata\*
 
-	@echo "Generating Sparkle signature"
+	@echo "Generating Sparkle DSA signature"
 	@ruby "sparkle/sign_update.rb" $(APP_PATH) "sparkle/dsa_priv.pem" 2> /dev/null
 
+	@echo "Generating Sparkle EdDSA signature for archive"
+	@cd $(BUILD_DIR); ../sparkle/sign_update $(APP_ZIP_NAME)
+
 size:
 	@echo "App bundle size:"
 	@du -hs $(APP_PATH)

Sloth.xcodeproj/project.pbxproj

@@ -107,7 +107,6 @@
 		F4F1D8A01C7623AF00945D3E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		F4F1D9111C7CB95700945D3E /* dsa_priv.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = dsa_priv.pem; sourceTree = "<group>"; };
 		F4F1D9121C7CB95700945D3E /* dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
-		F4F1D9141C7CB95700945D3E /* sign_update.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = sign_update.rb; sourceTree = "<group>"; };
 		F4F1D9151C7CB95700945D3E /* SlothAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SlothAppcast.xml; sourceTree = "<group>"; };
 		F4F1D9161C7CB95700945D3E /* update_appcast.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = update_appcast.sh; sourceTree = "<group>"; };
 		F4F7A5032215F11E004421AA /* Prefs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Prefs.xib; sourceTree = "<group>"; };
@@ -247,7 +246,6 @@
 				F4F1D9151C7CB95700945D3E /* SlothAppcast.xml */,
 				F4F1D9111C7CB95700945D3E /* dsa_priv.pem */,
 				F4F1D9121C7CB95700945D3E /* dsa_pub.pem */,
-				F4F1D9141C7CB95700945D3E /* sign_update.rb */,
 				F4F1D9161C7CB95700945D3E /* update_appcast.sh */,
 			);
 			name = Sparkle;
@@ -288,7 +286,7 @@
 				TargetAttributes = {
 					8D1107260486CEB800E47090 = {
 						DevelopmentTeam = 5WX26Y89JP;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
@@ -375,14 +373,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_ENTITLEMENTS = Sloth.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_ENTITLEMENTS = "";
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DEVELOPMENT_TEAM = 5WX26Y89JP;
-				ENABLE_HARDENED_RUNTIME = YES;
+				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/sparkle",
@@ -410,14 +408,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_ENTITLEMENTS = Sloth.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_ENTITLEMENTS = "";
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DEVELOPMENT_TEAM = 5WX26Y89JP;
-				ENABLE_HARDENED_RUNTIME = YES;
+				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/sparkle",

resources/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>252</string>
+	<string>253</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -40,5 +40,7 @@
 	<string>https://sveinbjorn.org/files/appcasts/SlothAppcast.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
+	<key>SUPublicEDKey</key>
+	<string>XqfjBk0i1aF2FrZQfUIcpU+h7151345+3pSN9Bs7GwI=</string>
 </dict>
 </plist>

sparkle/SlothAppcast.xml

@@ -8,9 +8,14 @@
         <item>
             <title>Version 3.0</title>
             <pubDate>Tuesday, 24 Nov 2020 22:03:00 +0000</pubDate>
-            <enclosure url="https://sveinbjorn.org/files/software/sloth/sloth-3.0.zip" sparkle:version="252" sparkle:shortVersionString="3.0" length="1118901" type="application/octet-stream" sparkle:dsaSignature="MEQCIHcoH/6RBHU9sC+s3WAh4wiDrAqvDdzuPJWiS8LwLTMwAiAEkOghk1UULNs4LU4by449IugLNSfAsqUel4PDVBzgpg=="/>
+            <enclosure url="https://sveinbjorn.org/files/software/sloth/sloth-3.0.zip" sparkle:version="253" sparkle:shortVersionString="3.0" type="application/octet-stream" sparkle:dsaSignature="MEQCIGMolV+TdkTuUdkO/NgliEQSlvMTeNk1tQ+hl259G5dNAiB0Dib/Vz/LOrU8l1pxpvEKlnwBjbZ0scmvIXDZRCNmgw==" sparkle:edSignature="AP6Fd2MwpbEbgsF1E5OiyUVVSzYjHkB71o3t9LpLuDjF5CdHR3E6cxeeu+fDif69FrmkfZws4ceihzA89I8ECg==" length="1126186"/>
             <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
             <description><![CDATA[
+                <p><strong>Sorry guys, due to signing issues you'll have to fetch the latest version manually instead of using the auto-update mechanism.</strong>
+                <br>
+                    <a href="https://sveinbjorn.org/files/software/sloth/sloth-3.0.zip">Download Sloth 3.0</a>
+                </p>
+                
                 <h2>New in Sloth 3.0</h2>
                 <ul>
                     <li>Universal binary supporting Apple's new arm64 architecture</li>

sparkle/update_appcast.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scp SlothAppcast.xml sveinbjorn@sveinbjorn.org:/www/sveinbjorn/html/files/appcasts/SlothAppcast.xml
+scp SlothAppcast.xml root@sveinbjorn.org:/www/sveinbjorn/html/files/appcasts/SlothAppcast.xml