Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
Date: Thu, 05 Apr 2018 14:12:25
Message-Id: 1522937529.0bd4bb972e24cc8ae1296db4e5082677e541ff36.asturm@gentoo
1 commit: 0bd4bb972e24cc8ae1296db4e5082677e541ff36
2 Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net>
3 AuthorDate: Thu Apr 5 00:35:59 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 5 14:12:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd4bb97
7
8 net-dns/dnscrypt-proxy: fix failing patch
9
10 Closes: https://bugs.gentoo.org/652574
11 Package-Manager: Portage-2.3.28, Repoman-2.3.9
12 Closes: https://github.com/gentoo/gentoo/pull/7816
13
14 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild | 2 +-
15 ...l-paths-r3.patch => config-full-paths-r8.patch} | 44 +++++-----------------
16 2 files changed, 11 insertions(+), 35 deletions(-)
17
18 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
19 index d5b792bf7d3..b162076d23a 100644
20 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
21 +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
22 @@ -16,7 +16,7 @@ SLOT="0"
23 KEYWORDS="~amd64 ~arm ~x86"
24
25 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
26 -PATCHES=( "${FILESDIR}"/config-full-paths-r3.patch )
27 +PATCHES=( "${FILESDIR}"/config-full-paths-r8.patch )
28
29 pkg_setup() {
30 enewgroup dnscrypt
31
32 diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
33 similarity index 61%
34 rename from net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
35 rename to net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
36 index c7fd7705d9e..a5e9a7c2117 100644
37 --- a/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
38 +++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
39 @@ -1,5 +1,5 @@
40 ---- dnscrypt-proxy-2.0.6/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-03-03 13:43:28.733466923 -0800
41 -+++ dnscrypt-proxy-2.0.6/dnscrypt-proxy/dnscrypt-proxy.toml 2018-03-03 13:46:19.666853492 -0800
42 +--- dnscrypt-proxy-2.0.8/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-04 17:23:33.607326639 -0700
43 ++++ dnscrypt-proxy-2.0.8/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-04 17:26:18.174044063 -0700
44 @@ -86,7 +86,7 @@
45
46 ## log file for the application
47 @@ -9,25 +9,7 @@
48
49
50 ## Use the system logger (syslog on Unix, Event Log on Windows)
51 -@@ -153,7 +153,7 @@
52 - ## example.com 9.9.9.9
53 - ## example.net 9.9.9.9,8.8.8.8
54 -
55 --# forwarding_rules = 'forwarding-rules.txt'
56 -+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
57 -
58 -
59 -
60 -@@ -169,7 +169,7 @@
61 - ## example.com 10.1.1.1
62 - ## www.google.com forcesafesearch.google.com
63 -
64 --# cloaking_rules = 'cloaking-rules.txt'
65 -+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
66 -
67 -
68 -
69 -@@ -213,7 +213,7 @@
70 +@@ -215,7 +215,7 @@
71
72 ## Path to the query log file (absolute, or relative to the same directory as the executable file)
73
74 @@ -36,7 +18,7 @@
75
76
77 ## Query log format (currently supported: tsv and ltsv)
78 -@@ -239,7 +239,7 @@
79 +@@ -241,7 +241,7 @@
80
81 ## Path to the query log file (absolute, or relative to the same directory as the executable file)
82
83 @@ -45,7 +27,7 @@
84
85
86 ## Query log format (currently supported: tsv and ltsv)
87 -@@ -268,12 +268,12 @@
88 +@@ -270,12 +270,12 @@
89
90 ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
91
92 @@ -60,13 +42,7 @@
93
94
95 ## Optional log format: tsv or ltsv (default: tsv)
96 -@@ -296,12 +296,12 @@
97 -
98 - ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
99 -
100 -- # blacklist_file = 'ip-blacklist.txt'
101 -+ # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
102 -
103 +@@ -303,7 +303,7 @@
104
105 ## Optional path to a file logging blocked queries
106
107 @@ -75,19 +51,19 @@
108
109
110 ## Optional log format: tsv or ltsv (default: tsv)
111 -@@ -371,7 +371,7 @@
112 +@@ -373,7 +373,7 @@
113
114 [sources.'public-resolvers']
115 - url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
116 + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
117 - cache_file = 'public-resolvers.md'
118 + cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
119 minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
120 refresh_delay = 72
121 prefix = ''
122 -@@ -381,7 +381,7 @@
123 +@@ -383,7 +383,7 @@
124
125 # [sources.'parental-control']
126 - # url = 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
127 + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
128 - # cache_file = 'parental-control.md'
129 + # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
130 # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
Report Message
Find on MARC Find on Google Groups