Attachment #166585 for bug #206938

View | Details | Raw Unified | Return to bug 206938
Collapse All | Expand All




# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 400556 2015-10-30 22:43:16Z bapt $

PORTNAME=	dnscrypt-proxy
PORTVERSION=	1.6.1
PORTREVISION=	3
CATEGORIES=	dns
MASTER_SITES=	http://download.dnscrypt.org/dnscrypt-proxy/ \
		http://www.dns-lab.com/downloads/dnscrypt-proxy/


USERS=		_dnscrypt-proxy

PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README* THANKS
		README-PLUGINS.markdown README-WINDOWS.markdown \
		README.markdown TECHNOTES THANKS

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)dnscrypt-proxy/distinfo (-2 / +2 lines)
1	SHA256 (dnscrypt-proxy-1.6.0.tar.gz) = 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be	1	SHA256 (dnscrypt-proxy-1.6.1.tar.gz) = c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340
2	SIZE (dnscrypt-proxy-1.6.0.tar.gz) = 1579293	2	SIZE (dnscrypt-proxy-1.6.1.tar.gz) = 1721006

Lines 57-63 Link Here

(-)dnscrypt-proxy/files/dnscrypt-proxy_multi.in (-1 / +1 lines)
57	eval dnscrypt_proxy_logfile_tmp=\${${i}_logfile}	57	eval dnscrypt_proxy_logfile_tmp=\${${i}_logfile}
58		58
59	: ${dnscrypt_proxy_uid_tmp:=_dnscrypt-proxy} # User to run daemon as	59	: ${dnscrypt_proxy_uid_tmp:=_dnscrypt-proxy} # User to run daemon as
60	: ${dnscrypt_proxy_resolver_tmp:=opendns} # resolver to use	60	: ${dnscrypt_proxy_resolver_tmp:=cisco} # resolver to use
61	: ${dnscrypt_proxy_pidfile_tmp:=/var/run/${i}.pid} # Path to pid file	61	: ${dnscrypt_proxy_pidfile_tmp:=/var/run/${i}.pid} # Path to pid file
62	: ${dnscrypt_proxy_logfile_tmp:=/var/log/${i}.log} # Path to log file	62	: ${dnscrypt_proxy_logfile_tmp:=/var/log/${i}.log} # Path to log file
63		63




# 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;

Return to bug 206938

Lines 2-9 Link Here

(-)dnscrypt-proxy/Makefile (-5 / +2 lines)
2	# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 400556 2015-10-30 22:43:16Z bapt $	2	# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 400556 2015-10-30 22:43:16Z bapt $
3		3
4	PORTNAME= dnscrypt-proxy	4	PORTNAME= dnscrypt-proxy
5	PORTVERSION= 1.6.0	5	PORTVERSION= 1.6.1
6	PORTREVISION= 3
7	CATEGORIES= dns	6	CATEGORIES= dns
8	MASTER_SITES= http://download.dnscrypt.org/dnscrypt-proxy/ \	7	MASTER_SITES= http://download.dnscrypt.org/dnscrypt-proxy/ \
9	http://www.dns-lab.com/downloads/dnscrypt-proxy/	8	http://www.dns-lab.com/downloads/dnscrypt-proxy/
Lines 39-47 Link Here
39		38
40	USERS= _dnscrypt-proxy	39	USERS= _dnscrypt-proxy
41		40
42	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README \	41	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS
43	README-PLUGINS.markdown README-WINDOWS.markdown \
44	README.markdown TECHNOTES THANKS
45		42
46	post-install:	43	post-install:
47	@${MKDIR} ${STAGEDIR}${DOCSDIR}	44	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Line 0 Link Here

(-)dnscrypt-proxy/files/patch-src_proxy_edns.c (+34 lines)
	1	# Origin: https://github.com/jedisct1/dnscrypt-proxy/commit/a193c6ff1ca2b24bb283f0d64bf8f5faefc0def1
	2	# Subject: Repair edns0 support
	3
	4	--- src/proxy/edns.c.orig 2016-02-02 15:42:19 UTC
	5	+++ src/proxy/edns.c
	6	@@ -10,7 +10,7 @@
	7	#include "dnscrypt_proxy.h"
	8	#include "edns.h"
	9
	10	-#define DNS_MAX_HOSTNAME_LEN 255U
	11	+#define DNS_MAX_HOSTNAME_LEN 256U
	12
	13	static int
	14	_skip_name(const uint8_t * const dns_packet, const size_t dns_packet_len,
	15	@@ -26,9 +26,6 @@ _skip_name(const uint8_t * const dns_pac
	16	}
	17	for (;;) {
	18	name_component_len = dns_packet[offset];
	19	- if (name_component_len == 0U) {
	20	- break;
	21	- }
	22	if ((name_component_len & 0xC0) == 0xC0) {
	23	name_component_len = 1U;
	24	}
	25	@@ -40,6 +37,9 @@ _skip_name(const uint8_t * const dns_pac
	26	return -1;
	27	}
	28	offset += name_component_len + 1U;
	29	+ if (name_component_len == 0U) {
	30	+ break;
	31	+ }
	32	}
	33	if (offset >= dns_packet_len) {
	34	return -1;