gentoo resync : 05.04.2018

3 files changed, 14 insertions, 38 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 2aca2351e250..eb6a8a9729a1 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,4 @@
-AUX config-full-paths-r3.patch 2896 BLAKE2B 6777ce33d475e5a5fd07f37f4ed7390301114819058b7ca407a0e53f2b5e1c2207eec4860d8c60a6b0b81cc72dd0da864f25d7507ccb13000e347467683fce2f SHA512 1e1672755110233a1629bb762dc637ace4c2719975582742d40eb3831c288294b5561cb2b3b99c5948c43f2a8e142ecba869838b79d4411b33f17413b57f4532
+AUX config-full-paths-r8.patch 2472 BLAKE2B 41861b0b443c1b31031181b9a36194b7ae06711e6c2ab0547c27359066763fcc0ef673663a5309faf4470340a574ed83d3ae3aefe09941996e37a75b84ee24f5 SHA512 d4c275d9299af90c52dbcd416626fa9c0c5af90aa782d4df38afde7db15abd77ab3dce7dbdc0f2082f9b83624adedb6288e917bf64b082bb1295c301b92be919
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
 AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
@@ -8,7 +8,7 @@ AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589a
 AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.7.tar.gz 746018 BLAKE2B f6ede938d3a49a972510614f07831530aa2cdceccecaa9bc91e4c6c85bf809400ae7d451a538bc0ba63e9031091fae04cd83fd5d82bebccc33b482535eeeb76c SHA512 42d14e3aad5b38f6de8cafb0774c572807632f6464b0abf1ab7e33837d90e348e4ff8540ced02245531e1423fadfc5f7f6366ac15a56b10049ac46fb0fbc49ea
+DIST dnscrypt-proxy-2.0.8.tar.gz 750606 BLAKE2B 83a9201389061c250e0c6bf535ff2e718aa9f67202887dcad33847160325225ccc1197b98343a8012bc84f5f42f049131b01b78febd7a418d47db946c9f58779 SHA512 c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.7.ebuild 2448 BLAKE2B 93a03421e1a7784e719be54230187fbc674e685c700191d4bdf3a46975adc2dc1511ec42eb271f6cfd78255c5619a8edce9adba9e21da3967508c20e4b455cd3 SHA512 3aef6aff6d40f978f2a4798e26958cd371d033ccc54f6c2d2eafe786412a31f39b1500d79566eb3109896ff14cb2a0d626bc16b54d72036f1feff4ca8aeabeca
+EBUILD dnscrypt-proxy-2.0.8.ebuild 2448 BLAKE2B e520cea047806e87cc1db8f108d515bbf7ed97c9aaeba303a8790d15708dce69e88c477bcc1a336dba3b1fe067eadd8e35b5325cefd7fc1f9d2cbe30a87ea629 SHA512 a42228d24b808b3f531be5801671fe41d71bafbd885a1ad4805c9753f8d0786336c3b908403388a30b3be000bec001b7ef3be70d4cd21a8e043557ecc8f6ea3a
 MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
index d5b792bf7d31..b162076d23a3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.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
index c7fd7705d9ee..a5e9a7c21171 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.toml	2018-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.toml	2018-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'