4 files changed, 15 insertions, 5 deletions
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
index 5ae91c2d71aec..f0d40fc5b5853 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
@@ -28,7 +28,7 @@
 # value of this script!
 
 PRGNAM=dnscrypt-proxy
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.default b/network/dnscrypt-proxy/dnscrypt-proxy.default
index a1b62d82f92e6..1f8408ffe297d 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.default
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.default
@@ -25,7 +25,7 @@ USER[0]="dnscrypt"
 # If RESOLVERNAME is set, then RESOLVERADDRESS, PROVIDERNAME, and
 # PROVIDERKEY will be ignored. RESOLVERNAME should be the name of a resolver
 # from RESOLVERSLIST (the first column).
-RESOLVERNAME[0]="opendns"
+RESOLVERNAME[0]="cisco"
 
 # Specify the location of the resolver list, used if RESOLVERNAME is set.
 RESOLVERSLIST[0]="/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
@@ -42,6 +42,13 @@ RESOLVERSLIST[0]="/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
 # mitigates this by computing an ephemeral key pair for every query.
 #EPHEMERALKEYS[0]="no"
 
+# Use client authentication (ie. a static client key) instead of randomly
+# generating one. This should point to a private file. Its content does *not*
+# need to be known by the DNS service provider. See
+# /usr/doc/dnscrypt-proxy-@VERSION@/README.markdown for more information. This
+# option conflicts with EPHEMERALKEYS.
+#CLIENTKEY[0]="/etc/dnscrypt.clientkey"
+
 # Transparently add an OPT pseudo-RR to outgoing queries in order to enable
 # the EDNS0 extension mechanism. The payload size is the size of the largest
 # response we accept from the resolver before retrying over TCP. This feature
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.info b/network/dnscrypt-proxy/dnscrypt-proxy.info
index e98578ba3b161..bdd17ffd2e016 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.info
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.info
@@ -1,8 +1,8 @@
 PRGNAM="dnscrypt-proxy"
-VERSION="1.5.0"
+VERSION="1.6.0"
 HOMEPAGE="http://dnscrypt.org/"
-DOWNLOAD="http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.5.0.tar.bz2"
-MD5SUM="7811ae38c6cd2be06dd024f3f73bcc9e"
+DOWNLOAD="http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.6.0.tar.bz2"
+MD5SUM="fa1dad8e487ab587be06e1cbccb9cfcc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libsodium"
diff --git a/network/dnscrypt-proxy/rc.dnscrypt-proxy b/network/dnscrypt-proxy/rc.dnscrypt-proxy
index 781c78a1ba8a8..221df34842031 100644
--- a/network/dnscrypt-proxy/rc.dnscrypt-proxy
+++ b/network/dnscrypt-proxy/rc.dnscrypt-proxy
@@ -62,6 +62,9 @@ start_instance() {
     if [ "${EPHEMERALKEYS[$1]}" == "yes" ]; then
         OPTIONS="${OPTIONS} --ephemeral-keys"
     fi
+    if [ -n "${CLIENTKEY[$1]}" ]; then
+        OPTIONS="${OPTIONS} --client-key=${CLIENTKEY[$1]}"
+    fi
     if [ -n "${EDNSPAYLOADSIZE[$1]}" ]; then
         OPTIONS="${OPTIONS} --edns-payload-size=${EDNSPAYLOADSIZE[$1]}"
     fi