Skip to content

Commit 5c64ad6

Browse files
committed
Update Sparkle signature to EdDSA
Transitional, next update will drop DSA in favor of EdDSA alone. Make sandbox to work with Sparkle
1 parent 4381c75 commit 5c64ad6

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

Base.lproj/MainMenu.xib

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
1111
</connections>
1212
</customObject>
1313
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
14-
<customObject id="-3" userLabel="Application"/>
14+
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
1515
<customObject id="252" userLabel="SquirrelApplicationDelegate" customClass="SquirrelApplicationDelegate">
1616
<connections>
1717
<outlet property="_menu" destination="773" id="779"/>
@@ -53,7 +53,8 @@
5353
</connections>
5454
</menuItem>
5555
</items>
56+
<point key="canvasLocation" x="139" y="-38"/>
5657
</menu>
57-
<customObject id="772" userLabel="Updater" customClass="SUUpdater"/>
58+
<customObject id="772" userLabel="Updater" customClass="SPUStandardUpdaterController"/>
5859
</objects>
5960
</document>

Info.plist

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
<string>https://rime.github.io/release/squirrel/appcast.xml</string>
108108
<key>SUPublicDSAKeyFile</key>
109109
<string>dsa_pub.pem</string>
110+
<key>SUPublicEDKey</key>
111+
<string>ukvWq2dKOWn3B9AsdsQIwOptiDdDKdUjAVNgFxSvB2o=</string>
110112
<key>TICapsLockLanguageSwitchCapable</key>
111113
<true/>
114+
<key>SUEnableInstallerLauncherService</key>
115+
<true/>
112116
</dict>
113117
</plist>

Squirrel.entitlements

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.temporary-exception.files.home-relative-path.read-write</key>
6+
<array>
7+
<string>/Library/Rime/</string>
8+
</array>
9+
<key>com.apple.security.files.bookmarks.app-scope</key>
10+
<true/>
11+
<key>com.apple.security.app-sandbox</key>
12+
<true/>
13+
<key>com.apple.security.files.user-selected.read-write</key>
14+
<true/>
15+
<key>com.apple.security.network.client</key>
16+
<true/>
17+
<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
18+
<array>
19+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
20+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
21+
</array>
22+
</dict>
23+
</plist>

Squirrel.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@
296296
A47C48DE105E8CE8006D528B /* macos_keycode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macos_keycode.m; sourceTree = "<group>"; };
297297
A4B8E1B20F645B870094E08B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
298298
A4FC48CA0F6530EF0069BE81 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
299+
B32B80772BE7FAA200FCF3BC /* Squirrel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Squirrel.entitlements; sourceTree = "<group>"; };
299300
D26434542706A15100857391 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
300301
E93074B60A5C264700470842 /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = /System/Library/Frameworks/InputMethodKit.framework; sourceTree = "<absolute>"; };
301302
F45E005E2B8CA81C00179B75 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
@@ -394,6 +395,7 @@
394395
44F7708E152B3334005CF491 /* dsa_pub.pem */,
395396
A4FC48C90F6530EF0069BE81 /* Localizable.strings */,
396397
8D1107310486CEB800E47090 /* Info.plist */,
398+
B32B80772BE7FAA200FCF3BC /* Squirrel.entitlements */,
397399
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
398400
A45578F41146A75200592C6E /* MainMenu.xib */,
399401
446C01D61F767BD400A6C23E /* Assets.xcassets */,
@@ -629,6 +631,7 @@
629631
buildSettings = {
630632
CLANG_CXX_LIBRARY = "libc++";
631633
CLANG_ENABLE_OBJC_ARC = YES;
634+
CODE_SIGN_ENTITLEMENTS = Squirrel.entitlements;
632635
CODE_SIGN_IDENTITY = "-";
633636
COMBINE_HIDPI_IMAGES = YES;
634637
COPY_PHASE_STRIP = NO;
@@ -679,6 +682,7 @@
679682
buildSettings = {
680683
CLANG_CXX_LIBRARY = "libc++";
681684
CLANG_ENABLE_OBJC_ARC = YES;
685+
CODE_SIGN_ENTITLEMENTS = Squirrel.entitlements;
682686
CODE_SIGN_IDENTITY = "-";
683687
COMBINE_HIDPI_IMAGES = YES;
684688
CURRENT_PROJECT_VERSION = 0.18;

zh-Hans.lproj/MainMenu.xib

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
1111
</connections>
1212
</customObject>
1313
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
14-
<customObject id="-3" userLabel="Application"/>
14+
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
1515
<customObject id="252" userLabel="SquirrelApplicationDelegate" customClass="SquirrelApplicationDelegate">
1616
<connections>
1717
<outlet property="_menu" destination="773" id="779"/>
@@ -53,7 +53,8 @@
5353
</connections>
5454
</menuItem>
5555
</items>
56+
<point key="canvasLocation" x="139" y="-38"/>
5657
</menu>
57-
<customObject id="772" userLabel="Updater" customClass="SUUpdater"/>
58+
<customObject id="772" userLabel="Updater" customClass="SPUStandardUpdaterController"/>
5859
</objects>
5960
</document>

zh-Hant.lproj/MainMenu.xib

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
1111
</connections>
1212
</customObject>
1313
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
14-
<customObject id="-3" userLabel="Application"/>
14+
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
1515
<customObject id="252" userLabel="SquirrelApplicationDelegate" customClass="SquirrelApplicationDelegate">
1616
<connections>
1717
<outlet property="_menu" destination="773" id="779"/>
@@ -53,7 +53,8 @@
5353
</connections>
5454
</menuItem>
5555
</items>
56+
<point key="canvasLocation" x="139" y="-38"/>
5657
</menu>
57-
<customObject id="772" userLabel="Updater" customClass="SUUpdater"/>
58+
<customObject id="772" userLabel="Updater" customClass="SPUStandardUpdaterController"/>
5859
</objects>
5960
</document>

0 commit comments

Comments
 (0)