update to dnscrypt-proxy-2.1.0

submitted and tested by tj@
tweaks by me to use sed instead of SUBST_CMD for cache_file lines
This commit is contained in:
namn 2021-08-22 01:54:11 +00:00
parent 41c706a165
commit 7fcaf31ff0
3 changed files with 11 additions and 28 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.56 2021/03/08 13:59:24 sthen Exp $
# $OpenBSD: Makefile,v 1.57 2021/08/22 01:54:11 namn Exp $
COMMENT = flexible DNS proxy with support for encrypted DNS protocols
GH_ACCOUNT = jedisct1
GH_PROJECT = dnscrypt-proxy
GH_TAGNAME = 2.0.45
REVISION = 0
GH_TAGNAME = 2.1.0
CATEGORIES = net
@ -23,7 +22,9 @@ MODGO_TYPE = bin
INSTDIR = ${PREFIX}/share/examples/dnscrypt-proxy
post-patch:
${SUBST_CMD} ${WRKDIST}/dnscrypt-proxy/example-dnscrypt-proxy.toml
sed -i "s;cache_file = '\(.*\)\.md';cache_file =\
'${LOCALSTATEDIR}/dnscrypt-proxy/\1.md';g" \
${MODGO_SUBDIR}/dnscrypt-proxy/example-dnscrypt-proxy.toml
do-build:
cd ${WRKSRC}/dnscrypt-proxy && ${MODGO_CMD} build
@ -35,6 +36,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dnscrypt-proxy/dnscrypt-proxy ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${INSTDIR}
${INSTALL_DATA} ${WRKSRC}/dnscrypt-proxy/example-* ${INSTDIR}
rm -f ${INSTDIR}/example-dnscrypt-proxy.toml.{beforesubst,orig}
rm -f ${INSTDIR}/example-dnscrypt-proxy.toml.orig
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (dnscrypt-proxy-2.0.45.tar.gz) = 96rCjGpgQEaD1DYHK4nRjtO7MJ+NipXI6HrSUNoZCCE=
SIZE (dnscrypt-proxy-2.0.45.tar.gz) = 2721610
SHA256 (dnscrypt-proxy-2.1.0.tar.gz) = SvQ6IUOh0Pm0MPXwiYFBfLRHXMWQ2vedEcmgSH9y+tw=
SIZE (dnscrypt-proxy-2.1.0.tar.gz) = 6248378

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-dnscrypt-proxy_example-dnscrypt-proxy_toml,v 1.15 2021/01/12 05:18:25 bket Exp $
$OpenBSD: patch-dnscrypt-proxy_example-dnscrypt-proxy_toml,v 1.16 2021/08/22 01:54:11 namn Exp $
Index: dnscrypt-proxy/example-dnscrypt-proxy.toml
--- dnscrypt-proxy/example-dnscrypt-proxy.toml.orig
+++ dnscrypt-proxy/example-dnscrypt-proxy.toml
@@ -49,7 +49,7 @@ max_clients = 250
@@ -52,7 +52,7 @@ max_clients = 250
## Note (2): this feature is not compatible with systemd socket activation.
## Note (3): when using -pidfile, the PID file directory must be writable by the new user
@ -11,22 +11,4 @@ Index: dnscrypt-proxy/example-dnscrypt-proxy.toml
+user_name = '_dnscrypt-proxy'
## Require servers (from static + remote sources) to satisfy specific properties
@@ -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 = '${LOCALSTATEDIR}/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 = '${LOCALSTATEDIR}/dnscrypt-proxy/relays.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
refresh_delay = 72
prefix = ''
## Require servers (from remote sources) to satisfy specific properties