Add a meta-installer

Use csh instead of ksh. Because ksh occasionally likes to dereference a NULL
pointer on Mountain Lion.
2012-10-12 13:28:08 -07:00 · 2012-10-11 14:15:43 -07:00 · 2012-10-11 14:11:12 -07:00 · 2012-10-10 22:22:34 -07:00 · 2012-10-10 16:27:35 -07:00 · 2012-10-10 15:25:38 -07:00
470 changed files with 7485 additions and 3610 deletions
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 OpenDNS, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
@@ -1,267 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		09080E931458B8DB00A85DAE /* SocketListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 09080E921458B8DB00A85DAE /* SocketListener.m */; };
-		09080E971458DDE300A85DAE /* DNSUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 09080E961458DDE300A85DAE /* DNSUpdater.m */; };
-		097388CE1456007900EAF57F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097388CD1456007900EAF57F /* Foundation.framework */; };
-		097388D11456007900EAF57F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 097388D01456007900EAF57F /* main.m */; };
-		097388DC145600E600EAF57F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097388DB145600E600EAF57F /* SystemConfiguration.framework */; };
-		09859652145669720037CE16 /* DNSGlobalSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 09859651145669720037CE16 /* DNSGlobalSettings.m */; };
-		09C03F83145A29C1009804EF /* ProxySpawner.m in Sources */ = {isa = PBXBuildFile; fileRef = 09C03F82145A29C1009804EF /* ProxySpawner.m */; };
-		09E8DB95145FB58E00B1DECF /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09E8DB94145FB58E00B1DECF /* CoreServices.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		097388C71456007900EAF57F /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		09080E911458B8DB00A85DAE /* SocketListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketListener.h; sourceTree = "<group>"; };
-		09080E921458B8DB00A85DAE /* SocketListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocketListener.m; sourceTree = "<group>"; };
-		09080E951458DDE300A85DAE /* DNSUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSUpdater.h; sourceTree = "<group>"; };
-		09080E961458DDE300A85DAE /* DNSUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSUpdater.m; sourceTree = "<group>"; };
-		097388C91456007900EAF57F /* dns-updater */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "dns-updater"; sourceTree = BUILT_PRODUCTS_DIR; };
-		097388CD1456007900EAF57F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		097388D01456007900EAF57F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		097388D31456007900EAF57F /* dns-updater-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "dns-updater-Prefix.pch"; sourceTree = "<group>"; };
-		097388DB145600E600EAF57F /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		09859650145669720037CE16 /* DNSGlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSGlobalSettings.h; sourceTree = "<group>"; };
-		09859651145669720037CE16 /* DNSGlobalSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSGlobalSettings.m; sourceTree = "<group>"; };
-		09C03F81145A29C1009804EF /* ProxySpawner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxySpawner.h; sourceTree = "<group>"; };
-		09C03F82145A29C1009804EF /* ProxySpawner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProxySpawner.m; sourceTree = "<group>"; };
-		09E8DB94145FB58E00B1DECF /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		097388C61456007900EAF57F /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				09E8DB95145FB58E00B1DECF /* CoreServices.framework in Frameworks */,
-				097388CE1456007900EAF57F /* Foundation.framework in Frameworks */,
-				097388DC145600E600EAF57F /* SystemConfiguration.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		097388BE1456007900EAF57F = {
-			isa = PBXGroup;
-			children = (
-				097388CF1456007900EAF57F /* dns-updater */,
-				097388CC1456007900EAF57F /* Frameworks */,
-				097388CA1456007900EAF57F /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		097388CA1456007900EAF57F /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				097388C91456007900EAF57F /* dns-updater */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		097388CC1456007900EAF57F /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				09E8DB94145FB58E00B1DECF /* CoreServices.framework */,
-				097388CD1456007900EAF57F /* Foundation.framework */,
-				097388DB145600E600EAF57F /* SystemConfiguration.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		097388CF1456007900EAF57F /* dns-updater */ = {
-			isa = PBXGroup;
-			children = (
-				097388D01456007900EAF57F /* main.m */,
-				09080E951458DDE300A85DAE /* DNSUpdater.h */,
-				09080E961458DDE300A85DAE /* DNSUpdater.m */,
-				09859650145669720037CE16 /* DNSGlobalSettings.h */,
-				09859651145669720037CE16 /* DNSGlobalSettings.m */,
-				09C03F81145A29C1009804EF /* ProxySpawner.h */,
-				09C03F82145A29C1009804EF /* ProxySpawner.m */,
-				09080E911458B8DB00A85DAE /* SocketListener.h */,
-				09080E921458B8DB00A85DAE /* SocketListener.m */,
-				097388D21456007900EAF57F /* Supporting Files */,
-			);
-			path = "dns-updater";
-			sourceTree = "<group>";
-		};
-		097388D21456007900EAF57F /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				097388D31456007900EAF57F /* dns-updater-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		097388C81456007900EAF57F /* dns-updater */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 097388D81456007900EAF57F /* Build configuration list for PBXNativeTarget "dns-updater" */;
-			buildPhases = (
-				097388C51456007900EAF57F /* Sources */,
-				097388C61456007900EAF57F /* Frameworks */,
-				097388C71456007900EAF57F /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "dns-updater";
-			productName = "dns-updater";
-			productReference = 097388C91456007900EAF57F /* dns-updater */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		097388C01456007900EAF57F /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0430;
-			};
-			buildConfigurationList = 097388C31456007900EAF57F /* Build configuration list for PBXProject "dns-updater" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 097388BE1456007900EAF57F;
-			productRefGroup = 097388CA1456007900EAF57F /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				097388C81456007900EAF57F /* dns-updater */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		097388C51456007900EAF57F /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				097388D11456007900EAF57F /* main.m in Sources */,
-				09859652145669720037CE16 /* DNSGlobalSettings.m in Sources */,
-				09080E931458B8DB00A85DAE /* SocketListener.m in Sources */,
-				09080E971458DDE300A85DAE /* DNSUpdater.m in Sources */,
-				09C03F83145A29C1009804EF /* ProxySpawner.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		097388D61456007900EAF57F /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		097388D71456007900EAF57F /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		097388D91456007900EAF57F /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "dns-updater/dns-updater-Prefix.pch";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		097388DA1456007900EAF57F /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "dns-updater/dns-updater-Prefix.pch";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		097388C31456007900EAF57F /* Build configuration list for PBXProject "dns-updater" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				097388D61456007900EAF57F /* Debug */,
-				097388D71456007900EAF57F /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		097388D81456007900EAF57F /* Build configuration list for PBXNativeTarget "dns-updater" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				097388D91456007900EAF57F /* Debug */,
-				097388DA1456007900EAF57F /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 097388C01456007900EAF57F /* Project object */;
-}
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:dns-updater.xcodeproj">
-   </FileRef>
-</Workspace>
@@ -1,23 +0,0 @@
-//
-//  DNSGlobalSettings.h
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/24/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <SystemConfiguration/SystemConfiguration.h>
-
-#define kONLY_CHANGE_SERVICES_WITH_A_BSD_INTERFACE 1
-
-@interface DNSGlobalSettings : NSObject
-
- (NSArray *) getActiveResolvers __attribute((ns_returns_retained));
- (BOOL) isRunningWithResolvers: (NSArray *) resolvers;
- (BOOL) isRunningWithResolversInResolversList: (NSArray *) resolversList;
- (BOOL) setResolvers: (NSArray *) resolvers;
- (BOOL) revertResolvers;
- (BOOL) backupExceptResolversList: (NSArray *) resolversList;
-
-@end
@@ -1,164 +0,0 @@
-//
-//  DNSGlobalSettings.m
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/24/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import "DNSGlobalSettings.h"
-
-@implementation DNSGlobalSettings
-
- (BOOL) forceDHCPUpdate
-{
-    NSLog(@"Forcing DHCP update");
-    NSArray *interfaces = (__bridge_transfer NSArray *) SCNetworkInterfaceCopyAll();
-    for (id interface_ in interfaces) {
-        SCNetworkInterfaceRef interface = (__bridge SCNetworkInterfaceRef) interface_;
-        SCNetworkInterfaceForceConfigurationRefresh(interface);
-    }
-    return TRUE;
-}
-
- (BOOL) applyToNetworkServices: (BOOL (^)(SCDynamicStoreRef fs, NSString *service, NSDictionary *properties, NSArray *serverAddresses)) cb
-{
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("dnscrypt"), NULL, NULL);
-#ifdef kONLY_CHANGE_SERVICES_WITH_A_BSD_INTERFACE
-    NSArray *services = (__bridge_transfer NSArray *) SCDynamicStoreCopyKeyList(ds, CFSTR("(State|Setup):/Network/Service/.+/DNS"));
-#else
-    NSArray *services = (__bridge_transfer NSArray *) SCDynamicStoreCopyKeyList(ds, CFSTR("(State|Setup):/Network/(Service/.+|Global)/DNS"));
-#endif
-    BOOL ret = TRUE;
-    for (NSString *service in services) {
-#ifdef kONLY_CHANGE_SERVICES_WITH_A_BSD_INTERFACE
-        NSArray *elements = [service componentsSeparatedByString: @"/"];
-        if (elements.count < 4U) {
-            continue;
-        }
-        NSString *serviceId = [elements objectAtIndex: 3U];
-        NSString *interfacePath = [NSString stringWithFormat: @"Setup:/Network/Service/%@/Interface", serviceId];
-        NSDictionary *interfaceProperties = (__bridge_transfer NSDictionary *) SCDynamicStoreCopyValue(ds, (__bridge CFStringRef) interfacePath);
-        if (interfaceProperties == nil || ! [interfaceProperties isKindOfClass: [NSDictionary class]]) {
-            continue;
-        }
-        NSString *bsdInterface = [interfaceProperties objectForKey: @"DeviceName"];
-        if (bsdInterface == nil) {
-            continue;
-        }
-        NSLog(@"Found BSD interface: [%@]", bsdInterface);
-#endif
-        NSDictionary *properties = (__bridge_transfer NSDictionary *) SCDynamicStoreCopyValue(ds, (__bridge CFStringRef) service);
-        if (properties == nil || ! [properties isKindOfClass: [NSDictionary class]]) {
-            continue;
-        }
-        NSArray *serverAddresses = [properties objectForKey: @"ServerAddresses"];
-        if (serverAddresses == nil || ! [serverAddresses isKindOfClass: [NSArray class]]) {
-            continue;
-        }
-        ret &= cb(ds, service, properties, serverAddresses);
-    }
-    CFRelease(ds);
-
-    return ret;
-}
-
- (BOOL) setResolvers: (NSArray *) resolvers
-{
-    [self applyToNetworkServices: ^BOOL(SCDynamicStoreRef ds, NSString *service, NSDictionary *properties, NSArray *serverAddresses) {
-        NSMutableDictionary *newProperties = [NSMutableDictionary dictionaryWithDictionary: properties];
-        [newProperties setObject: resolvers forKey: @"ServerAddresses"];
-        SCDynamicStoreSetValue(ds, (__bridge CFStringRef) service, (__bridge CFDictionaryRef) newProperties);
-        return TRUE;
-    }];
-
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"CONFIGURATION_CHANGED" object: self userInfo: nil];
-
-    return TRUE;
-}
-
- (BOOL) revertResolvers
-{
-    [self applyToNetworkServices: ^BOOL(SCDynamicStoreRef ds, NSString *service, NSDictionary *properties, NSArray *serverAddresses) {
-        NSDictionary *propertiesWithBackup = [properties objectForKey: @"DNSCryptBackup"];
-        if (propertiesWithBackup == nil || ! [propertiesWithBackup isKindOfClass: [NSDictionary class]]) {
-            return FALSE;
-        }
-        NSArray *backupedServerAddresses = [propertiesWithBackup objectForKey: @"ServerAddresses"];
-        if (backupedServerAddresses == nil || ! [backupedServerAddresses isKindOfClass: [NSArray class]]) {
-            return FALSE;
-        }
-        NSMutableDictionary *newProperties = [NSMutableDictionary dictionaryWithDictionary: properties];
-        [newProperties setObject: backupedServerAddresses forKey: @"ServerAddresses"];
-        SCDynamicStoreSetValue(ds, (__bridge CFStringRef) service, (__bridge CFDictionaryRef) newProperties);
-        return TRUE;
-    }];
-
-    [self forceDHCPUpdate];
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"CONFIGURATION_CHANGED" object: self userInfo: nil];
-
-    return TRUE;
-}
-
- (NSArray *) getActiveResolvers
-{
-    NSError *err;
-    NSString *resolvConf = [NSString stringWithContentsOfFile: @"/etc/resolv.conf" encoding: NSISOLatin1StringEncoding error: &err];
-    NSMutableArray *resolvers = [[NSMutableArray alloc] init];
-    if (! resolvConf) {
-        return resolvers;
-    }
-    NSArray *lines = [resolvConf componentsSeparatedByString: @"\n"];
-    for (NSString *line_ in lines) {
-        NSString *line = [line_ stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-        NSArray *entry = [line componentsSeparatedByCharactersInSet: [NSCharacterSet whitespaceCharacterSet]];
-        if (![[entry objectAtIndex: 0U] isEqualToString: @"nameserver"]) {
-            continue;
-        }
-        NSString *resolver = [entry objectAtIndex: 1U];
-        [resolvers addObject: resolver];
-    }
-    return resolvers;
-}
-
- (BOOL) resolversForService: (NSArray *) serverAddresses areInResolversList: (NSArray *) resolversList
-{
-    for (NSArray *resolvers in resolversList) {
-        if ([serverAddresses isEqualToArray: resolvers]) {
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
- (BOOL) isRunningWithResolvers: (NSArray *) resolvers
-{
-    NSArray *activeResolvers = [self getActiveResolvers];
-
-    return [activeResolvers isEqualToArray: resolvers];
-}
-
- (BOOL) isRunningWithResolversInResolversList: (NSArray *) resolversList
-{
-    NSArray *activeResolvers = [self getActiveResolvers];
-
-    return [self resolversForService: activeResolvers areInResolversList: resolversList];
-}
-
- (BOOL) backupExceptResolversList: (NSArray *) resolversList
-{
-    [self applyToNetworkServices: ^BOOL(SCDynamicStoreRef ds, NSString *service, NSDictionary *properties, NSArray *serverAddresses) {
-        if ([self resolversForService: serverAddresses areInResolversList: resolversList]) {
-            return FALSE;
-        }
-        NSMutableDictionary *propertiesWithBackup = [NSMutableDictionary dictionaryWithDictionary: properties];
-        NSDictionary *serverAddressesBackup = [NSDictionary dictionaryWithObject: serverAddresses forKey: @"ServerAddresses"];
-        [propertiesWithBackup setObject: serverAddressesBackup forKey: @"DNSCryptBackup"];
-        SCDynamicStoreSetValue(ds, (__bridge CFStringRef) service, (__bridge CFDictionaryRef) propertiesWithBackup);
-        return TRUE;
-    }];
-
-    return TRUE;
-}
-
-@end
@@ -1,53 +0,0 @@
-//
-//  DNSUpdater.h
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/26/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import "ProxySpawner.h"
-
-typedef enum {
-    kDNS_CONFIGURATION_UNKNOWN, kDNS_CONFIGURATION_VANILLA, kDNS_CONFIGURATION_LOCALHOST, kDNS_CONFIGURATION_OPENDNS
-} DNSConfigurationState;
-
-#define kRESOLVER_IP_LOCALHOST @"127.0.0.1"
-#define kRESOLVER_IP_OPENDNS1  @"208.67.220.220"
-#define kRESOLVER_IP_OPENDNS2  @"208.67.222.222"
-#define kRESOLVER_IP_DNSCRYPT  @"208.67.220.220"
-
-#define kHOST_NAME_FOR_PROBES  @"myip.opendns.com"
-
-#define kINTERVAL_BETWEEN_CONFIG_UPDATES 2.5
-#define kINTERVAL_BETWEEN_DELAYED_PROBES (60.0 * 15.0)
-#define kDELAY_BETWEEN_ASYNC_RESOLUTION_ATTEMPTS 0.5
-#define kINTERVAL_BETWEEN_ASYNC_RESOLUTION_RETRIES 1.0
-#define kINTERVAL_BEFORE_ASYNC_RESOLUTION 5.0
-#define kASYNC_RESOLUTION_TIMEOUT 10.0
-
-#define kASYNC_RESOLUTION_MAX_ATTEMPTS 3U
-
-#define kDNSCRYPT_APPLICATION_SUPPORT_DIR @"DNSCrypt Updater"
-#define kDNS_SETTINGS_FILE @"settings-v1.plist"
-
-@interface DNSUpdater : NSObject {
-    DNSConfigurationState state;
-    DNSConfigurationState _wantedState;
-    BOOL _enableFallback;
-    BOOL enableSaveSettings;
-}
-
-@property (assign) DNSConfigurationState state;
-@property (assign) BOOL enableSaveSettings;
-@property (readwrite) DNSConfigurationState wantedState;
-@property (readwrite) BOOL enableFallback;
-
- (id) initWithProxySpawner: (ProxySpawner *) proxySpawner;
- (void) start;
- (void) periodicallyUpdate;
- (void) update;
- (BOOL) saveDNSSettings;
- (BOOL) loadDNSSettings;
-
-@end
@@ -1,293 +0,0 @@
-//
-//  DNSUpdater.m
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/26/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import "DNSGlobalSettings.h"
-#import "DNSUpdater.h"
-
-@implementation DNSUpdater
-
-@synthesize state;
-@synthesize enableSaveSettings;
-
-ProxySpawner *_proxySpawner;
-NSArray *resolversForLocalhost;
-NSArray *resolversForOpenDNS;
-NSArray *resolversList;
-DNSGlobalSettings *configuration;
-CFHostRef hostR;
-NSTimer *asyncResolutionTimer;
-NSUInteger asyncResolutionFailures;
-
- (DNSConfigurationState) wantedState {
-    return _wantedState;
-}
-
- (void) setWantedState:(DNSConfigurationState) wantedState {
-    _wantedState = wantedState;
-    [self saveDNSSettings];
-}
-
- (BOOL) enableFallback {
-    return _enableFallback;
-}
-
- (void) setEnableFallback: (BOOL)enableFallback {
-    _enableFallback = enableFallback;
-    [self saveDNSSettings];
-}
-
- (id) initWithProxySpawner: (ProxySpawner *) proxySpawner;
-{
-    if (! (self = [super init])) {
-        return nil;
-    }
-    _proxySpawner = proxySpawner;
-    state = self.wantedState = kDNS_CONFIGURATION_VANILLA;
-    resolversForLocalhost = [NSArray arrayWithObjects: kRESOLVER_IP_LOCALHOST, nil];
-    resolversForOpenDNS = [NSArray arrayWithObjects: kRESOLVER_IP_OPENDNS1, kRESOLVER_IP_OPENDNS2, nil];
-    resolversList = [NSArray arrayWithObjects: resolversForLocalhost, resolversForOpenDNS, nil];
-    configuration = [[DNSGlobalSettings alloc] init];
-    hostR = nil;
-    asyncResolutionTimer = nil;
-    asyncResolutionFailures = 0U;
-    self.enableFallback = NO;
-    enableSaveSettings = YES;
-
-    if ([configuration isRunningWithResolvers: resolversForLocalhost]) {
-        NSLog(@"Current configuration is localhost, not vanilla");
-        self.wantedState = state = kDNS_CONFIGURATION_LOCALHOST;
-    } else if ([configuration isRunningWithResolvers: resolversForOpenDNS]) {
-        NSLog(@"Current configuration is opendns, not vanilla");
-        self.wantedState = state = kDNS_CONFIGURATION_OPENDNS;
-    }
-    return self;
-}
-
- (void) update
-{
-    if ([configuration isRunningWithResolvers: resolversForLocalhost]) {
-        if (state != kDNS_CONFIGURATION_LOCALHOST) {
-            NSLog(@"Supposed state was not LOCALHOST but it actually is");
-            state = kDNS_CONFIGURATION_UNKNOWN;
-            self.wantedState = kDNS_CONFIGURATION_LOCALHOST;
-            NSArray *proxyArguments = [NSArray arrayWithObjects: @"--resolver-address=" kRESOLVER_IP_DNSCRYPT, nil];
-            [_proxySpawner startWithArguments: proxyArguments];
-        }
-    } else if ([configuration isRunningWithResolvers: resolversForOpenDNS]) {
-        if (state != kDNS_CONFIGURATION_OPENDNS) {
-            NSLog(@"Supposed state was not OPENDNS but it actually is");
-            state = kDNS_CONFIGURATION_OPENDNS;
-        }
-    } else {
-        if (state == kDNS_CONFIGURATION_LOCALHOST) {
-            NSLog(@"Settings have been manually changed while not in vanilla mode");
-        }
-        state = kDNS_CONFIGURATION_VANILLA;
-    }
-    if (state == self.wantedState) {
-        return;
-    }
-
-    [configuration backupExceptResolversList: resolversList];
-    if (self.wantedState == kDNS_CONFIGURATION_VANILLA) {
-        if ([configuration revertResolvers] == TRUE) {
-            state = self.wantedState;
-            NSLog(@"Back to a vanilla configuration");
-        } else {
-            NSLog(@"* loadSettings failed");
-        }
-    } else if (self.wantedState == kDNS_CONFIGURATION_LOCALHOST) {
-        if ([configuration setResolvers: resolversForLocalhost] == TRUE) {
-            state = self.wantedState;
-            NSLog(@"Configuration switched to localhost");
-        } else {
-            NSLog(@"* setResolvers failed");
-        }
-    } else if (self.wantedState == kDNS_CONFIGURATION_OPENDNS) {
-        if ([configuration setResolvers: resolversForOpenDNS] == TRUE) {
-            state = self.wantedState;
-            NSLog(@"Configuration switched to opendns");
-        } else {
-            NSLog(@"* setResolvers failed");
-        }
-    }
-}
-
- (void) periodicallyUpdate
-{
-    [self update];
-    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(periodicallyUpdate) object: nil];
-    [self performSelector: @selector(periodicallyUpdate) withObject: nil afterDelay: kINTERVAL_BETWEEN_CONFIG_UPDATES];
-}
-
- (void) fallback
-{
-    NSLog(@"Falling back to vanilla configuration");
-    self.wantedState = kDNS_CONFIGURATION_VANILLA;
-}
-
- (BOOL) asyncResolutionFailed
-{
-    asyncResolutionFailures++;
-    if (asyncResolutionFailures >= kASYNC_RESOLUTION_MAX_ATTEMPTS) {
-        [self fallback];
-        return TRUE;
-    }
-    return FALSE;
-}
-
- (void) asyncResolutionSuccess
-{
-    asyncResolutionFailures = 0U;
-}
-
-static void asyncResolutionDone(CFHostRef hostReplyR, CFHostInfoType typeInfo, const CFStreamError *error, void *info)
-{
-    DNSUpdater *self = (__bridge DNSUpdater *) info;
-    [asyncResolutionTimer invalidate];
-    Boolean hasBeenResolved;
-    CFArrayRef addresses = CFHostGetAddressing(hostReplyR, &hasBeenResolved);
-    if (hasBeenResolved == TRUE && addresses != nil) {
-        NSLog(@"Test query has been resolved");
-    }
-    CFHostUnscheduleFromRunLoop(hostReplyR, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
-    CFHostSetClient(hostReplyR, NULL, NULL);
-    CFRelease(hostReplyR);
-    assert(hostReplyR == hostR);
-    hostR = nil;
-    [self asyncResolutionSuccess];
-    [self performSelector: @selector(performAsyncResolution) withObject: self afterDelay: kINTERVAL_BETWEEN_DELAYED_PROBES];
-}
-
- (void) asyncResolutionTimeout
-{
-    NSLog(@"async resolution timeout");
-    CFHostCancelInfoResolution(hostR, kCFHostAddresses);
-    CFHostUnscheduleFromRunLoop(hostR, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
-    CFHostSetClient(hostR, NULL, NULL);
-    CFRelease(hostR);
-    hostR = nil;
-    if ([self asyncResolutionFailed] == FALSE) {
-        [self performSelector: @selector(performAsyncResolution) withObject: self afterDelay: kDELAY_BETWEEN_ASYNC_RESOLUTION_ATTEMPTS];
-        NSLog(@"Performing a new resolution attempt");
-    }
-}
-
- (void) performAsyncResolution
-{
-    if (self.enableFallback == NO) {
-        return;
-    }
-    if (hostR) {
-        [self performSelector: @selector(performAsyncResolution) withObject: self afterDelay: kINTERVAL_BETWEEN_ASYNC_RESOLUTION_RETRIES];
-        return;
-    }
-    NSLog(@"Starting async resolution");
-    CFHostClientContext context = { 0, (__bridge void *) self, CFRetain, CFRelease, NULL };
-    CFStringRef name = (__bridge CFStringRef) kHOST_NAME_FOR_PROBES;
-    hostR = CFHostCreateWithName(kCFAllocatorDefault, name);
-    CFHostSetClient(hostR, asyncResolutionDone, &context);
-    CFHostScheduleWithRunLoop(hostR, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
-    CFStreamError error;
-    CFHostStartInfoResolution(hostR, kCFHostAddresses, &error);
-    asyncResolutionTimer = [NSTimer scheduledTimerWithTimeInterval: kASYNC_RESOLUTION_TIMEOUT target: self selector: @selector(asyncResolutionTimeout) userInfo: nil repeats: NO];
-}
-
- (void) configurationChanged
-{
-    NSLog(@"CONFIGURATION_CHANGED notification received");
-    if (self.enableFallback == NO) {
-        return;
-    }
-    [self performSelector: @selector(performAsyncResolution) withObject: self afterDelay: kINTERVAL_BEFORE_ASYNC_RESOLUTION];
-}
-
- (void) start
-{
-    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(configurationChanged) name:@"CONFIGURATION_CHANGED" object: nil];
-    [self periodicallyUpdate];
-}
-
- (NSString *) getSupportDirectory {
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSLocalDomainMask, YES);
-    NSString *path = nil;
-    NSError *error = nil;
-    BOOL isDirectory;
-    
-    for (path in paths) {
-        if ([[NSFileManager defaultManager] fileExistsAtPath: path isDirectory: &isDirectory] == FALSE || isDirectory == FALSE) {
-            continue;
-        }
-        path = [path stringByAppendingPathComponent: kDNSCRYPT_APPLICATION_SUPPORT_DIR];
-        if ([[NSFileManager defaultManager] createDirectoryAtPath: path withIntermediateDirectories: TRUE attributes: nil error: &error] == TRUE) {
-            return path;
-        }
-    }
-    NSLog(@"Error: [%@]", error);
-    return nil;
-}
-
- (NSString *) getDNSSettingsFile
-{
-    NSString *supportDirectory = [self getSupportDirectory];
-    if (! supportDirectory) {
-        return nil;
-    }
-    return [supportDirectory stringByAppendingPathComponent: kDNS_SETTINGS_FILE];
-}
-
- (BOOL) saveDNSSettings
-{
-    if (enableSaveSettings == NO) {
-        return TRUE;
-    }
-    NSString *settingsFile = [self getDNSSettingsFile];    
-    if (! settingsFile) {
-        return FALSE;
-    }
-    NSLog(@"Saving DNS settings");
-    NSArray *proxyArguments = [_proxySpawner arguments];
-    if (! proxyArguments) {
-        proxyArguments = [NSArray array];
-    }
-    NSDictionary *settings = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: self.wantedState], @"wantedState", [NSNumber numberWithBool: self.enableFallback], @"enableFallback", proxyArguments, @"proxyArguments", nil];
-    return [settings writeToFile: settingsFile atomically: TRUE];
-}
-
- (BOOL) loadDNSSettings
-{
-    NSString *settingsFile = [self getDNSSettingsFile];    
-    if (! settingsFile) {
-        return FALSE;
-    }
-    NSLog(@"Loading DNS settings");
-    NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile: settingsFile];
-    if (!settings) {
-        return FALSE;
-    }
-    NSNumber *wantedStateN = [settings objectForKey: @"wantedState"];
-    if (wantedStateN) {
-        self.wantedState = [wantedStateN intValue];
-    }
-    NSNumber *enableFallbackN = [settings objectForKey: @"enableFallback"];
-    if (enableFallbackN) {
-        self.enableFallback = [enableFallbackN boolValue];
-    }
-    NSArray *proxyArguments = [settings objectForKey: @"proxyArguments"];
-    if (proxyArguments && [proxyArguments count] > 0U) {
-        NSLog(@"Starting the proxy with previous arguments: [%@]", proxyArguments);
-        [_proxySpawner stop];
-        [_proxySpawner startWithArguments: proxyArguments];
-    }
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"CONFIGURATION_CHANGED" object: self userInfo: nil];
-    [self saveDNSSettings];
-    
-    return wantedStateN || enableFallbackN;
-}
-
-@end
@@ -1,25 +0,0 @@
-//
-//  ProxySpawner.h
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/27/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#define KLAUNCHCTL_PATH @"/bin/launchctl"
-#define kDNSCRYPT_PROXY_USER @"nobody"
-#define KDNSCRYPT_PROXY_LABEL @"com.opendns.osx.DNSCryptProxy"
-#define kDNSCRYPT_PROXY_PATH @"/usr/local/sbin/dnscrypt-proxy"
-
-@interface ProxySpawner : NSObject {
-    NSArray *_arguments;
-}
-
-@property (strong) NSArray *arguments;
-
- (BOOL) startWithArguments: (NSArray *) suppliedArguments;
- (BOOL) stop;
-
-@end
@@ -1,105 +0,0 @@
-//
-//  ProxySpawner.m
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/27/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import "ProxySpawner.h"
-
-@implementation ProxySpawner
-
-@synthesize arguments = _arguments;
-
- (id) init {
-    if (! (self = [super init])) {
-        return nil;
-    }
-    _arguments = nil;
-    
-    return self;
-}
-
- (BOOL) registerLaunchdLabelWithArguments: (NSArray *) arguments
-{
-    NSArray *launchdBaseArguments = [NSArray arrayWithObjects: @"submit", @"-l", KDNSCRYPT_PROXY_LABEL, @"--", kDNSCRYPT_PROXY_PATH, nil];
-    NSArray *launchdArguments = [launchdBaseArguments arrayByAddingObjectsFromArray: arguments];
-    NSTask *task = [[NSTask alloc] init];
-    task.launchPath = KLAUNCHCTL_PATH;
-    task.arguments = launchdArguments;
-    task.standardError = [NSFileHandle fileHandleWithNullDevice];
-    [task launch];
-    [task waitUntilExit];
-
-    return TRUE;
-}
-
- (BOOL) unregisterLaunchdLabel
-{
-    NSArray *launchdArguments = [NSArray arrayWithObjects: @"remove", KDNSCRYPT_PROXY_LABEL, nil];
-    NSTask *task = [[NSTask alloc] init];
-    task.launchPath = KLAUNCHCTL_PATH;
-    task.arguments = launchdArguments;
-    task.standardError = [NSFileHandle fileHandleWithNullDevice];
-    [task launch];
-    [task waitUntilExit];
-
-    return TRUE;
-}
-
- (BOOL) argumentsAreWhiteListed: (NSArray *) arguments {
-    NSArray *whiteListedPrefixes = [NSArray arrayWithObjects: @"--tcp-port=443", @"--resolver-address=208.67.", nil];
-    BOOL found;
-    
-    for (NSString *argument in arguments) {
-        found = NO;
-        for (NSString *whiteListedPrefix in whiteListedPrefixes) {
-            if ([argument hasPrefix: whiteListedPrefix]) {
-                found = YES;
-                break;
-            }
-        }
-        if (! found) {
-            return NO;
-        }
-    }
-    return YES;
-}
-
- (BOOL) startWithArguments: (NSArray *) arguments;
-{
-    if ([self argumentsAreWhiteListed: arguments] == NO) {
-        return FALSE;        
-    }
-    NSArray *proxyBaseArguments = [NSArray arrayWithObjects: @"--user", kDNSCRYPT_PROXY_USER, nil];
-    NSArray *proxyArguments = [proxyBaseArguments arrayByAddingObjectsFromArray: arguments];
-    [self registerLaunchdLabelWithArguments: proxyArguments];
-
-    NSArray *launchdArguments = [NSArray arrayWithObjects: @"start", KDNSCRYPT_PROXY_LABEL, nil];
-    NSTask *task = [[NSTask alloc] init];
-    task.launchPath = KLAUNCHCTL_PATH;
-    task.arguments = launchdArguments;
-    [task launch];
-    [task waitUntilExit];
-    _arguments = arguments;
-
-    return TRUE;
-}
-
- (BOOL) stop
-{
-    NSArray *launchdArguments = [NSArray arrayWithObjects: @"stop", KDNSCRYPT_PROXY_LABEL, nil];
-    NSTask *task = [[NSTask alloc] init];
-    task.launchPath = KLAUNCHCTL_PATH;
-    task.arguments = launchdArguments;
-    task.standardError = [NSFileHandle fileHandleWithNullDevice];
-    [task launch];
-    [task waitUntilExit];
-    _arguments = nil;
-    [self unregisterLaunchdLabel];
-
-    return TRUE;
-}
-
-@end
@@ -1,27 +0,0 @@
-//
-//  SocketListener.h
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/26/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import "DNSUpdater.h"
-#import "ProxySpawner.h"
-
-#define kSOCK_GRAND_PARENT_DIR @"/var/run"
-#define kSOCK_PARENT_DIR kSOCK_GRAND_PARENT_DIR @"/com.opendns.osx.DNSCryptConfigUpdater"
-#define kSOCK_PATH kSOCK_PARENT_DIR @"/sock"
-#define kSOCK_GROUP_NAME "admin"
-#define kSOCK_PARENT_DIR_PERMS 0710
-#define kSOCK_PERMS 0660
-#define kSOCK_REFRESH_RATE 5.0
-#define kREF_OWNER_FILE @"/dev/console"
-
-@interface SocketListener : NSObject
-
- (id) initWithDNSUpdater: (DNSUpdater *) updater andProxySpawner: (ProxySpawner *) proxySpawner;
- (BOOL) createListener;
- (BOOL) updateSocketPerms;
-
-@end
@@ -1,223 +0,0 @@
-//
-//  SocketListener.m
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/26/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#include <sys/stat.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <grp.h>
-#import "ProxySpawner.h"
-#import "SocketListener.h"
-
-@implementation SocketListener
-
-DNSUpdater *_updater;
-ProxySpawner *_proxySpawner;
-NSMutableData *_commandBuffer;
-gid_t gid;
-
- (id) initWithDNSUpdater: (DNSUpdater *) updater andProxySpawner: (ProxySpawner *)proxySpawner
-{
-    if (! (self = [super init])) {
-        return nil;
-    }
-    _updater = updater;
-    _proxySpawner = proxySpawner;
-    _commandBuffer = [[NSMutableData alloc] init];
-    
-    return self;
-}
-
- (BOOL) commandParseConfig: (NSArray *) commandAsComponents
-{
-    if (commandAsComponents.count != 2U) {
-        return FALSE;
-    }
-    NSString *stateName = [commandAsComponents objectAtIndex: 1U];
-    NSLog(@"Wanted state name: [%@]", stateName);
-    if ([stateName isEqualToString: @"VANILLA"]) {
-        _updater.wantedState = kDNS_CONFIGURATION_VANILLA;        
-    } else if ([stateName isEqualToString: @"LOCALHOST"]) {
-        _updater.wantedState = kDNS_CONFIGURATION_LOCALHOST;
-    } else if ([stateName isEqualToString: @"OPENDNS"]) {
-        _updater.wantedState = kDNS_CONFIGURATION_OPENDNS;
-    } else {
-        return FALSE;
-    }
-    if (_updater.state != _updater.wantedState) {
-        [_updater periodicallyUpdate];
-    }
-    return TRUE;
-}
-
- (BOOL) commandParseFallback: (NSArray *) commandAsComponents
-{
-    if (commandAsComponents.count < 2U) {
-        return FALSE;
-    }
-    NSString *action = [commandAsComponents objectAtIndex: 1U];
-    if ([action isEqualToString: @"OFF"]) {
-        _updater.enableFallback = NO;
-    } else if ([action isEqualToString: @"ON"]) {
-        _updater.enableFallback = YES;
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"CONFIGURATION_CHANGED" object: self userInfo: nil];
-    }
-    return FALSE;
-}
-
- (BOOL) commandParseProxy: (NSArray *) commandAsComponents
-{
-    BOOL ret = FALSE;
-    
-    if (commandAsComponents.count < 2U) {
-        return FALSE;
-    }
-    NSString *action = [commandAsComponents objectAtIndex: 1U];
-    if ([action isEqualToString: @"STOP"]) {
-        ret = [_proxySpawner stop];
-        [_updater saveDNSSettings];
-    } else if ([action isEqualToString: @"START"]) {
-        NSArray *suppliedArguments = [commandAsComponents subarrayWithRange: NSMakeRange(2U, commandAsComponents.count - 2U)];
-        [_proxySpawner stop];
-        ret = [_proxySpawner startWithArguments: suppliedArguments];
-        [_updater saveDNSSettings];        
-    }
-    return ret;
-}
-
- (BOOL) commandParse: (NSString *) command
-{
-    NSArray *commandAsComponents = [command componentsSeparatedByString: @" "];
-    if (commandAsComponents.count <= 0U) {
-        return FALSE;
-    }
-    NSString *action = [commandAsComponents objectAtIndex: 0U];
-    if ([action isEqualToString: @"CONFIG"]) {
-        return [self commandParseConfig: commandAsComponents];
-    }
-    if ([action isEqualToString: @"PROXY"]) {
-        return [self commandParseProxy: commandAsComponents];
-    }
-    if ([action isEqualToString: @"FALLBACK"]) {
-        return [self commandParseFallback: commandAsComponents];
-    }
-    return FALSE;
-}
-
- (void) commandRead: (NSNotification *) notification
-{
-    NSFileHandle *fh = (NSFileHandle *) notification.object;
-    NSData *chunk = [[notification userInfo] objectForKey: @"NSFileHandleNotificationDataItem"];
-    [_commandBuffer appendData: chunk];
-    uint32_t commandLen;
-    for (;;) {
-        if (_commandBuffer.length <= sizeof commandLen) {
-            break;
-        }
-        memcpy(&commandLen, _commandBuffer.bytes, sizeof commandLen);
-        if (_commandBuffer.length < commandLen + sizeof commandLen) {
-            break;        
-        }
-        NSData *command_ = [_commandBuffer subdataWithRange: NSMakeRange(sizeof commandLen, commandLen)];
-        NSData *remainingBuffer = [_commandBuffer subdataWithRange: NSMakeRange(commandLen + sizeof commandLen, _commandBuffer.length - commandLen - sizeof commandLen)];
-        _commandBuffer = [[NSMutableData alloc] initWithData: remainingBuffer];    
-        NSString *command = [[NSString alloc] initWithData: command_ encoding: NSUTF8StringEncoding];
-        command = [command stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-        NSLog(@"Received command: [%@]", command);
-        [self commandParse: command];
-    }
-    [fh readInBackgroundAndNotify];    
-}
-
- (BOOL) updateSocketPerms
-{
-    const char *refOwnerFile = [kREF_OWNER_FILE cStringUsingEncoding: NSUTF8StringEncoding];
-    struct stat st;
-    BOOL ret = TRUE;
-    
-    if (stat(refOwnerFile, &st) != 0) {
-        return FALSE;
-    }
-    const char *sockParentDir = [kSOCK_PARENT_DIR cStringUsingEncoding: NSUTF8StringEncoding];
-    ret &= ! chown(sockParentDir, st.st_uid, gid);
-    const char *sockPath = [kSOCK_PATH cStringUsingEncoding: NSUTF8StringEncoding];
-    ret &= ! chown(sockPath, st.st_uid, gid);
-
-    return ret;
-}
-
- (BOOL) createListener
-{
-    mode_t sockParentDirPerms = (mode_t) kSOCK_PARENT_DIR_PERMS;
-    mode_t sockPerms = (mode_t) kSOCK_PERMS;
-    const char *sockParentDir = [kSOCK_PARENT_DIR cStringUsingEncoding: NSUTF8StringEncoding];
-    struct group *group = getgrnam(kSOCK_GROUP_NAME);
-    if (group == NULL) {
-        sockParentDirPerms = (mode_t) 0711;
-        sockPerms = (mode_t) 0666;
-    }
-    const mode_t previousMask = umask((mode_t) 0177);
-    umask((mode_t) 0);
-    if (mkdir(sockParentDir, sockParentDirPerms) != 0) {
-        if (errno != EEXIST) {
-            NSLog(@"mkdir(): [%s]", strerror(errno));
-            umask(previousMask);
-            return FALSE;
-        }
-    } else {
-        chmod(sockParentDir, sockParentDirPerms);        
-    }
-    if (group != NULL) {
-        gid = group->gr_gid;
-    } else {
-        gid = (gid_t) 0;
-    }
-    chown(sockParentDir, (uid_t) 0, gid);
-    const char *sockPath = [kSOCK_PATH cStringUsingEncoding: NSUTF8StringEncoding];
-    size_t sockPathSize = strlen(sockPath) + (size_t) 1U;
-    struct sockaddr_un *su;
-    assert(sockPathSize < sizeof su->sun_path);
-    socklen_t sun_len = (socklen_t) (sizeof *su) + (socklen_t) sockPathSize;
-    su = calloc(1U, sun_len);
-    su->sun_family = AF_UNIX;
-    memcpy(su->sun_path, sockPath, sockPathSize);    
-    su->sun_len = SUN_LEN(su);    
-    [[NSFileManager defaultManager] removeItemAtPath: kSOCK_PATH error: nil];
-    CFSocketRef socket = CFSocketCreate(kCFAllocatorDefault, PF_UNIX, SOCK_DGRAM, IPPROTO_IP, 0, NULL, NULL);
-    CFSocketSetSocketFlags(socket, CFSocketGetSocketFlags(socket) & ~kCFSocketCloseOnInvalidate);
-    int fd = CFSocketGetNative(socket);
-    NSData *address = [NSData dataWithBytes: su length: SUN_LEN(su)];
-    if (CFSocketSetAddress(socket, (__bridge CFDataRef) address) != kCFSocketSuccess) {
-        free(su);
-        CFSocketInvalidate(socket);
-        CFRelease(socket);
-        NSLog(@"*** Could not bind to address");
-        umask(previousMask);
-        [[NSFileManager defaultManager] removeItemAtPath: kSOCK_PATH error: nil];
-
-        return FALSE;
-    }
-    free(su);
-    chown(sockPath, (uid_t) 0, gid);
-    chmod(sockPath, sockPerms);
-    umask(previousMask);
-    NSFileHandle *fh = [[NSFileHandle alloc] initWithFileDescriptor: fd closeOnDealloc: TRUE];
-    CFRelease(socket);
-    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-
-    [fh readInBackgroundAndNotify];
-    [center addObserver:self
-               selector:@selector(commandRead:)
-                   name:@"NSFileHandleReadCompletionNotification"
-                 object:nil];
-    
-    [NSTimer scheduledTimerWithTimeInterval: kSOCK_REFRESH_RATE target: self selector: @selector(updateSocketPerms) userInfo: nil repeats: YES];
-    
-    return TRUE;
-}
-
-@end
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'dns-updater' target in the 'dns-updater' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif
@@ -1,57 +0,0 @@
-//
-//  main.m
-//  dns-updater
-//
-//  Created by OpenDNS, Inc. on 10/24/11.
-//  Copyright (c) 2011 OpenDNS, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "DNSUpdater.h"
-#import "ProxySpawner.h"
-#import "SocketListener.h"
-
-static DNSUpdater *dnsUpdater;
-
-static void restoreVanilla(void)
-{
-    dnsUpdater.enableSaveSettings = NO;
-    if (dnsUpdater) {
-        NSLog(@"Restoring vanilla configuration");
-        dnsUpdater.wantedState = kDNS_CONFIGURATION_VANILLA;
-        [dnsUpdater update];
-        dnsUpdater = nil;
-    }
-}
-
-static void sigQuitHandler(int sig)
-{
-    (void) sig;
-    restoreVanilla();
-    exit(0);
-}
-
-int main(void)
-{
-    @autoreleasepool {
-        nice(10);
-        ProxySpawner *proxySpawner = [[ProxySpawner alloc] init];
-        dnsUpdater = [[DNSUpdater alloc] initWithProxySpawner: proxySpawner];
-        SocketListener *socketListener = [[SocketListener alloc] initWithDNSUpdater: dnsUpdater andProxySpawner: proxySpawner];
-        [socketListener createListener];
-
-        signal(SIGPIPE, SIG_IGN);
-        signal(SIGALRM, sigQuitHandler);
-        signal(SIGHUP,  sigQuitHandler);
-        signal(SIGINT,  sigQuitHandler);
-        signal(SIGQUIT, sigQuitHandler);
-        signal(SIGTERM, sigQuitHandler);
-        signal(SIGXCPU, sigQuitHandler);
-        [dnsUpdater start];
-        [dnsUpdater loadDNSSettings];
-        [[NSRunLoop currentRunLoop] run];
-        restoreVanilla();
-    }    
-    return 0;
-}
-
@@ -13,24 +13,24 @@
 		0906D83114B4D9AC0093FA7D /* yes-opendns-yes-crypt.png in Resources */ = {isa = PBXBuildFile; fileRef = 0906D82D14B4D9AC0093FA7D /* yes-opendns-yes-crypt.png */; };
 		09651148147D832D007FEE31 /* dnscrypt.icns in Resources */ = {isa = PBXBuildFile; fileRef = 09651147147D832D007FEE31 /* dnscrypt.icns */; };
 		096AEEFA1468A11E009F2AA4 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 096AEEF91468A11E009F2AA4 /* dsa_pub.pem */; };
-		09972870147CCE41004E7017 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0997286F147CCE41004E7017 /* Sparkle.framework */; };
-		09972871147CCEDC004E7017 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0997286F147CCE41004E7017 /* Sparkle.framework */; };
+		0970EAAB160A5B1600865D5D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 09F4DDA816019D0D002C4E04 /* Sparkle.framework */; };
 		09A13AD2145F3B9000B227A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A13AD1145F3B9000B227A4 /* Cocoa.framework */; };
 		09A13ADC145F3B9000B227A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 09A13ADA145F3B9000B227A4 /* InfoPlist.strings */; };
 		09A13ADE145F3B9000B227A4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A13ADD145F3B9000B227A4 /* main.m */; };
 		09A13AE2145F3B9000B227A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AE0145F3B9000B227A4 /* Credits.rtf */; };
 		09A13AE5145F3B9000B227A4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A13AE4145F3B9000B227A4 /* AppDelegate.m */; };
 		09A13AE8145F3B9000B227A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AE6145F3B9000B227A4 /* MainMenu.xib */; };
+		09F4DDA916019D0D002C4E04 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09F4DDA816019D0D002C4E04 /* Sparkle.framework */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
-		096AEEF714689FEB009F2AA4 /* CopyFiles */ = {
+		0970EAA9160A5B0000865D5D /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				09972871147CCEDC004E7017 /* Sparkle.framework in CopyFiles */,
+				0970EAAB160A5B1600865D5D /* Sparkle.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -43,7 +43,6 @@
 		0906D82D14B4D9AC0093FA7D /* yes-opendns-yes-crypt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yes-opendns-yes-crypt.png"; sourceTree = "<group>"; };
 		09651147147D832D007FEE31 /* dnscrypt.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = dnscrypt.icns; path = ../dnscrypt.icns; sourceTree = "<group>"; };
 		096AEEF91468A11E009F2AA4 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
-		0997286F147CCE41004E7017 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		09A13ACD145F3B9000B227A4 /* DNSCrypt-Menubar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DNSCrypt-Menubar.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		09A13AD1145F3B9000B227A4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		09A13AD4145F3B9000B227A4 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -57,6 +56,7 @@
 		09A13AE3145F3B9000B227A4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		09A13AE4145F3B9000B227A4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		09A13AE7145F3B9000B227A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		09F4DDA816019D0D002C4E04 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -65,7 +65,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				09A13AD2145F3B9000B227A4 /* Cocoa.framework in Frameworks */,
-				09972870147CCE41004E7017 /* Sparkle.framework in Frameworks */,
+				09F4DDA916019D0D002C4E04 /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -92,7 +92,7 @@
 		09A13AD0145F3B9000B227A4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				0997286F147CCE41004E7017 /* Sparkle.framework */,
+				09F4DDA816019D0D002C4E04 /* Sparkle.framework */,
 				09A13AD1145F3B9000B227A4 /* Cocoa.framework */,
 				09A13AD3145F3B9000B227A4 /* Other Frameworks */,
 			);
@@ -148,7 +148,7 @@
 				09A13AC9145F3B9000B227A4 /* Sources */,
 				09A13ACA145F3B9000B227A4 /* Frameworks */,
 				09A13ACB145F3B9000B227A4 /* Resources */,
-				096AEEF714689FEB009F2AA4 /* CopyFiles */,
+				0970EAA9160A5B0000865D5D /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -165,7 +165,7 @@
 		09A13AC4145F3B9000B227A4 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = 09A13AC7145F3B9000B227A4 /* Build configuration list for PBXProject "DNSCrypt-Menubar" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -248,7 +248,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_ARC = NO;
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -275,8 +275,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COPY_PHASE_STRIP = YES;
+				CLANG_ENABLE_OBJC_ARC = NO;
+				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -293,9 +293,11 @@
 		09A13AEC145F3B9000B227A4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/Sparkle-evkudstnytcsfdeunmxihhpyexor/Build/Products/Release\"",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DNSCrypt-Menubar/DNSCrypt-Menubar-Prefix.pch";
@@ -308,9 +310,11 @@
 		09A13AED145F3B9000B227A4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/Sparkle-evkudstnytcsfdeunmxihhpyexor/Build/Products/Release\"",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DNSCrypt-Menubar/DNSCrypt-Menubar-Prefix.pch";
@@ -8,12 +8,11 @@

 #import <Cocoa/Cocoa.h>

-#define kRESOLVER_IP_LOCALHOST @"127.0.0.1"
-#define kRESOLVER_IP_OPENDNS1  @"208.67.220.220"
-#define kRESOLVER_IP_OPENDNS2  @"208.67.222.222"
-#define kDNSCRYPT_RESOLVER     @"208.67.220.220"
-
 #define kDNSCRYPT_PREFPANE_APP_PATH @"/Library/PreferencePanes/DNSCrypt.prefPane"
+#define kDNSCRYPT_USR_BASE_DIR kDNSCRYPT_PREFPANE_APP_PATH @"/Contents/Resources/usr"
+#define kDNSCRIPT_SCRIPTS_BASE_DIR kDNSCRYPT_USR_BASE_DIR @"/scripts"
+#define kDNSCRYPT_VAR_BASE_DIR @"/Library/Application Support/DNSCrypt"
+#define kDNSCRYPT_CONTROL_DIR kDNSCRYPT_VAR_BASE_DIR @"/control"

@interface AppDelegate : NSObject <NSApplicationDelegate>

@@ -22,13 +21,25 @@
@property (strong) NSStatusItem *statusItem;
@property (strong) IBOutlet NSMenuItem *versionMenuItem;

+#define kREFRESH_DELAY 2.0
+#define kCHECKBOXES_AFTER_CHANGE_DELAY 8.0
+#define kMAX_TRIES_AFTER_CHANGE (30 / kREFRESH_DELAY)
+
 typedef enum {
    kDNS_CONFIGURATION_UNKNOWN, kDNS_CONFIGURATION_VANILLA, kDNS_CONFIGURATION_LOCALHOST, kDNS_CONFIGURATION_OPENDNS
 } DNSConfigurationState;

@property (strong) IBOutlet NSMenuItem *statusResolversMenuItem;
@property (strong) IBOutlet NSMenuItem *statusConfigurationMenuItem;
+@property (strong) IBOutlet NSMenuItem *familyShieldMenuItem;
+@property (strong) IBOutlet NSMenuItem *dnscryptMenuItem;
+@property (strong) IBOutlet NSMenuItem *fallbackMenuItem;
+@property (strong) IBOutlet NSMenuItem *opendnsMenuItem;

 - (IBAction)preferencesMenuItemPushed:(NSMenuItem *)sender;
+- (IBAction)dnscryptMenuItemPushed:(NSMenuItem *)sender;
+- (IBAction)familyShieldMenuItemPushed:(NSMenuItem *)sender;
+- (IBAction)fallbackMenuItemPushed:(NSMenuItem *)sender;
+- (IBAction)opendnsMenuItemPushed:(NSMenuItem *)sender;

@end
@@ -12,6 +12,10 @@
@implementation AppDelegate
@synthesize statusResolversMenuItem = _statusResolversMenuItem;
@synthesize statusConfigurationMenuItem = _statusConfigurationMenuItem;
+@synthesize familyShieldMenuItem = _familyShieldMenuItem;
+@synthesize dnscryptMenuItem = _dnscryptMenuItem;
+@synthesize fallbackMenuItem = _fallbackMenuItem;
+@synthesize opendnsMenuItem = _opendnsMenuItem;
@synthesize window = _window;
@synthesize dnscryptMenu = _dnscryptMenu;
@synthesize statusItem = _statusItem;
@@ -19,6 +23,61 @@

 DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;

+- (void) setCheckBoxesEnabled: (BOOL) enabled
+{
+    [_dnscryptMenuItem setEnabled: enabled];
+    [_opendnsMenuItem setEnabled: enabled];
+    [_familyShieldMenuItem setEnabled: enabled];
+    [_fallbackMenuItem setEnabled: enabled];
+}
+
+- (NSString *) fromCommand: (NSString *) launchPath withArguments: (NSArray *) arguments
+{
+    NSPipe *pipe = [NSPipe pipe];
+    NSTask *task = [[NSTask alloc] init];
+    NSData *data;
+    NSString *result;
+    task.launchPath = launchPath;
+    task.arguments = arguments;
+    task.standardOutput = pipe;
+    [task launch];
+    data = [[pipe fileHandleForReading] readDataToEndOfFile];
+    [task waitUntilExit];
+    [task release];
+    result = [[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease];
+    if ([result hasSuffix: @"\n"]) {
+        result = [result substringToIndex: result.length - 1];
+    }
+    return result;
+}
+
+- (void) initState
+{
+    NSString *res;
+
+    _dnscryptMenuItem.state = 0;
+    _familyShieldMenuItem.state = 0;
+    _opendnsMenuItem.state = 0;
+    _fallbackMenuItem.state = 0;
+
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./get-dnscrypt-status.sh", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [_dnscryptMenuItem setState: 1];
+    }
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./get-familyshield-status.sh", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [_familyShieldMenuItem setState: 1];
+    }
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./get-insecure-opendns-status.sh", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [_opendnsMenuItem setState: 1];
+    }
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./get-fallback-status.sh", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [_fallbackMenuItem setState: 1];
+    }
+}
+
 - (BOOL) resolversForService: (NSArray *) resolversForService includeResolvers:(NSArray *) resolvers
 {
    NSUInteger matches = 0U;
@@ -55,52 +114,37 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
            led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"no-network.png"]];
    }
    _statusItem.image = led;
+    [led release];
 }

 - (BOOL) updateStatusWithCurrentConfig
-{    
-    currentState = kDNS_CONFIGURATION_UNKNOWN;
-    NSArray *resolversForLocalhost = [NSArray arrayWithObjects: kRESOLVER_IP_LOCALHOST, nil];
-    NSArray *resolversForOpenDNS = [NSArray arrayWithObjects: kRESOLVER_IP_OPENDNS1, kRESOLVER_IP_OPENDNS2, nil];
-    
-    NSError *err;
-    NSString *resolvConf = [NSString stringWithContentsOfFile: @"/etc/resolv.conf" encoding: NSISOLatin1StringEncoding error: &err];
-    NSString *currentStateString = @"";
-    NSMutableString *resolversString = [[NSMutableString alloc] init];
-    if (! resolvConf) {
+{
+    NSString *stateDescription = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-resolvers-description.sh", nil]];
+    if ([stateDescription isEqualToString: @"FamilyShield"]) {
+        currentState = kDNS_CONFIGURATION_OPENDNS;
+    } else if ([stateDescription isEqualToString: @"DNSCrypt"]) {
+        currentState = kDNS_CONFIGURATION_LOCALHOST;
+    } else if ([stateDescription isEqualToString: @"OpenDNS"]) {
+        currentState = kDNS_CONFIGURATION_OPENDNS;
+    } else if ([stateDescription isEqualToString: @"OpenDNS IPv6"]) {
+        currentState = kDNS_CONFIGURATION_OPENDNS;
+    } else if ([stateDescription isEqualToString: @"None"]) {
        currentState = kDNS_CONFIGURATION_UNKNOWN;
-        currentStateString = NSLocalizedString(@"Network unavailable", @"Current state");
-        [resolversString appendString: NSLocalizedString(@"None", @"No current state")];
-    } else {
-        NSMutableArray *resolvers = [[NSMutableArray alloc] init];
-        NSArray *lines = [resolvConf componentsSeparatedByString: @"\n"];
-        for (NSString *line_ in lines) {            
-            NSString *line = [line_ stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-            NSArray *entry = [line componentsSeparatedByCharactersInSet: [NSCharacterSet whitespaceCharacterSet]];
-            if (![[entry objectAtIndex: 0U] isEqualToString: @"nameserver"]) {
-                continue;
-            }
-            NSString *resolver = [entry objectAtIndex: 1U];
-            [resolvers addObject: resolver];
-            [resolversString appendFormat: @"%s%@", (resolversString.length > 0 ? ", " : ""), resolver];            
-        }
-        if ([self resolversForService: resolvers includeResolvers: resolversForLocalhost]) {
-            currentState = kDNS_CONFIGURATION_LOCALHOST;
-            currentStateString = NSLocalizedString(@"DNSCrypt", @"Current state");
-        } else if ([self resolversForService: resolvers includeResolvers: resolversForOpenDNS]) {
-            currentStateString = NSLocalizedString(@"OpenDNS", @"Current state");        
-            currentState = kDNS_CONFIGURATION_OPENDNS;
-        } else {
-            currentStateString = NSLocalizedString(@"Default", @"Current state");
-            currentState = kDNS_CONFIGURATION_VANILLA;
-        }
-        if ([resolversString isEqualToString: kRESOLVER_IP_LOCALHOST]) {
-            resolversString = [NSString stringWithFormat: NSLocalizedString(@"%@\nusing DNSCrypt", @"Current resolver when DNSCrypt has been enabled"), kDNSCRYPT_RESOLVER];
-        }
+    } else if ([stateDescription isEqualToString: @"Updating"]) {
+    } else if (stateDescription.length > 0) {
+        currentState = kDNS_CONFIGURATION_VANILLA;
    }
    [self updateLedStatus];
-    _statusConfigurationMenuItem.title = currentStateString;
-    _statusResolversMenuItem.title = resolversString;
+    
+    NSString *currentResolvers = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-upstream-resolvers.sh", nil]];
+    _statusConfigurationMenuItem.title = stateDescription;
+    _statusResolversMenuItem.title = currentResolvers;
+    
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./gui-pop-conf-change.sh menubar", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [self initState];
+    }
+    [self setCheckBoxesEnabled: TRUE];
    
    return TRUE;
 }
@@ -108,19 +152,54 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
 - (void) periodicallyUpdateStatusWithCurrentConfig {
    [self updateStatusWithCurrentConfig];
    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(periodicallyUpdateStatusWithCurrentConfig) object: nil];
-    [self performSelector: @selector(periodicallyUpdateStatusWithCurrentConfig) withObject:nil afterDelay: 2.5];
+    [self performSelector: @selector(periodicallyUpdateStatusWithCurrentConfig) withObject:nil afterDelay: 5.0];
+}
+
+- (void) waitForUpdate {
+    NSString *res;
+    static unsigned int tries;
+    
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./get-tickets-count.sh", nil]];
+    if (res.length <= 0 || [res isEqualToString: @"0"] || tries > kMAX_TRIES_AFTER_CHANGE) {
+        tries = 0U;
+        [self periodicallyUpdateStatusWithCurrentConfig];
+        return;
+    }
+    tries++;
+    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(waitForUpdate) object: nil];
+    [self performSelector: @selector(waitForUpdate) withObject: self afterDelay:kREFRESH_DELAY];
+}
+
+- (void) showSpinners
+{
+    [self setCheckBoxesEnabled: FALSE];
+
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSImage *led = [[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"no-network.png"]];
+    _statusItem.image = led;
+    [led release];
+    
+    [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./gui-push-conf-change.sh prefpane", nil]];
+    
+    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(periodicallyUpdateStatusWithCurrentConfig) object: nil];
+    [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(waitForUpdate) object: nil];
+    [self performSelector: @selector(waitForUpdate) withObject: self afterDelay:kREFRESH_DELAY];
 }

 - (void) awakeFromNib
 {
-    _statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];    
+    _statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
+    [_statusItem retain];
    _statusItem.highlightMode = TRUE;
    _statusItem.toolTip = @"DNSCrypt";
    _statusItem.menu = _dnscryptMenu;
-    
-    NSString *versionStringFormat = NSLocalizedString(@"Client version: %@", @"Current version in the menu");
+        
+    NSString *versionStringFormat = NSLocalizedString(@"Client UI version: %@", @"Current UI version as shown in the menu");
    NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
    _versionMenuItem.title = [NSString stringWithFormat: versionStringFormat, version];
+    
+    [self initState];
+    
    [self periodicallyUpdateStatusWithCurrentConfig];
    [self updateLedStatus];
 }
@@ -142,4 +221,104 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
    }
 }

+- (BOOL) setDNSCryptOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-to-dnscrypt.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setDNSCryptOff {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-to-dhcp.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setFamilyShieldOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-familyshield-on.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setFamilyShieldOff {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-familyshield-off.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setInsecureOpenDNSOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-insecure-opendns-on.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setInsecureOpenDNSOff {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-insecure-opendns-off.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setFallbackOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-fallback-on.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setFallbackOff {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-fallback-off.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (IBAction)dnscryptMenuItemPushed:(NSMenuItem *)sender
+{
+    if (sender.state == 0) {
+        sender.state = 1;
+        [self setDNSCryptOn];
+    } else {
+        sender.state = 0;
+        [self setDNSCryptOff];
+    }
+}
+
+- (IBAction)familyShieldMenuItemPushed:(NSMenuItem *)sender
+{
+    if (sender.state == 0) {
+        sender.state = 1;
+        [self setFamilyShieldOn];
+    } else {
+        sender.state = 0;
+        [self setFamilyShieldOff];
+    }
+}
+
+- (IBAction)opendnsMenuItemPushed:(NSMenuItem *)sender
+{
+    if (sender.state == 0) {
+        sender.state = 1;
+        [self setInsecureOpenDNSOn];
+    } else {
+        sender.state = 0;
+        [self setInsecureOpenDNSOff];
+    }
+}
+
+- (IBAction)fallbackMenuItemPushed:(NSMenuItem *)sender
+{
+    if (sender.state == 0) {
+        sender.state = 1;
+        [self setFallbackOn];
+    } else {
+        sender.state = 0;
+        [self setFallbackOff];
+    }
+}
+
@end
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9 (beta)</string>
+	<string>0.19 (beta)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.9</string>
+	<string>0.19</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -29,13 +29,13 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011 OpenDNS, Inc. All rights reserved.</string>
+	<string>Copyright © 2012 OpenDNS, Inc. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>SUFeedURL</key>
-	<string>http://shared.opendns.com/upgrade/osx/dnscrypt-client/updater.xml</string>
+	<string>http://opendns.github.com/dnscrypt-osx-client/updates/osx/sparkle-updates.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
 </dict>
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11C73</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<int key="IBDocument.SystemTarget">1080</int>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2818</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
+			<string key="NS.object.0">2818</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSCustomObject</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -40,8 +40,8 @@
 				<array class="NSMutableArray" key="NSMenuItems">
 					<object class="NSMenuItem" id="1061864523">
 						<reference key="NSMenu" ref="705716806"/>
-						<string key="NSTitle">DNSCrypt Preferences</string>
-						<string key="NSKeyEquiv">,</string>
+						<string key="NSTitle">Enable DNSCrypt</string>
+						<string key="NSKeyEquiv">e</string>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<object class="NSCustomResource" key="NSOnImage" id="720710128">
@@ -53,6 +53,52 @@
 							<string key="NSResourceName">NSMenuMixedState</string>
 						</object>
 					</object>
+					<object class="NSMenuItem" id="512564254">
+						<reference key="NSMenu" ref="705716806"/>
+						<string key="NSTitle">Fallback to insecure</string>
+						<string key="NSKeyEquiv">x</string>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="720710128"/>
+						<reference key="NSMixedImage" ref="1029721002"/>
+					</object>
+					<object class="NSMenuItem" id="947483772">
+						<reference key="NSMenu" ref="705716806"/>
+						<string key="NSTitle">Always use FamilyShield</string>
+						<string key="NSKeyEquiv">f</string>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="720710128"/>
+						<reference key="NSMixedImage" ref="1029721002"/>
+					</object>
+					<object class="NSMenuItem" id="31983378">
+						<reference key="NSMenu" ref="705716806"/>
+						<string key="NSTitle">Always use OpenDNS</string>
+						<string key="NSKeyEquiv">o</string>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="720710128"/>
+						<reference key="NSMixedImage" ref="1029721002"/>
+					</object>
+					<object class="NSMenuItem" id="392357407">
+						<reference key="NSMenu" ref="705716806"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="720710128"/>
+						<reference key="NSMixedImage" ref="1029721002"/>
+					</object>
+					<object class="NSMenuItem" id="721984748">
+						<reference key="NSMenu" ref="705716806"/>
+						<string key="NSTitle">DNSCrypt Preferences</string>
+						<string key="NSKeyEquiv">,</string>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="720710128"/>
+						<reference key="NSMixedImage" ref="1029721002"/>
+					</object>
 					<object class="NSMenuItem" id="669888296">
 						<reference key="NSMenu" ref="705716806"/>
 						<bool key="NSIsDisabled">YES</bool>
@@ -200,14 +246,6 @@
 					</object>
 					<int key="connectionID">543</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">preferencesMenuItemPushed:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1061864523"/>
-					</object>
-					<int key="connectionID">548</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">statusConfigurationMenuItem</string>
@@ -232,6 +270,70 @@
 					</object>
 					<int key="connectionID">568</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">preferencesMenuItemPushed:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="721984748"/>
+					</object>
+					<int key="connectionID">571</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">familyShieldMenuItem</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="947483772"/>
+					</object>
+					<int key="connectionID">577</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dnscryptMenuItem</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1061864523"/>
+					</object>
+					<int key="connectionID">578</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">dnscryptMenuItemPushed:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1061864523"/>
+					</object>
+					<int key="connectionID">580</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">familyShieldMenuItemPushed:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="947483772"/>
+					</object>
+					<int key="connectionID">581</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">fallbackMenuItemPushed:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="512564254"/>
+					</object>
+					<int key="connectionID">584</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">opendnsMenuItem</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="31983378"/>
+					</object>
+					<int key="connectionID">587</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">opendnsMenuItemPushed:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="31983378"/>
+					</object>
+					<int key="connectionID">588</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">checkForUpdates:</string>
@@ -289,6 +391,11 @@
 							<reference ref="580228755"/>
 							<reference ref="472006404"/>
 							<reference ref="512706455"/>
+							<reference ref="721984748"/>
+							<reference ref="947483772"/>
+							<reference ref="31983378"/>
+							<reference ref="392357407"/>
+							<reference ref="512564254"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -362,6 +469,31 @@
 						<reference key="object" ref="512706455"/>
 						<reference key="parent" ref="705716806"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">570</int>
+						<reference key="object" ref="721984748"/>
+						<reference key="parent" ref="705716806"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">572</int>
+						<reference key="object" ref="947483772"/>
+						<reference key="parent" ref="705716806"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="31983378"/>
+						<reference key="parent" ref="705716806"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">576</int>
+						<reference key="object" ref="392357407"/>
+						<reference key="parent" ref="705716806"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">583</int>
+						<reference key="object" ref="512564254"/>
+						<reference key="parent" ref="705716806"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -384,31 +516,58 @@
 				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="570.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="583.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">568</int>
+			<int key="maxID">588</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">AppDelegate</string>
 					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">preferencesMenuItemPushed:</string>
-						<string key="NS.object.0">NSMenuItem</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">preferencesMenuItemPushed:</string>
-						<object class="IBActionInfo" key="NS.object.0">
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="dnscryptMenuItemPushed:">NSMenuItem</string>
+						<string key="fallbackMenuItemPushed:">NSMenuItem</string>
+						<string key="familyShieldMenuItemPushed:">NSMenuItem</string>
+						<string key="opendnsMenuItemPushed:">NSMenuItem</string>
+						<string key="preferencesMenuItemPushed:">NSMenuItem</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="dnscryptMenuItemPushed:">
+							<string key="name">dnscryptMenuItemPushed:</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBActionInfo" key="fallbackMenuItemPushed:">
+							<string key="name">fallbackMenuItemPushed:</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBActionInfo" key="familyShieldMenuItemPushed:">
+							<string key="name">familyShieldMenuItemPushed:</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBActionInfo" key="opendnsMenuItemPushed:">
+							<string key="name">opendnsMenuItemPushed:</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBActionInfo" key="preferencesMenuItemPushed:">
 							<string key="name">preferencesMenuItemPushed:</string>
 							<string key="candidateClassName">NSMenuItem</string>
 						</object>
-					</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="dnscryptMenu">NSMenu</string>
+						<string key="dnscryptMenuItem">NSMenuItem</string>
+						<string key="fallbackMenuItem">NSMenuItem</string>
+						<string key="familyShieldMenuItem">NSMenuItem</string>
+						<string key="opendnsMenuItem">NSMenuItem</string>
 						<string key="statusConfigurationMenuItem">NSMenuItem</string>
 						<string key="statusResolversMenuItem">NSMenuItem</string>
 						<string key="versionMenuItem">NSMenuItem</string>
@@ -419,6 +578,22 @@
 							<string key="name">dnscryptMenu</string>
 							<string key="candidateClassName">NSMenu</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="dnscryptMenuItem">
+							<string key="name">dnscryptMenuItem</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fallbackMenuItem">
+							<string key="name">fallbackMenuItem</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="familyShieldMenuItem">
+							<string key="name">familyShieldMenuItem</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="opendnsMenuItem">
+							<string key="name">opendnsMenuItem</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="statusConfigurationMenuItem">
 							<string key="name">statusConfigurationMenuItem</string>
 							<string key="candidateClassName">NSMenuItem</string>
@@ -478,8 +653,8 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{9, 8}</string>
-			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
 		</dictionary>
 	</data>
 </archive>
@@ -0,0 +1 @@
+Versions/Current/Headers
@@ -1,36 +0,0 @@
-//
-//  SUAppcast.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUAPPCAST_H
-#define SUAPPCAST_H
-
-@class SUAppcastItem;
-@interface SUAppcast : NSObject
-{
-@private
-	NSArray *items;
-	NSString *userAgentString;
-	id delegate;
-	NSString *downloadFilename;
-	NSURLDownload *download;
-}
-
- (void)fetchAppcastFromURL:(NSURL *)url;
- (void)setDelegate:delegate;
- (void)setUserAgentString:(NSString *)userAgentString;
-
- (NSArray *)items;
-
-@end
-
-@interface NSObject (SUAppcastDelegate)
- (void)appcastDidFinishLoading:(SUAppcast *)appcast;
- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error;
-@end
-
-#endif
@@ -1,58 +0,0 @@
-//
-//  SUAppcastItem.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUAPPCASTITEM_H
-#define SUAPPCASTITEM_H
-
-@interface SUAppcastItem : NSObject
-{
-@private
-	NSString *title;
-	NSDate *date;
-	NSString *itemDescription;
-	
-	NSURL *releaseNotesURL;
-	
-	NSString *DSASignature;	
-	NSString *minimumSystemVersion;
-	
-	NSURL *fileURL;
-	NSString *versionString;
-	NSString *displayVersionString;
-
-	NSDictionary *deltaUpdates;
-
-	NSDictionary *propertiesDictionary;
-	
-	NSURL *infoURL;	// UK 2007-08-31
-}
-
-// Initializes with data from a dictionary provided by the RSS class.
- initWithDictionary:(NSDictionary *)dict;
- initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error;
-
- (NSString *)title;
- (NSString *)versionString;
- (NSString *)displayVersionString;
- (NSDate *)date;
- (NSString *)itemDescription;
- (NSURL *)releaseNotesURL;
- (NSURL *)fileURL;
- (NSString *)DSASignature;
- (NSString *)minimumSystemVersion;
- (NSDictionary *)deltaUpdates;
- (BOOL)isDeltaUpdate;
-
-// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
- (NSDictionary *)propertiesDictionary;
-
- (NSURL *)infoURL;						// UK 2007-08-31
-
-@end
-
-#endif
@@ -1,161 +0,0 @@
-//
-//  SUUpdater.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 1/4/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUUPDATER_H
-#define SUUPDATER_H
-
-#import "SUVersionComparisonProtocol.h"
-#import "SUVersionDisplayProtocol.h"
-
-@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast;
-
-@interface SUUpdater : NSObject
-{
-@private
-	NSTimer *checkTimer;
-	SUUpdateDriver *driver;
-
-	NSString *customUserAgentString;
-	SUHost *host;
-	IBOutlet id delegate;
-}
-
-+ (SUUpdater *)sharedUpdater;
-+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
- initForBundle:(NSBundle *)bundle;
-
- (NSBundle *)hostBundle;
-
- (void)setDelegate:(id)delegate;
- delegate;
-
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks;
- (BOOL)automaticallyChecksForUpdates;
-
- (void)setUpdateCheckInterval:(NSTimeInterval)interval;
- (NSTimeInterval)updateCheckInterval;
-
- (void)setFeedURL:(NSURL *)feedURL;
- (NSURL *)feedURL;	// *** MUST BE CALLED ON MAIN THREAD ***
-
- (void)setUserAgentString:(NSString *)userAgent;
- (NSString *)userAgentString;
-
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile;
- (BOOL)sendsSystemProfile;
-
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates;
- (BOOL)automaticallyDownloadsUpdates;
-
-// This IBAction is meant for a main menu item. Hook up any menu item to this action,
-// and Sparkle will check for updates and report back its findings verbosely.
- (IBAction)checkForUpdates:(id)sender;
-
-// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update,
-// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an
-// update is found, it will be downloaded and prepped for installation.
- (void)checkForUpdatesInBackground;
-
-// Date of last update check. Returns nil if no check has been performed.
- (NSDate*)lastUpdateCheckDate;
-
-// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though,
-// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI.
- (void)checkForUpdateInformation;
-
-// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer.
- (void)resetUpdateCycle;
-
- (BOOL)updateInProgress;
-
-@end
-
-
-// -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-@interface NSObject (SUUpdaterDelegateInformalProtocol)
-
-// Use this to keep Sparkle from popping up e.g. while your setup assistant is showing:
- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle;
-
-// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-
-// Override this to dynamically specify the entire URL.
- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater;
-
-// Use this to override the default behavior for Sparkle prompting the user about automatic update checks.
- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle;
-
-// Implement this if you want to do some special handling with the appcast once it finishes loading.
- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding
-// a valid update, if any, in the given appcast.
- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle;
-
-// Sent when a valid update is found by the update driver.
- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update;
-
-// Sent when a valid update is not found.
- (void)updaterDidNotFindUpdate:(SUUpdater *)update;
-
-// Sent immediately before installing the specified update.
- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
-
-// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue.
-//	This is not called if the user didn't relaunch on the previous update, in that case it will immediately
-//	restart.
- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
-
-// Some apps *can not* be relaunched in certain circumstances. They can use this method
-//	to prevent a relaunch "hard":
- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
-
-// Called immediately before relaunching.
- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
-
-// This method allows you to provide a custom version comparator.
-// If you don't implement this method or return nil, the standard version comparator will be used.
- (id <SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
-
-// This method allows you to provide a custom version comparator.
-// If you don't implement this method or return nil, the standard version displayer will be used.
- (id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
-
-// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle.
- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
-
-// Called before and after, respectively, an updater shows a modal alert window, to give the host
-//	the opportunity to hide attached windows etc. that may get in the way:
-(void)	updaterWillShowModalAlert:(SUUpdater *)updater;
-(void)	updaterDidShowModalAlert:(SUUpdater *)updater;
-
-@end
-
-
-// -----------------------------------------------------------------------------
-//	Constants:
-// -----------------------------------------------------------------------------
-
-// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds.
-#if defined(DEBUG) && DEBUG && 0
-#define SU_MIN_CHECK_INTERVAL 60
-#else
-#define SU_MIN_CHECK_INTERVAL 60*60
-#endif
-
-#if defined(DEBUG) && DEBUG && 0
-#define SU_DEFAULT_CHECK_INTERVAL 60
-#else
-#define SU_DEFAULT_CHECK_INTERVAL 60*60*24
-#endif
-
-#endif
@@ -1,29 +0,0 @@
-//
-//  SUVersionComparisonProtocol.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 12/21/07.
-//  Copyright 2007 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUVERSIONCOMPARISONPROTOCOL_H
-#define SUVERSIONCOMPARISONPROTOCOL_H
-
-#import <Cocoa/Cocoa.h>
-
-/*!
-    @protocol
-    @abstract    Implement this protocol to provide version comparison facilities for Sparkle.
-*/
-@protocol SUVersionComparison
-
-/*!
-    @method     
-    @abstract   An abstract method to compare two version strings.
-    @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent.
-*/
- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;	// *** MAY BE CALLED ON NON-MAIN THREAD!
-
-@end
-
-#endif
@@ -1,27 +0,0 @@
-//
-//  SUVersionDisplayProtocol.h
-//  EyeTV
-//
-//  Created by Uli Kusterer on 08.12.09.
-//  Copyright 2009 Elgato Systems GmbH. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-/*!
-    @protocol
-    @abstract	Implement this protocol to apply special formatting to the two
-				version numbers.
-*/
-@protocol SUVersionDisplay
-
-/*!
-    @method     
-    @abstract   An abstract method to format two version strings.
-    @discussion You get both so you can display important distinguishing
-				information, but leave out unnecessary/confusing parts.
-*/
-(void)	formatVersion: (NSString**)inOutVersionA andVersion: (NSString**)inOutVersionB; 
-
-@end
@@ -1,21 +0,0 @@
-//
-//  Sparkle.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SPARKLE_H
-#define SPARKLE_H
-
-// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
-// there are name-space collisions) so we can list all of them to start with:
-
-#import <Sparkle/SUUpdater.h>
-
-#import <Sparkle/SUAppcast.h>
-#import <Sparkle/SUAppcastItem.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
-
-#endif
@@ -0,0 +1 @@
+Versions/Current/Resources
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>11C73</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Sparkle</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.andymatuschak.Sparkle</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Sparkle</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.5 Beta (git)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>290f64f</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>4D199</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>10K549</string>
-	<key>DTSDKName</key>
-	<string>macosx10.6</string>
-	<key>DTXcode</key>
-	<string>0420</string>
-	<key>DTXcodeBuild</key>
-	<string>4D199</string>
-</dict>
-</plist>
@@ -1,153 +0,0 @@
-Copyright (c) 2006 Andy Matuschak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-=================
-EXTERNAL LICENSES
-=================
-
-This project uses software developed by the OpenSSL Project for use in the OpenSSL 
-Toolkit (http://www.openssl.org). This toolkit is licensed as follows: 
-/* ==================================================================== 
-* Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved. 
-* 
-* Redistribution and use in source and binary forms, with or without 
-* modiÞcation, are permitted provided that the following conditions 
-* are met: 
-* 
-* 1. Redistributions of source code must retain the above copyright 
-*    notice, this list of conditions and the following disclaimer. 
-* 
-* 2. Redistributions in binary form must reproduce the above copyright 
-*    notice, this list of conditions and the following disclaimer in 
-*    the documentation and/or other materials provided with the 
-*    distribution. 
-* 
-* 3. All advertising materials mentioning features or use of this 
-*    software must display the following acknowledgment: 
-*    ÒThis product includes software developed by the OpenSSL Project 
-*    for use in the OpenSSL Toolkit. (http://www.openssl.org/)Ó 
-* 
-* 4. The names ÒOpenSSL ToolkitÓ and ÒOpenSSL ProjectÓ must not be used to 
-*    endorse or promote products derived from this software without 
-*    prior written permission. For written permission, please contact 
-*    openssl-core@openssl.org. 
-* 
-* 5. Products derived from this software may not be called ÒOpenSSLÓ 
-*    nor may ÒOpenSSLÓ appear in their names without prior written 
-*    permission of the OpenSSL Project. 
-* 
-* 6. Redistributions of any form whatsoever must retain the following 
-
-*    acknowledgment: 
-*    ÒThis product includes software developed by the OpenSSL Project 
-*    for use in the OpenSSL Toolkit (http://www.openssl.org/)Ó 
-* 
-* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS ISÕÕ AND ANY 
-* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-* PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR 
-* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
-* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
-* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
-* OF THE POSSIBILITY OF SUCH DAMAGE. 
-* ==================================================================== 
-* 
-* This product includes cryptographic software written by Eric Young 
-* (eay@cryptsoft.com).  This product includes software written by Tim 
-* Hudson (tjh@cryptsoft.com). 
-* 
-*/
- 
-Original SSLeay License 
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 
-* All rights reserved. 
-* 
-* This package is an SSL implementation written 
-* by Eric Young (eay@cryptsoft.com). 
-* The implementation was written so as to conform with Netscapes SSL. 
-* 
-* This library is free for commercial and non-commercial use as long as 
-* the following conditions are aheared to.  The following conditions 
-* apply to all code found in this distribution, be it the RC4, RSA, 
-* lhash, DES, etc., code; not just the SSL code.  The SSL documentation 
-* included with this distribution is covered by the same copyright terms 
-* except that the holder is Tim Hudson (tjh@cryptsoft.com). 
-* 
-* Copyright remains Eric YoungÕs, and as such any Copyright notices in 
-* the code are not to be removed. 
-* If this package is used in a product, Eric Young should be given attribution 
-* as the author of the parts of the library used. 
-* This can be in the form of a textual message at program startup or 
-* in documentation (online or textual) provided with the package. 
-* 
-* Redistribution and use in source and binary forms, with or without 
-* modiÞcation, are permitted provided that the following conditions 
-* are met: 
-* 1. Redistributions of source code must retain the copyright 
-*    notice, this list of conditions and the following disclaimer. 
-* 2. Redistributions in binary form must reproduce the above copyright 
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the distribution. 
-* 3. All advertising materials mentioning features or use of this software 
-*    must display the following acknowledgement: 
-*    ÒThis product includes cryptographic software written by 
-*     Eric Young (eay@cryptsoft.com)Ó
-*    The word ÔcryptographicÕ can be left out if the rouines from the library 
-*    being used are not cryptographic related :-). 
-* 4. If you include any Windows speciÞc code (or a derivative thereof) from 
-*    the apps directory (application code) you must include an acknowledgement: 
-*    ÒThis product includes software written by Tim Hudson (tjh@cryptsoft.com)Ó 
-* 
-* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS ISÕÕ AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
-* SUCH DAMAGE. 
-* 
-* The licence and distribution terms for any publically available version or 
-* derivative of this code cannot be changed.  i.e. this code cannot simply be 
-* copied and put under another distribution licence 
-* [including the GNU Public Licence.] 
-*/
-
-License for bspatch.c and bsdiff.c, from bsdiff 4.3 (<http://www.daemonology.net/bsdiff/>:
-/*-
- * Copyright 2003-2005 Colin Percival
- * All rights reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted providing that the following conditions 
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ADP2,1</key>
-	<string>Developer Transition Kit</string>
-	<key>iMac1,1</key>
-	<string>iMac G3 (Rev A-D)</string>
-	<key>iMac4,1</key>
-	<string>iMac (Core Duo)</string>
-	<key>iMac4,2</key>
-	<string>iMac for Education (17-inch, Core Duo)</string>
-	<key>iMac5,1</key>
-	<string>iMac (Core 2 Duo, 17 or 20 inch, SuperDrive)</string>
-	<key>iMac5,2</key>
-	<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
-	<key>iMac6,1</key>
-	<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
-	<key>iMac8,1</key>
-	<string>iMac (April 2008)</string>
-	<key>MacBook1,1</key>
-	<string>MacBook (Core Duo)</string>
-	<key>MacBook2,1</key>
-	<string>MacBook (Core 2 Duo)</string>
-	<key>MacBook4,1</key>
-	<string>MacBook (Core 2 Duo Feb 2008)</string>
-	<key>MacBookAir1,1</key>
-	<string>MacBook Air (January 2008)</string>
-	<key>MacBookAir2,1</key>
-	<string>MacBook Air (June 2009)</string>
-	<key>MacBookAir3,1</key>
-	<string>MacBook Air (October 2010)</string>
-	<key>MacBookPro1,1</key>
-	<string>MacBook Pro Core Duo (15-inch)</string>
-	<key>MacBookPro1,2</key>
-	<string>MacBook Pro Core Duo (17-inch)</string>
-	<key>MacBookPro2,1</key>
-	<string>MacBook Pro Core 2 Duo (17-inch)</string>
-	<key>MacBookPro2,2</key>
-	<string>MacBook Pro Core 2 Duo (15-inch)</string>
-	<key>MacBookPro3,1</key>
-	<string>MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo)</string>
-	<key>MacBookPro3,2</key>
-	<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
-	<key>MacBookPro4,1</key>
-	<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
-	<key>Macmini1,1</key>
-	<string>Mac Mini (Core Solo/Duo)</string>
-	<key>MacPro1,1</key>
-	<string>Mac Pro (four-core)</string>
-	<key>MacPro2,1</key>
-	<string>Mac Pro (eight-core)</string>
-	<key>MacPro3,1</key>
-	<string>Mac Pro (January 2008 4- or 8- core &quot;Harpertown&quot;)</string>
-	<key>MacPro4,1</key>
-	<string>Mac Pro (March 2009)</string>
-	<key>MacPro5,1</key>
-	<string>Mac Pro (August 2010)</string>
-	<key>PowerBook1,1</key>
-	<string>PowerBook G3</string>
-	<key>PowerBook2,1</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,2</key>
-	<string>iBook G3 (FireWire)</string>
-	<key>PowerBook2,3</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,4</key>
-	<string>iBook G3</string>
-	<key>PowerBook3,1</key>
-	<string>PowerBook G3 (FireWire)</string>
-	<key>PowerBook3,2</key>
-	<string>PowerBook G4</string>
-	<key>PowerBook3,3</key>
-	<string>PowerBook G4 (Gigabit Ethernet)</string>
-	<key>PowerBook3,4</key>
-	<string>PowerBook G4 (DVI)</string>
-	<key>PowerBook3,5</key>
-	<string>PowerBook G4 (1GHz / 867MHz)</string>
-	<key>PowerBook4,1</key>
-	<string>iBook G3 (Dual USB, Late 2001)</string>
-	<key>PowerBook4,2</key>
-	<string>iBook G3 (16MB VRAM)</string>
-	<key>PowerBook4,3</key>
-	<string>iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003)</string>
-	<key>PowerBook5,1</key>
-	<string>PowerBook G4 (17 inch)</string>
-	<key>PowerBook5,2</key>
-	<string>PowerBook G4 (15 inch FW 800)</string>
-	<key>PowerBook5,3</key>
-	<string>PowerBook G4 (17-inch 1.33GHz)</string>
-	<key>PowerBook5,4</key>
-	<string>PowerBook G4 (15 inch 1.5/1.33GHz)</string>
-	<key>PowerBook5,5</key>
-	<string>PowerBook G4 (17-inch 1.5GHz)</string>
-	<key>PowerBook5,6</key>
-	<string>PowerBook G4 (15 inch 1.67GHz/1.5GHz)</string>
-	<key>PowerBook5,7</key>
-	<string>PowerBook G4 (17-inch 1.67GHz)</string>
-	<key>PowerBook5,8</key>
-	<string>PowerBook G4 (Double layer SD, 15 inch)</string>
-	<key>PowerBook5,9</key>
-	<string>PowerBook G4 (Double layer SD, 17 inch)</string>
-	<key>PowerBook6,1</key>
-	<string>PowerBook G4 (12 inch)</string>
-	<key>PowerBook6,2</key>
-	<string>PowerBook G4 (12 inch, DVI)</string>
-	<key>PowerBook6,3</key>
-	<string>iBook G4</string>
-	<key>PowerBook6,4</key>
-	<string>PowerBook G4 (12 inch 1.33GHz)</string>
-	<key>PowerBook6,5</key>
-	<string>iBook G4 (Early-Late 2004)</string>
-	<key>PowerBook6,7</key>
-	<string>iBook G4 (Mid 2005)</string>
-	<key>PowerBook6,8</key>
-	<string>PowerBook G4 (12 inch 1.5GHz)</string>
-	<key>PowerMac1,1</key>
-	<string>Power Macintosh G3 (Blue &amp; White)</string>
-	<key>PowerMac1,2</key>
-	<string>Power Macintosh G4 (PCI Graphics)</string>
-	<key>PowerMac10,1</key>
-	<string>Mac Mini G4</string>
-	<key>PowerMac10,2</key>
-	<string>Mac Mini (Late 2005)</string>
-	<key>PowerMac11,2</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac12,1</key>
-	<string>iMac G5 (iSight)</string>
-	<key>PowerMac2,1</key>
-	<string>iMac G3 (Slot-loading CD-ROM)</string>
-	<key>PowerMac2,2</key>
-	<string>iMac G3 (Summer 2000)</string>
-	<key>PowerMac3,1</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,2</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,3</key>
-	<string>Power Macintosh G4 (Gigabit Ethernet)</string>
-	<key>PowerMac3,4</key>
-	<string>Power Macintosh G4 (Digital Audio)</string>
-	<key>PowerMac3,5</key>
-	<string>Power Macintosh G4 (Quick Silver)</string>
-	<key>PowerMac3,6</key>
-	<string>Power Macintosh G4 (Mirrored Drive Door)</string>
-	<key>PowerMac4,1</key>
-	<string>iMac G3 (Early/Summer 2001)</string>
-	<key>PowerMac4,2</key>
-	<string>iMac G4 (Flat Panel)</string>
-	<key>PowerMac4,4</key>
-	<string>eMac</string>
-	<key>PowerMac4,5</key>
-	<string>iMac G4 (17-inch Flat Panel)</string>
-	<key>PowerMac5,1</key>
-	<string>Power Macintosh G4 Cube</string>
-	<key>PowerMac6,1</key>
-	<string>iMac G4 (USB 2.0)</string>
-	<key>PowerMac6,3</key>
-	<string>iMac G4 (20-inch Flat Panel)</string>
-	<key>PowerMac6,4</key>
-	<string>eMac (USB 2.0, 2005)</string>
-	<key>PowerMac7,2</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac7,3</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac8,1</key>
-	<string>iMac G5</string>
-	<key>PowerMac8,2</key>
-	<string>iMac G5 (Ambient Light Sensor)</string>
-	<key>PowerMac9,1</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>RackMac1,1</key>
-	<string>Xserve G4</string>
-	<key>RackMac1,2</key>
-	<string>Xserve G4 (slot-loading, cluster node)</string>
-	<key>RackMac3,1</key>
-	<string>Xserve G5</string>
-	<key>Xserve1,1</key>
-	<string>Xserve (Intel Xeon)</string>
-	<key>Xserve2,1</key>
-	<string>Xserve (January 2008 quad-core)</string>
-</dict>
-</plist>
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>11C73</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>finish_installation</string>
-	<key>CFBundleIconFile</key>
-	<string>Sparkle</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.andymatuschak.sparkle.finish-installation</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>4D199</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>10K549</string>
-	<key>DTSDKName</key>
-	<string>macosx10.6</string>
-	<key>DTXcode</key>
-	<string>0420</string>
-	<key>DTXcodeBuild</key>
-	<string>4D199</string>
-	<key>LSBackgroundOnly</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.4</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
@@ -1 +0,0 @@
-APPL????
--- a/Show More
+++ b/Show More