gentoo resync : 22.04.2018

3 files changed, 40 insertions, 29 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index eb6a8a9729a1..72e499aee7ce 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,4 @@
-AUX config-full-paths-r8.patch 2472 BLAKE2B 41861b0b443c1b31031181b9a36194b7ae06711e6c2ab0547c27359066763fcc0ef673663a5309faf4470340a574ed83d3ae3aefe09941996e37a75b84ee24f5 SHA512 d4c275d9299af90c52dbcd416626fa9c0c5af90aa782d4df38afde7db15abd77ab3dce7dbdc0f2082f9b83624adedb6288e917bf64b082bb1295c301b92be919
+AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
 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.8.tar.gz 750606 BLAKE2B 83a9201389061c250e0c6bf535ff2e718aa9f67202887dcad33847160325225ccc1197b98343a8012bc84f5f42f049131b01b78febd7a418d47db946c9f58779 SHA512 c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265
+DIST dnscrypt-proxy-2.0.10.tar.gz 2773118 BLAKE2B 331b62c84cf84f26757dd5e663d5ea8fa59b90a2b149cac5e795b6f7edad810b7dcd0fa2e6e9ce77d6d19d9d708a9ed7d30a7e8d43986545c6f38c3e623e3681 SHA512 b28bbce986bace9c4ee1acfe5b372b9f847d5a0a199b085ead31813ad697753b6a25cead72a90a1967bd473bb4bcb591a384765b2de9af817af0dde3d33dcb58
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.8.ebuild 2448 BLAKE2B e520cea047806e87cc1db8f108d515bbf7ed97c9aaeba303a8790d15708dce69e88c477bcc1a336dba3b1fe067eadd8e35b5325cefd7fc1f9d2cbe30a87ea629 SHA512 a42228d24b808b3f531be5801671fe41d71bafbd885a1ad4805c9753f8d0786336c3b908403388a30b3be000bec001b7ef3be70d4cd21a8e043557ecc8f6ea3a
+EBUILD dnscrypt-proxy-2.0.10.ebuild 2692 BLAKE2B 72884728ad3012578ac8b1eb3799c5cca44ec8daeef67f045409e6ddd99a9dcd58ab2bec22a0cc47a74e3ef4e8ac09325ebc99e881dcc69b162bc60b75ab0c63 SHA512 330ecba2bf86b48b3308decbb5464d9572d5522d65188ab9de2f12b39ec5dc24870b39c81706cc62e7aab57073c1193a708e11a63f5a65ef66eea58c45fc614b
 MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
index b162076d23a3..948f785d3d5f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
@@ -14,21 +14,27 @@ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
+IUSE="systemd"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r8.patch )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
 pkg_setup() {
 	enewgroup dnscrypt
 	enewuser dnscrypt -1 -1 /var/empty dnscrypt
 }
 
-src_compile() {
+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
-	golang-build_src_compile
+
+	if use systemd; then
+		sed -i 's|\['\''127\.0\.0\.1:53'\'', '\''\[::1\]:53'\''\]|\[\]|' \
+			"src/${EGO_PN}"/example-dnscrypt-proxy.toml || die
+	fi
 }
 
 src_install() {
@@ -36,18 +42,17 @@ src_install() {
 
 	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}
+	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.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.service
 	systemd_dounit systemd/dnscrypt-proxy.socket
 
-	keepdir /var/log/dnscrypt-proxy
-
 	einstalldocs
 }
 
@@ -72,10 +77,15 @@ pkg_postinst() {
 	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 "Starting with version 2.0.9 ${PN} unit changed:"
+		elog "It now runs as an unprivileged user with dynamic UID/GID"
+		elog "and privately stores log and cache files"
+		elog
+		elog "See man:systemd.exec, man:nss-systemd"
+		elog
 		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"
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
index a5e9a7c21171..aba278c221a2 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- dnscrypt-proxy-2.0.9/dnscrypt-proxy/example-dnscrypt-proxy.toml  2018-04-11 05:05:16.000000000 -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
  
@@ -9,7 +9,7 @@
  
  
  ## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -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)
  
@@ -18,7 +18,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)
  
@@ -27,13 +27,7 @@
  
  
    ## Query log format (currently supported: tsv and ltsv)
-@@ -270,12 +270,12 @@
- 
-   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
- 
--  # blacklist_file = 'blacklist.txt'
-+  # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt'
- 
+@@ -315,7 +315,7 @@
  
    ## Optional path to a file logging blocked queries
  
@@ -42,7 +36,7 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -303,7 +303,7 @@
+@@ -343,7 +343,7 @@
  
    ## Optional path to a file logging blocked queries
  
@@ -51,7 +45,16 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -373,7 +373,7 @@
+@@ -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']
@@ -60,12 +63,10 @@
    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']
 -  #  cache_file = 'parental-control.md'
 +  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
    #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
-