diff --git a/Makefile b/Makefile index 7c65979..97c2379 100644 --- a/Makefile +++ b/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) diff --git a/Sloth.xcodeproj/project.pbxproj b/Sloth.xcodeproj/project.pbxproj index dd73c92..661460f 100644 --- a/Sloth.xcodeproj/project.pbxproj +++ b/Sloth.xcodeproj/project.pbxproj @@ -107,7 +107,6 @@ F4F1D8A01C7623AF00945D3E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; F4F1D9111C7CB95700945D3E /* dsa_priv.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = dsa_priv.pem; sourceTree = ""; }; F4F1D9121C7CB95700945D3E /* dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; - F4F1D9141C7CB95700945D3E /* sign_update.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = sign_update.rb; sourceTree = ""; }; F4F1D9151C7CB95700945D3E /* SlothAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SlothAppcast.xml; sourceTree = ""; }; F4F1D9161C7CB95700945D3E /* update_appcast.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = update_appcast.sh; sourceTree = ""; }; F4F7A5032215F11E004421AA /* Prefs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Prefs.xib; sourceTree = ""; }; @@ -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", diff --git a/resources/Info.plist b/resources/Info.plist index 01d40e6..265d305 100644 --- a/resources/Info.plist +++ b/resources/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 252 + 253 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion @@ -40,5 +40,7 @@ https://sveinbjorn.org/files/appcasts/SlothAppcast.xml SUPublicDSAKeyFile dsa_pub.pem + SUPublicEDKey + XqfjBk0i1aF2FrZQfUIcpU+h7151345+3pSN9Bs7GwI= diff --git a/sparkle/SlothAppcast.xml b/sparkle/SlothAppcast.xml index 3d217cb..6ac183a 100644 --- a/sparkle/SlothAppcast.xml +++ b/sparkle/SlothAppcast.xml @@ -8,9 +8,14 @@ Version 3.0 Tuesday, 24 Nov 2020 22:03:00 +0000 - + 10.9.0 Sorry guys, due to signing issues you'll have to fetch the latest version manually instead of using the auto-update mechanism. +
+ Download Sloth 3.0 +

+

New in Sloth 3.0

  • Universal binary supporting Apple's new arm64 architecture
  • diff --git a/sparkle/generate_keys b/sparkle/generate_keys new file mode 100755 index 0000000..2dfbb29 Binary files /dev/null and b/sparkle/generate_keys differ diff --git a/sparkle/sign_update b/sparkle/sign_update new file mode 100755 index 0000000..8193e1f Binary files /dev/null and b/sparkle/sign_update differ diff --git a/sparkle/update_appcast.sh b/sparkle/update_appcast.sh index 8f5fb35..f7e8ede 100755 --- a/sparkle/update_appcast.sh +++ b/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