diff options
| author | Mark Felder <feld@FreeBSD.org> | 2016-02-10 00:04:04 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2016-02-10 00:04:04 +0000 |
| commit | 75fa446fdcd11bb697fc83a60becaa3f058388a9 (patch) | |
| tree | b567ec39a35fd0cce201fe8e89c71561e2c25393 /dns | |
| parent | e37c070c78c1c112b2533fc79c74475d29cc277a (diff) | |
| download | ports-75fa446fdcd11bb697fc83a60becaa3f058388a9.tar.gz ports-75fa446fdcd11bb697fc83a60becaa3f058388a9.zip | |
Notes
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/dnscrypt-proxy/Makefile | 7 | ||||
| -rw-r--r-- | dns/dnscrypt-proxy/distinfo | 4 | ||||
| -rw-r--r-- | dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in | 2 | ||||
| -rw-r--r-- | dns/dnscrypt-proxy/files/patch-src_proxy_edns.c | 34 |
4 files changed, 39 insertions, 8 deletions
diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile index a74148eb9575..668aacdb9015 100644 --- a/dns/dnscrypt-proxy/Makefile +++ b/dns/dnscrypt-proxy/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dnscrypt-proxy -PORTVERSION= 1.6.0 -PORTREVISION= 3 +PORTVERSION= 1.6.1 CATEGORIES= dns MASTER_SITES= http://download.dnscrypt.org/dnscrypt-proxy/ \ http://www.dns-lab.com/downloads/dnscrypt-proxy/ @@ -39,9 +38,7 @@ SUB_FILES= pkg-message USERS= _dnscrypt-proxy -PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README \ - README-PLUGINS.markdown README-WINDOWS.markdown \ - README.markdown TECHNOTES THANKS +PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/dns/dnscrypt-proxy/distinfo b/dns/dnscrypt-proxy/distinfo index a3ec52a8d2cf..de5772b0cf6c 100644 --- a/dns/dnscrypt-proxy/distinfo +++ b/dns/dnscrypt-proxy/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnscrypt-proxy-1.6.0.tar.gz) = 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be -SIZE (dnscrypt-proxy-1.6.0.tar.gz) = 1579293 +SHA256 (dnscrypt-proxy-1.6.1.tar.gz) = c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 +SIZE (dnscrypt-proxy-1.6.1.tar.gz) = 1721006 diff --git a/dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in b/dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in index c3ed3c583af0..5e3d6f4182c3 100644 --- a/dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in +++ b/dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in @@ -57,7 +57,7 @@ for i in $dnscrypt_proxy_instances; do eval dnscrypt_proxy_logfile_tmp=\${${i}_logfile} : ${dnscrypt_proxy_uid_tmp:=_dnscrypt-proxy} # User to run daemon as -: ${dnscrypt_proxy_resolver_tmp:=opendns} # resolver to use +: ${dnscrypt_proxy_resolver_tmp:=cisco} # resolver to use : ${dnscrypt_proxy_pidfile_tmp:=/var/run/${i}.pid} # Path to pid file : ${dnscrypt_proxy_logfile_tmp:=/var/log/${i}.log} # Path to log file diff --git a/dns/dnscrypt-proxy/files/patch-src_proxy_edns.c b/dns/dnscrypt-proxy/files/patch-src_proxy_edns.c new file mode 100644 index 000000000000..67fa3f44c778 --- /dev/null +++ b/dns/dnscrypt-proxy/files/patch-src_proxy_edns.c @@ -0,0 +1,34 @@ +# Origin: https://github.com/jedisct1/dnscrypt-proxy/commit/a193c6ff1ca2b24bb283f0d64bf8f5faefc0def1 +# Subject: Repair edns0 support + +--- src/proxy/edns.c.orig 2016-02-02 15:42:19 UTC ++++ src/proxy/edns.c +@@ -10,7 +10,7 @@ + #include "dnscrypt_proxy.h" + #include "edns.h" + +-#define DNS_MAX_HOSTNAME_LEN 255U ++#define DNS_MAX_HOSTNAME_LEN 256U + + static int + _skip_name(const uint8_t * const dns_packet, const size_t dns_packet_len, +@@ -26,9 +26,6 @@ _skip_name(const uint8_t * const dns_pac + } + for (;;) { + name_component_len = dns_packet[offset]; +- if (name_component_len == 0U) { +- break; +- } + if ((name_component_len & 0xC0) == 0xC0) { + name_component_len = 1U; + } +@@ -40,6 +37,9 @@ _skip_name(const uint8_t * const dns_pac + return -1; + } + offset += name_component_len + 1U; ++ if (name_component_len == 0U) { ++ break; ++ } + } + if (offset >= dns_packet_len) { + return -1; |