+++ /dev/null
-# 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-r8.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"
-}
+++ /dev/null
---- dnscrypt-proxy-2.0.8/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-04 17:23:33.607326639 -0700
-+++ dnscrypt-proxy-2.0.8/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-04 17:26:18.174044063 -0700
-@@ -86,7 +86,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)
-@@ -215,7 +215,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)
-@@ -241,7 +241,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)
-@@ -270,12 +270,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)
-@@ -303,7 +303,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)
-@@ -373,7 +373,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 = ''
-@@ -383,7 +383,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'
-
-