[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 231001d252cd81974b8745d07a4440d4f59bced7
Author: Julian Ospald gentoo org>
AuthorDate: Thu Oct 22 12:14:25 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Thu Oct 22 12:45:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231001d2
net-dns/dnscrypt-proxy: add missing quotes to dnscrypt-proxy.initd
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 3ef60f9..8e231e4 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -21,8 +21,8 @@ start() {
if [ ! -d "${rundir}" ]; then
mkdir "${rundir}"
if [ -n "${runas_user}" ]; then
- touch ${DNSCRYPT_LOGFILE}
- chown ${runas_user}:${runas_group} ${DNSCRYPT_LOGFILE}
+ touch "${DNSCRYPT_LOGFILE}"
+ chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
chown -R ${runas_user}:${runas_group} "${rundir}"
fi
fi
@@ -31,8 +31,8 @@ start() {
start-stop-daemon --start --quiet \
--exec /usr/sbin/dnscrypt-proxy \
-- \
- --pidfile=${pidfile} \
- --logfile=${DNSCRYPT_LOGFILE} \
+ --pidfile="${pidfile}" \
+ --logfile="${DNSCRYPT_LOGFILE}" \
--daemonize --user=${runas_user} \
--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 538d9b025dd42583c2e6d9c622022cedf20801ec
Author: Georgy Yakovlev sysdump net>
AuthorDate: Fri May 11 17:43:51 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Wed May 16 08:10:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538d9b02
net-dns/dnscrypt-proxy: QA minor openrc nits
Closes: https://github.com/gentoo/gentoo/pull/8414
Package-Manager: Portage-2.3.36, Repoman-2.3.9
net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd | 2 +-
net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
index fb40827a77e..492b2fc2294 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
@@ -1,3 +1,3 @@
-#DNSCRYPT_PROXY_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_PROXY_OPTS="-config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
#DNSCRYPT_PROXY_USER="dnscrypt-proxy"
#DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
index 74c2dad63f7..4a46acdc4bb 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
@@ -14,6 +14,6 @@ depend() {
}
start_pre() {
-checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
-checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
}
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 23b51318bca3c2c85bc77701809b05fd68eb466f
Author: Georgy Yakovlev gentoo org>
AuthorDate: Tue Jul 10 05:26:07 2018 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Tue Jul 10 05:26:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b51318
net-dns/dnscrypt-proxy: use tabs in init.d file
Package-Manager: Portage-2.3.41, Repoman-2.3.9
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 4a46acdc4bb..d81a36fc8f8 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -9,11 +9,11 @@ pidfile="/run/${RC_SVCNAME}.pid"
start_stop_daemon_args="--background --make-pidfile"
depend() {
- use net logger
+ use logger net
provide dns
}
start_pre() {
-checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
-checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
+ checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+ checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
}
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: ff422337a888f3b2e2bd9a648e18b400abc44733 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jul 10 05:24:40 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jul 10 05:24:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff422337 net-dns/dnscrypt-proxy: adjust systemd service Disable socket file by default, as described in pkg_postinst message. Users who want to use socket activation will have to set listen_addresses to an empty set (i.e. [] ) and enable dnscrypt-proxy.socket explicitly. Package-Manager: Portage-2.3.41, Repoman-2.3.9 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service index ed02955621b..a0c7a1408c8 100644 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service @@ -7,12 +7,11 @@ Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki ## If you enable this, the `listen_addresses` list in the main configuration file can be empty. ## Or, at least, the addresses it contains should not overlap with the systemd socket addresses. -# Requires=dnscrypt-proxy.socket - -After=network.target -Wants=network.target +#Requires=dnscrypt-proxy.socket Before=nss-lookup.target -Wants=nss-lookup.target +After=network.target +Wants=network.target nss-lookup.target + [Service] ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml @@ -35,5 +34,5 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_BIND_SERVICE [Install] -Also=dnscrypt-proxy.socket +#Also=dnscrypt-proxy.socket WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 56c0f3e1344c21d6a1ea98fc61ed4cec374cdb27 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Apr 30 16:22:44 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri May 1 07:04:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c0f3e1 net-dns/dnscrypt-proxy: remove unused patch Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15577 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/config-full-paths-r10.patch | 72 -- 1 file changed, 72 deletions(-) diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch deleted file mode 100644 index aba278c221a..000 --- a/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch +++ /dev/null @@ -1,72 +0,0 @@ dnscrypt-proxy-2.0.9/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 05:05:16.0 -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/files/
commit: fddb0093047f7894988be85053367612d550db48
Author: Georgy Yakovlev gentoo org>
AuthorDate: Wed Dec 4 20:57:29 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Wed Dec 4 21:01:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fddb0093
net-dns/dnscrypt-proxy: fix missing initfile
accidentally mv file on bump instead of copying.
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev gentoo.org>
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 19 +++
1 file changed, 19 insertions(+)
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
new file mode 100644
index 000..e0fc08ad6a0
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# 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"
+start_stop_daemon_args="--background --make-pidfile"
+
+depend() {
+ use logger net
+ provide dns
+}
+
+start_pre() {
+ checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+ checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
+}
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 34d0fd905f2581f33320abad2840da8e1ff65288
Author: Brian Evans gentoo org>
AuthorDate: Fri Dec 3 14:41:13 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Dec 3 14:41:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d0fd90
net-dns/dnscrypt-proxy: Update OpenRC script
Non-maintainer commit: This is effectively the same options reorganized
for future consideration.
Closes: https://bugs.gentoo.org/828076
Signed-off-by: Brian Evans gentoo.org>
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index ce1d1175d707..c1cb90040a20 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/bin/dnscrypt-proxy"
@@ -7,7 +7,7 @@ command_args="${DNSCRYPT_PROXY_OPTS:--config
/etc/dnscrypt-proxy/dnscrypt-proxy.
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"
+command_background="yes"
depend() {
use logger net
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
commit: 20a1da9271be1b1303a3b74f0581345ea33a654e Author: Sam James gentoo org> AuthorDate: Sun Jan 3 23:12:35 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 3 23:12:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a1da92 net-dns/dnscrypt-proxy: cleanup patch cruft Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch | 2 -- 1 file changed, 2 deletions(-) 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 index 86ca893440d..a871990deb9 100644 --- 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 @@ -1,5 +1,3 @@ -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
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 24cb0cb2acf666aac1803cadf366ed0378a07574
Author: Georgy Yakovlev sysdump net>
AuthorDate: Sun Feb 11 08:00:49 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 11 21:15:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cb0cb2
net-dns/dnscrypt-proxy: bump to 2.0.0, a completely new rewrite in go
Closes: https://bugs.gentoo.org/647110
Closes: https://github.com/gentoo/gentoo/pull/7152
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-dns/dnscrypt-proxy/Manifest| 1 +
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild | 88
.../files/config-full-paths-r2.patch | 95 ++
.../dnscrypt-proxy/files/dnscrypt-proxy.confd-r2 | 3 +
.../dnscrypt-proxy/files/dnscrypt-proxy.initd-r2 | 19 +
.../dnscrypt-proxy/files/dnscrypt-proxy.service-r2 | 23 ++
6 files changed, 229 insertions(+)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index ffe9265161e..9298a1c8f04 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +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
d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abbb548461ad09f3f57d
SHA512
c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
new file mode 100644
index 000..5e497f13532
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# 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 --g
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 4dee603320e14298cbf69488a2b8d1127c80b469
Author: Georgy Yakovlev sysdump net>
AuthorDate: Sun Feb 11 06:46:45 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 11 21:13:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dee6033
net-dns/dnscrypt-proxy: drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-dns/dnscrypt-proxy/Manifest| 1 -
.../dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild | 62 --
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd | 7 ---
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 47
.../dnscrypt-proxy/files/dnscrypt-proxy.service| 20 ---
5 files changed, 137 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 659abf0ea05..ffe9265161e 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1 @@
-DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 BLAKE2B
8b6fb85e8fb0784a4bc87f4d4b4af593cc78baa2e0f88e79183890cc62dcdc59755d31da76f4aa75807b6d4ef1491e81251307af01cab9e0d83699a255eb0379
SHA512
b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0
DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B
8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0
SHA512
84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
deleted file mode 100644
index b8069db8ab6..000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +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.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 "
- elog
- elog "where 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
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
deleted file mode 100644
index ceedd454b5f..000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-DNSCRYPT_LOCALIP=127.0.0.1
-DNSCRYPT_LOCALPORT=53
-DNSCRYPT_USER=dnscrypt
-DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
-DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
-DNSCRYPT_RESOLVERIP=208.67.220.220
-DNSCRYPT_RESOLVERPORT=443
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
deleted file mode 100644
index 9b07d7d47d8..000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ /dev/null
@@ -1,47 +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}
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 1ed038ff265c42ba1e9843eeb0a823e6ed55c8df
Author: Georgy Yakovlev sysdump net>
AuthorDate: Wed Feb 28 05:57:52 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Mar 4 08:05:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed038ff
net-dns/dnscrypt-proxy: version bump to 2.0.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-dns/dnscrypt-proxy/Manifest| 1 +
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild | 88
.../files/config-full-paths-r3.patch | 95 ++
3 files changed, 184 insertions(+)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 340c2b08df5..fbfcefae2f2 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1,4 @@
DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B
8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0
SHA512
84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B
d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abbb548461ad09f3f57d
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.6.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
new file mode 100644
index 000..4176fce8ebb
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
@@ -0,0 +1,88 @@
+# 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-r3.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"
+
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 63b61ddab4f32b66e1c02a449e8b629fbd498ee4
Author: Georgy Yakovlev sysdump net>
AuthorDate: Fri May 11 02:38:11 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Fri May 11 09:24:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b61dda
net-dns/dnscrypt-proxy: version bump to 2.0.12
Package-Manager: Portage-2.3.36, Repoman-2.3.9
net-dns/dnscrypt-proxy/Manifest| 1 +
.../dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild| 97 ++
.../dnscrypt-proxy/files/dnscrypt-proxy-2.confd| 3 +
.../dnscrypt-proxy/files/dnscrypt-proxy-2.initd| 19 +
.../dnscrypt-proxy/files/dnscrypt-proxy-2.service | 39 +
.../dnscrypt-proxy/files/dnscrypt-proxy-2.socket | 21 +
6 files changed, 180 insertions(+)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 21c7549a544..fca34637fe1 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.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.12.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild
new file mode 100644
index 000..0b64d8b992e
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.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-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
+
+ 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_versi
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 0bd4bb972e24cc8ae1296db4e5082677e541ff36
Author: Georgy Yakovlev sysdump net>
AuthorDate: Thu Apr 5 00:35:59 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 5 14:12:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd4bb97
net-dns/dnscrypt-proxy: fix failing patch
Closes: https://bugs.gentoo.org/652574
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7816
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild | 2 +-
...l-paths-r3.patch => config-full-paths-r8.patch} | 44 +-
2 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
index d5b792bf7d3..b162076d23a 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r3.patch )
+PATCHES=( "${FILESDIR}"/config-full-paths-r8.patch )
pkg_setup() {
enewgroup dnscrypt
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
similarity index 61%
rename from net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
rename to net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
index c7fd7705d9e..a5e9a7c2117 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
@@ -1,5 +1,5 @@
dnscrypt-proxy-2.0.6/dnscrypt-proxy/example-dnscrypt-proxy.toml
2018-03-03 13:43:28.733466923 -0800
-+++ dnscrypt-proxy-2.0.6/dnscrypt-proxy/dnscrypt-proxy.toml2018-03-03
13:46:19.666853492 -0800
+--- 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.toml2018-04-04
17:26:18.174044063 -0700
@@ -86,7 +86,7 @@
## log file for the application
@@ -9,25 +9,7 @@
## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -153,7 +153,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'
-
-
-
-@@ -169,7 +169,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'
-
-
-
-@@ -213,7 +213,7 @@
+@@ -215,7 +215,7 @@
## Path to the query log file (absolute, or relative to the same directory
as the executable file)
@@ -36,7 +18,7 @@
## Query log format (currently supported: tsv and ltsv)
-@@ -239,7 +239,7 @@
+@@ -241,7 +241,7 @@
## Path to the query log file (absolute, or relative to the same directory
as the executable file)
@@ -45,7 +27,7 @@
## Query log format (currently supported: tsv and ltsv)
-@@ -268,12 +268,12 @@
+@@ -270,12 +270,12 @@
## Path to the file of blocking rules (absolute, or relative to the same
directory as the executable file)
@@ -60,13 +42,7 @@
## Optional log format: tsv or ltsv (default: tsv)
-@@ -296,12 +296,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'
-
+@@ -303,7 +303,7 @@
## Optional path to a file logging blocked queries
@@ -75,19 +51,19 @@
## Optional log format: tsv or ltsv (default: tsv)
-@@ -371,7 +371,7 @@
+@@ -373,7 +373,7 @@
[sources.'public-resolvers']
- url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
+ 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 = ''
-@@ -381,7 +381,7 @@
+@@ -383,7 +383,7 @@
# [sources.'parental-control']
- # url =
'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
+ # 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/files/, net-dns/dnscrypt-proxy/
commit: 4b3a034aa4911838e23fbbdd085f6bde253d9592
Author: Georgy Yakovlev sysdump net>
AuthorDate: Mon Apr 16 07:56:37 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Apr 20 07:32:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3a034a
net-dns/dnscrypt-proxy: drop old
Closes: https://github.com/gentoo/gentoo/pull/7948
Package-Manager: Portage-2.3.28, Repoman-2.3.9
net-dns/dnscrypt-proxy/Manifest| 1 -
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild | 88 --
.../files/config-full-paths-r8.patch | 71 -
3 files changed, 160 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 17a4d7219ef..d412229c663 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.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.8.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
deleted file mode 100644
index b162076d23a..000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.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 ~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
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: f5e0993e70b089c58916e9b3c79902bbc22196fd
Author: Georgy Yakovlev gentoo org>
AuthorDate: Wed Mar 25 20:41:01 2020 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Wed Mar 25 20:49:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e0993e
net-dns/dnscrypt-proxy: update config patch
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev gentoo.org>
.../dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild| 1 +
.../files/config-full-paths-r11.patch | 106 ++---
2 files changed, 70 insertions(+), 37 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 e5403d4594b..b5bda3db325 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
"
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
src_compile() {
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
index 15247d42880..b7489fa2985 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
@@ -1,74 +1,106 @@
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 @@
-
+From c6a126931297b8256c06ea5c85229a721768f15e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev
+Date: Wed, 25 Mar 2020 13:38:31 -0700
+Subject: [PATCH] config paths
+
+---
+ dnscrypt-proxy/example-dnscrypt-proxy.toml | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml
b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+index 778de5c..5eaffb1 100644
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -142,7 +142,7 @@ keepalive = 30
+
## 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 @@
+@@ -399,7 +399,7 @@ cache_neg_max_ttl = 600
## 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 @@
-
+@@ -425,7 +425,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)
-@@ -460,7 +460,7 @@
-
+@@ -460,7 +460,7 @@ cache_neg_max_ttl = 600
+
## 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 @@
-
+@@ -488,7 +488,7 @@ cache_neg_max_ttl = 600
+
## 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 @@
-
+@@ -516,7 +516,7 @@ cache_neg_max_ttl = 600
+
## 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 @@
-
+@@ -585,7 +585,7 @@ cache_neg_max_ttl = 600
+
[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 @@
-
+
+@@ -593,7 +593,7 @@ cache_neg_max_ttl = 600
+
[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'
++ cache_file = '/var/cache/dnscrypt-proxy/relays.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
refresh_delay = 72
prefix = ''
+@@ -603,7 +603,7 @@ cache_neg_max_ttl = 600
+ # [sourc
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: d995f2843d1ff2ffcf64a90d376364c9ea1e0a02
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Dec 22 02:37:27 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun Dec 22 02:41:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d995f284
net-dns/dnscrypt-proxy: drop old, cleanup
Closes: https://bugs.gentoo.org/695280
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 5 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild | 101 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild| 98
.../dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild| 101 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.28.ebuild| 101 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.29.ebuild| 101 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild| 101 -
net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 19
8 files changed, 627 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 97ccc6e3b2d..66a479f6498 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,8 +1,3 @@
-DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B
10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8
SHA512
74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133
-DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B
e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef
SHA512
68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277f92937fa726783af3f7246
-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
DIST dnscrypt-proxy-2.0.33.tar.gz 2723092 BLAKE2B
26ed819f264c1a536b2e47d9ffa412097eba5c9597ad2a5e7ff7a485ad660aeb882c5ce527bb072a5f7b5782387ce1b72cc74400973f9cebd66a50bd2308d830
SHA512
5c6eb655aa70457889253cbf630e7e37011a461a7f181f0a667694d53146ad9dee88bbbf80c7db3187bba0054af2a63b7b5be1a229800b2566a9758e9d047429
DIST dnscrypt-proxy-2.0.34.tar.gz 2741556 BLAKE2B
81e3c5b1de70cf81882725b1d1f9bfb0b687dbac6ce408c70178ac7107c6c4fc6fbee4a05deb775519aef82c2added5cec9e264a73af1b6eca1524ecd973c381
SHA512
b48bbedbd5fea5514669ff5593ecd0aee083979c3030fe775558441ee2c398206eba786b9497022c3fab08fe7ee49dcc5205303629834f8fe65d7246e3352381
DIST dnscrypt-proxy-2.0.35.tar.gz 2740595 BLAKE2B
a64d1771979179f6b2387473c6ac21705b30263572550efd4ffb8ef008e67a74878ab4e72bbb4f29528c4c13dfaf4654f7625671579cb90c3b784ab4299f7ec0
SHA512
41e3c0646e215da3ce00e9ff9f22a4d3468b6589c424343ce0649c5a47cdbce26c2d9ffc3abf61c35d85eda964c499877d6f13619ce2308fe045a0272b1ca0e9
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
deleted file mode 100644
index 694bc5d7c02..000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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} == ]]; 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="ISC"
-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() {
-
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 632f74a9055bf64626eb60cc038ba3a41bc038d7
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Dec 22 02:39:25 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun Dec 22 02:41:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632f74a9
net-dns/dnscrypt-proxy: rename initd file
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev gentoo.org>
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild | 2 +-
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild | 2 +-
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild | 2 +-
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild | 2 +-
net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild | 2 +-
.../files/{dnscrypt-proxy.initd-r1 => dnscrypt-proxy.initd} | 0
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
index eac66d7f082..357e2fb1bc9 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
@@ -57,7 +57,7 @@ src_install() {
insinto /usr/share/dnscrypt-proxy
doins -r "utils/generate-domains-blacklists/."
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+ 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
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
index e3266982fa2..3d902b82aae 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
@@ -53,7 +53,7 @@ src_install() {
insinto /usr/share/dnscrypt-proxy
doins -r "utils/generate-domains-blacklists/."
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service
dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
index e3266982fa2..3d902b82aae 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
@@ -53,7 +53,7 @@ src_install() {
insinto /usr/share/dnscrypt-proxy
doins -r "utils/generate-domains-blacklists/."
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service
dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
index e3266982fa2..3d902b82aae 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
@@ -53,7 +53,7 @@ src_install() {
insinto /usr/share/dnscrypt-proxy
doins -r "utils/generate-domains-blacklists/."
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service
dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
index e3266982fa2..3d902b82aae 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
@@ -53,7 +53,7 @@ src_install() {
insinto /usr/share/dnscrypt-proxy
doins -r "utils/generate-domains-blacklists/."
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service
dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
similarity index 100%
rename from net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
rename to net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 5c35a789ce0cd12ea9af685d15080d1f16e45c73
Author: Sam James gentoo org>
AuthorDate: Mon Feb 15 00:42:42 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 15 00:42:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c35a789
net-dns/dnscrypt-proxy: cleanup old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 1 -
.../dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild| 105
.../files/config-full-paths-r11.patch | 106 -
3 files changed, 212 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 0b2a4e38348..6dc33183e09 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1 @@
-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-2.0.44.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
deleted file mode 100644
index a0456c6a5fc..000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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} == ]]; 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}"/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_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-{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"
-
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 40e58581693abc41314d828dae36b80f49267e8c
Author: Sam James gentoo org>
AuthorDate: Mon Aug 16 01:12:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 16 01:58:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e58581
net-dns/dnscrypt-proxy: add 2.1.0
Signed-off-by: Sam James gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 1 +
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild | 106 +
.../dnscrypt-proxy-2.1.0-config-full-paths.patch | 76 +++
3 files changed, 183 insertions(+)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 6dc33183e09..e799b8395ee 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
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
201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c8ddaacc66dc0f87c74029
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
new file mode 100644
index 000..19acce66145
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
@@ -0,0 +1,106 @@
+# 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} == ]]; 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
+ 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
+
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 3302f5bab7454f7dffde6902c97d5031d92d61e3
Author: Sam James gentoo org>
AuthorDate: Wed Aug 3 02:40:01 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 3 02:40:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3302f5ba
net-dns/dnscrypt-proxy: add 2.1.2
Signed-off-by: Sam James gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 1 +
...oxy-.ebuild => dnscrypt-proxy-2.1.2.ebuild} | 21 +++--
net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild | 21 +++--
.../dnscrypt-proxy-2.1.2-config-full-paths.patch | 92 ++
4 files changed, 111 insertions(+), 24 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index d719871447cd..076d965057a9 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B
9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7
SHA512
1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
+DIST dnscrypt-proxy-2.1.2.tar.gz 6792121 BLAKE2B
f6e69e9b7bba5bcaf49f710c78fc1b9607a8e791ad222da7af2a129de4807ecf87ddb7289aa79132a0d5ada588d2557beff618a79a341d168674bda7c8ba58ee
SHA512
1b3598d60abc70141127b5bf8bfaa76239d33e4220664dadd47f09544553e06eba6d82e5daf2c44c6da9c3c21c53683c2ff33db63257b782ad48c534bd54
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild
similarity index 88%
copy from net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
copy to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild
index 3e4c51ce549e..f80bcb78727b 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
+EAPI=8
inherit fcaps go-module systemd
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
+
if [[ ${PV} == ]]; then
+ EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git";
inherit git-r3
- EGIT_REPO_URI="https://${EGO_PN}.git";
else
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/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
@@ -31,7 +28,7 @@ RDEPEND="
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
PATCHES=(
- "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
+ "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch
)
src_compile() {
@@ -96,7 +93,7 @@ pkg_postinst() {
fi
elog "After starting the service you will need to update your"
- elog "/etc/resolv.conf and replace your current set of resolvers"
+ elog "${EROOT}/etc/resolv.conf and replace your current set of
resolvers"
elog "with:"
elog
elog "nameserver 127.0.0.1"
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
index 3e4c51ce549e..f80bcb78727b 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
+EAPI=8
inherit fcaps go-module systemd
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
+
if [[ ${PV} == ]]; then
+ EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git";
inherit git-r3
- EGIT_REPO_URI="https://${EGO_PN}.git";
else
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/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-p
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 99f73017a1cff764354205ccb0e1b11ed77858d4
Author: Sam James gentoo org>
AuthorDate: Sat Aug 12 04:40:46 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 12 04:40:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f73017
net-dns/dnscrypt-proxy: add 2.1.5
- Drop USE=pie because the eclass handles it for us now
- Use ego helper
- Respect prefix in config paths
Closes: https://bugs.gentoo.org/912151
Signed-off-by: Sam James gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 1 +
...oxy-.ebuild => dnscrypt-proxy-2.1.5.ebuild} | 14 ++--
net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild | 14 ++--
.../dnscrypt-proxy-2.1.5-config-full-paths.patch | 92 ++
4 files changed, 107 insertions(+), 14 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index fad6acc75562..537000cfa8d1 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1 +1,2 @@
DIST dnscrypt-proxy-2.1.4.tar.gz 6897787 BLAKE2B
655011c98e335e0f605c093e5b12156afc9be88f0e14882e11cfdca1affa6de29830344e7c3aa7a5013f90a322f824d54e2db4d37a69395d344e90b0160e442b
SHA512
4540d11432c4f35244b79f66b8926f8a1025e09010d8d313f0cd0d62e3fafcbd12bd24e9956ddf9cd8c1ec8aae997b031ab08dae4ee220bf31f33227ec6c07ca
+DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B
f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c
SHA512
2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
similarity index 86%
copy from net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
copy to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
index f80bcb78727b..74779702e9ac 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit fcaps go-module systemd
+inherit fcaps go-module prefix systemd
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
if [[ ${PV} == ]]; then
@@ -18,7 +18,6 @@ fi
LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
SLOT="0"
-IUSE="+pie"
RDEPEND="
acct-group/dnscrypt-proxy
@@ -28,18 +27,18 @@ RDEPEND="
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
PATCHES=(
- "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch
+ "${FILESDIR}"/${PN}-2.1.5-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
+ ego build -v -x -mod=readonly -mod=vendor
popd >/dev/null || die
}
src_test() {
cd "${PN}" || die
- go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed
to run tests"
+ ego test -mod=vendor
}
src_install() {
@@ -47,6 +46,7 @@ src_install() {
dobin dnscrypt-proxy
+ eprefixify example-dnscrypt-proxy.toml
insinto /etc/dnscrypt-proxy
newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
doins example-{allowed,blocked}-{ips.txt,names.txt}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
index f80bcb78727b..74779702e9ac 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit fcaps go-module systemd
+inherit fcaps go-module prefix systemd
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
if [[ ${PV} == ]]; then
@@ -18,7 +18,6 @@ fi
LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
SLOT="0"
-IUSE="+pie"
RDEPEND="
acct-group/dnscrypt-proxy
@@ -28,18 +27,18 @@ RDEPEND="
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
PATCHES=(
- "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch
+ "${FILESDIR}"/${PN}-2.1.5-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
+ ego build -v -x -mod=readonly -mod=vendor
popd >/dev/null || die
}
src_test() {
[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
commit: 1b5460d5f945b8f7e9079dbbc4423bdcf5a5651b
Author: Sam James gentoo org>
AuthorDate: Fri Oct 28 19:34:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 28 19:50:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5460d5
net-dns/dnscrypt-proxy: drop 2.1.1
Signed-off-by: Sam James gentoo.org>
net-dns/dnscrypt-proxy/Manifest| 1 -
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild | 105 -
.../dnscrypt-proxy-2.1.0-config-full-paths.patch | 76 ---
3 files changed, 182 deletions(-)
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 076d965057a9..a56cbe5c3d84 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1 @@
-DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B
9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7
SHA512
1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
DIST dnscrypt-proxy-2.1.2.tar.gz 6792121 BLAKE2B
f6e69e9b7bba5bcaf49f710c78fc1b9607a8e791ad222da7af2a129de4807ecf87ddb7289aa79132a0d5ada588d2557beff618a79a341d168674bda7c8ba58ee
SHA512
1b3598d60abc70141127b5bf8bfaa76239d33e4220664dadd47f09544553e06eba6d82e5daf2c44c6da9c3c21c53683c2ff33db63257b782ad48c534bd54
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
deleted file mode 100644
index 2f8f698a764a..
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.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} == ]]; 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"
