Compare commits

...
19 Commits
Author SHA1 Message Date
Oleg Krupnov 7f1555d525 Merge branch 'master' of https://github.com/sparkle-project/Sparkle
# Conflicts:
#	CHANGELOG
#	Configurations/ConfigBinaryDelta.xcconfig
#	Configurations/ConfigCommon.xcconfig
#	Configurations/ConfigFramework.xcconfig
#	Configurations/ConfigTestApp.xcconfig
#	Configurations/ConfigUnitTest.xcconfig
#	Documentation/.gitignore
#	Documentation/Doxyfile
#	LICENSE
#	Resources/Images.xcassets/AppIcon.appiconset/Contents.json
#	Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png
#	Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png
#	Resources/Screenshot.png
#	Resources/Sparkle.png
#	Sparkle.podspec
#	Sparkle.xcodeproj/xcshareddata/xcschemes/Distribution.xcscheme
#	Sparkle/Autoupdate/Autoupdate-Info.plist
#	Sparkle/Autoupdate/Autoupdate.m
#	Sparkle/SUAppcast.h
#	Sparkle/SUAppcast.m
#	Sparkle/SUAppcastItem.h
#	Sparkle/SUAppcastItem.m
#	Sparkle/SUAutomaticUpdateAlert.h
#	Sparkle/SUAutomaticUpdateAlert.m
#	Sparkle/SUAutomaticUpdateDriver.m
#	Sparkle/SUBasicUpdateDriver.m
#	Sparkle/SUBinaryDeltaApply.m
#	Sparkle/SUBinaryDeltaCommon.h
#	Sparkle/SUBinaryDeltaCommon.m
#	Sparkle/SUBinaryDeltaCreate.h
#	Sparkle/SUBinaryDeltaCreate.m
#	Sparkle/SUBinaryDeltaTool.m
#	Sparkle/SUBinaryDeltaUnarchiver.m
#	Sparkle/SUCodeSigningVerifier.m
#	Sparkle/SUConstants.h
#	Sparkle/SUDSAVerifier.h
#	Sparkle/SUDSAVerifier.m
#	Sparkle/SUDiskImageUnarchiver.m
#	Sparkle/SUErrors.h
#	Sparkle/SUExport.h
#	Sparkle/SUGuidedPackageInstaller.h
#	Sparkle/SUGuidedPackageInstaller.m
#	Sparkle/SUHost.h
#	Sparkle/SUHost.m
#	Sparkle/SUInstaller.h
#	Sparkle/SUInstaller.m
#	Sparkle/SUPackageInstaller.m
#	Sparkle/SUPipedUnarchiver.m
#	Sparkle/SUPlainInstaller.m
#	Sparkle/SUPlainInstallerInternals.m
#	Sparkle/SUProbingUpdateDriver.m
#	Sparkle/SUScheduledUpdateDriver.m
#	Sparkle/SUStandardVersionComparator.h
#	Sparkle/SUStatus.xib
#	Sparkle/SUStatusController.m
#	Sparkle/SUSystemProfiler.m
#	Sparkle/SUUIBasedUpdateDriver.h
#	Sparkle/SUUIBasedUpdateDriver.m
#	Sparkle/SUUnarchiver.h
#	Sparkle/SUUnarchiver.m
#	Sparkle/SUUpdateAlert.h
#	Sparkle/SUUpdateAlert.m
#	Sparkle/SUUpdateDriver.h
#	Sparkle/SUUpdateDriver.m
#	Sparkle/SUUpdatePermissionPrompt.h
#	Sparkle/SUUpdatePermissionPrompt.m
#	Sparkle/SUUpdater.h
#	Sparkle/SUUpdater.m
#	Sparkle/SUUserInitiatedUpdateDriver.m
#	Sparkle/SUVersionComparisonProtocol.h
#	Sparkle/SUVersionDisplayProtocol.h
#	Sparkle/SUWindowController.m
#	Sparkle/Sparkle-Info.plist
#	Sparkle/Sparkle.pch
#	Sparkle/ar.lproj/SUUpdateAlert.xib
#	Sparkle/ar.lproj/Sparkle.strings
#	Sparkle/ca.lproj/SUAutomaticUpdateAlert.strings
#	Sparkle/ca.lproj/SUUpdateAlert.strings
#	Sparkle/ca.lproj/Sparkle.strings
#	Sparkle/cs.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/cs.lproj/SUUpdateAlert.xib
#	Sparkle/cs.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/cs.lproj/Sparkle.strings
#	Sparkle/cy.lproj/Sparkle.strings
#	Sparkle/da.lproj/SUUpdateAlert.xib
#	Sparkle/da.lproj/Sparkle.strings
#	Sparkle/de.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/de.lproj/SUUpdateAlert.xib
#	Sparkle/de.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/de.lproj/Sparkle.strings
#	Sparkle/el.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/el.lproj/SUUpdateAlert.xib
#	Sparkle/el.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/el.lproj/Sparkle.strings
#	Sparkle/en.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/en.lproj/SUUpdateAlert.xib
#	Sparkle/en.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/en.lproj/Sparkle.strings
#	Sparkle/es.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/es.lproj/SUUpdateAlert.xib
#	Sparkle/es.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/es.lproj/Sparkle.strings
#	Sparkle/fi.lproj/SUAutomaticUpdateAlert.strings
#	Sparkle/fi.lproj/SUUpdateAlert.strings
#	Sparkle/fi.lproj/Sparkle.strings
#	Sparkle/fr.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/fr.lproj/SUUpdateAlert.xib
#	Sparkle/fr.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/fr.lproj/Sparkle.strings
#	Sparkle/he.lproj/SUAutomaticUpdateAlert.strings
#	Sparkle/he.lproj/SUUpdateAlert.strings
#	Sparkle/he.lproj/Sparkle.strings
#	Sparkle/hu.lproj/Sparkle.strings
#	Sparkle/id.lproj/Sparkle.strings
#	Sparkle/is.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/is.lproj/SUUpdateAlert.xib
#	Sparkle/is.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/is.lproj/Sparkle.strings
#	Sparkle/it.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/it.lproj/SUUpdateAlert.xib
#	Sparkle/it.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/it.lproj/Sparkle.strings
#	Sparkle/ja.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/ja.lproj/SUUpdateAlert.xib
#	Sparkle/ja.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/ja.lproj/Sparkle.strings
#	Sparkle/ko.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/ko.lproj/SUUpdateAlert.xib
#	Sparkle/ko.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/ko.lproj/Sparkle.strings
#	Sparkle/nb.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/nb.lproj/SUUpdateAlert.xib
#	Sparkle/nb.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/nb.lproj/Sparkle.strings
#	Sparkle/nl.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/nl.lproj/SUUpdateAlert.xib
#	Sparkle/nl.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/nl.lproj/Sparkle.strings
#	Sparkle/no.lproj/SUAutomaticUpdateAlert.strings
#	Sparkle/no.lproj/SUUpdateAlert.strings
#	Sparkle/no.lproj/Sparkle.strings
#	Sparkle/pl.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/pl.lproj/SUUpdateAlert.xib
#	Sparkle/pl.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/pl.lproj/Sparkle.strings
#	Sparkle/pt_BR.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/pt_BR.lproj/SUUpdateAlert.xib
#	Sparkle/pt_BR.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/pt_BR.lproj/Sparkle.strings
#	Sparkle/pt_PT.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/pt_PT.lproj/SUUpdateAlert.xib
#	Sparkle/pt_PT.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/pt_PT.lproj/Sparkle.strings
#	Sparkle/ro.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/ro.lproj/SUUpdateAlert.xib
#	Sparkle/ro.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/ro.lproj/Sparkle.strings
#	Sparkle/ru.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/ru.lproj/SUUpdateAlert.xib
#	Sparkle/ru.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/ru.lproj/Sparkle.strings
#	Sparkle/sk.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/sk.lproj/SUUpdateAlert.xib
#	Sparkle/sk.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/sk.lproj/Sparkle.strings
#	Sparkle/sl.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/sl.lproj/SUUpdateAlert.xib
#	Sparkle/sl.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/sv.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/sv.lproj/SUUpdateAlert.xib
#	Sparkle/sv.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/sv.lproj/Sparkle.strings
#	Sparkle/th.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/th.lproj/SUUpdateAlert.xib
#	Sparkle/th.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/tr.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/tr.lproj/SUUpdateAlert.xib
#	Sparkle/tr.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/tr.lproj/Sparkle.strings
#	Sparkle/uk.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/uk.lproj/SUUpdateAlert.xib
#	Sparkle/uk.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/zh_CN.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/zh_CN.lproj/SUUpdateAlert.xib
#	Sparkle/zh_CN.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/zh_CN.lproj/Sparkle.strings
#	Sparkle/zh_TW.lproj/SUAutomaticUpdateAlert.xib
#	Sparkle/zh_TW.lproj/SUUpdateAlert.xib
#	Sparkle/zh_TW.lproj/SUUpdatePermissionPrompt.xib
#	Sparkle/zh_TW.lproj/Sparkle.strings
#	TestApplication/After Update/Sparkle Updated Test App.xcodeproj/project.pbxproj
#	TestApplication/After Update/Sparkle Updated Test App/AppDelegate.h
#	TestApplication/After Update/Sparkle Updated Test App/AppDelegate.m
#	TestApplication/After Update/Sparkle Updated Test App/Base.lproj/MainMenu.xib
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/Contents.json
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_128x128.png
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_128x128@2x.png
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_16x16.png
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_16x16@2x.png
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_32x32.png
#	TestApplication/After Update/Sparkle Updated Test App/Images.xcassets/Sparkle.appiconset/icon_32x32@2x.png
#	TestApplication/After Update/Sparkle Updated Test App/Info.plist
#	TestApplication/After Update/Sparkle Updated Test App/main.m
#	TestApplication/English.lproj/InfoPlist.strings
#	TestApplication/English.lproj/MainMenu.xib
#	TestApplication/TestApplication-Info.plist
#	Tests/Resources/SparkleTestCodeSignApp.zip
#	Tests/Resources/signed-test-file.txt
#	Tests/Resources/test archive.zip
#	Tests/Resources/test-pubkey.pem
#	Tests/Resources/test.sparkle_guided.pkg
#	Tests/SUBinaryDeltaTest.m
#	Tests/SUCodeSigningVerifierTest.m
#	Tests/SUDSAVerifierTest.m
#	Tests/SUInstallerTest.m
#	Tests/SUPipedUnarchiverTest.m
#	Tests/SUUpdaterTest.m
#	Tests/SUVersionComparisonTest.m
#	Tests/SparkleTests-Info.plist
#	Vendor/CocoatechCore/NTSynchronousTask.m
#	Vendor/bsdiff/sais.c
#	Vendor/bsdiff/sais.h
2015-06-23 16:00:18 +03:00
Oleg Krupnov be8f682a34 Merging with the main fork 2015-06-23 15:52:35 +03:00
Oleg Krupnov d1904ed606 Updated to 10.10 losing all changes 2015-06-23 13:41:37 +03:00
Oleg Krupnov 54547db28e Merge branch 'master' of https://github.com/AJet/Sparkle
Conflicts:
	Sparkle.xcodeproj/project.pbxproj
2014-08-14 20:04:09 +03:00
Oleg Krupnov 5456da6ab2 Fixed typos in Polish localization
Updated project settings
2014-08-14 20:02:47 +03:00
Oleg Krupnov 3a52b7a503 Added XPC service for relaunching from sandboxed mode 2014-01-21 14:55:37 +02:00
Eugene Krupnov 75f86a6d98 Add Sandbox XPC Service 2014-01-20 19:59:46 +02:00
Oleg Krupnov 8d2f0d31d4 Converted encoding of strings files to UTF-8 2014-01-09 09:00:17 +02:00
Oleg Krupnov a7ca6d79de Improved Polish localization 2014-01-09 08:58:22 +02:00
Oleg Krupnov 076087d4f7 Improved Spanish localization 2014-01-08 15:16:00 +02:00
Oleg Krupnov 93b034b244 Improved Swedish localization 2013-11-04 22:30:07 +02:00
Oleg Krupnov 1fc5d2f215 Updated Italian localization 2013-10-21 18:31:51 +03:00
Oleg Krupnov 6dd689adfc Updated French localization 2013-10-21 13:08:42 +03:00
Oleg Krupnov fa3b83a8c7 Improved German localization 2013-10-21 12:10:56 +03:00
Oleg Krupnov 249331bd32 Improved Russian localization 2013-10-18 17:29:40 +03:00
Oleg Krupnov 262cbf2ff9 Removed unused resources, Russian 2013-10-16 14:13:14 +03:00
Oleg Krupnov 40ab94d684 Removed some dummy strings 2013-10-14 16:17:35 +03:00
Oleg Krupnov 20f73ffc94 Fixed Xcode5 warnings 2013-10-10 17:39:19 +03:00
Oleg Krupnov 11ccce2981 Removed unused strings 2013-10-10 17:39:10 +03:00
281 changed files with 136 additions and 291 deletions

No files matched your search

-45
View File
@@ -1,45 +0,0 @@
AccessModifierOffset: -4
AlignEscapedNewlinesLeft: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackParameters: true
BreakBeforeBinaryOperators: true
BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 0
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
#DerivePointerAlignment: false
DisableFormat: false
#ForEachMacros: foreach,Q_FOREACH
IndentCaseLabels: true
IndentFunctionDeclarationAfterType: true
IndentWidth: 4
KeepEmptyLinesAtTheStartOfBlocks: false
Language: Cpp
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
#PointerAlignment: Right
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
Standard: Cpp03
TabWidth: 4
UseTab: Never
+7 -25
View File
@@ -1,4 +1,5 @@
build/
# Xcode
build/*
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -7,30 +8,11 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.xcworkspace
!default.xcworkspace
xcuserdata/
profile
*.moved-aside
DerivedData
*.xcuserstate
## Ignore incredibly annoying .DS_Store files
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100
.Trashes
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
-2
View File
@@ -1,2 +0,0 @@
language: objective-c
script: make travis
Regular → Executable
View File
File mode changed.
+2
View File
@@ -1 +1,3 @@
// BinaryDelta tool only
PRODUCT_NAME = BinaryDelta
View File
File mode changed.
View File
File mode changed.
-2
View File
@@ -27,8 +27,6 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES
GCC_INLINES_ARE_PRIVATE_EXTERN = YES
ARCHS = $(ARCHS_STANDARD)
MACOSX_DEPLOYMENT_TARGET = 10.7
PRODUCT_NAME = ${TARGET_NAME}
PRODUCT_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier}
GCC_PREPROCESSOR_DEFINITIONS = SPARKLE_BUNDLE_IDENTIFIER=\"$(SPARKLE_BUNDLE_IDENTIFIER)\" SPARKLE_RELAUNCH_TOOL_NAME=\"$(SPARKLE_RELAUNCH_TOOL_NAME)\"
CLANG_ENABLE_OBJC_ARC = YES
-1
View File
@@ -4,7 +4,6 @@
GCC_OPTIMIZATION_LEVEL = 0
DEBUG_INFORMATION_FORMAT = dwarf
ENABLE_TESTABILITY = YES
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
SPARKLE_EXTRA_DEBUG = -DDEBUG
OTHER_CFLAGS = $(SPARKLE_EXTRA_DEBUG)
View File
File mode changed.
+1 -1
View File
@@ -3,6 +3,7 @@
DYLIB_INSTALL_NAME_BASE = @rpath
DYLIB_COMPATIBILITY_VERSION = 1.6
DYLIB_CURRENT_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)
PRODUCT_NAME = Sparkle
WRAPPER_EXTENSION = framework
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Sparkle/Sparkle-Info.plist
@@ -10,4 +11,3 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BUILDING_SPARKLE=1
OTHER_LDFLAGS = -Wl,-U,_NSURLQuarantinePropertiesKey
SKIP_INSTALL = YES
DEFINES_MODULE = YES
PRODUCT_BUNDLE_IDENTIFIER = ${SPARKLE_BUNDLE_IDENTIFIER}
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
+1 -1
View File
@@ -1,8 +1,8 @@
// Test Application only
INFOPLIST_FILE = TestApplication/TestApplication-Info.plist
PRODUCT_NAME = Sparkle Test App
WRAPPER_EXTENSION = app
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
CLANG_ENABLE_OBJC_ARC = NO
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
PRODUCT_BUNDLE_IDENTIFIER = org.sparkle-project.SparkleTestApp
View File
File mode changed.
View File
File mode changed.
+1
View File
@@ -1,6 +1,7 @@
// Unit Test only
INFOPLIST_FILE = Tests/SparkleTests-Info.plist
PRODUCT_NAME = Sparkle Unit Tests
WRAPPER_EXTENSION = xctest
OTHER_CFLAGS = $(inherited) -iframework"$(DEVELOPER_FRAMEWORKS_DIR)" -iframework"$(PLATFORM_DIR)/Developer/Library/Frameworks"
GCC_SYMBOLS_PRIVATE_EXTERN = NO
View File
File mode changed.
View File
File mode changed.
Regular → Executable
View File
File mode changed.
Regular → Executable
View File
File mode changed.
Regular → Executable
View File
File mode changed.
Regular → Executable
View File
File mode changed.
Regular → Executable
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File
File mode changed.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File
File mode changed.
Regular → Executable
View File
File mode changed.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Regular → Executable
View File
File mode changed.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Regular → Executable
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "1.10.0"
s.version = "1.9.0"
s.summary = "A software update framework for OS X"
s.description = "Sparkle is an easy-to-use software update framework for Cocoa developers."
s.homepage = "http://sparkle-project.org"
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
s.platform = :osx, '10.7'
s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.bz2" }
s.public_header_files = 'Sparkle.framework/Versions/A/Headers/*.h'
s.public_header_files = 'Sparkle.framework/Headers/*.h'
s.vendored_framework = 'Sparkle.framework'
s.resources = 'Sparkle.framework'
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"' }
View File
File mode changed.
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:Sparkle.xcodeproj">
</FileRef>
</Workspace>
View File
File mode changed.
View File
File mode changed.
Vendored Regular → Executable
+1 -1
View File
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<string>org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef SUAPPCAST_H
#define SUAPPCAST_H
#import <Foundation/Foundation.h>
#import <Foundation/NSURLDownload.h>
#import "SUExport.h"
@class SUAppcastItem;
Vendored Regular → Executable
-3
View File
@@ -244,13 +244,10 @@
- (void)reportError:(NSError *)error
{
NSURL *failingUrl = error.userInfo[NSURLErrorFailingURLErrorKey];
self.completionBlock([NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastError userInfo:@{
NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred in retrieving update information. Please try again later.", nil),
NSLocalizedFailureReasonErrorKey: [error localizedDescription],
NSUnderlyingErrorKey: error,
NSURLErrorFailingURLErrorKey: failingUrl ? failingUrl : [NSNull null],
}]);
self.completionBlock = nil;
}
Vendored Regular → Executable
+1 -2
View File
@@ -9,8 +9,7 @@
#ifndef SUAPPCASTITEM_H
#define SUAPPCASTITEM_H
#import <Foundation/Foundation.h>
#import "SUExport.h"
#include "SUExport.h"
SU_EXPORT @interface SUAppcastItem : NSObject
@property (copy, readonly) NSString *title;
Vendored Regular → Executable
+1 -1
View File
@@ -167,7 +167,7 @@
NSMutableDictionary *fakeAppCastDict = [dict mutableCopy];
[fakeAppCastDict removeObjectForKey:SUAppcastElementDeltas];
fakeAppCastDict[SURSSElementEnclosure] = deltaDictionary;
SUAppcastItem *deltaItem = [[SUAppcastItem alloc] initWithDictionary:fakeAppCastDict];
SUAppcastItem *deltaItem = [[[self class] alloc] initWithDictionary:fakeAppCastDict];
deltas[deltaDictionary[SUAppcastAttributeDeltaFrom]] = deltaItem;
}
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-1
View File
@@ -27,7 +27,6 @@
- (BOOL)hostSupportsItem:(SUAppcastItem *)ui;
- (BOOL)itemContainsSkippedVersion:(SUAppcastItem *)ui;
- (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui;
- (void)appcastDidFinishLoading:(SUAppcast *)ac;
- (void)didFindValidUpdate;
- (void)didNotFindUpdate;
Vendored Regular → Executable
+17 -57
View File
@@ -221,61 +221,27 @@
- (BOOL)validateUpdateDownloadedToPath:(NSString *)downloadedPath extractedToPath:(NSString *)extractedPath DSASignature:(NSString *)DSASignature publicDSAKey:(NSString *)publicDSAKey
{
BOOL isPackage = NO;
NSString *installSourcePath = [SUInstaller installSourcePathInUpdateFolder:extractedPath forHost:self.host isPackage:&isPackage isGuided:NULL];
if (installSourcePath == nil) {
SULog(@"No suitable install is found in the update. The update will be rejected.");
return NO;
}
// Modern packages are not distributed as bundles and are code signed differently than regular applications
if (isPackage) {
BOOL packageValidated = [SUDSAVerifier validatePath:downloadedPath withEncodedDSASignature:DSASignature withPublicDSAKey:publicDSAKey];
NSString *newBundlePath = [SUInstaller appPathInUpdateFolder:extractedPath forHost:self.host];
if (!packageValidated) {
SULog(@"DSA signature validation failed. The update will be rejected.");
if (newBundlePath) {
if ([SUCodeSigningVerifier hostApplicationIsCodeSigned]) {
NSError *error = nil;
if ([SUCodeSigningVerifier codeSignatureMatchesHostAndIsValidAtPath:newBundlePath error:&error]) {
return YES;
} else {
SULog(@"Code signature check on update failed: %@. Sparkle will use DSA signature instead.", error);
}
} else {
SULog(@"The host app is not signed using Apple Code Signing, and therefore cannot verify updates this way. Sparkle will use DSA signature instead.");
}
return packageValidated;
}
NSBundle *newBundle = [NSBundle bundleWithPath:installSourcePath];
if (newBundle == nil) {
SULog(@"No suitable bundle is found in the update. The update will be rejected.");
if (DSASignature) {
return [SUDSAVerifier validatePath:downloadedPath withEncodedDSASignature:DSASignature withPublicDSAKey:publicDSAKey];
} else {
SULog(@"The appcast item for the update has no DSA signature. The update will be rejected, because both DSA and Apple Code Signing verification failed.");
return NO;
}
SUHost *newHost = [[SUHost alloc] initWithBundle:newBundle];
NSString *newPublicDSAKey = newHost.publicDSAKey;
if (newPublicDSAKey != nil) {
if (![SUDSAVerifier validatePath:downloadedPath withEncodedDSASignature:DSASignature withPublicDSAKey:newPublicDSAKey]) {
SULog(@"DSA signature validation failed. The update will be rejected.");
return NO;
}
}
BOOL dsaKeysMatch = (publicDSAKey == nil || newPublicDSAKey == nil) ? NO : [publicDSAKey isEqualToString:newPublicDSAKey];
if (dsaKeysMatch) {
NSError *error = nil;
if ([SUCodeSigningVerifier applicationAtPathIsCodeSigned:installSourcePath] && ![SUCodeSigningVerifier codeSignatureIsValidAtPath:installSourcePath error:&error]) {
SULog(@"The application to update has an invalid code signature: %@. The update will be rejected.", error);
return NO;
}
} else {
if (![SUCodeSigningVerifier hostApplicationIsCodeSigned] || ![SUCodeSigningVerifier applicationAtPathIsCodeSigned:installSourcePath]) {
SULog(@"Public DSA keys differ or are absent, and both apps are not code signed. The update will be rejected.");
return NO;
}
NSError *error = nil;
if (![SUCodeSigningVerifier codeSignatureMatchesHostAndIsValidAtPath:installSourcePath error:&error]) {
SULog(@"The update will be rejected because the code signature from the original and updated application failed to match: %@", error);
return NO;
}
}
return YES;
}
- (void)downloadDidFinish:(NSURLDownload *)__unused d
@@ -287,15 +253,9 @@
- (void)download:(NSURLDownload *)__unused download didFailWithError:(NSError *)error
{
NSURL *failingUrl = error.userInfo[NSURLErrorFailingURLErrorKey];
if (!failingUrl) {
failingUrl = [self.updateItem fileURL];
}
[self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURelaunchError userInfo:@{
NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while downloading the update. Please try again later.", nil),
NSUnderlyingErrorKey: error,
NSURLErrorFailingURLErrorKey: failingUrl ? failingUrl : [NSNull null],
}]];
}
@@ -481,7 +441,7 @@
- (void)abortUpdateWithError:(NSError *)error
{
if ([error code] != SUNoUpdateError) { // Let's not bother logging this.
SULog(@"Error: %@ %@ (URL %@)", error.localizedDescription, error.localizedFailureReason, error.userInfo[NSURLErrorFailingURLErrorKey]);
SULog(@"Error: %@ %@", [error localizedDescription], [error localizedFailureReason]);
}
if (self.download) {
[self.download cancel];
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
+3 -2
View File
@@ -9,8 +9,6 @@
#ifndef SUBINARYDELTACOMMON_H
#define SUBINARYDELTACOMMON_H
#import <Foundation/Foundation.h>
#include <fts.h>
#define PERMISSION_FLAGS (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)
@@ -65,6 +63,9 @@ typedef NS_ENUM(uint16_t, SUBinaryDeltaMinorVersion)
#define LATEST_DELTA_DIFF_MAJOR_VERSION SUBeigeMajorVersion
@class NSString;
@class NSData;
extern int compareFiles(const FTSENT **a, const FTSENT **b);
extern NSData *hashOfFileContents(FTSENT *ent);
extern NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion);
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-2
View File
@@ -10,8 +10,6 @@
#ifndef SUCONSTANTS_H
#define SUCONSTANTS_H
#import <Foundation/Foundation.h>
// -----------------------------------------------------------------------------
// Misc:
// -----------------------------------------------------------------------------
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-8
View File
@@ -15,14 +15,6 @@
#ifndef SUDSAVERIFIER_H
#define SUDSAVERIFIER_H
#import <Foundation/Foundation.h>
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1090
@interface NSData (SUDSAVerifier)
- (id)initWithBase64Encoding:(NSString *)base64String;
@end
#endif
@interface SUDSAVerifier : NSObject
+ (BOOL)validatePath:(NSString *)path withEncodedDSASignature:(NSString *)encodedSignature withPublicDSAKey:(NSString *)pkeyString;
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
+1 -1
View File
@@ -65,7 +65,7 @@
CFRelease(uuid);
}
}
while (noErr == FSPathMakeRefWithOptions((const UInt8 *)[mountPoint fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &tmpRef, NULL));
while (noErr == FSPathMakeRefWithOptions((UInt8 *)[mountPoint fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &tmpRef, NULL));
NSData *promptData = nil;
promptData = [NSData dataWithBytes:"yes\n" length:4];
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
+2 -2
View File
@@ -22,11 +22,11 @@ A guided installation can be started by applications other than the application
#ifndef SUGUIDEDPACKAGEINSTALLER_H
#define SUGUIDEDPACKAGEINSTALLER_H
#import <Foundation/Foundation.h>
#import "Sparkle.h"
#import "SUInstaller.h"
@interface SUGuidedPackageInstaller : SUInstaller
@interface SUGuidedPackageInstaller : SUInstaller {
}
/*! Perform the guided installation */
+ (void)performInstallationToPath:(NSString *)path fromPath:(NSString *)installerGuide host:(SUHost *)host versionComparator:(id<SUVersionComparison>)comparator completionHandler:(void (^)(NSError *))completionHandler;
Vendored Regular → Executable
+2 -3
View File
@@ -71,10 +71,9 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
validAuth = AuthorizationCopyRights(auth,
&rights,
kAuthorizationEmptyEnvironment,
(AuthorizationFlags)
(kAuthorizationFlagPreAuthorize |
kAuthorizationFlagPreAuthorize |
kAuthorizationFlagExtendRights |
kAuthorizationFlagInteractionAllowed),
kAuthorizationFlagInteractionAllowed,
NULL);
if (validAuth != errAuthorizationSuccess)
{
Vendored Regular → Executable
-1
View File
@@ -5,7 +5,6 @@
// Copyright 2008 Andy Matuschak. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SUUpdater.h"
#import "SUAppcast.h"
#import "SUAppcastItem.h"
Vendored Regular → Executable
+1 -1
View File
@@ -151,7 +151,7 @@ typedef struct {
if (!icon) {
BOOL isMainBundle = (self.bundle == [NSBundle mainBundle]);
NSString *fileType = isMainBundle ? (__bridge NSString *)kUTTypeApplication : (__bridge NSString *)kUTTypeBundle;
NSString *fileType = isMainBundle ? (NSString *)kUTTypeApplication : (NSString *)kUTTypeBundle;
icon = [[NSWorkspace sharedWorkspace] iconForFileType:fileType];
}
return icon;
Vendored Regular → Executable
+1 -1
View File
@@ -15,7 +15,7 @@
@class SUHost;
@interface SUInstaller : NSObject
+ (NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host isPackage:(BOOL *)isPackagePtr isGuided:(BOOL *)isGuidedPtr;
+ (NSString *)appPathInUpdateFolder:(NSString *)updateFolder forHost:(SUHost *)host;
+ (void)installFromUpdateFolder:(NSString *)updateFolder overHost:(SUHost *)host installationPath:(NSString *)installationPath versionComparator:(id<SUVersionComparison>)comparator completionHandler:(void (^)(NSError *))completionHandler;
+ (void)finishInstallationToPath:(NSString *)installationPath withResult:(BOOL)result error:(NSError *)error completionHandler:(void (^)(NSError *))completionHandler;
+ (NSString *)updateFolder;
Vendored Regular → Executable
+7
View File
@@ -121,6 +121,13 @@ static NSString *sUpdateFolder = nil;
return newAppDownloadPath;
}
+ (NSString *)appPathInUpdateFolder:(NSString *)updateFolder forHost:(SUHost *)host
{
BOOL isPackage = NO;
NSString *path = [self installSourcePathInUpdateFolder:updateFolder forHost:host isPackage:&isPackage isGuided:nil];
return isPackage ? nil : path;
}
+ (void)installFromUpdateFolder:(NSString *)inUpdateFolder overHost:(SUHost *)host installationPath:(NSString *)installationPath versionComparator:(id<SUVersionComparison>)comparator completionHandler:(void (^)(NSError *))completionHandler
{
BOOL isPackage = NO;
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-2
View File
@@ -9,8 +9,6 @@
#ifndef SUPACKAGEINSTALLER_H
#define SUPACKAGEINSTALLER_H
#import <Foundation/Foundation.h>
#import "SUUpdater.h"
#import "SUAppcast.h"
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-2
View File
@@ -9,8 +9,6 @@
#ifndef SUPLAININSTALLER_H
#define SUPLAININSTALLER_H
#import <Foundation/Foundation.h>
#import "SUUpdater.h"
#import "SUAppcast.h"
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-2
View File
@@ -9,8 +9,6 @@
#ifndef SUPLAININSTALLERINTERNALS_H
#define SUPLAININSTALLERINTERNALS_H
#import <Foundation/Foundation.h>
#import "SUPlainInstaller.h"
@interface SUPlainInstaller (Internals)
Vendored Regular → Executable
+9 -17
View File
@@ -117,7 +117,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
FSVolumeRefNum vSrcRefNum = kFSInvalidVolumeRefNum;
FSCatalogInfo catInfo;
memset(&catInfo, 0, sizeof(catInfo));
OSStatus err = FSPathMakeRef((const UInt8 *)[path fileSystemRepresentation], &pathRef, NULL);
OSStatus err = FSPathMakeRef((UInt8 *)[path fileSystemRepresentation], &pathRef, NULL);
if( err == noErr )
{
err = FSGetCatalogInfo(&pathRef, kFSCatInfoVolume, &catInfo, NULL, NULL, NULL);
@@ -461,7 +461,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
NSString *tmpPath = [self _temporaryCopyNameForPath:dst didFindTrash:&didFindTrash];
// Make FSRef for destination:
err = FSPathMakeRefWithOptions((const UInt8 *)[dst fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &dstRef, NULL);
err = FSPathMakeRefWithOptions((UInt8 *)[dst fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &dstRef, NULL);
hadFileAtDest = (err == noErr); // There is a file at the destination, move it aside. If we normalized the name, we might not get here, so don't error.
if( hadFileAtDest )
{
@@ -481,12 +481,12 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
if( hadFileAtDest )
{
err = FSPathMakeRef((const UInt8 *)[[tmpPath stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL);
err = FSPathMakeRef((UInt8 *)[[tmpPath stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL);
if (err != noErr)
FSPathMakeRef((const UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL);
FSPathMakeRef((UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL);
}
err = FSPathMakeRef((const UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &dstDirRef, NULL);
err = FSPathMakeRef((UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &dstDirRef, NULL);
if (err == noErr && hadFileAtDest)
{
@@ -500,7 +500,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
}
}
err = FSPathMakeRef((const UInt8 *)[src fileSystemRepresentation], &srcRef, NULL);
err = FSPathMakeRef((UInt8 *)[src fileSystemRepresentation], &srcRef, NULL);
if (err == noErr)
{
NSFileManager *manager = [[NSFileManager alloc] init];
@@ -572,7 +572,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
NSFileManager *manager = [NSFileManager defaultManager];
#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
if (!&NSURLQuarantinePropertiesKey) {
NSString *const quarantineAttribute = (__bridge NSString *)kLSItemQuarantineProperties;
NSString *const quarantineAttribute = (NSString*)kLSItemQuarantineProperties;
const int removeXAttrOptions = XATTR_NOFOLLOW;
[self removeXAttr:quarantineAttribute
@@ -599,11 +599,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
}
#endif
NSURL *rootURL = [NSURL fileURLWithPath:root];
id rootResourceValue = nil;
[rootURL getResourceValue:&rootResourceValue forKey:NSURLQuarantinePropertiesKey error:NULL];
if (rootResourceValue) {
[rootURL setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL];
}
[rootURL setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL];
// Only recurse if it's actually a directory. Don't recurse into a
// root-level symbolic link.
@@ -616,11 +612,7 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
NSDirectoryEnumerator *directoryEnumerator = [manager enumeratorAtURL:rootURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil];
for (NSURL *file in directoryEnumerator) {
id fileResourceValue = nil;
[file getResourceValue:&fileResourceValue forKey:NSURLQuarantinePropertiesKey error:NULL];
if (fileResourceValue) {
[file setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL];
}
[file setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL];
}
}
}
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
-1
View File
@@ -9,7 +9,6 @@
#ifndef SUSTANDARDVERSIONCOMPARATOR_H
#define SUSTANDARDVERSIONCOMPARATOR_H
#import <Foundation/Foundation.h>
#import "SUExport.h"
#import "SUVersionComparisonProtocol.h"
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef SUSYSTEMPROFILER_H
#define SUSYSTEMPROFILER_H
#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>
@class SUHost;
@interface SUSystemProfiler : NSObject
Loaded 100 of 281 files, more files were not shown because too many files have changed in this diff. Show more