[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Patrice Clement]

commit:     77fd2070512923b418b55bdd45dca8cfc797332d
Author:     soredake <fdsfgs <AT> krutt <DOT> org>
AuthorDate: Tue Mar 28 20:13:39 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 21:24:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd2070

net-dns/dnscrypt-proxy: clean up old.

Closes: https://github.com/gentoo/gentoo/pull/4320

 net-dns/dnscrypt-proxy/Manifest                    |  5 --
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild | 42 --------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild | 42 --------------
 .../dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild  | 57 -------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild | 57 -------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild | 57 -------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild | 57 -------------------
 .../files/dnscrypt-proxy.confd-1.6.0-r1            | 13 -----
 .../files/dnscrypt-proxy.initd-1.6.0-r1            | 59 --------------------
 .../files/dnscrypt-proxy.initd-1.6.1               | 64 ----------------------
 10 files changed, 453 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index abfc5a7fef2..ffe882a34a7 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,6 +1 @@
-DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
-DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
-DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
-DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18
-DIST dnscrypt-proxy-1.7.0.tar.gz 1714401 SHA256 be9827f66401f38fd4bdb372046eff9b5802ab5f3d188878a0dcd7bd20074c09 SHA512 611d9cd9d9c086ec8e2b60f6c574451eae71ea07de85973049be7090cfbd8bf790d41f8a4a2b39d74091fba7091551967b93b85a8661c03ecad43d868df597a3 WHIRLPOOL 0c3902bfcc3571175f0f8638327cbaf5eada512565f214232732d14dc6a83f55a0babedd68007cbaeec1b584bcb1d3cc621df8b07638bacfe5893c6222d12997
 DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 SHA256 40543efbcd56033ac03a1edf4581305e8c9bed4579ac55e6279644f07c315307 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0 WHIRLPOOL 4e9494c2765ecf9d625f7b44c0f58c40e491e1334a58552111730ecd3b95cba10667b2bfa2b29e291ccfa97a5678bbbc398dd14e888914bfddc6f7e61bac4a3a

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild
deleted file mode 100644
index 36ff8103838..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="http://dnscrypt.org/"
-SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins ldns systemd"
-
-DEPEND="dev-libs/libsodium
-	ldns? ( net-libs/ldns )"
-RDEPEND="${DEPEND}
-	systemd? ( sys-apps/systemd )"
-
-DOCS=( AUTHORS ChangeLog COPYING NEWS README.markdown README-PLUGINS.markdown
-	TECHNOTES THANKS )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd )
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild
deleted file mode 100644
index 5af435bbe77..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="http://dnscrypt.org/"
-SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins ldns systemd"
-
-DEPEND="dev-libs/libsodium
-	ldns? ( net-libs/ldns )"
-RDEPEND="${DEPEND}
-	systemd? ( sys-apps/systemd )"
-
-DOCS=( AUTHORS ChangeLog COPYING NEWS README.markdown README-PLUGINS.markdown
-	TECHNOTES THANKS )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd )
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
deleted file mode 100644
index 7935118328c..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="http://dnscrypt.org/"
-SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins systemd"
-
-CDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-1.6.0-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
deleted file mode 100644
index b1beb34c0c4..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="http://dnscrypt.org/"
-SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins systemd"
-
-CDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
deleted file mode 100644
index 142a3acf682..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="http://dnscrypt.org/"
-SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins systemd"
-
-CDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild
deleted file mode 100644
index a136524376e..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="https://dnscrypt.org/"
-SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+plugins systemd"
-
-CDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable plugins) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
deleted file mode 100644
index 5b1b28dd5ab..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DNSCRYPT_LOCALIP=127.0.0.1
-DNSCRYPT_LOCALPORT=53
-DNSCRYPT_USER=dnscrypt
-DNSCRYPT_OPTIONS="--ephemeral-keys"
-# Pick exactly ONE of the following sets:
-# option 1) selection from CSV file, uses the first column as the key
-DNSCRYPT_RESOLVER_NAME=cisco # Cisco OpenDNS
-DNSCRYPT_RESOLVERS_LIST=/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
-# option 2) manually specified parameters
-#DNSCRYPT_RESOLVERIP=203.0.133.53
-#DNSCRYPT_RESOLVERPORT=443
-#DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.example.com
-#DNSCRYPT_PROVIDER_KEY=1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7:1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
deleted file mode 100644
index db5e3223132..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
-DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
-
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-runas_user=${runas_user:-dnscrypt}
-runas_group=${runas_user:-dnscrypt}
-
-depend() {
-	use net
-	before dns
-	after logger
-}
-
-start() {
-	if [ ! -d "${rundir}" ]; then
-		mkdir "${rundir}"
-		if [ -n "${runas_user}" ]; then
-			touch "${DNSCRYPT_LOGFILE}"
-			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
-			chown -R ${runas_user}:${runas_group} "${rundir}"
-		fi
-	fi
-
-	if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
-		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
-		return 1
-	elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
-		resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
-	elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
-		resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
-	else
-		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
-		return 1
-	fi
-
-	ebegin "Starting dnscrypt-proxy"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dnscrypt-proxy \
-		-- \
-		${DNSCRYPT_OPTIONS} \
-		--pidfile="${pidfile}" \
-		--logfile="${DNSCRYPT_LOGFILE}" \
-		--daemonize --user=${runas_user} \
-		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-		$resolver_opts
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dnscrypt-proxy"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
-	eend $?
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
deleted file mode 100644
index 453ab0b3149..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-syslog}
-DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
-
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-runas_user=${runas_user:-dnscrypt}
-runas_group=${runas_user:-dnscrypt}
-
-depend() {
-	use net
-	before dns
-	after logger
-}
-
-start() {
-	if [ ! -d "${rundir}" ]; then
-		mkdir "${rundir}"
-		if [ -n "${runas_user}" ]; then
-			touch "${DNSCRYPT_LOGFILE}"
-			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
-			chown -R ${runas_user}:${runas_group} "${rundir}"
-		fi
-	fi
-
-	if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
-		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
-		return 1
-	elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
-		resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
-	elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
-		resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
-	else
-		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
-		return 1
-	fi
-
-	if [[ "${DNSCRYPT_LOGFILE}" == "syslog" ]]; then
-		logopt="--syslog"
-	else
-		logopt="--logfile='${DNSCRYPT_LOGFILE}'"
-	fi
-	ebegin "Starting dnscrypt-proxy"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dnscrypt-proxy \
-		-- \
-		$logopt \
-		--pidfile="${pidfile}" \
-		--daemonize --user=${runas_user} \
-		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-		$resolver_opts \
-		${DNSCRYPT_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dnscrypt-proxy"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Sam James]

commit:     0ee20a4d2c987a374d7751091259e06caa6fc443
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 09:27:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 09:38:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee20a4d

net-dns/dnscrypt-proxy: drop 2.0.45, 2.1.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |   2 -
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild    | 105 ---------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild | 105 ---------------------
 .../dnscrypt-proxy-2.0.45-config-full-paths.patch  | 101 --------------------
 4 files changed, 313 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 28b447df6e50..d719871447cd 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1 @@
-DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
-DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029
 DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
deleted file mode 100644
index ffe2f5f05aa2..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
-
-inherit fcaps go-module systemd
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-else
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="pie"
-
-BDEPEND=">=dev-lang/go-1.13"
-RDEPEND="
-	acct-group/dnscrypt-proxy
-	acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
-)
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-src_test() {
-	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
-}
-
-src_install() {
-	pushd "${PN}" >/dev/null || die
-
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{allowed,blocked}-{ips.txt,names.txt}
-	doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	popd >/dev/null || die
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blocklist/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
deleted file mode 100644
index 2f8f698a764a..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
-
-inherit fcaps go-module systemd
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-else
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+pie"
-
-BDEPEND=">=dev-lang/go-1.13"
-RDEPEND="
-	acct-group/dnscrypt-proxy
-	acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
-)
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-src_test() {
-	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
-}
-
-src_install() {
-	pushd "${PN}" >/dev/null || die
-
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{allowed,blocked}-{ips.txt,names.txt}
-	doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	popd >/dev/null || die
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blocklist/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
deleted file mode 100644
index a871990deb9f..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
-+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-@@ -157,7 +157,7 @@ keepalive = 30
- ## This file is different from other log files, and will not be
- ## automatically rotated by the application.
- 
--# log_file = 'dnscrypt-proxy.log'
-+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
- 
- 
- ## When using a log file, only keep logs from the most recent launch.
-@@ -438,7 +438,7 @@ cache_neg_max_ttl = 600
-   ## Path to the query log file (absolute, or relative to the same directory as the config file)
-   ## Can be set to /dev/stdout in order to log to the standard output.
- 
--  # file = 'query.log'
-+  # file = '/var/log/dnscrypt-proxy/query.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -464,7 +464,7 @@ cache_neg_max_ttl = 600
- 
-   ## Path to the query log file (absolute, or relative to the same directory as the config file)
- 
--  # file = 'nx.log'
-+  # file = '/var/log/dnscrypt-proxy/nx.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -499,7 +499,7 @@ cache_neg_max_ttl = 600
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'blocked-names.log'
-+  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -527,7 +527,7 @@ cache_neg_max_ttl = 600
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'blocked-ips.log'
-+  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -555,7 +555,7 @@ cache_neg_max_ttl = 600
- 
-   ## Optional path to a file logging allowed queries
- 
--  # log_file = 'allowed-names.log'
-+  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -583,7 +583,7 @@ cache_neg_max_ttl = 600
- 
-   ## Optional path to a file logging allowed queries
- 
--  # log_file = 'allowed-ips.log'
-+  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
- 
-@@ -654,7 +654,7 @@ cache_neg_max_ttl = 600
- 
-   [sources.'public-resolvers']
-   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
--  cache_file = 'public-resolvers.md'
-+  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
-   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   refresh_delay = 72
-   prefix = ''
-@@ -663,7 +663,7 @@ cache_neg_max_ttl = 600
- 
-   [sources.'relays']
-   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
--  cache_file = 'relays.md'
-+  cache_file = '/var/cache/dnscrypt-proxy/relays.md'
-   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   refresh_delay = 72
-   prefix = ''
-@@ -673,7 +673,7 @@ cache_neg_max_ttl = 600
-   # [sources.quad9-resolvers]
-   # urls = ['https://www.quad9.net/quad9-resolvers.md']
-   # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
--  # cache_file = 'quad9-resolvers.md'
-+  # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
-   # prefix = 'quad9-'
- 
-   ## Another example source, with resolvers censoring some websites not appropriate for children
-@@ -681,7 +681,7 @@ cache_neg_max_ttl = 600
- 
-   #  [sources.'parental-control']
-   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
--  #  cache_file = 'parental-control.md'
-+  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
-   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Sam James]

commit:     dc5570c2c49db48832676e68f77fd4cb94596979
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 23:10:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 23:10:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5570c2

net-dns/dnscrypt-proxy: bump to 2.0.45

Closes: https://bugs.gentoo.org/763312
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |   1 +
 ...xy-9999.ebuild => dnscrypt-proxy-2.0.45.ebuild} |  13 +--
 net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild  |  13 +--
 .../dnscrypt-proxy-2.0.45-config-full-paths.patch  | 103 +++++++++++++++++++++
 4 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 1723c8920ad..0b2a4e38348 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
 DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992583999a6688d09a532f8c7c1ec6d285bd39893f66726da928f295056fd66cd756f4332f1ed21284ffa3d357ce355a08625 SHA512 009e2b669c1d6f6cd6b41f5e04d08735587f420dacdea8d422a3c12a62614c1ce1963deebca3af1f956070abd9ff5df9182cb27e31fa0fac8a95478739445801
+DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
similarity index 91%
copy from net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
copy to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
index 4f7ddaa4a1b..43359636f25 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -23,7 +23,6 @@ SLOT="0"
 IUSE="pie"
 
 BDEPEND=">=dev-lang/go-1.13"
-
 RDEPEND="
 	acct-group/dnscrypt-proxy
 	acct-user/dnscrypt-proxy
@@ -31,7 +30,9 @@ RDEPEND="
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
-PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+)
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
@@ -51,13 +52,13 @@ src_install() {
 
 	insinto /etc/dnscrypt-proxy
 	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
 	doins example-{cloaking-rules.txt,forwarding-rules.txt}
 
 	popd >/dev/null || die
 
 	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
+	doins -r "utils/generate-domains-blocklist/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 4f7ddaa4a1b..43359636f25 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -23,7 +23,6 @@ SLOT="0"
 IUSE="pie"
 
 BDEPEND=">=dev-lang/go-1.13"
-
 RDEPEND="
 	acct-group/dnscrypt-proxy
 	acct-user/dnscrypt-proxy
@@ -31,7 +30,9 @@ RDEPEND="
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
-PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+)
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
@@ -51,13 +52,13 @@ src_install() {
 
 	insinto /etc/dnscrypt-proxy
 	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
 	doins example-{cloaking-rules.txt,forwarding-rules.txt}
 
 	popd >/dev/null || die
 
 	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
+	doins -r "utils/generate-domains-blocklist/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
new file mode 100644
index 00000000000..86ca893440d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
@@ -0,0 +1,103 @@
+diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+index 12d9bde..0c7f3e1 100644
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -157,7 +157,7 @@ keepalive = 30
+ ## This file is different from other log files, and will not be
+ ## automatically rotated by the application.
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## When using a log file, only keep logs from the most recent launch.
+@@ -438,7 +438,7 @@ cache_neg_max_ttl = 600
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+   ## Can be set to /dev/stdout in order to log to the standard output.
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -464,7 +464,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -499,7 +499,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -527,7 +527,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -555,7 +555,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-names.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -583,7 +583,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging allowed queries
+ 
+-  # log_file = 'allowed-ips.log'
++  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+ 
+@@ -654,7 +654,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -663,7 +663,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'relays']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
+-  cache_file = 'relays.md'
++  cache_file = '/var/cache/dnscrypt-proxy/relays.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -673,7 +673,7 @@ cache_neg_max_ttl = 600
+   # [sources.quad9-resolvers]
+   # urls = ['https://www.quad9.net/quad9-resolvers.md']
+   # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  # cache_file = 'quad9-resolvers.md'
++  # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   # prefix = 'quad9-'
+ 
+   ## Another example source, with resolvers censoring some websites not appropriate for children
+@@ -681,7 +681,7 @@ cache_neg_max_ttl = 600
+ 
+   #  [sources.'parental-control']
+   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+ 

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Joonas Niilola]

commit:     9d089bfb421cfb2665aa0e13c497b89a21fb8842
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Wed Apr 29 01:28:14 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 10:15:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d089bfb

net-dns/dnscrypt-proxy: fix homepage

Move from upstream's old personal URL to new GitHub organisation.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15559
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild | 2 +-
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild | 2 +-
 net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild   | 2 +-
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service | 2 +-
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
index b5bda3db325..7bc0187ab8c 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
index 995396f0597..2a13bf21225 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index b5bda3db325..7bc0187ab8c 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index a0c7a1408c8..4e447cdd777 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=DNSCrypt-proxy client
-Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+Documentation=https://github.com/DNSCrypt/dnscrypt-proxy/wiki
 
 ## systemd sockets - Do not enable unless you are very familiar with the systemd socket activation mechanism.
 ## Always try without systemd sockets before reporting any issues related to speed, latency or reliability.

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
index ea38c90e8a5..8467b6f2970 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=DNSCrypt-proxy socket
-Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+Documentation=https://github.com/DNSCrypt/dnscrypt-proxy/wiki
 
 [Socket]
 ## Listen on TCP socket.

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Georgy Yakovlev]

commit:     8077d9109b40c48e57a5ad223e31225861e3fa49
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Tue Mar 24 19:20:39 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 20:49:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8077d910

net-dns/dnscrypt-proxy: Bump to 2.0.41

Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15091
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild    | 99 ++++++++++++++++++++++
 .../files/config-full-paths-r11.patch              | 74 ++++++++++++++++
 3 files changed, 174 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 3ff726cd60d..0fd119dfa6f 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST dnscrypt-proxy-2.0.33.tar.gz 2723092 BLAKE2B 26ed819f264c1a536b2e47d9ffa412097eba5c9597ad2a5e7ff7a485ad660aeb882c5ce527bb072a5f7b5782387ce1b72cc74400973f9cebd66a50bd2308d830 SHA512 5c6eb655aa70457889253cbf630e7e37011a461a7f181f0a667694d53146ad9dee88bbbf80c7db3187bba0054af2a63b7b5be1a229800b2566a9758e9d047429
 DIST dnscrypt-proxy-2.0.39.tar.gz 2814424 BLAKE2B 59be804a9c9641dd43e6b49e95c58c7d20dfdc940f2279a47a9ced707d1bbe64b1864c65feab2cada6c12945567ffd93478bd0a8129d40ea65c0fef50e5e90e4 SHA512 d4eacd8d1989b99d9932d66ef609948558af26f9db1fc37acd6b5609e2a410d20828e32f2b79f2f9fbdf822998af641aec20128e4c58233663929106e29d8e24
+DIST dnscrypt-proxy-2.0.41.tar.gz 2323421 BLAKE2B 572a0ad15df6c40d1738b296972584f5d8fe382ca3c0a05b4fc74e986e767a058227dda2127c843127bc0b90e8b7bbe17a5eaee42175f0b77e21160ac63f7a88 SHA512 26be163daa03633f2d76f1121fb1987e0155613bd84cbb2aad2ba0eedbd35ec0b393d1c1a0aaba47968b3a08bd0273ad929a164695ce35d2ebe05ce3b5f5dfd1

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
new file mode 100644
index 00000000000..e5403d4594b
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/DNSCrypt/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}

diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
new file mode 100644
index 00000000000..15247d42880
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
@@ -0,0 +1,74 @@
+--- dnscrypt-proxy-2.0.41/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ dnscrypt-proxy-2.0.41/dnscrypt-proxy/dnscrypt-proxy.toml
+@@ -142,7 +142,7 @@
+
+ ## log file for the application
+
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+
+
+ ## Use the system logger (syslog on Unix, Event Log on Windows)
+@@ -399,7 +399,7 @@
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+   ## On non-Windows systems, can be /dev/stdout to log to the standard output (also set log_files_max_size to 0)
+
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+
+
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -425,7 +425,7 @@
+
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+
+
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -460,7 +460,7 @@
+
+   ## Optional path to a file logging blocked queries
+
+-  # log_file = 'blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+
+
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -488,7 +488,7 @@
+
+   ## Optional path to a file logging blocked queries
+
+-  # log_file = 'ip-blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+
+
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -516,7 +516,7 @@
+
+   ## Optional path to a file logging whitelisted queries
+
+-  # log_file = 'whitelisted.log'
++  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
+
+
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -585,7 +585,7 @@
+
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   prefix = ''
+
+@@ -593,7 +593,7 @@
+
+   [sources.'relays']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
+-  cache_file = 'relays.md'
++  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Georgy Yakovlev]

commit:     b093ece9d5161f339a52855d7711c551b2743198
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 21:15:50 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 21:31:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b093ece9

net-dns/dnscrypt-proxy: bump to 2.0.31

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |   1 +
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild    | 101 +++++++++++++++++++++
 ...nscrypt-proxy.initd => dnscrypt-proxy.initd-r1} |   3 +-
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index af2a2a0c366..4fb0ec3f25c 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -3,3 +3,4 @@ DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad9
 DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef SHA512 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246
 DIST dnscrypt-proxy-2.0.28.tar.gz 2620245 BLAKE2B fe31dd6d8054c4ae3d5892aaef0c8362405e06dba6de32121d9dea5d64d396ec39b1cfa884d5587c21367bb1dc3c1a4b4f994c286d0b8cc2a8bdbd9d247d239e SHA512 45496a02bd19c94def17b621d0843cc93de4467e51ded4c20af91d9b5aa127529d85b8ff2473a88293c726611291a055d466a50258b7587da0e7d4ba7f0f366e
 DIST dnscrypt-proxy-2.0.29.tar.gz 2621844 BLAKE2B 3ebd02b3c9df9dcb41d27d38a9d9f64c01d98f7b1afee7a7c3b1dd3ef26b2104aae650e34ff1b5651007461ee75d28bcfbfa3c7e82c32532f36553740e3dcb50 SHA512 f02abe56e017153e7fc8b4a26b34c90f68554a1b32a16558c05e8113327896dbf7f81aa69c76fa823a4a0a697b4bb2089bdeb1237ad4ef3587121c2d4cdfe78c
+DIST dnscrypt-proxy-2.0.31.tar.gz 2640523 BLAKE2B cf2e2b5557e6fcf59d3d28978db6c5e46f6b7f58aa4c5ae423149ec2f557269e88846dc4f97c6f6f20ff013b14b61b20d2df750d6b07946606293778a31e0ca1 SHA512 500c800213b94bf8ecbea7493716de5fe41afd584c70844519f1f50827b94a28ec982f2c2b85f7a281dca58273ba968113beed6a965c62bb3dc47ab83d7a1629

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
new file mode 100644
index 00000000000..215c07210b2
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+DEPEND=">=dev-lang/go-1.12"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	# fixes $GOPATH/go.mod exists but should not
+	rm go.mod || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/${EGO_PN}" || die
+}
+
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
similarity index 88%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
index d81a36fc8f8..ce1d1175d70 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
@@ -1,11 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/dnscrypt-proxy"
 command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
 command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Georgy Yakovlev]

commit:     10f674c0ce76478e454a68cbc63cb043ad360169
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 01:21:45 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 01:22:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f674c0

net-dns/dnscrypt-proxy: fix logrotate file

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...rypt-proxy-2.0.25-r1.ebuild => dnscrypt-proxy-2.0.25-r2.ebuild} | 0
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate              | 7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
similarity index 100%
rename from net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r1.ebuild
rename to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
index dcc603284a8..ff58fbeab1e 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
@@ -1,5 +1,6 @@
 /var/log/dnscrypt-proxy/*.log {
-        copytruncate
-        missingok
-        notifempty
+	su dnscrypt-proxy dnscrypt-proxy
+	copytruncate
+	missingok
+	notifempty
 }

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Georgy Yakovlev]

commit:     8f622db8da37097481c9150f152fd2b2ed2b31ec
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 09:01:08 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 09:02:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f622db8

net-dns/dnscrypt-proxy: add logrotate file to live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild     | 3 +++
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 419d40281c6..721259c1364 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -62,6 +62,9 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
 
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
 	einstalldocs
 }
 

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
new file mode 100644
index 00000000000..dcc603284a8
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
@@ -0,0 +1,5 @@
+/var/log/dnscrypt-proxy/*.log {
+        copytruncate
+        missingok
+        notifempty
+}

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     e96a4982508fb1abd9eeedcc0f54c2378b1f72fa
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Wed Jun  6 16:49:17 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 18:03:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96a4982

net-dns/dnscrypt-proxy: bump to 2.0.15, tor aware

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8734

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild    | 97 ++++++++++++++++++++++
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd  |  1 +
 3 files changed, 99 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 2ce97ddf16a..358bffe9a86 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
 DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613
+DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
new file mode 100644
index 00000000000..5b04253b9c9
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt-proxy
+	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2 is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+		if [[ ${v} == 2.* ]] ; then
+			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+			elog "you can remove obsolete 'dnscrypt' accounts from the system"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
index 492b2fc2294..a8db66a6ecd 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
@@ -1,3 +1,4 @@
+#rc_use="tor"
 #DNSCRYPT_PROXY_OPTS="-config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
 #DNSCRYPT_PROXY_USER="dnscrypt-proxy"
 #DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     6e2f64cf60bce5c774ae7a0f1bbeb1ea10126f0b
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Wed Jun  6 15:53:41 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 11:10:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2f64cf

net-dns/dnscrypt-proxy: remove last rited version

Closes: https://bugs.gentoo.org/650464
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-dns/dnscrypt-proxy/Manifest                    |   1 -
 .../dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild  |  72 ------
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf   | 242 ---------------------
 .../dnscrypt-proxy/files/dnscrypt-proxy.confd-r1   |   1 -
 .../dnscrypt-proxy/files/dnscrypt-proxy.initd-r1   |  11 -
 .../dnscrypt-proxy/files/dnscrypt-proxy.service-r1 |  18 --
 .../dnscrypt-proxy/files/dnscrypt-proxy.socket-r1  |   9 -
 net-dns/dnscrypt-proxy/metadata.xml                |  10 +-
 8 files changed, 2 insertions(+), 362 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 581fc01b565..2ce97ddf16a 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1 @@
-DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
 DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild
deleted file mode 100644
index f72136ca55b..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="https://dnscrypt.org"
-SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="hardened libressl +plugins ssl systemd"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	net-libs/ldns
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable hardened pie) \
-		$(use_enable plugins) \
-		$(use_enable ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README* THANKS *txt )
-
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}.socket-r1 ${PN}.socket
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf /etc
-}
-
-pkg_preinst() {
-	# ship working default configuration for systemd users
-	if use systemd; then
-		sed -i 's/Daemonize yes/Daemonize no/g' "${D}"/etc/${PN}.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	use systemd && elog "with systemd dnscrypt-proxy ignores LocalAddress setting in the config file"
-	use systemd && elog "edit dnscrypt-proxy.socket if you need to change the defaults"
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
deleted file mode 100644
index 52487c09c87..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
+++ /dev/null
@@ -1,242 +0,0 @@
-######################################################
-#                                                    #
-#    Sample configuration file for dnscrypt-proxy    #
-#                                                    #
-######################################################
-
-
-############## Resolver settings ##############
-
-## [CHANGE THIS] Short name of the resolver to use
-## Usually the only thing you need to change in this configuration file.
-## This corresponds to the first column in the dnscrypt-resolvers.csv file.
-## Alternatively, "random" (without quotes) picks a random random resolver
-## accessible over IPv4, that doesn't log and supports DNSSEC.
-
-ResolverName random
-
-
-## Full path to the list of available DNSCrypt resolvers (dnscrypt-resolvers.csv)
-## An up-to-date list is available here:
-## https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv
-## and the dnscrypt-update-resolvers.sh script can be used in order to
-## automatically download and verify updates.
-
-ResolversList /usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
-
-
-## Manual settings, only for a custom resolver not present in the CSV file
-
-#ProviderName    2.dnscrypt.some.provider.name.tld
-#ProviderKey     0000:1111:2222:3333:4444:5555:6666:7777:8888:9999:AAAA:BBBB:CCCC:DDDD:EEEE:FFFF
-#ResolverAddress 111.222.333.444:56789
-
-
-
-############## Process options ##############
-
-## [NOT AVAILABLE ON WINDOWS] Run the proxy as a background process.
-## Unless you are using systemd, you probably want to change this to "yes"
-## after having verified that the rest of the configuration works as expected.
-
-Daemonize yes
-
-
-## Write the PID number to a file
-
-PidFile /run/dnscrypt-proxy.pid
-
-
-## [NOT AVAILABLE ON WINDOWS] Start the process, bind the required ports, and
-## run the server as a less-privileged system user.
-## The value for this parameter is a user name.
-
-User dnscrypt
-
-
-############## Network/protocol settings ##############
-
-## Local address and port to listen to.
-## A 127.0.0.x address is recommended for local use, but 0.0.0.0 or
-## a specific interface address can be used on a router, or to
-## configure a single machine to act as a DNS proxy for different
-## devices.
-## If the socket is created by systemd, the proxy cannot change the address
-## using this option. You should edit systemd's dnscrypt-proxy.socket file
-## instead.
-
-LocalAddress 127.0.0.1:53
-
-
-## Cache DNS responses to avoid outgoing traffic when the same queries
-## are repeated multiple times in a row.
-
-LocalCache on
-
-
-## Creates a new key pair for every query.
-## This prevents logging servers from correlating client public keys with
-## IP addresses. However, this option implies extra CPU load, and is not
-## very useful with trusted/non-logging servers.
-
-EphemeralKeys off
-
-
-## Maximum number of active requests waiting for a response.
-## Keep it reasonable relative to the expected number of clients.
-
-# MaxActiveRequests 250
-
-
-## This is the maximum payload size allowed when using the UDP protocol.
-## The default is safe, and rarely needs to be changed.
-
-# EDNSPayloadSize 1252
-
-
-## Ignore the time stamps when checking the certificates
-## Do not enable this option ever, unless you know that you need it.
-
-# IgnoreTimestamps no
-
-
-## Do not send queries using UDP. Only use TCP.
-## Even if some resolvers mitigate this, DNS over TCP is almost always slower
-## than UDP and doesn't offer additional security.
-## Only enable this option if UDP doesn't work on your network.
-
-# TCPOnly no
-
-
-## Forward queries for specific zones to one or more non-DNSCrypt resolvers.
-## For instance, this can be used to redirect queries for local domains to
-## the router, or queries for an internal domain to an internal DNS server.
-## Multiple whitespace-delimited zones and IP addresses can be specified.
-## Do not enable this unless you absolutely know you need it.
-## If you see useless queries to these zones, you'd better block them with
-## the BlackList feature instead of sending them in clear text to the router.
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-
-#Forward domains:"localdomain" to:"192.168.0.1"
-
-
-############## Logging ##############
-
-## Log the received DNS queries to a file, so you can watch in real-time what
-## is happening on the network.
-## The value for this parameter is a full path to the log file.
-## The file name can be prefixed with ltsv: in order to store logs using the
-## LTSV format (ex: ltsv:/tmp/dns-queries.log).
-
-# QueryLogFile /tmp/dns-queries.log
-
-
-## Log file to write server errors and information to.
-## If you use this tool for privacy, keeping logs of any kind is usually not
-## a good idea.
-
-# LogFile /var/log/dnscrypt-proxy.log
-
-
-## Don't log events with priority above this log level after the service has
-## been started up. Default is 6.
-## Valid values are between 0 (critical) to 7 (debug-level messages).
-
-# LogLevel 6
-
-
-## [NOT AVAILABLE ON WINDOWS] Send server logs to the syslog daemon
-## Log entries can optionally be prefixed with a string.
-
-Syslog       on
-# SyslogPrefix dnscrypt
-
-
-
-############## Local filtering ##############
-
-## If your network doesn't support IPv6, chances are that your
-## applications are still constantly trying to resolve IPv6 addresses,
-## causing unnecessary slowdowns.
-## This causes the proxy to immediately reply to IPv6 requests,
-## without having to send a useless request to upstream resolvers, and
-## having to wait for a response.
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-
-BlockIPv6 no
-
-
-## Want to filter ads, malware, sensitive or inappropriate websites and
-## domain names? This feature can block lists of IP addresses and names
-## matching a list of patterns. The list of rules remains private, and
-## the filtering process directly happens on your own network. In order
-## to filter IP addresses, the list of IPs has to be put into a text
-## file, with one IP address per line. Lists of domain names can also be
-## blocked as well. Put the list into a text file, one domain per line.
-## Domains can include wildcards (*) in order to match patterns. For
-## example *sex* will match any name that contains the sex substring, and
-## ads.* will match anything starting with ads. The Internet has plenty
-## of free feeds of IP addresses and domain names used for malware,
-## phishing and spam that you can use with this feature.
-##
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-##
-## To enable, uncomment one of the following definitions:
-
-## Block query names matching the rules stored in that file:
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt"
-
-## Block responses whose IP addresses match IPs stored in that file:
-# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt"
-
-## Block both domain names and IP addresses:
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt"
-
-## Same as the above + log the blocked queries in a file.
-## The log file can be prefixed with ltsv: (ex: ltsv:/tmp/log.txt) in order to
-## store logs using the LTSV format.
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" logfile:"/var/log/dnscrypt-blocked.log"
-# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
-
-
-
-############## User identification ##############
-
-## Use a client public key for identification
-## By default, the client uses a randomized key pair in order to make tracking
-## more difficult. This option does the opposite and uses a static key pair, so
-## that DNS providers can offer premium services to queries signed with a known
-## set of public keys. A client cannot decrypt the received responses without
-## also knowing the secret key.
-## The value for this property is the path to a file containing the secret key,
-## encoded as a hexadecimal string. The corresponding public key is computed
-## automatically.
-
-# ClientKey /etc/dnscrypt-client-secret.key
-
-
-
-############## Monitoring ##############
-
-## Do not actually start the proxy, but check that a valid certificate can be
-## retrieved from the server and that it will remain valid for the specified
-## time period. The process exit code is 0 if a valid certificate can be used,
-## 2 if no valid certificates can be used, 3 if a timeout occurred, and 4 if a
-## currently valid certificate is going to expire before the given margin.
-## Useful in a cron job to monitor your own dnscrypt-servers.
-## The margin is specified in minutes.
-
-# Test 2880
-
-
-
-############## Recursive configuration ##############
-
-## A configuration file can include other configuration files by inserting
-## the `Include` directive anywhere (the full path required, no quotes):
-
-# Include /etc/dnscrypt-proxy-common.conf

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
deleted file mode 100644
index 9137e1836fe..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
+++ /dev/null
@@ -1 +0,0 @@
-DNSCRYPT_OPTS="/etc/dnscrypt-proxy.conf"

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
deleted file mode 100644
index 08196ff1a7c..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/dnscrypt-proxy"
-command_args="${DNSCRYPT_OPTS}"
-pidfile="/run/${SVCNAME}.pid"
-
-depend() {
-	use net dns logger
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
deleted file mode 100644
index 8cbf5f1a414..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=DNSCrypt client proxy
-Documentation=man:dnscrypt-proxy(8)
-Requires=dnscrypt-proxy.socket
-After=network.target
-Before=nss-lookup.target
-
-[Install]
-Also=dnscrypt-proxy.socket
-WantedBy=multi-user.target
-
-[Service]
-Type=simple
-NonBlocking=true
-
-# Edit the configuration file appropriately, or the service will not start.
-# See https://dnscrypt.org for more information.
-ExecStart=/usr/sbin/dnscrypt-proxy /etc/dnscrypt-proxy.conf

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
deleted file mode 100644
index 5ee0e4502cf..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=dnscrypt-proxy listening socket
-
-[Socket]
-ListenStream=127.0.0.53:53
-ListenDatagram=127.0.0.53:53
-
-[Install]
-WantedBy=sockets.target

diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index c1a85090aac..d67745d93d2 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -12,15 +12,9 @@
 	<longdescription lang="en">
 		dnscrypt-proxy provides local service which can be used directly as your
 		local resolver or as a DNS forwarder, encrypting and authenticating
-		requests using the DNSCrypt protocol and passing them to upstream
-		servers.
+		requests using the DNSCrypt or DNS-over-HTTPS protocol and passing them
+		to upstream servers.
 	</longdescription>
-	<use>
-		<flag name="plugins">Enable plugin support to inspect and modify
-			queries and responses</flag>
-		<flag name="systemd">Use systemd's socket activation instead of
-			creating the sockets itself</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">jedisct1/dnscrypt-proxy</remote-id>
 	</upstream>

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     afff37df785faee26042af48654460639adb2517
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Wed Jun  6 16:24:01 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 11:10:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afff37df

net-dns/dnscrypt-proxy: cleanup filesdir

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild               | 8 ++++----
 .../files/{dnscrypt-proxy-2.confd => dnscrypt-proxy.confd}        | 0
 .../files/{dnscrypt-proxy-2.initd => dnscrypt-proxy.initd}        | 0
 .../files/{dnscrypt-proxy-2.service => dnscrypt-proxy.service}    | 0
 .../files/{dnscrypt-proxy-2.socket => dnscrypt-proxy.socket}      | 0
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
index 0b64d8b992e..5b04253b9c9 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
@@ -42,10 +42,10 @@ src_install() {
 	insinto "/usr/share/dnscrypt-proxy"
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy-2.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy-2.confd dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.socket dnscrypt-proxy.socket
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
 
 	einstalldocs
 }

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
similarity index 100%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
similarity index 100%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
similarity index 100%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
similarity index 100%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     b32d4b796577489505904cf2ca4392ad4e00790c
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Fri May 11 02:40:28 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 11 09:25:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32d4b79

net-dns/dnscrypt-proxy: drop 2.0.11

Closes: https://github.com/gentoo/gentoo/pull/8341
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 net-dns/dnscrypt-proxy/Manifest                    |  1 -
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild    | 98 ----------------------
 .../dnscrypt-proxy/files/dnscrypt-proxy.confd-r2   |  3 -
 .../dnscrypt-proxy/files/dnscrypt-proxy.initd-r2   | 19 -----
 .../dnscrypt-proxy/files/dnscrypt-proxy.service-r2 | 23 -----
 5 files changed, 144 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index fca34637fe1..7cde5e81d8c 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1,2 @@
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.11.tar.gz 2774458 BLAKE2B 36c9109a682a0d70c32910a44a64f49ebf0a958660154c10bf3687da3fdaa405e8add43717267f30a79d96941160cda5994704060a78e2ee6bbeddc55ff87766 SHA512 5e306c3bff65d0375b650666e2191c6f54e72bb0d2d2f6f8f7b941ffc063eb7eb244a52eb69b0b008dc566e9a6ce8a8f75929edb6762fad4751d966aa2da98a0
 DIST dnscrypt-proxy-2.0.12.tar.gz 2775112 BLAKE2B c3a1085c7c4d005d323d2d3e803b7bce447b86a8f2e9bff0eb7e5e145d275dd19fe6913c805be9469ba0a492f7a479a146af56a769432d8120790375628bb936 SHA512 757a7a88e8f6ed61462736184f0ca8426c40f800f54727881412de44c527e4334a6b42aa6906c19ecf9287d462a1ec7bd55cb471781bd94c2a0faa8ad7055137

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild
deleted file mode 100644
index 948f785d3d5..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="systemd"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-
-	if use systemd; then
-		sed -i 's|\['\''127\.0\.0\.1:53'\'', '\''\[::1\]:53'\''\]|\[\]|' \
-			"src/${EGO_PN}"/example-dnscrypt-proxy.toml || die
-	fi
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto "/usr/share/dnscrypt-proxy"
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_dounit systemd/dnscrypt-proxy.service
-	systemd_dounit systemd/dnscrypt-proxy.socket
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
-		ewarn "please either change port to > 1024, configure to run ${PN} as root"
-		ewarn "or re-enable 'filecaps'"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2.x.x is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Starting with version 2.0.9 ${PN} unit changed:"
-		elog "It now runs as an unprivileged user with dynamic UID/GID"
-		elog "and privately stores log and cache files"
-		elog
-		elog "See man:systemd.exec, man:nss-systemd"
-		elog
-		elog "Edit ${PN}.socket if you need to change port and address"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
deleted file mode 100644
index 9934e828b82..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-#DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-#DNSCRYPT_USER="dnscrypt"
-#DNSCRYPT_GROUP="dnscrypt"

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
deleted file mode 100644
index dcccd83dab3..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/dnscrypt-proxy"
-command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
-command_user="${DNSCRYPT_USER:-dnscrypt}:${DNSCRYPT_GROUP:-dnscrypt}"
-pidfile="/run/${SVCNAME}.pid"
-start_stop_daemon_args="--background --make-pidfile"
-
-depend() {
-	use net logger
-	provide dns
-}
-
-start_pre() {
-	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
-	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
-}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
deleted file mode 100644
index 745b094aaa1..00000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=DNSCrypt client proxy
-Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
-Requires=dnscrypt-proxy.socket
-After=network.target
-Before=nss-lookup.target
-Wants=nss-lookup.target
-
-[Install]
-Also=dnscrypt-proxy.socket
-WantedBy=multi-user.target
-
-[Service]
-User=dnscrypt
-Group=dnscrypt
-Type=simple
-NonBlocking=true
-ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
-ProtectHome=true
-CacheDirectory=dnscrypt-proxy
-LogsDirectory=dnscrypt-proxy
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     0481c755b3192bf2f9e40c9ca83128b3f97b55b8
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Thu Apr 12 06:53:25 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 07:27:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0481c755

net-dns/dnscrypt-proxy: version bump to 2.0.10

Use upstream provided systemd unit.
It unit now offers additional hardening:
 DynamicUsers and private directories.

ebuild no longer owns log directory, service
manages will create it on startup automatically.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 .../dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild    | 98 ++++++++++++++++++++++
 .../files/config-full-paths-r10.patch              | 72 ++++++++++++++++
 3 files changed, 171 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index bd117a44345..17a4d7219ef 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
+DIST dnscrypt-proxy-2.0.10.tar.gz 2773118 BLAKE2B 331b62c84cf84f26757dd5e663d5ea8fa59b90a2b149cac5e795b6f7edad810b7dcd0fa2e6e9ce77d6d19d9d708a9ed7d30a7e8d43986545c6f38c3e623e3681 SHA512 b28bbce986bace9c4ee1acfe5b372b9f847d5a0a199b085ead31813ad697753b6a25cead72a90a1967bd473bb4bcb591a384765b2de9af817af0dde3d33dcb58
 DIST dnscrypt-proxy-2.0.8.tar.gz 750606 BLAKE2B 83a9201389061c250e0c6bf535ff2e718aa9f67202887dcad33847160325225ccc1197b98343a8012bc84f5f42f049131b01b78febd7a418d47db946c9f58779 SHA512 c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
new file mode 100644
index 00000000000..948f785d3d5
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="systemd"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+
+	if use systemd; then
+		sed -i 's|\['\''127\.0\.0\.1:53'\'', '\''\[::1\]:53'\''\]|\[\]|' \
+			"src/${EGO_PN}"/example-dnscrypt-proxy.toml || die
+	fi
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
+	systemd_dounit systemd/dnscrypt-proxy.service
+	systemd_dounit systemd/dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
+		ewarn "please either change port to > 1024, configure to run ${PN} as root"
+		ewarn "or re-enable 'filecaps'"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2.x.x is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Starting with version 2.0.9 ${PN} unit changed:"
+		elog "It now runs as an unprivileged user with dynamic UID/GID"
+		elog "and privately stores log and cache files"
+		elog
+		elog "See man:systemd.exec, man:nss-systemd"
+		elog
+		elog "Edit ${PN}.socket if you need to change port and address"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}

diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
new file mode 100644
index 00000000000..aba278c221a
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
@@ -0,0 +1,72 @@
+--- dnscrypt-proxy-2.0.9/dnscrypt-proxy/example-dnscrypt-proxy.toml  2018-04-11 05:05:16.000000000 -0700
++++ dnscrypt-proxy-2.0.9/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-11 22:29:21.810501858 -0700
+@@ -96,7 +96,7 @@
+ 
+ ## log file for the application
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## Use the system logger (syslog on Unix, Event Log on Windows)
+@@ -254,7 +254,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -280,7 +280,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -315,7 +315,7 @@
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -343,7 +343,7 @@
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'ip-blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -371,7 +371,7 @@
+ 
+   ## Optional path to a file logging whitelisted queries
+ 
+-  # log_file = 'whitelisted.log'
++  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -441,7 +441,7 @@
+ 
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -451,7 +451,7 @@
+ 
+   #  [sources.'parental-control']
+   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michał Górny]

commit:     085712ca0a9601247456eac645cc5a1547e57899
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Sat Mar  3 22:12:35 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 08:06:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085712ca

net-dns/dnscrypt-proxy: drop old

Closes: https://github.com/gentoo/gentoo/pull/7314
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-dns/dnscrypt-proxy/Manifest                    |  2 -
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild | 88 --------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild | 88 --------------------
 .../files/config-full-paths-r2.patch               | 95 ----------------------
 4 files changed, 273 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index fbfcefae2f2..0bf5057ad6e 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,2 @@
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abb2222b548461ad09f3f57d SHA512 c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
-DIST dnscrypt-proxy-2.0.4.tar.gz 727969 BLAKE2B 80f29fbc150f8731dce0ab0af8f4282264b19fade73846f972bd0e762bfe4ebd1a0f014fb6fad860623377c833c099f1d50d8ab7ccd8cecb7e210a422d96ea99 SHA512 ba8f419c85b3ccd0bdd930404c3781f1cadf58dcacb30bf35c3be0933887a6dc910496424cb3847ef2630b8205794cef03d980ac82605faca38c6bfd58b213be
 DIST dnscrypt-proxy-2.0.6.tar.gz 744263 BLAKE2B c24acf7fbdf007b58e674f4c01db5bc3ea84d974c902086840f64c890bd72a64828283400e5f1f9c5d5f1c6a0e8233a366c33db3e3cdbec2e942a6d973091fb8 SHA512 f581b3663d5162ebd3fa5971c1af96e192b644e806578899ec37b86dceb3823fbfe1102cc8748cba361f3d000c4e952133e2dc92b94c6276819e37e07af6f0e5

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
deleted file mode 100644
index 5e497f13532..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_compile() {
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-	golang-build_src_compile
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto "/usr/share/dnscrypt-proxy"
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
-	systemd_dounit systemd/dnscrypt-proxy.socket
-
-	keepdir /var/log/dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
-		ewarn "please either change port to > 1024, configure to run ${PN} as root"
-		ewarn "or re-enable 'filecaps'"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2.x.x is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "To use systemd socket activation with ${PN} you must"
-		elog "set listen_addresses setting to \"[]\" in the config file"
-		elog "Edit ${PN}.socket if you need to change port and address"
-		elog
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
deleted file mode 100644
index 5e497f13532..00000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_compile() {
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-	golang-build_src_compile
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto "/usr/share/dnscrypt-proxy"
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
-	systemd_dounit systemd/dnscrypt-proxy.socket
-
-	keepdir /var/log/dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
-		ewarn "please either change port to > 1024, configure to run ${PN} as root"
-		ewarn "or re-enable 'filecaps'"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2.x.x is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "To use systemd socket activation with ${PN} you must"
-		elog "set listen_addresses setting to \"[]\" in the config file"
-		elog "Edit ${PN}.socket if you need to change port and address"
-		elog
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}

diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
deleted file mode 100644
index b693f1abbb3..00000000000
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- dnscrypt-proxy-2.0.0/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-02-06 10:33:58.000000000 -0800
-+++ dnscrypt-proxy-2.0.0/dnscrypt-proxy/dnscrypt-proxy.toml	2018-02-09 19:15:00.105927884 -0800
-@@ -85,7 +85,7 @@
- 
- ## log file for the application
- 
--# log_file = 'dnscrypt-proxy.log'
-+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
- 
- 
- ## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -140,7 +140,7 @@
- ## example.com 9.9.9.9
- ## example.net 9.9.9.9,8.8.8.8
- 
--# forwarding_rules = 'forwarding-rules.txt'
-+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
- 
- 
- 
-@@ -156,7 +156,7 @@
- ## example.com     10.1.1.1
- ## www.google.com  forcesafesearch.google.com
- 
--# cloaking_rules = 'cloaking-rules.txt'
-+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
- 
- 
- 
-@@ -200,7 +200,7 @@
- 
-   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
- 
--  # file = 'query.log'
-+  # file = '/var/log/dnscrypt-proxy/query.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -226,7 +226,7 @@
- 
-   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
- 
--  # file = 'nx.log'
-+  # file = '/var/log/dnscrypt-proxy/nx.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -255,12 +255,12 @@
- 
-   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
- 
--  # blacklist_file = 'blacklist.txt'
-+  # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt'
- 
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'blocked.log'
-+  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -283,12 +283,12 @@
- 
-   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
- 
--  # blacklist_file = 'ip-blacklist.txt'
-+  # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
- 
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'ip-blocked.log'
-+  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -357,7 +357,7 @@
- 
-   [sources.'public-resolvers']
-   url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
--  cache_file = 'public-resolvers.md'
-+  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
-   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   refresh_delay = 72
-   prefix = ''
-@@ -367,7 +367,7 @@
- 
-   #  [sources.'parental-control']
-   #  url = 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
--  #  cache_file = 'parental-control.md'
-+  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
-   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Lars Wendler]

commit:     0ee515fb8a5ff324983ec37c38ec1e2dc8d7aaa6
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Mon Aug  7 20:52:14 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 08:48:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee515fb

net-dns/dnscrypt-proxy: bump to 1.9.5, Sanitize initscripts.

Greatly simplify initscript to allow symlinking of unit files
for openrc. This approach follows upstream recommendation to
use config file instead of command line args.
Also proper systemd unit with socket activation from upstream.
Fixes 588462

Bug: https://bugs.gentoo.org/show_bug.cgi?id=588462
Closes: https://github.com/gentoo/gentoo/pull/5346

 net-dns/dnscrypt-proxy/Manifest                    |   1 +
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5.ebuild |  72 ++++++
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf   | 242 +++++++++++++++++++++
 .../dnscrypt-proxy/files/dnscrypt-proxy.confd-r1   |   1 +
 .../dnscrypt-proxy/files/dnscrypt-proxy.initd-r1   |  11 +
 .../dnscrypt-proxy/files/dnscrypt-proxy.service-r1 |  18 ++
 .../dnscrypt-proxy/files/dnscrypt-proxy.socket-r1  |   9 +
 7 files changed, 354 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index ffe882a34a7..4c6bf97e058 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
 DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 SHA256 40543efbcd56033ac03a1edf4581305e8c9bed4579ac55e6279644f07c315307 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0 WHIRLPOOL 4e9494c2765ecf9d625f7b44c0f58c40e491e1334a58552111730ecd3b95cba10667b2bfa2b29e291ccfa97a5678bbbc398dd14e888914bfddc6f7e61bac4a3a
+DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 SHA256 e89f5b9039979ab392302faf369ef7593155d5ea21580402a75bbc46329d1bb6 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836 WHIRLPOOL dec0090456a36fcc2b6883c1510c09d7a17459f022b0957eccf5f48272a305f546a760f9fb5c598b3fe86747ff16fac9b6767e3422f999dfca5fb717cd926ea1

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5.ebuild
new file mode 100644
index 00000000000..ee775460c6d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="https://dnscrypt.org"
+SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="hardened libressl +plugins ssl systemd"
+
+RDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable hardened pie) \
+		$(use_enable plugins) \
+		$(use_enable ssl openssl) \
+		$(use_with systemd)
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README* THANKS *txt )
+
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.socket-r1 ${PN}.socket
+	insinto /etc
+	doins "${FILESDIR}"/${PN}.conf /etc
+}
+
+pkg_preinst() {
+	# ship working default configuration for systemd users
+	if use systemd; then
+		sed -i 's/Daemonize yes/Daemonize no/g' "${D}"/etc/${PN}.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	use systemd && elog "with systemd dnscrypt-proxy ignores LocalAddress setting in the config file"
+	use systemd && elog "edit dnscrypt-proxy.socket if you need to change the defaults"
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
new file mode 100644
index 00000000000..52487c09c87
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
@@ -0,0 +1,242 @@
+######################################################
+#                                                    #
+#    Sample configuration file for dnscrypt-proxy    #
+#                                                    #
+######################################################
+
+
+############## Resolver settings ##############
+
+## [CHANGE THIS] Short name of the resolver to use
+## Usually the only thing you need to change in this configuration file.
+## This corresponds to the first column in the dnscrypt-resolvers.csv file.
+## Alternatively, "random" (without quotes) picks a random random resolver
+## accessible over IPv4, that doesn't log and supports DNSSEC.
+
+ResolverName random
+
+
+## Full path to the list of available DNSCrypt resolvers (dnscrypt-resolvers.csv)
+## An up-to-date list is available here:
+## https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv
+## and the dnscrypt-update-resolvers.sh script can be used in order to
+## automatically download and verify updates.
+
+ResolversList /usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
+
+
+## Manual settings, only for a custom resolver not present in the CSV file
+
+#ProviderName    2.dnscrypt.some.provider.name.tld
+#ProviderKey     0000:1111:2222:3333:4444:5555:6666:7777:8888:9999:AAAA:BBBB:CCCC:DDDD:EEEE:FFFF
+#ResolverAddress 111.222.333.444:56789
+
+
+
+############## Process options ##############
+
+## [NOT AVAILABLE ON WINDOWS] Run the proxy as a background process.
+## Unless you are using systemd, you probably want to change this to "yes"
+## after having verified that the rest of the configuration works as expected.
+
+Daemonize yes
+
+
+## Write the PID number to a file
+
+PidFile /run/dnscrypt-proxy.pid
+
+
+## [NOT AVAILABLE ON WINDOWS] Start the process, bind the required ports, and
+## run the server as a less-privileged system user.
+## The value for this parameter is a user name.
+
+User dnscrypt
+
+
+############## Network/protocol settings ##############
+
+## Local address and port to listen to.
+## A 127.0.0.x address is recommended for local use, but 0.0.0.0 or
+## a specific interface address can be used on a router, or to
+## configure a single machine to act as a DNS proxy for different
+## devices.
+## If the socket is created by systemd, the proxy cannot change the address
+## using this option. You should edit systemd's dnscrypt-proxy.socket file
+## instead.
+
+LocalAddress 127.0.0.1:53
+
+
+## Cache DNS responses to avoid outgoing traffic when the same queries
+## are repeated multiple times in a row.
+
+LocalCache on
+
+
+## Creates a new key pair for every query.
+## This prevents logging servers from correlating client public keys with
+## IP addresses. However, this option implies extra CPU load, and is not
+## very useful with trusted/non-logging servers.
+
+EphemeralKeys off
+
+
+## Maximum number of active requests waiting for a response.
+## Keep it reasonable relative to the expected number of clients.
+
+# MaxActiveRequests 250
+
+
+## This is the maximum payload size allowed when using the UDP protocol.
+## The default is safe, and rarely needs to be changed.
+
+# EDNSPayloadSize 1252
+
+
+## Ignore the time stamps when checking the certificates
+## Do not enable this option ever, unless you know that you need it.
+
+# IgnoreTimestamps no
+
+
+## Do not send queries using UDP. Only use TCP.
+## Even if some resolvers mitigate this, DNS over TCP is almost always slower
+## than UDP and doesn't offer additional security.
+## Only enable this option if UDP doesn't work on your network.
+
+# TCPOnly no
+
+
+## Forward queries for specific zones to one or more non-DNSCrypt resolvers.
+## For instance, this can be used to redirect queries for local domains to
+## the router, or queries for an internal domain to an internal DNS server.
+## Multiple whitespace-delimited zones and IP addresses can be specified.
+## Do not enable this unless you absolutely know you need it.
+## If you see useless queries to these zones, you'd better block them with
+## the BlackList feature instead of sending them in clear text to the router.
+## This uses a plugin that requires dnscrypt-proxy to be compiled with
+## the ldns library.
+
+#Forward domains:"localdomain" to:"192.168.0.1"
+
+
+############## Logging ##############
+
+## Log the received DNS queries to a file, so you can watch in real-time what
+## is happening on the network.
+## The value for this parameter is a full path to the log file.
+## The file name can be prefixed with ltsv: in order to store logs using the
+## LTSV format (ex: ltsv:/tmp/dns-queries.log).
+
+# QueryLogFile /tmp/dns-queries.log
+
+
+## Log file to write server errors and information to.
+## If you use this tool for privacy, keeping logs of any kind is usually not
+## a good idea.
+
+# LogFile /var/log/dnscrypt-proxy.log
+
+
+## Don't log events with priority above this log level after the service has
+## been started up. Default is 6.
+## Valid values are between 0 (critical) to 7 (debug-level messages).
+
+# LogLevel 6
+
+
+## [NOT AVAILABLE ON WINDOWS] Send server logs to the syslog daemon
+## Log entries can optionally be prefixed with a string.
+
+Syslog       on
+# SyslogPrefix dnscrypt
+
+
+
+############## Local filtering ##############
+
+## If your network doesn't support IPv6, chances are that your
+## applications are still constantly trying to resolve IPv6 addresses,
+## causing unnecessary slowdowns.
+## This causes the proxy to immediately reply to IPv6 requests,
+## without having to send a useless request to upstream resolvers, and
+## having to wait for a response.
+## This uses a plugin that requires dnscrypt-proxy to be compiled with
+## the ldns library.
+
+BlockIPv6 no
+
+
+## Want to filter ads, malware, sensitive or inappropriate websites and
+## domain names? This feature can block lists of IP addresses and names
+## matching a list of patterns. The list of rules remains private, and
+## the filtering process directly happens on your own network. In order
+## to filter IP addresses, the list of IPs has to be put into a text
+## file, with one IP address per line. Lists of domain names can also be
+## blocked as well. Put the list into a text file, one domain per line.
+## Domains can include wildcards (*) in order to match patterns. For
+## example *sex* will match any name that contains the sex substring, and
+## ads.* will match anything starting with ads. The Internet has plenty
+## of free feeds of IP addresses and domain names used for malware,
+## phishing and spam that you can use with this feature.
+##
+## This uses a plugin that requires dnscrypt-proxy to be compiled with
+## the ldns library.
+##
+## To enable, uncomment one of the following definitions:
+
+## Block query names matching the rules stored in that file:
+# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt"
+
+## Block responses whose IP addresses match IPs stored in that file:
+# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt"
+
+## Block both domain names and IP addresses:
+# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt"
+
+## Same as the above + log the blocked queries in a file.
+## The log file can be prefixed with ltsv: (ex: ltsv:/tmp/log.txt) in order to
+## store logs using the LTSV format.
+# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" logfile:"/var/log/dnscrypt-blocked.log"
+# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
+# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
+
+
+
+############## User identification ##############
+
+## Use a client public key for identification
+## By default, the client uses a randomized key pair in order to make tracking
+## more difficult. This option does the opposite and uses a static key pair, so
+## that DNS providers can offer premium services to queries signed with a known
+## set of public keys. A client cannot decrypt the received responses without
+## also knowing the secret key.
+## The value for this property is the path to a file containing the secret key,
+## encoded as a hexadecimal string. The corresponding public key is computed
+## automatically.
+
+# ClientKey /etc/dnscrypt-client-secret.key
+
+
+
+############## Monitoring ##############
+
+## Do not actually start the proxy, but check that a valid certificate can be
+## retrieved from the server and that it will remain valid for the specified
+## time period. The process exit code is 0 if a valid certificate can be used,
+## 2 if no valid certificates can be used, 3 if a timeout occurred, and 4 if a
+## currently valid certificate is going to expire before the given margin.
+## Useful in a cron job to monitor your own dnscrypt-servers.
+## The margin is specified in minutes.
+
+# Test 2880
+
+
+
+############## Recursive configuration ##############
+
+## A configuration file can include other configuration files by inserting
+## the `Include` directive anywhere (the full path required, no quotes):
+
+# Include /etc/dnscrypt-proxy-common.conf

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
new file mode 100644
index 00000000000..9137e1836fe
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
@@ -0,0 +1 @@
+DNSCRYPT_OPTS="/etc/dnscrypt-proxy.conf"

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
new file mode 100644
index 00000000000..08196ff1a7c
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/dnscrypt-proxy"
+command_args="${DNSCRYPT_OPTS}"
+pidfile="/run/${SVCNAME}.pid"
+
+depend() {
+	use net dns logger
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
new file mode 100644
index 00000000000..8cbf5f1a414
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
@@ -0,0 +1,18 @@
+[Unit]
+Description=DNSCrypt client proxy
+Documentation=man:dnscrypt-proxy(8)
+Requires=dnscrypt-proxy.socket
+After=network.target
+Before=nss-lookup.target
+
+[Install]
+Also=dnscrypt-proxy.socket
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+NonBlocking=true
+
+# Edit the configuration file appropriately, or the service will not start.
+# See https://dnscrypt.org for more information.
+ExecStart=/usr/sbin/dnscrypt-proxy /etc/dnscrypt-proxy.conf

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
new file mode 100644
index 00000000000..5ee0e4502cf
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
@@ -0,0 +1,9 @@
+[Unit]
+Description=dnscrypt-proxy listening socket
+
+[Socket]
+ListenStream=127.0.0.53:53
+ListenDatagram=127.0.0.53:53
+
+[Install]
+WantedBy=sockets.target

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Michael Palimaka]

commit:     9d31e149a7aaeab625fd9523b0a3d963278ae9a6
Author:     Samantha McVey <samantham <AT> posteo <DOT> net>
AuthorDate: Sun Jun 25 06:46:03 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 06:50:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d31e149

net-dns/dnscrypt-proxy: don't daemonize dnscrypt-proxy on systemd

If dnscrypt-proxy is daemonized, journald cannot
log any errors that occur. All systemd service files
should *not* be daemonized.

Gentoo-bug: 618784

 .../{dnscrypt-proxy-1.9.4.ebuild => dnscrypt-proxy-1.9.4-r1.ebuild}     | 0
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
similarity index 100%
rename from net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild
rename to net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index 1363ac8f8fc..4403254280a 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
@@ -6,7 +6,7 @@ Type=simple
 PIDFile=/var/run/dnscrypt-proxy.pid
 EnvironmentFile=/etc/conf.d/dnscrypt-proxy
 ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
-ExecStart=/usr/sbin/dnscrypt-proxy --daemonize \
+ExecStart=/usr/sbin/dnscrypt-proxy \
 	--pidfile=/var/run/dnscrypt-proxy.pid \
 	--logfile=/var/log/dnscrypt-proxy.log \
 	--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Patrice Clement]

commit:     5f338345bb76b04f58cb1fc71f785b6dc5488ee5
Author:     soredake <fdsfgs <AT> krutt <DOT> org>
AuthorDate: Tue Mar 28 19:57:12 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 21:24:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f338345

net-dns/dnscrypt-proxy: version bump to 1.9.4.

Closes: https://github.com/gentoo/gentoo/pull/4320

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild | 62 ++++++++++++++++++++++
 .../dnscrypt-proxy/files/dnscrypt-proxy.service    |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index ae23f926c2e..abfc5a7fef2 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -3,3 +3,4 @@ DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d332
 DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
 DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18
 DIST dnscrypt-proxy-1.7.0.tar.gz 1714401 SHA256 be9827f66401f38fd4bdb372046eff9b5802ab5f3d188878a0dcd7bd20074c09 SHA512 611d9cd9d9c086ec8e2b60f6c574451eae71ea07de85973049be7090cfbd8bf790d41f8a4a2b39d74091fba7091551967b93b85a8661c03ecad43d868df597a3 WHIRLPOOL 0c3902bfcc3571175f0f8638327cbaf5eada512565f214232732d14dc6a83f55a0babedd68007cbaeec1b584bcb1d3cc621df8b07638bacfe5893c6222d12997
+DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 SHA256 40543efbcd56033ac03a1edf4581305e8c9bed4579ac55e6279644f07c315307 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0 WHIRLPOOL 4e9494c2765ecf9d625f7b44c0f58c40e491e1334a58552111730ecd3b95cba10667b2bfa2b29e291ccfa97a5678bbbc398dd14e888914bfddc6f7e61bac4a3a

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild
new file mode 100644
index 00000000000..b8069db8ab6
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="https://dnscrypt.org"
+SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="hardened libressl +plugins ssl systemd"
+
+RDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable hardened pie) \
+		$(use_enable plugins) \
+		$(use_enable ssl openssl) \
+		$(use_with systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver <DNSCRYPT_LOCALIP>"
+	elog
+	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index 414c0b498c5..1363ac8f8fc 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
@@ -2,7 +2,7 @@
 Description=A tool for securing communications between a client and a DNS resolver
 
 [Service]
-Type=forking
+Type=simple
 PIDFile=/var/run/dnscrypt-proxy.pid
 EnvironmentFile=/etc/conf.d/dnscrypt-proxy
 ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Robin H. Johnson]

commit:     161f6371818c0df5496883080cc45f2372b15959
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 00:19:03 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 00:19:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161f6371

net-dns/dnscrypt-proxy: bump, security vuln in OpenDNS plugins; use syslog by default for logging

Package-Manager: portage-2.2.27

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild | 58 +++++++++++++++++++
 .../files/dnscrypt-proxy.initd-1.6.1               | 65 ++++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index c6b84c9..c886122 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
 DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
+DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
new file mode 100644
index 0000000..524bed4
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="http://dnscrypt.org/"
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable plugins) \
+		$(use_with systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver <DNSCRYPT_LOCALIP>"
+	elog
+	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
new file mode 100644
index 0000000..e7a02d6
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-syslog}
+DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
+
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+runas_user=${runas_user:-dnscrypt}
+runas_group=${runas_user:-dnscrypt}
+
+depend() {
+	use net
+	before dns
+	after logger
+}
+
+start() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			touch "${DNSCRYPT_LOGFILE}"
+			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
+			chown -R ${runas_user}:${runas_group} "${rundir}"
+		fi
+	fi
+
+	if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
+		resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
+	elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
+		resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
+	else
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	fi
+
+	if [[ "${DNSCRYPT_LOGFILE}" == "syslog" ]]; then
+		logopt="--syslog"
+	else
+		logopt="--logfile='${DNSCRYPT_LOGFILE}'"
+	fi
+	ebegin "Starting dnscrypt-proxy"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dnscrypt-proxy \
+		-- \
+		$logopt \
+		--pidfile="${pidfile}" \
+		--daemonize --user=${runas_user} \
+		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+		$resolver_opts \
+		${DNSCRYPT_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dnscrypt-proxy"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
+	eend $?
+}

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

[Robin H. Johnson]

commit:     0b06988e696c9be3c361b61b632225bf0adb0d70
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 23:57:05 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 00:05:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b06988e

net-dns/dnscrypt-proxy: ease of use improvements.

Make it possible to select easily select resolver using the
upstream-provided CSV file, rather than having to manually specify
parameters. Keep the default as the same Cisco OpenDNS provider.

Also use ephemeral keys by default to improve security.

Package-Manager: portage-2.2.24

 .../dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild  | 58 +++++++++++++++++++++
 .../files/dnscrypt-proxy.confd-1.6.0-r1            | 13 +++++
 .../files/dnscrypt-proxy.initd-1.6.0-r1            | 60 ++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
new file mode 100644
index 0000000..5d52ce9
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="http://dnscrypt.org/"
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable plugins) \
+		$(use_with systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-1.6.0-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver <DNSCRYPT_LOCALIP>"
+	elog
+	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
new file mode 100644
index 0000000..5b1b28d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
@@ -0,0 +1,13 @@
+DNSCRYPT_LOCALIP=127.0.0.1
+DNSCRYPT_LOCALPORT=53
+DNSCRYPT_USER=dnscrypt
+DNSCRYPT_OPTIONS="--ephemeral-keys"
+# Pick exactly ONE of the following sets:
+# option 1) selection from CSV file, uses the first column as the key
+DNSCRYPT_RESOLVER_NAME=cisco # Cisco OpenDNS
+DNSCRYPT_RESOLVERS_LIST=/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
+# option 2) manually specified parameters
+#DNSCRYPT_RESOLVERIP=203.0.133.53
+#DNSCRYPT_RESOLVERPORT=443
+#DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.example.com
+#DNSCRYPT_PROVIDER_KEY=1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7:1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
new file mode 100644
index 0000000..e79f8f9
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
+DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
+
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+runas_user=${runas_user:-dnscrypt}
+runas_group=${runas_user:-dnscrypt}
+
+depend() {
+	use net
+	before dns
+	after logger
+}
+
+start() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			touch "${DNSCRYPT_LOGFILE}"
+			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
+			chown -R ${runas_user}:${runas_group} "${rundir}"
+		fi
+	fi
+
+	if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
+		resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
+	elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
+		resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
+	else
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	fi
+
+	ebegin "Starting dnscrypt-proxy"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dnscrypt-proxy \
+		-- \
+		${DNSCRYPT_OPTIONS} \
+		--pidfile="${pidfile}" \
+		--logfile="${DNSCRYPT_LOGFILE}" \
+		--daemonize --user=${runas_user} \
+		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+		$resolver_opts
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dnscrypt-proxy"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
+	eend $?
+}