Attachment 190506 Details for Bug 225821 – [NEW PORT] [PATCH] dns/dnscrypt-proxy2: Flexible DNS proxy with support for modern encrypted DNS protocols

[NEW PORT] [PATCH] dns/dnscrypt-proxy2: Flexible DNS proxy with support for modern encrypted DNS protocols

dns_dnscrypt-proxy2_diff.txt (text/plain), 14.84 KB, created by Vinícius Zavam on 2018-02-11 13:06:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2018-02-11 13:06:52 UTC

Size: 14.84 KB

patch

obsolete

>Index: dns/Makefile
>===================================================================
>--- dns/Makefile	(revision 461409)
>+++ dns/Makefile	(working copy)
>@@ -1,228 +1,229 @@
> # $FreeBSD$
> #
> 
>     COMMENT = Domain Name Service tools
> 
>     SUBDIR += adns
>     SUBDIR += adsuck
>     SUBDIR += ares
>     SUBDIR += autotrust
>     SUBDIR += axfr2acl
>     SUBDIR += bind-tools
>     SUBDIR += bind9-devel
>     SUBDIR += bind910
>     SUBDIR += bind911
>     SUBDIR += bind912
>     SUBDIR += bind99
>     SUBDIR += bindgraph
>     SUBDIR += bundy
>     SUBDIR += c-ares
>     SUBDIR += checkdns
>     SUBDIR += cli53
>     SUBDIR += credns
>     SUBDIR += crossip
>     SUBDIR += curvedns
>     SUBDIR += ddclient
>     SUBDIR += ddns
>     SUBDIR += denominator
>     SUBDIR += dhisd
>     SUBDIR += djbdns
>     SUBDIR += djbdns-tools
>     SUBDIR += dlint
>     SUBDIR += dnrd
>     SUBDIR += dns2blackhole
>     SUBDIR += dns2tcp
>     SUBDIR += dns_balance
>     SUBDIR += dnscap
>     SUBDIR += dnscheck
>     SUBDIR += dnscheckengine
>     SUBDIR += dnscrypt-proxy
>+    SUBDIR += dnscrypt-proxy2
>     SUBDIR += dnscrypt-wrapper
>     SUBDIR += dnsdbck
>     SUBDIR += dnsdist
>     SUBDIR += dnsenum
>     SUBDIR += dnsflood
>     SUBDIR += dnsforwarder
>     SUBDIR += dnshistory
>     SUBDIR += dnsjava
>     SUBDIR += dnsmasq
>     SUBDIR += dnsmasq-devel
>     SUBDIR += dnsmax-perl
>     SUBDIR += dnsperf
>     SUBDIR += dnsproxy
>     SUBDIR += dnsrecon
>     SUBDIR += dnsreflector
>     SUBDIR += dnstable
>     SUBDIR += dnstop
>     SUBDIR += dnstracer
>     SUBDIR += dnsutl
>     SUBDIR += dnsviz
>     SUBDIR += dnswalk
>     SUBDIR += dnswall
>     SUBDIR += doc
>     SUBDIR += dq
>     SUBDIR += drool
>     SUBDIR += dynip
>     SUBDIR += erlang-idna
>     SUBDIR += ez-ipupdate
>     SUBDIR += fastresolve
>     SUBDIR += firedns
>     SUBDIR += fpdns
>     SUBDIR += gdnsd
>     SUBDIR += gdnsd2
>     SUBDIR += gen6dns
>     SUBDIR += getdns
>     SUBDIR += ghtool
>     SUBDIR += hesiod
>     SUBDIR += hostdb
>     SUBDIR += hs-dns
>     SUBDIR += hs-gnuidn
>     SUBDIR += idnkit
>     SUBDIR += idnkit2
>     SUBDIR += inadyn
>     SUBDIR += inadyn-mt
>     SUBDIR += ipcheck
>     SUBDIR += ironsides
>     SUBDIR += kf5-kdnssd
>     SUBDIR += knot-resolver
>     SUBDIR += knot1
>     SUBDIR += knot2
>     SUBDIR += ldapdns
>     SUBDIR += ldns
>     SUBDIR += libasr
>     SUBDIR += libasr-devel
>     SUBDIR += libbind
>     SUBDIR += libdjbdns
>     SUBDIR += libidn
>     SUBDIR += libidn2
>     SUBDIR += libnspsl
>     SUBDIR += libpsl
>     SUBDIR += linux-c6-libasyncns
>     SUBDIR += linux-c7-libasyncns
>     SUBDIR += mDNSResponder_nss
>     SUBDIR += maradns
>     SUBDIR += mdnsd
>     SUBDIR += mydns
>     SUBDIR += mydns-ng
>     SUBDIR += noip
>     SUBDIR += nsd
>     SUBDIR += nslint
>     SUBDIR += nsnotifyd
>     SUBDIR += nsping
>     SUBDIR += nss_mdns
>     SUBDIR += nss_resinit
>     SUBDIR += opendd
>     SUBDIR += opendnssec
>     SUBDIR += opendnssec2
>     SUBDIR += openmdns
>     SUBDIR += openresolv
>     SUBDIR += p5-AnyEvent-CacheDNS
>     SUBDIR += p5-AnyEvent-DNS-EtcHosts
>     SUBDIR += p5-BIND-Conf_Parser
>     SUBDIR += p5-BIND-Config-Parser
>     SUBDIR += p5-DNS-Config
>     SUBDIR += p5-DNS-EasyDNS
>     SUBDIR += p5-DNS-Ldns
>     SUBDIR += p5-DNS-Zone
>     SUBDIR += p5-DNS-ZoneParse
>     SUBDIR += p5-Data-Validate-Domain
>     SUBDIR += p5-IO-Async-Resolver-DNS
>     SUBDIR += p5-Mozilla-PublicSuffix
>     SUBDIR += p5-Net-Amazon-Route53
>     SUBDIR += p5-Net-Bonjour
>     SUBDIR += p5-Net-DNS
>     SUBDIR += p5-Net-DNS-Async
>     SUBDIR += p5-Net-DNS-Check
>     SUBDIR += p5-Net-DNS-Codes
>     SUBDIR += p5-Net-DNS-Lite
>     SUBDIR += p5-Net-DNS-Match
>     SUBDIR += p5-Net-DNS-RR-SRV-Helper
>     SUBDIR += p5-Net-DNS-Resolver-Mock
>     SUBDIR += p5-Net-DNS-Resolver-Programmable
>     SUBDIR += p5-Net-DNS-SEC
>     SUBDIR += p5-Net-DNS-TestNS
>     SUBDIR += p5-Net-DNS-ToolKit
>     SUBDIR += p5-Net-DNS-Zone-Parser
>     SUBDIR += p5-Net-DNS-ZoneFile-Fast
>     SUBDIR += p5-Net-DNSBL-MultiDaemon
>     SUBDIR += p5-Net-DNSBL-Statistics
>     SUBDIR += p5-Net-DRI
>     SUBDIR += p5-Net-Domain-ExpireDate
>     SUBDIR += p5-Net-Domain-TLD
>     SUBDIR += p5-Net-LibIDN
>     SUBDIR += p5-Net-LibIDN2
>     SUBDIR += p5-Net-Nslookup
>     SUBDIR += p5-Net-RBLClient
>     SUBDIR += p5-Net-RNDC
>     SUBDIR += p5-POE-Component-Client-DNS
>     SUBDIR += p5-POE-Component-Client-DNS-Recursive
>     SUBDIR += p5-POE-Component-Client-DNSBL
>     SUBDIR += p5-POE-Component-Resolver
>     SUBDIR += p5-POE-Component-Server-DNS
>     SUBDIR += p5-POE-Filter-DNS-TCP
>     SUBDIR += p5-Stanford-DNSserver
>     SUBDIR += p5-Tie-DNS
>     SUBDIR += p5-URBL-Prepare
>     SUBDIR += p5-pgeodns
>     SUBDIR += packetq
>     SUBDIR += pdnsd
>     SUBDIR += pear-File_DNS
>     SUBDIR += pear-Horde_Idna
>     SUBDIR += pear-Net_DNS2
>     SUBDIR += powerdns
>     SUBDIR += powerdns-recursor
>     SUBDIR += powerdns-recursor40
>     SUBDIR += public_suffix_list
>     SUBDIR += py-dns
>     SUBDIR += py-dns-lexicon
>     SUBDIR += py-dnschain
>     SUBDIR += py-dnspython
>     SUBDIR += py-easyzone
>     SUBDIR += py-idna
>     SUBDIR += py-idnkit2
>     SUBDIR += py-ldns
>     SUBDIR += py-namebench
>     SUBDIR += py-publicsuffix
>     SUBDIR += py-py3dns
>     SUBDIR += py-pycares
>     SUBDIR += py-pydnstable
>     SUBDIR += py-pywdns
>     SUBDIR += py-tld
>     SUBDIR += py-tldextract
>     SUBDIR += radns
>     SUBDIR += rbldnsd
>     SUBDIR += rbllookup
>     SUBDIR += rbllookup-ng
>     SUBDIR += renewck
>     SUBDIR += rpsl2acl
>     SUBDIR += rubygem-dnsruby
>     SUBDIR += rubygem-idn-ruby
>     SUBDIR += rubygem-net-dns
>     SUBDIR += rubygem-public_suffix
>     SUBDIR += rubygem-public_suffix_service
>     SUBDIR += rubygem-simpleidn
>     SUBDIR += rubygem-validates_hostname
>     SUBDIR += samba-nsupdate
>     SUBDIR += scavenge
>     SUBDIR += sheerdns
>     SUBDIR += sleuth
>     SUBDIR += sshfp
>     SUBDIR += tinystats
>     SUBDIR += totd
>     SUBDIR += udns
>     SUBDIR += unbound
>     SUBDIR += updatedd
>     SUBDIR += validns
>     SUBDIR += vhostcname
>     SUBDIR += vizone
>     SUBDIR += void-zones-tools
>     SUBDIR += walker
>     SUBDIR += wdns
>     SUBDIR += whoseip
>     SUBDIR += wrapsrv
>     SUBDIR += yadifa
>     SUBDIR += zkt
>     SUBDIR += zonecheck
>     SUBDIR += zonenotify
> 
> .include <bsd.port.subdir.mk>
>Index: dns/dnscrypt-proxy/Makefile
>===================================================================
>--- dns/dnscrypt-proxy/Makefile	(revision 461409)
>+++ dns/dnscrypt-proxy/Makefile	(working copy)
>@@ -1,64 +1,66 @@
> # Created by: Leo Vandewoestijne <freebsd@dns-lab.com>
> # $FreeBSD$
> 
> PORTNAME=	dnscrypt-proxy
> PORTVERSION=	1.9.5
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	dns
> MASTER_SITES=	https://download.dnscrypt.org/dnscrypt-proxy/ \
> 		https://download.dnscrypt.org/dnscrypt-proxy/old/
> 
> MAINTAINER=	freebsd@dns-lab.com
> COMMENT=	Boost privacy and security of DNS
> 
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BROKEN_powerpc64=	fails to compile: fpst.c: error: redefinition of typedef 'FPST'
> 
> LIB_DEPENDS=	libsodium.so:security/libsodium
> 
>+CONFLICTS=	dnscrypt-proxy2-[2-9]*
>+
> USERS=		_dnscrypt-proxy
> GROUPS=		_dnscrypt-proxy
> 
> GNU_CONFIGURE=	yes
> USES=		gmake
> 
> INSTALL_TARGET=	install-strip
> 
> PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README* THANKS
> 
> OPTIONS_DEFINE=	DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT
> OPTIONS_SINGLE=	RCWHICH
> OPTIONS_SINGLE_RCWHICH=	RCSINGLE RCMULTI
> OPTIONS_DEFAULT=	PLUGINS RCSINGLE
> OPTIONS_SUB=	yes
> 
> PLUGINS_RELAXED_DESC=	Allow loading plugins owned by other users
> PLUGINS_ROOT_DESC=	Only load plugins sitting in the default plugins directory
> RCWHICH_DESC=	Rc script to use:
> RCSINGLE_DESC=	Use default rc script for single daemon
> RCMULTI_DESC=	Use experimental rc script for multiple instances
> 
> PLUGINS_CONFIGURE_ENABLE=	plugins
> PLUGINS_LIB_DEPENDS=	libltdl.so:devel/libltdl \
> 		libldns.so:dns/ldns
> 
> PLUGINS_USE=	LDCONFIG=${PREFIX}/lib/dnscrypt-proxy
> PLUGINS_USES=	libtool
> PLUGINS_RELAXED_CONFIGURE_ENABLE=	relaxed-plugins-permissions
> PLUGINS_ROOT_CONFIGURE_ENABLE=	plugins-root
> 
> RCSINGLE_VARS=	USE_RC_SUBR=${PORTNAME}
> RCSINGLE_SUB_FILES=	pkg-message
> RCMULTI_VARS=	USE_RC_SUBR=${PORTNAME}_multi
> RCMULTI_SUB_FILES=	pkg-message_multi
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_MAN} ${WRKSRC}/man/dnscrypt-proxy.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> 	${INSTALL_MAN} ${WRKSRC}/man/hostip.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> 	${MV} ${STAGEDIR}${PREFIX}/etc/dnscrypt-proxy.conf ${STAGEDIR}${PREFIX}/etc/dnscrypt-proxy.conf.sample
> 
> .include <bsd.port.mk>
>Index: dns/dnscrypt-proxy2/Makefile
>===================================================================
>--- dns/dnscrypt-proxy2/Makefile	(nonexistent)
>+++ dns/dnscrypt-proxy2/Makefile	(working copy)
>@@ -0,0 +1,47 @@
>+# $FreeBSD$
>+
>+PORTNAME=	dnscrypt-proxy
>+PORTVERSION=	2.0.0
>+CATEGORIES=	dns security
>+PKGNAMESUFFIX=	2
>+
>+MAINTAINER=	egypcio@googlemail.com
>+COMMENT=	Flexible DNS proxy with support for modern encrypted DNS protocols
>+
>+LICENSE=	ISCL
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+BUILD_DEPENDS=	go:lang/go
>+RUN_DEPENDS=	ca_root_nss>=3.35:security/ca_root_nss
>+
>+PORTDOCS=	${WRKSRC}/README.*
>+PORTEXAMPLES=	${WRKSRC}/${PORTNAME}/example*
>+
>+CONFLICTS=	dnscrypt-proxy-[0-1]*
>+
>+SUB_FILES=	pkg-message
>+
>+USE_RC_SUBR=	${PORTNAME}
>+
>+USE_GITHUB=	yes
>+
>+GH_ACCOUNT=	jedisct1
>+
>+do-build:
>+	${RLN} ${WRKSRC}/vendor ${WRKSRC}/src
>+	cd ${WRKSRC}/${PORTNAME} && \
>+		${SETENV} GOPATH=${WRKSRC} \
>+		go build -ldflags "-s -w" -o ${WRKDIR}/sbin/${PORTNAME}
>+do-install:
>+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_PROGRAM} ${WRKDIR}/sbin/${PORTNAME} ${STAGEDIR}${LOCALBASE}/sbin/.
>+	${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/.
>+	${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/.
>+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/example-${PORTNAME}.toml \
>+		${STAGEDIR}${LOCALBASE}/etc/${PORTNAME}.toml
>+
>+post-install:
>+	${REINPLACE_CMD} -e 's|require_dnssec\ \=\ false|require_dnssec\ \=\ true|g' \
>+		${STAGEDIR}${LOCALBASE}/etc/${PORTNAME}.toml
>+
>+.include <bsd.port.mk>
>
>Property changes on: dns/dnscrypt-proxy2/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dnscrypt-proxy2/distinfo
>===================================================================
>--- dns/dnscrypt-proxy2/distinfo	(nonexistent)
>+++ dns/dnscrypt-proxy2/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1518269475
>+SHA256 (jedisct1-dnscrypt-proxy-2.0.0_GH0.tar.gz) = afc280613269b1f5e9c581c23d648884218974f7e7e1a25c8a1309197d67e358
>+SIZE (jedisct1-dnscrypt-proxy-2.0.0_GH0.tar.gz) = 725490
>
>Property changes on: dns/dnscrypt-proxy2/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dnscrypt-proxy2/files/dnscrypt-proxy.in
>===================================================================
>--- dns/dnscrypt-proxy2/files/dnscrypt-proxy.in	(nonexistent)
>+++ dns/dnscrypt-proxy2/files/dnscrypt-proxy.in	(working copy)
>@@ -0,0 +1,32 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+# PROVIDE: dnscrypt_proxy
>+# REQUIRE: cleanvar SERVERS
>+# BEFORE:  dnsmasq local_unbound unbound named
>+#
>+# These are some lines to configure dnscrypt-proxy on /etc/rc.conf:
>+#
>+# dnscrypt_proxy_enable	(bool):	Enable service on boot.	Default: NO
>+# dnscrypt_proxy_conf	(str):	Config file to use.	Default: %%PREFIX%%/etc/dnscrypt-proxy.toml
>+# dnscrypt_proxy_log	(str):	Log notice/warns here.	Default: /var/log/dnscrypt-proxy.log
>+#
>+
>+. /etc/rc.subr
>+
>+name="dnscrypt_proxy"
>+rcvar="dnscrypt_proxy_enable"
>+pidfile="/var/run/dnscrypt-proxy.pid"
>+procname="%%PREFIX%%/sbin/dnscrypt-proxy"
>+
>+load_rc_config $name
>+
>+: ${dnscrypt_proxy_enable:=NO}
>+: ${dnscrypt_proxy_conf:=%%PREFIX%%/etc/dnscrypt-proxy.toml}
>+: ${dnscrypt_proxy_log:=/var/log/dnscrypt-proxy.log}
>+
>+command="/usr/sbin/daemon"
>+command_args="-P ${pidfile} -r -f ${procname} -config ${dnscrypt_proxy_conf} -logfile ${dnscrypt_proxy_log}"
>+
>+run_rc_command "$1"
>
>Property changes on: dns/dnscrypt-proxy2/files/dnscrypt-proxy.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dnscrypt-proxy2/files/pkg-message.in
>===================================================================
>--- dns/dnscrypt-proxy2/files/pkg-message.in	(nonexistent)
>+++ dns/dnscrypt-proxy2/files/pkg-message.in	(working copy)
>@@ -0,0 +1,9 @@
>+
>+This port comes all working "out of the box". It is using random resolvers.
>+
>+To enable dnscrypt-proxy at boot:
>+
>+  # sysrc dnscrypt_proxy_enable=YES
>+
>+dnscrypt-proxy is set to use resolvers offering DNSSEC by default!
>+
>
>Property changes on: dns/dnscrypt-proxy2/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dnscrypt-proxy2/pkg-descr
>===================================================================
>--- dns/dnscrypt-proxy2/pkg-descr	(nonexistent)
>+++ dns/dnscrypt-proxy2/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+A flexible DNS proxy, with support for modern encrypted DNS protocols 
>+  such as DNSCrypt v2 and DNS-over-HTTP/2.
>+
>+WWW: https://github.com/jedisct1/dnscrypt-proxy
>
>Property changes on: dns/dnscrypt-proxy2/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dnscrypt-proxy2/pkg-plist
>===================================================================
>--- dns/dnscrypt-proxy2/pkg-plist	(nonexistent)
>+++ dns/dnscrypt-proxy2/pkg-plist	(working copy)
>@@ -0,0 +1,7 @@
>+@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-blacklist.txt
>+@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-cloaking-rules.txt
>+@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-dnscrypt-proxy.toml
>+@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-forwarding-rules.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+etc/dnscrypt-proxy.toml
>+sbin/dnscrypt-proxy
>
>Property changes on: dns/dnscrypt-proxy2/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 225821: 190506 | 190507