Attachment 166585 Details for Bug 206938 – Proposed patch (since 400556 revision)

[patch] Proposed patch (since 400556 revision)

dnscrypt-proxy_1.6.0-1.6.1.diff (text/plain), 3.30 KB, created by lightside on 2016-02-05 03:01:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-02-05 03:01:08 UTC

Size: 3.30 KB

patch

obsolete

>diff -ruN dnscrypt-proxy.orig/Makefile dnscrypt-proxy/Makefile
>--- dnscrypt-proxy.orig/Makefile	2015-10-31 02:43:16.000000000 +0400
>+++ dnscrypt-proxy/Makefile	2016-02-05 05:40:21.898798000 +0400
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/dns/dnscrypt-proxy/Makefile 400556 2015-10-30 22:43:16Z bapt $
> 
> 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 @@
> 
> 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 -ruN dnscrypt-proxy.orig/distinfo dnscrypt-proxy/distinfo
>--- dnscrypt-proxy.orig/distinfo	2015-08-27 19:15:20.000000000 +0400
>+++ dnscrypt-proxy/distinfo	2016-02-05 05:01:50.338605000 +0400
>@@ -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 -ruN dnscrypt-proxy.orig/files/dnscrypt-proxy_multi.in dnscrypt-proxy/files/dnscrypt-proxy_multi.in
>--- dnscrypt-proxy.orig/files/dnscrypt-proxy_multi.in	2015-09-26 06:39:09.000000000 +0400
>+++ dnscrypt-proxy/files/dnscrypt-proxy_multi.in	2016-02-05 05:28:27.188962000 +0400
>@@ -57,7 +57,7 @@
>     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 -ruN dnscrypt-proxy.orig/files/patch-src_proxy_edns.c dnscrypt-proxy/files/patch-src_proxy_edns.c
>--- dnscrypt-proxy.orig/files/patch-src_proxy_edns.c	1970-01-01 03:00:00.000000000 +0300
>+++ dnscrypt-proxy/files/patch-src_proxy_edns.c	2016-02-05 05:08:27.440645000 +0400
>@@ -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;

Actions: View | Diff

Attachments on bug 206938: 166585 | 166586