Attachment #187799 for bug #223222





PORTNAME=	dnscrypt-proxy
PORTVERSION=	1.9.5
PORTREVISION=	3
CATEGORIES=	dns
MASTER_SITES=	https://download.dnscrypt.org/dnscrypt-proxy/ \
		http://download.dnscrypt.org/dnscrypt-proxy/ \


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_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_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}




#
# Add the following lines to /etc/rc.conf to enable dnscrypt-proxy:
#
# dnscrypt_proxy_enable (bool):	  Set to NO by default.
#				  Set to YES to enable dnscrypt-proxy.
# dnscrypt_proxy_conf (str):	  Unset by default. Will override all other
#				  settings and only use the config file.
# dnscrypt_proxy_uid (str):	  Set to "_dnscrypt-proxy" by default.
#				  User to switch to after starting.
# dnscrypt_proxy_resolver (str):  Set to "random" by default.
#				  Better select one of your own choise.
# dnscrypt_proxy_pidfile (str):	  default: "/var/run/dnscrypt-proxy.pid"
#				  Location of pid file.
# dnscrypt_proxy_logfile (str):	  default: "/var/log/dnscrypt-proxy.log"
#				  Location of log file.
#
# To redirect a local resolver through dnscrypt-proxy, point it at 127.0.0.2
# and add the following to rc.conf:

load_rc_config ${name}

: ${dnscrypt_proxy_enable:=NO}
: ${dnscrypt_proxy_uid=_dnscrypt-proxy}			# User to run daemon as
: ${dnscrypt_proxy_resolver=random}			# Resolver to use
: ${dnscrypt_proxy_pidfile=/var/run/dnscrypt-proxy.pid}	# Path to pid file
: ${dnscrypt_proxy_logfile=/var/log/dnscrypt-proxy.log}	# Path to log file

command=%%PREFIX%%/sbin/dnscrypt-proxy
if [ ${dnscrypt_proxy_conf} ]; then




# Add the following lines to /etc/rc.conf to enable dnscrypt-proxy:
#
# dnscrypt_proxy_instances (str): Set to "dnscrypt_proxy" by default.
#				  List of dnscrypt_proxy instance id's,
#				  e.g. "dnscrypt_proxy_1 dnscrypt_proxy_2", etc.
# {instance_id}_enable (bool):	  Set to NO by default.
#				  Set to YES to enable dnscrypt-proxy.
# {instance_id}_uid (str):	  Set to "_dnscrypt-proxy" by default.
#				  User to switch to after starting.
# {instance_id}_resolver (str):	  Set to "random" by default.
#				  Better select your own choises.
# {instance_id}_pidfile (str):	  default: "/var/run/dnscrypt-proxy.pid"
#				  Location of pid file.
# {instance_id}_logfile (str):	  default: "/var/log/dnscrypt-proxy.log"
#				  Location of log file.
#
# To redirect a local resolver through dnscrypt-proxy, point it at 127.0.0.2
# and add the following to rc.conf:

    eval dnscrypt_proxy_pidfile_tmp=\${${i}_pidfile}
    eval dnscrypt_proxy_logfile_tmp=\${${i}_logfile}

:   ${dnscrypt_proxy_uid_tmp:=_dnscrypt-proxy}		# User to run daemon as
:   ${dnscrypt_proxy_resolver_tmp:=random}		# 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

    command_args="-d -p ${dnscrypt_proxy_pidfile_tmp} -l ${dnscrypt_proxy_logfile_tmp} -u ${dnscrypt_proxy_uid_tmp} -R ${dnscrypt_proxy_resolver_tmp}"






This port/software comes all 'working out of the box'.

By default this port is using random resolvers. Better select your own choise.

To enable dnscrypt-proxy at boot:
  sysrc dnscrypt_proxy_enable=YES
  sysrc dnscrypt_proxy_flags='-a 127.0.0.2'
or:
  sysrc dnscrypt_proxy_enable=YES
  sysrc dnscrypt_proxy_conf="/usr/local/etc/dnscrypt-proxy.conf"
sysrc dnscrypt_proxy_enable=YES
sysrc dnscrypt_proxy_conf="/usr/local/etc/dnscrypt-proxy.conf"


** You cannot mix the config file with the other rc.conf flags / settings. **

Be sure to setup the IP address/alias, so dnscrypt-proxy can bind correctly.

To view available options, run:
  %%PREFIX%%/sbin/dnscrypt-proxy --help
or read the manual:
  man dnscrypt-proxy

**************************************************
*                                                *
*    You can't mix the config file option with   *
* other options or flags/settings on the rc.conf *
*                                                *
**************************************************





This port/software comes all 'working out of the box'.

By default this port is using random resolvers. Better select your own choises.

To enable dnscrypt-proxy at boot:
  sysrc dnscrypt_proxy_enable=YES
  sysrc dnscrypt_proxy_instances="dnscrypt_proxy_1 dnscrypt_proxy_2" # etc.
  sysrc dnscrypt_proxy_1_resolver=soltysiak
  sysrc dnscrypt_proxy_1_flags="-a 127.0.0.2"
  sysrc dnscrypt_proxy_2_resolver=okturtles
  sysrc dnscrypt_proxy_2_flags="-a 127.0.0.3"

Be sure to setup above IP addresses, so dnscrypt-proxy can bind correctly.

To view available options, run:
  %%PREFIX%%/sbin/dnscrypt-proxy --help
or read the manual:
  man dnscrypt-proxy

**************************************************
*                                                *
*    You can't mix the config file option with   *
* other options or flags/settings on the rc.conf *
*                                                *
**************************************************


Lines 11-17 Link Here

(-)dns/dnscrypt-proxy/pkg-descr (-3 / +3 lines)
11	It also provides some confidentiality to DNS queries.	11	It also provides some confidentiality to DNS queries.
12		12
13	Reference links:	13	Reference links:
14	1. https://www.opendns.com/technology/dnscrypt/	14	1. https://www.opendns.com/about/innovations/dnscrypt/
15	2. http://dnscurve.org	15	2. https://dnscurve.org
16		16
17	WWW: http://dnscrypt.org	17	WWW: https://dnscrypt.org

Return to bug 223222

Lines 3-9 Link Here

(-)dns/dnscrypt-proxy/Makefile (-22 / +23 lines)
3		3
4	PORTNAME= dnscrypt-proxy	4	PORTNAME= dnscrypt-proxy
5	PORTVERSION= 1.9.5	5	PORTVERSION= 1.9.5
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= dns	7	CATEGORIES= dns
8	MASTER_SITES= https://download.dnscrypt.org/dnscrypt-proxy/ \	8	MASTER_SITES= https://download.dnscrypt.org/dnscrypt-proxy/ \
9	http://download.dnscrypt.org/dnscrypt-proxy/ \	9	http://download.dnscrypt.org/dnscrypt-proxy/ \
Lines 29-56 Link Here
29		29
30	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS	30	PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS
31		31
32	OPTIONS_DEFINE= DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT	32	OPTIONS_DEFINE= DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT
33	OPTIONS_SINGLE= RCWHICH	33	OPTIONS_SINGLE= RCWHICH
34	OPTIONS_SINGLE_RCWHICH= RCSINGLE RCMULTI	34	OPTIONS_SINGLE_RCWHICH= RCSINGLE RCMULTI
35	OPTIONS_DEFAULT= PLUGINS RCSINGLE	35	OPTIONS_DEFAULT= PLUGINS RCSINGLE
36	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
37		37
38	PLUGINS_CONFIGURE_ENABLE= plugins	38	PLUGINS_CONFIGURE_ENABLE= plugins
39	PLUGINS_LIB_DEPENDS= libltdl.so:devel/libltdl \	39	PLUGINS_LIB_DEPENDS= libltdl.so:devel/libltdl \
40	libldns.so:dns/ldns	40	libldns.so:dns/ldns
41	PLUGINS_USE= LDCONFIG=${PREFIX}/lib/dnscrypt-proxy	41	PLUGINS_USE= LDCONFIG=${PREFIX}/lib/dnscrypt-proxy
42	PLUGINS_USES= libtool	42	PLUGINS_USES= libtool
43	PLUGINS_RELAXED_DESC= Allow loading plugins owned by other users	43	PLUGINS_RELAXED_DESC= Allow loading plugins owned by other users
44	PLUGINS_RELAXED_CONFIGURE_ENABLE= relaxed-plugins-permissions	44	PLUGINS_RELAXED_CONFIGURE_ENABLE= relaxed-plugins-permissions
45	PLUGINS_ROOT_DESC= Only load plugins sitting in the default plugins directory	45	PLUGINS_ROOT_DESC= Only load plugins sitting in the default plugins directory
46	PLUGINS_ROOT_CONFIGURE_ENABLE= plugins-root	46	PLUGINS_ROOT_CONFIGURE_ENABLE= plugins-root
47	RCWHICH_DESC= Rc script to use:	47
48	RCSINGLE_DESC= Use default rc script for single daemon	48	RCWHICH_DESC= Rc script to use:
49	RCSINGLE_VARS= USE_RC_SUBR=${PORTNAME}	49	RCSINGLE_DESC= Use default rc script for single daemon
50	RCSINGLE_SUB_FILES= pkg-message	50	RCSINGLE_VARS= USE_RC_SUBR=${PORTNAME}
51	RCMULTI_DESC= Use experimental rc script for multiple instances	51	RCSINGLE_SUB_FILES= pkg-message
52	RCMULTI_VARS= USE_RC_SUBR=${PORTNAME}_multi	52	RCMULTI_DESC= Use experimental rc script for multiple instances
53	RCMULTI_SUB_FILES= pkg-message_multi	53	RCMULTI_VARS= USE_RC_SUBR=${PORTNAME}_multi
		54	RCMULTI_SUB_FILES= pkg-message_multi
54		55
55	post-install:	56	post-install:
56	@${MKDIR} ${STAGEDIR}${DOCSDIR}	57	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 9-26 Link Here

(-)dns/dnscrypt-proxy/files/dnscrypt-proxy.in (-16 / +16 lines)
9	#	9	#
10	# Add the following lines to /etc/rc.conf to enable dnscrypt-proxy:	10	# Add the following lines to /etc/rc.conf to enable dnscrypt-proxy:
11	#	11	#
12	# dnscrypt_proxy_enable (bool): Set to NO by default.	12	# dnscrypt_proxy_enable (bool): Set to NO by default.
13	# Set to YES to enable dnscrypt-proxy.	13	# Set to YES to enable dnscrypt-proxy.
14	# dnscrypt_proxy_conf (str): Unset by default. Will override all other	14	# dnscrypt_proxy_conf (str): Unset by default. Will override all other
15	# settings and only use the config file.	15	# settings and only use the config file.
16	# dnscrypt_proxy_uid (str): Set to "_dnscrypt-proxy" by default.	16	# dnscrypt_proxy_uid (str): Set to "_dnscrypt-proxy" by default.
17	# User to switch to after starting.	17	# User to switch to after starting.
18	# dnscrypt_proxy_resolver (str):Set to "cisco" by default.	18	# dnscrypt_proxy_resolver (str): Set to "random" by default.
19	# Choose a different upstream resolver.	19	# Better select one of your own choise.
20	# dnscrypt_proxy_pidfile (str): default: "/var/run/dnscrypt-proxy.pid"	20	# dnscrypt_proxy_pidfile (str): default: "/var/run/dnscrypt-proxy.pid"
21	# Location of pid file.	21	# Location of pid file.
22	# dnscrypt_proxy_logfile (str): default: "/var/log/dnscrypt-proxy.log"	22	# dnscrypt_proxy_logfile (str): default: "/var/log/dnscrypt-proxy.log"
23	# Location of log file.	23	# Location of log file.
24	#	24	#
25	# To redirect a local resolver through dnscrypt-proxy, point it at 127.0.0.2	25	# To redirect a local resolver through dnscrypt-proxy, point it at 127.0.0.2
26	# and add the following to rc.conf:	26	# and add the following to rc.conf:
Lines 35-44 Link Here
35	load_rc_config ${name}	35	load_rc_config ${name}
36		36
37	: ${dnscrypt_proxy_enable:=NO}	37	: ${dnscrypt_proxy_enable:=NO}
38	: ${dnscrypt_proxy_uid=_dnscrypt-proxy} # User to run daemon as	38	: ${dnscrypt_proxy_uid=_dnscrypt-proxy} # User to run daemon as
39	: ${dnscrypt_proxy_resolver=cisco} # resolver to use	39	: ${dnscrypt_proxy_resolver=random} # Resolver to use
40	: ${dnscrypt_proxy_pidfile=/var/run/dnscrypt-proxy.pid} # Path to pid file	40	: ${dnscrypt_proxy_pidfile=/var/run/dnscrypt-proxy.pid} # Path to pid file
41	: ${dnscrypt_proxy_logfile=/var/log/dnscrypt-proxy.log} # Path to log file	41	: ${dnscrypt_proxy_logfile=/var/log/dnscrypt-proxy.log} # Path to log file
42		42
43	command=%%PREFIX%%/sbin/dnscrypt-proxy	43	command=%%PREFIX%%/sbin/dnscrypt-proxy
44	if [ ${dnscrypt_proxy_conf} ]; then	44	if [ ${dnscrypt_proxy_conf} ]; then

Lines 1-22 Link Here

(-)dns/dnscrypt-proxy/files/pkg-message.in (-14 / +17 lines)
1		1
2	This port/software comes all 'working out of the box'.	2	This port/software comes all 'working out of the box'.
3		3
4	By default this port is using OpenDNS' resolvers, other services are possible.	4	By default this port is using random resolvers. Better select your own choise.
5		5
6	To enable dnscrypt-proxy at boot:	6	To enable dnscrypt-proxy at boot:
7	sysrc dnscrypt_proxy_enable=YES	7	sysrc dnscrypt_proxy_enable=YES
8	sysrc dnscrypt_proxy_flags='-a 127.0.0.2'	8	sysrc dnscrypt_proxy_flags='-a 127.0.0.2'
9		9	or:
10	or	10	sysrc dnscrypt_proxy_enable=YES
11		11	sysrc dnscrypt_proxy_conf="/usr/local/etc/dnscrypt-proxy.conf"
12	sysrc dnscrypt_proxy_enable=YES
13	sysrc dnscrypt_proxy_conf="/usr/local/etc/dnscrypt-proxy.conf"
14
15
16	You cannot mix the config file with the other rc.conf flags / settings.
17		12
		13	Be sure to setup the IP address/alias, so dnscrypt-proxy can bind correctly.
18		14
19	To view available options, run:	15	To view available options, run:
20	%%PREFIX%%/sbin/dnscrypt-proxy --help	16	%%PREFIX%%/sbin/dnscrypt-proxy --help
21	or read the manual: `man dnscrypt-proxy`	17	or read the manual:
22		18	man dnscrypt-proxy
		19
		20	**************************************************
		21	* *
		22	* You can't mix the config file option with *
		23	* other options or flags/settings on the rc.conf *
		24	* *
		25	**************************************************

Lines 1-19 Link Here

(-)dns/dnscrypt-proxy/files/pkg-message_multi.in (-11 / +19 lines)
1		1
2	This port/software comes all 'working out of the box'.	2	This port/software comes all 'working out of the box'.
3		3
4	By default this port is using OpenDNS' resolvers, other services are possible.	4	By default this port is using random resolvers. Better select your own choises.
5		5
6	To enable dnscrypt-proxy at boot:	6	To enable dnscrypt-proxy at boot:
7	echo dnscrypt_proxy_enable=\"YES\" >> /etc/rc.conf	7	sysrc dnscrypt_proxy_enable=YES
8	echo dnscrypt_proxy_instances=\"dnscrypt_proxy_1 dnscrypt_proxy_2 dnscrypt_proxy_3\" >> /etc/rc.conf	8	sysrc dnscrypt_proxy_instances="dnscrypt_proxy_1 dnscrypt_proxy_2" # etc.
9	echo dnscrypt_proxy_1_resolver=\"soltysiak\" >> /etc/rc.conf	9	sysrc dnscrypt_proxy_1_resolver=soltysiak
10	echo dnscrypt_proxy_1_flags=\"-a 127.0.0.2\" >> /etc/rc.conf	10	sysrc dnscrypt_proxy_1_flags="-a 127.0.0.2"
11	echo dnscrypt_proxy_2_resolver=\"okturtles\" >> /etc/rc.conf	11	sysrc dnscrypt_proxy_2_resolver=okturtles
12	echo dnscrypt_proxy_2_flags=\"-a 127.0.0.3\" >> /etc/rc.conf	12	sysrc dnscrypt_proxy_2_flags="-a 127.0.0.3"
13	echo dnscrypt_proxy_3_resolver=\"cypherpunk\" >> /etc/rc.conf	13
14	echo dnscrypt_proxy_3_flags=\"-a 127.0.0.4\" >> /etc/rc.conf	14	Be sure to setup above IP addresses, so dnscrypt-proxy can bind correctly.
15		15
16	To view available options, run:	16	To view available options, run:
17	%%PREFIX%%/sbin/dnscrypt-proxy --help	17	%%PREFIX%%/sbin/dnscrypt-proxy --help
18	or read the manual: `man dnscrypt-proxy`	18	or read the manual:
		19	man dnscrypt-proxy
		20
		21	**************************************************
		22	* *
		23	* You can't mix the config file option with *
		24	* other options or flags/settings on the rc.conf *
		25	* *
		26	**************************************************
19		27