Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
690fc9038d | ||
|
|
3724e78ab2 | ||
|
|
dd3b6a2aa7 | ||
|
|
455ee1dbcb | ||
|
|
b036e93a6a | ||
|
|
73ca3e136f | ||
|
|
11640d3038 | ||
|
|
af6b2485ae | ||
|
|
b1e4f1a064 | ||
|
|
cf513f4745 | ||
|
|
12eff619cc | ||
|
|
065c93519e | ||
|
|
da8a4c2b55 | ||
|
|
18310fd607 | ||
|
|
128ee7809f | ||
|
|
76462a39b3 |
@@ -17,11 +17,11 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
||||
@@ -1436,7 +1436,7 @@
|
||||
<key>USE_HFS+_COMPRESSION</key>
|
||||
<true/>
|
||||
<key>VERSION</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
</dict>
|
||||
<key>TYPE</key>
|
||||
<integer>0</integer>
|
||||
@@ -1929,7 +1929,7 @@
|
||||
<key>USE_HFS+_COMPRESSION</key>
|
||||
<true/>
|
||||
<key>VERSION</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
</dict>
|
||||
<key>TYPE</key>
|
||||
<integer>0</integer>
|
||||
|
||||
@@ -2,14 +2,24 @@
|
||||
|
||||
exec 2>/dev/null
|
||||
|
||||
/bin/launchctl stop com.opendns.osx.RoamingClientMenubar
|
||||
/bin/launchctl remove com.opendns.osx.RoamingClientMenubar
|
||||
/bin/launchctl remove com.opendns.osx.RoamingClientConfigUpdater
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.Roaming*.plist
|
||||
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptMenuBar
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptMenuBar.plist
|
||||
/bin/launchctl stop com.opendns.osx.RoamingClientConfigUpdater
|
||||
/bin/launchctl remove com.opendns.osx.RoamingClientConfigUpdater
|
||||
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.Roaming*.plist
|
||||
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptMenuBar
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptMenuBar
|
||||
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptMenuBar
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptMenuBar
|
||||
|
||||
killall 'DNSCrypt-Menubar'
|
||||
killall 'DNSCrypt Menubar'
|
||||
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptMenuBar.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptMenuBar.plist
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -2,29 +2,46 @@
|
||||
|
||||
exec 2>/dev/null
|
||||
|
||||
if [ -x /usr/bin/pkill ]; then
|
||||
/usr/bin/pkill -f '/Applications/System Preferences.app'
|
||||
fi
|
||||
killall 'System Preferences'
|
||||
|
||||
/bin/rm -rf '/Library/Application Support/DNSCrypt Updater'
|
||||
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptConfigUpdater
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptConfigUpdater
|
||||
/bin/rm -f '/Library/LaunchDaemons/com.opendns.osx.DNSCryptConfigUpdater.plist'
|
||||
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptAfterboot
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptConsoleChange
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptControlChange
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptNetworkChange
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCrypt*.plist
|
||||
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptConfigUpdater
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptConfigUpdater
|
||||
/bin/rm -f '/Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptConfigUpdater.plist'
|
||||
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptAfterboot
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptAfterboot
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptConsoleChange
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptConsoleChange
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptControlChange
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptControlChange
|
||||
/bin/launchctl stop com.opendns.osx.DNSCryptNetworkChange
|
||||
/bin/launchctl remove com.opendns.osx.DNSCryptNetworkChange
|
||||
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptAfterboot.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptConsoleChange.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptControlChange.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.opendns.osx.DNSCryptNetworkChange.plist
|
||||
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptAfterboot
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptAfterboot
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptConsoleChange
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptConsoleChange
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptControlChange
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptControlChange
|
||||
/bin/launchctl stop com.github.dnscrypt-osxclient.DNSCryptNetworkChange
|
||||
/bin/launchctl remove com.github.dnscrypt-osxclient.DNSCryptNetworkChange
|
||||
|
||||
/bin/rm -f /Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptAfterboot.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptConsoleChange.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptControlChange.plist
|
||||
/bin/rm -f /Library/LaunchDaemons/com.github.dnscrypt-osxclient.DNSCryptNetworkChange.plist
|
||||
|
||||
/bin/rm -f /var/run/dnscrypt*.lock
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
VERSION='1.0.1'
|
||||
VERSION='1.0.2'
|
||||
|
||||
cd build || exit 1
|
||||
[ -d DNSCrypt.mpkg ] || exit 1
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0.1</string>
|
||||
<string>1.0.2</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>BSD</string>
|
||||
<key>NSMainNibFile</key>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#import <WebKit/WebKit.h>
|
||||
#import "CHCSVParser/CHCSVParser.h"
|
||||
|
||||
#define kDNSCRYPT_PACKAGE_VERSION @"1.0.1"
|
||||
#define kDNSCRYPT_PACKAGE_VERSION @"1.0.2"
|
||||
|
||||
#define kDNSCRYPT_PREFPANE_APP_PATH @"/Library/PreferencePanes/DNSCrypt.prefPane"
|
||||
#define kDNSCRYPT_USR_BASE_DIR kDNSCRYPT_PREFPANE_APP_PATH @"/Contents/Resources/usr"
|
||||
|
||||
@@ -21,6 +21,15 @@
|
||||
%body
|
||||
%h1 Release Notes for DNSCrypt-OSXclient by AlterStep
|
||||
|
||||
%article
|
||||
%h2 Version 1.0.2 by AlterStep
|
||||
%time Thu, 05 Jun 2014
|
||||
%p
|
||||
Improved installation scripts
|
||||
%p
|
||||
LDNS has been downgraded in order to work on systems without
|
||||
Homebrew.
|
||||
|
||||
%article
|
||||
%h2 Version 1.0.1 by AlterStep
|
||||
%time Mon, 28 Apr 2014
|
||||
|
||||
@@ -25,6 +25,17 @@
|
||||
</head>
|
||||
<body>
|
||||
<h1>Release Notes for DNSCrypt-OSXclient by AlterStep</h1>
|
||||
<article>
|
||||
<h2>Version 1.0.2 by AlterStep</h2>
|
||||
<time>Thu, 05 Jun 2014</time>
|
||||
<p>
|
||||
Improved installation scripts
|
||||
</p>
|
||||
<p>
|
||||
LDNS has been downgraded in order to work on systems without
|
||||
Homebrew.
|
||||
</p>
|
||||
</article>
|
||||
<article>
|
||||
<h2>Version 1.0.1 by AlterStep</h2>
|
||||
<time>Mon, 28 Apr 2014</time>
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
<key>name</key>
|
||||
<string>ScriptWindowState</string>
|
||||
<key>positionOfDivider</key>
|
||||
<real>333</real>
|
||||
<real>370</real>
|
||||
<key>savedFrame</key>
|
||||
<string>60 149 1053 597 0 0 1366 746 </string>
|
||||
<string>85 77 1202 655 0 0 1366 746 </string>
|
||||
<key>selectedTabView</key>
|
||||
<string>result</string>
|
||||
</dict>
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 362 B |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
libsodium.4.dylib
|
||||
libsodium.10.dylib
|
||||
@@ -19,7 +19,7 @@ fi
|
||||
|
||||
exec networksetup -listallnetworkservices 2>/dev/null | \
|
||||
fgrep -v '*' | while read x ; do
|
||||
networksetup -setdnsservers "$x" $servers
|
||||
networksetup -setdnsservers "$x" $servers > /dev/null
|
||||
done
|
||||
|
||||
logger_debug "Flushing the local DNS cache"
|
||||
|
||||
@@ -71,6 +71,7 @@ get_plugin_args() {
|
||||
}
|
||||
}
|
||||
|
||||
logger_debug "dnscrypt-proxy should be (re)started, stopping previous instance if needed"
|
||||
./stop-dnscrypt-proxy.sh
|
||||
|
||||
ipv6_supported="no"
|
||||
|
||||
+6
-2
@@ -13,10 +13,12 @@ logger_debug "DNSCrypt has been requested"
|
||||
|
||||
pause=0
|
||||
while [ -e "$DNSCRYPT_FILE" ]; do
|
||||
logger_debug "Switching to dnscrypt if required (pause=$pause)"
|
||||
current_resolvers=$(./get-current-resolvers.sh)
|
||||
if [ "$current_resolvers" = "$INTERFACE_PROXY" ]; then
|
||||
if [ ! -e "$PROXY_PID_FILE" ]; then
|
||||
./start-dnscrypt-proxy.sh || ./switch-to-dhcp.sh
|
||||
logger_debug "The proxy should be running but it isn't."
|
||||
./switch-to-dhcp.sh
|
||||
fi
|
||||
fi
|
||||
if [ $pause -lt $PAUSE_MAX ]; then
|
||||
@@ -30,15 +32,17 @@ while [ -e "$DNSCRYPT_FILE" ]; do
|
||||
logger_debug "The router hijacks HTTP queries - DNSCrypt is likely to be blocked"
|
||||
continue
|
||||
fi
|
||||
./start-dnscrypt-proxy.sh || continue
|
||||
./start-dnscrypt-proxy.sh
|
||||
./check-local-dns.sh || continue
|
||||
./set-dns.sh "$INTERFACE_PROXY"
|
||||
if [ $? != 0 ]; then
|
||||
logger_debug "Setting the DNS to [$INTERFACE_PROXY] didn't work"
|
||||
./set-dns-to-dhcp.sh
|
||||
continue
|
||||
fi
|
||||
./check-hijacking.sh
|
||||
if [ $? != 0 ]; then
|
||||
logger_debug "Current configuration seems to be hijacking HTTP queries. Reverting to default resolvers."
|
||||
./set-dns-to-dhcp.sh
|
||||
continue
|
||||
fi
|
||||
|
||||
Binary file not shown.
+2
-2
@@ -4,8 +4,8 @@ OSX client for managing the DNSCrypt Proxy
|
||||
The purpose of this application is to allow the user to have a better
|
||||
experience controlling the DNSCrypt Proxy on OSX.
|
||||
|
||||
[Download dnscrypt-osxclient-1.0.0.dmg](https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.0/dnscrypt-osxclient-1.0.0.dmg)
|
||||
for OSX 10.9 (Mavericks).
|
||||
[Download dnscrypt-osxclient-1.0.1.zip](https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.1/dnscrypt-osxclient-1.0.1.zip)
|
||||
for OSX 10.8 (Mountain Lion) and OSX 10.9 (Mavericks).
|
||||
|
||||
Compatible with:
|
||||
* CloudNS
|
||||
|
||||
Reference in New Issue
Block a user