[arch-commits] Commit in dnscrypt-proxy/trunk (PKGBUILD configuration.diff)
David Runge
dvzrv at archlinux.org
Wed Apr 11 21:21:12 UTC 2018
Date: Wednesday, April 11, 2018 @ 21:21:11
Author: dvzrv
Revision: 315810
upgpkg: dnscrypt-proxy 2.0.9-1
Upgrading to 2.0.9. Rebasing configuration.diff to incorporate changes.
Modified:
dnscrypt-proxy/trunk/PKGBUILD
dnscrypt-proxy/trunk/configuration.diff
--------------------+
PKGBUILD | 11 +++++++----
configuration.diff | 43 +++++++++++++++++++++++++++++--------------
2 files changed, 36 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-11 21:20:05 UTC (rev 315809)
+++ PKGBUILD 2018-04-11 21:21:11 UTC (rev 315810)
@@ -5,8 +5,8 @@
# Contributor: peace4all <markspost at rocketmail dot com>
pkgname=dnscrypt-proxy
-pkgver=2.0.8
-pkgrel=3
+pkgver=2.0.9
+pkgrel=1
pkgdesc="A flexible DNS proxy, with support for modern encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP/2."
arch=('x86_64')
url="https://dnscrypt.info"
@@ -19,11 +19,12 @@
"etc/${pkgname}/cloaking-rules.txt"
"etc/${pkgname}/forwarding-rules.txt"
"etc/${pkgname}/ip-blacklist.txt"
+ "etc/${pkgname}/whitelist.txt"
)
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jedisct1/${pkgname}/archive/${pkgver}.tar.gz"
'configuration.diff')
-sha512sums=('c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265'
- '2206b71aa05d81c962f6a93d837731946aacbcc36ee19320a9cdf379c105d04f97044be702ac83e96492ece358148227ef04ed45d17e54dd4b84f5b4d66575bf')
+sha512sums=('4a7273e0a779b4103998930d5e07cd49678b47ec1de242e7865e3f8519ba9d15ce4e672c240e46eff97c407e97ea47f05508c5e70c03dfa569216d403625659e'
+ 'e722e01e8e35778bcabe419847d07597415b10c486d4e4614fbbaf71d03be2243c007047370db9def10f39842bc71ffe71a227eaee1fb5d90b73341ced6fd579')
prepare() {
cd "$pkgname-$pkgver"
@@ -56,6 +57,8 @@
"${pkgdir}/etc/${pkgname}/forwarding-rules.txt"
install -vDm 644 "${pkgname}/ip-blacklist.txt" \
"${pkgdir}/etc/${pkgname}/ip-blacklist.txt"
+ install -vDm 644 "${pkgname}/example-whitelist.txt" \
+ "${pkgdir}/etc/${pkgname}/whitelist.txt"
# systemd service/socket
install -vDm 644 "systemd/${pkgname}."{service,socket} \
-t "$pkgdir/usr/lib/systemd/system/"
Modified: configuration.diff
===================================================================
--- configuration.diff 2018-04-11 21:20:05 UTC (rev 315809)
+++ configuration.diff 2018-04-11 21:21:11 UTC (rev 315810)
@@ -1,7 +1,7 @@
-diff -ruN dnscrypt-proxy-2.0.8-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy-2.0.8-b/dnscrypt-proxy/example-dnscrypt-proxy.toml
---- dnscrypt-proxy-2.0.8-a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-03-29 11:22:20.000000000 +0200
-+++ dnscrypt-proxy-2.0.8-b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-04 22:11:13.885537167 +0200
-@@ -28,7 +28,7 @@
+diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+--- dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 14:05:16.000000000 +0200
++++ dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 23:09:53.874362036 +0200
+@@ -33,7 +33,7 @@
## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6.
## Note: When using systemd socket activation, choose an empty set (i.e. [] ).
@@ -10,7 +10,7 @@
## Maximum number of simultaneous client connections to accept
-@@ -86,12 +86,12 @@
+@@ -96,12 +96,12 @@
## log file for the application
@@ -25,9 +25,9 @@
## Delay, in minutes, after which certificates are reloaded
-@@ -155,7 +155,7 @@
+@@ -194,7 +194,7 @@
## example.com 9.9.9.9
- ## example.net 9.9.9.9,8.8.8.8
+ ## example.net 9.9.9.9,8.8.8.8,1.1.1.1
-# forwarding_rules = 'forwarding-rules.txt'
+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
@@ -34,7 +34,7 @@
-@@ -171,7 +171,7 @@
+@@ -210,7 +210,7 @@
## example.com 10.1.1.1
## www.google.com forcesafesearch.google.com
@@ -43,7 +43,7 @@
-@@ -215,7 +215,7 @@
+@@ -254,7 +254,7 @@
## Path to the query log file (absolute, or relative to the same directory as the executable file)
@@ -52,7 +52,7 @@
## Query log format (currently supported: tsv and ltsv)
-@@ -241,7 +241,7 @@
+@@ -280,7 +280,7 @@
## Path to the query log file (absolute, or relative to the same directory as the executable file)
@@ -61,7 +61,7 @@
## Query log format (currently supported: tsv and ltsv)
-@@ -270,12 +270,12 @@
+@@ -310,12 +310,12 @@
## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
@@ -76,7 +76,7 @@
## Optional log format: tsv or ltsv (default: tsv)
-@@ -298,12 +298,12 @@
+@@ -338,12 +338,12 @@
## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
@@ -91,8 +91,23 @@
## Optional log format: tsv or ltsv (default: tsv)
-@@ -373,7 +373,7 @@
+@@ -366,12 +366,12 @@
+ ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file)
+
+- # whitelist_file = 'whitelist.txt'
++ # whitelist_file = '/etc/dnscrypt-proxy/whitelist.txt'
+
+
+ ## 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'
@@ -100,7 +115,7 @@
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
refresh_delay = 72
prefix = ''
-@@ -383,7 +383,7 @@
+@@ -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']
More information about the arch-commits
mailing list