Attachment #173685 for bug #211853

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




# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 418449 2016-07-12 22:03:52Z marino $

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


LIB_DEPENDS=	libsodium.so:security/libsodium

USERS=		_dnscrypt-proxy

GNU_CONFIGURE=	yes
USES=		execinfo gmake

INSTALL_TARGET=	install-strip
OPTIONS_SINGLE=	RCWHICH
OPTIONS_SINGLE_RCWHICH=	RCSINGLE RCMULTI
RCWHICH_DESC=	rc script to use:
RCSINGLE_DESC=	use default rc script for single daemon
RCMULTI_DESC=	use experimental rc script for multiple instances
OPTIONS_DEFAULT=RCSINGLE

.include <bsd.port.options.mk>

PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README* THANKS
USE_RC_SUBR=	${PORTNAME}_multi
SUB_FILES=	pkg-message_multi
.else
USE_RC_SUBR=	${PORTNAME}
SUB_FILES=	pkg-message
.endif

OPTIONS_DEFINE=	DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT
OPTIONS_SINGLE=	RCWHICH
OPTIONS_SINGLE_RCWHICH=	RCSINGLE RCMULTI
OPTIONS_DEFAULT=	PLUGINS RCSINGLE
OPTIONS_SUB=	yes

PLUGINS_CONFIGURE_ENABLE=	plugins
PLUGINS_LIB_DEPENDS=	libltdl.so:devel/libltdl \
		libldns.so:dns/ldns
PLUGINS_USES=	libtool
PLUGINS_RELAXED_DESC=	Allow loading plugins owned by other users
PLUGINS_RELAXED_CONFIGURE_ENABLE=	relaxed-plugins-permissions
PLUGINS_ROOT_DESC=	Only load plugins sitting in the default plugins directory
PLUGINS_ROOT_CONFIGURE_ENABLE=	plugins-root
RCWHICH_DESC=	Rc script to use:
RCSINGLE_DESC=	Use default rc script for single daemon
RCSINGLE_VARS=	USE_RC_SUBR=${PORTNAME}
RCSINGLE_SUB_FILES=	pkg-message
RCMULTI_DESC=	Use experimental rc script for multiple instances
RCMULTI_VARS=	USE_RC_SUBR=${PORTNAME}_multi
RCMULTI_SUB_FILES=	pkg-message_multi

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

Lines 1-2 Link Here

(-)dnscrypt-proxy/distinfo (-2 / +3 lines)
1	SHA256 (dnscrypt-proxy-1.6.1.tar.gz) = c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340	1	TIMESTAMP = 1469962250
2	SIZE (dnscrypt-proxy-1.6.1.tar.gz) = 1721006	2	SHA256 (dnscrypt-proxy-1.7.0.tar.gz) = be9827f66401f38fd4bdb372046eff9b5802ab5f3d188878a0dcd7bd20074c09
		3	SIZE (dnscrypt-proxy-1.7.0.tar.gz) = 1714401




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




bin/hostip
%%PLUGINS%%include/dnscrypt/plugin.h
%%PLUGINS%%include/dnscrypt/private.h
%%PLUGINS%%include/dnscrypt/version.h
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example.so
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_blocking.so
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_deviceid.so
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_set_client_ip.so
%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_logging.so
man/man8/dnscrypt-proxy.8.gz
man/man8/hostip.8.gz
sbin/dnscrypt-proxy
bin/hostip
%%DATADIR%%/dnscrypt-resolvers.csv
%%DATADIR%%/minisign.pub

Return to bug 211853

Lines 2-9 Link Here

(-)dnscrypt-proxy/Makefile (-20 / +25 lines)
2	# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 418449 2016-07-12 22:03:52Z marino $	2	# $FreeBSD: head/dns/dnscrypt-proxy/Makefile 418449 2016-07-12 22:03:52Z marino $
3		3
4	PORTNAME= dnscrypt-proxy	4	PORTNAME= dnscrypt-proxy
5	PORTVERSION= 1.6.1	5	PORTVERSION= 1.7.0
6	PORTREVISION= 2
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 16-45 Link Here
16		15
17	LIB_DEPENDS= libsodium.so:security/libsodium	16	LIB_DEPENDS= libsodium.so:security/libsodium
18		17
		18	USERS= _dnscrypt-proxy
		19
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	USES= execinfo gmake	21	USES= execinfo gmake
21		22
22	OPTIONS_DEFINE= DOCS	23	INSTALL_TARGET= install-strip
23	OPTIONS_SINGLE= RCWHICH
24	OPTIONS_SINGLE_RCWHICH= RCSINGLE RCMULTI
25	RCWHICH_DESC= rc script to use:
26	RCSINGLE_DESC= use default rc script for single daemon
27	RCMULTI_DESC= use experimental rc script for multiple instances
28	OPTIONS_DEFAULT=RCSINGLE
29
30	.include <bsd.port.options.mk>
31		24
32	.if ${PORT_OPTIONS:MRCMULTI}	25	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS
33	USE_RC_SUBR= ${PORTNAME}_multi
34	SUB_FILES= pkg-message_multi
35	.else
36	USE_RC_SUBR= ${PORTNAME}
37	SUB_FILES= pkg-message
38	.endif
39		26
40	USERS= _dnscrypt-proxy	27	OPTIONS_DEFINE= DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT
		28	OPTIONS_SINGLE= RCWHICH
		29	OPTIONS_SINGLE_RCWHICH= RCSINGLE RCMULTI
		30	OPTIONS_DEFAULT= PLUGINS RCSINGLE
		31	OPTIONS_SUB= yes
41		32
42	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS	33	PLUGINS_CONFIGURE_ENABLE= plugins
		34	PLUGINS_LIB_DEPENDS= libltdl.so:devel/libltdl \
		35	libldns.so:dns/ldns
		36	PLUGINS_USES= libtool
		37	PLUGINS_RELAXED_DESC= Allow loading plugins owned by other users
		38	PLUGINS_RELAXED_CONFIGURE_ENABLE= relaxed-plugins-permissions
		39	PLUGINS_ROOT_DESC= Only load plugins sitting in the default plugins directory
		40	PLUGINS_ROOT_CONFIGURE_ENABLE= plugins-root
		41	RCWHICH_DESC= Rc script to use:
		42	RCSINGLE_DESC= Use default rc script for single daemon
		43	RCSINGLE_VARS= USE_RC_SUBR=${PORTNAME}
		44	RCSINGLE_SUB_FILES= pkg-message
		45	RCMULTI_DESC= Use experimental rc script for multiple instances
		46	RCMULTI_VARS= USE_RC_SUBR=${PORTNAME}_multi
		47	RCMULTI_SUB_FILES= pkg-message_multi
43		48
44	post-install:	49	post-install:
45	@${MKDIR} ${STAGEDIR}${DOCSDIR}	50	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-34 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;

Lines 1-6 Link Here

(-)dnscrypt-proxy/pkg-plist (-1 / +10 lines)
		1	bin/hostip
		2	%%PLUGINS%%include/dnscrypt/plugin.h
		3	%%PLUGINS%%include/dnscrypt/private.h
		4	%%PLUGINS%%include/dnscrypt/version.h
		5	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example.so
		6	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so
		7	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_blocking.so
		8	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_deviceid.so
		9	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_set_client_ip.so
		10	%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_logging.so
1	man/man8/dnscrypt-proxy.8.gz	11	man/man8/dnscrypt-proxy.8.gz
2	man/man8/hostip.8.gz	12	man/man8/hostip.8.gz
3	sbin/dnscrypt-proxy	13	sbin/dnscrypt-proxy
4	bin/hostip
5	%%DATADIR%%/dnscrypt-resolvers.csv	14	%%DATADIR%%/dnscrypt-resolvers.csv
6	%%DATADIR%%/minisign.pub	15	%%DATADIR%%/minisign.pub