From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- net-dns/Manifest.gz | Bin 9219 -> 9220 bytes net-dns/dnscrypt-proxy/Manifest | 11 ++- .../dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild | 97 ------------------- .../dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild | 1 + .../dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild | 98 +++++++++++++++++++ net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild | 104 +++++++++++++++++++++ net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 6 +- .../dnscrypt-proxy/files/dnscrypt-proxy.service | 11 +-- net-dns/getdns/Manifest | 3 +- .../getdns/files/getdns-1.4.2-stubby.service.patch | 16 ++++ net-dns/getdns/getdns-1.4.2-r1.ebuild | 77 +++++++++++++++ net-dns/getdns/getdns-1.4.2.ebuild | 75 --------------- net-dns/knot/Manifest | 4 +- net-dns/knot/knot-2.6.7.ebuild | 103 -------------------- net-dns/knot/knot-2.6.8.ebuild | 103 ++++++++++++++++++++ 15 files changed, 417 insertions(+), 292 deletions(-) delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild create mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild create mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild create mode 100644 net-dns/getdns/files/getdns-1.4.2-stubby.service.patch create mode 100644 net-dns/getdns/getdns-1.4.2-r1.ebuild delete mode 100644 net-dns/getdns/getdns-1.4.2.ebuild delete mode 100644 net-dns/knot/knot-2.6.7.ebuild create mode 100644 net-dns/knot/knot-2.6.8.ebuild (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index c9ba03e5954c..3d323b1f6012 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest index 01ff499d107e..3944ab9ed142 100644 --- a/net-dns/dnscrypt-proxy/Manifest +++ b/net-dns/dnscrypt-proxy/Manifest @@ -1,10 +1,11 @@ AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab -AUX dnscrypt-proxy.initd 646 BLAKE2B 3ede3fd925b6fad6f42ce4b52184ebdaa9c9cc881886e2b18d45f10476a7957ea09037ba2faf8d9ff12f4a0352e982f5d267410a9f3531f1d0ad8f5558d6576d SHA512 faa119b18765eb59ddacad1340752f1bbd9d10acf59f6b79bc4c31fcbe9f0e5f08bf6cd214ce2a5bdafe13c5d1a116aacea2e09a181699f8f06f3ec34fb9dcaa -AUX dnscrypt-proxy.service 1204 BLAKE2B 879571cc00eab424b10f6ed79d9d52ba1ee835fd3ad7ef295d113b21afed075b3670066cf5dbdf0647c02853bb242c6d037f6ad962e0e6a7225b86fe88a3c9ab SHA512 3ae8f2dbe93169a6ddf71db85103a297210287006a63c71e9837ddfb62cecf6de28dd3ead6028e2f239edc4dab5a16d27c3c84fd2fcc23e41ba71b7b8fbf8b1f +AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072 +AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36 -DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613 DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9 -EBUILD dnscrypt-proxy-2.0.14.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6 -EBUILD dnscrypt-proxy-2.0.15.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6 +DIST dnscrypt-proxy-2.0.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f +EBUILD dnscrypt-proxy-2.0.15.ebuild 2880 BLAKE2B bf0fc37008d0d54f8aeec9b294175e1eefdfedd1ebda02de0f40ca6678a1070fdbc1702359fa0b8474f62b6a94ff6c68ac166eeac0302909d502c31f4298c2cd SHA512 d148bb289b66526eb0600c1817d54acdd702177571215da2a66a88a4ce5ae419b92ff8e8a0ef0a7b9988704e4571fae89b3f29cbe25e2808d168cf4db05ebe74 +EBUILD dnscrypt-proxy-2.0.16.ebuild 2878 BLAKE2B 42284fc77e8809e196a00cf6b24e0f379c6ac3e8f5da17fdd8387788a19e583914ea8ade40e82d039234632eda4e19e501e8f14e4cee7c4c7a9dd18546bdfc45 SHA512 a83ced12c49aceba4452c1db9173f72972aa105aa9344983f96b06b87da7255ba601970dec2546299921af71e20b1ccc3188a99dbb6b1c930cc0b84a5cc1c947 +EBUILD dnscrypt-proxy-9999.ebuild 2973 BLAKE2B ff38c4e6b05d8743d6d91e10569f89cd78e8d29a0ba05e252dd087fa076c922f3711c38bd3109ce69cec721807902e0f070bc1e664b9dc50fec0c6767a85827f SHA512 5510605f1c0b6aa5087a848f2662d93b890d868c2b81ddf6fe714f50eae7b681d90643f458aa8a51938e8dfa4e3aeb7b054ae81555bace5819f6b9c73e1f60ba MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild deleted file mode 100644 index 5b04253b9c9b..000000000000 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/jedisct1/${PN}" - -inherit fcaps golang-build systemd user - -DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" -HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) -PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) - -pkg_setup() { - enewgroup dnscrypt-proxy - enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy -} - -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 -} - -src_install() { - dobin dnscrypt-proxy - - insinto /etc/dnscrypt-proxy - newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml - 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 dnscrypt-proxy - newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket - - einstalldocs -} - -pkg_postinst() { - fcaps_pkg_postinst - - if ! use filecaps; then - ewarn "'filecaps' USE flag is disabled" - ewarn "${PN} will fail to listen on port 53" - ewarn "please do one the following:" - ewarn "1) re-enable 'filecaps'" - ewarn "2) change port to > 1024" - ewarn "3) configure to run ${PN} as root (not recommended)" - ewarn - fi - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - elog "Version 2 is a complete rewrite of ${PN}" - elog "please clean up old config/log files" - elog - fi - if [[ ${v} == 2.* ]] ; then - elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group" - elog "you can remove obsolete 'dnscrypt' accounts from the system" - elog - fi - done - - if systemd_is_booted || has_version sys-apps/systemd; then - elog "Using systemd socket activation may cause issues with speed" - elog "latency and reliability of ${PN} and is discouraged by upstream" - elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" - elog "It is disabled by default for new installations" - elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" - elog - - fi - - elog "After starting the service you will need to update your" - elog "/etc/resolv.conf and replace your current set of resolvers" - elog "with:" - elog - elog "nameserver 127.0.0.1" - elog - elog "Also see https://github.com/jedisct1/${PN}/wiki" -} diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild index 5b04253b9c9b..48aca6233183 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild @@ -14,6 +14,7 @@ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild new file mode 100644 index 000000000000..778e3aa9cecb --- /dev/null +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/jedisct1/${PN}" + +inherit fcaps golang-build systemd user + +DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" +HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy" +SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) +PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) + +pkg_setup() { + enewgroup dnscrypt-proxy + enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy +} + +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 +} + +src_install() { + dobin dnscrypt-proxy + + insinto /etc/dnscrypt-proxy + newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml + 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 dnscrypt-proxy + newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket + + einstalldocs +} + +pkg_postinst() { + fcaps_pkg_postinst + + if ! use filecaps; then + ewarn "'filecaps' USE flag is disabled" + ewarn "${PN} will fail to listen on port 53" + ewarn "please do one the following:" + ewarn "1) re-enable 'filecaps'" + ewarn "2) change port to > 1024" + ewarn "3) configure to run ${PN} as root (not recommended)" + ewarn + fi + + local v + for v in ${REPLACING_VERSIONS}; do + if [[ ${v} == 1.* ]] ; then + elog "Version 2 is a complete rewrite of ${PN}" + elog "please clean up old config/log files" + elog + fi + if [[ ${v} == 2.* ]] ; then + elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group" + elog "you can remove obsolete 'dnscrypt' accounts from the system" + elog + fi + done + + if systemd_is_booted || has_version sys-apps/systemd; then + elog "Using systemd socket activation may cause issues with speed" + elog "latency and reliability of ${PN} and is discouraged by upstream" + elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" + elog "It is disabled by default for new installations" + elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" + elog + + fi + + elog "After starting the service you will need to update your" + elog "/etc/resolv.conf and replace your current set of resolvers" + elog "with:" + elog + elog "nameserver 127.0.0.1" + elog + elog "Also see https://github.com/jedisct1/${PN}/wiki" +} diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild new file mode 100644 index 000000000000..98ba6f98e2c6 --- /dev/null +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/jedisct1/${PN}" + +inherit fcaps golang-build systemd user + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://${EGO_PN}.git" +else + SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" +HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy" + +LICENSE="ISC" +SLOT="0" +IUSE="test" + +FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) +PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) + +pkg_setup() { + enewgroup dnscrypt-proxy + enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy +} + +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 +} + +src_install() { + dobin dnscrypt-proxy + + insinto /etc/dnscrypt-proxy + newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml + 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 dnscrypt-proxy + newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket + + einstalldocs +} + +pkg_postinst() { + fcaps_pkg_postinst + + if ! use filecaps; then + ewarn "'filecaps' USE flag is disabled" + ewarn "${PN} will fail to listen on port 53" + ewarn "please do one the following:" + ewarn "1) re-enable 'filecaps'" + ewarn "2) change port to > 1024" + ewarn "3) configure to run ${PN} as root (not recommended)" + ewarn + fi + + local v + for v in ${REPLACING_VERSIONS}; do + if [[ ${v} == 1.* ]] ; then + elog "Version 2 is a complete rewrite of ${PN}" + elog "please clean up old config/log files" + elog + fi + if [[ ${v} == 2.* ]] ; then + elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group" + elog "you can remove obsolete 'dnscrypt' accounts from the system" + elog + fi + done + + if systemd_is_booted || has_version sys-apps/systemd; then + elog "Using systemd socket activation may cause issues with speed" + elog "latency and reliability of ${PN} and is discouraged by upstream" + elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" + elog "It is disabled by default for new installations" + elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" + elog + + fi + + elog "After starting the service you will need to update your" + elog "/etc/resolv.conf and replace your current set of resolvers" + elog "with:" + elog + elog "nameserver 127.0.0.1" + elog + elog "Also see https://github.com/jedisct1/${PN}/wiki" +} diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd index 4a46acdc4bb3..d81a36fc8f85 100644 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd @@ -9,11 +9,11 @@ pidfile="/run/${RC_SVCNAME}.pid" start_stop_daemon_args="--background --make-pidfile" depend() { - use net logger + use logger net provide dns } start_pre() { - checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}" - checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}" + checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}" + checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}" } diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service index ed02955621ba..a0c7a1408c85 100644 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service @@ -7,12 +7,11 @@ Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki ## If you enable this, the `listen_addresses` list in the main configuration file can be empty. ## Or, at least, the addresses it contains should not overlap with the systemd socket addresses. -# Requires=dnscrypt-proxy.socket - -After=network.target -Wants=network.target +#Requires=dnscrypt-proxy.socket Before=nss-lookup.target -Wants=nss-lookup.target +After=network.target +Wants=network.target nss-lookup.target + [Service] ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml @@ -35,5 +34,5 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_BIND_SERVICE [Install] -Also=dnscrypt-proxy.socket +#Also=dnscrypt-proxy.socket WantedBy=multi-user.target diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest index 1b4a44f3702b..9729a94923ad 100644 --- a/net-dns/getdns/Manifest +++ b/net-dns/getdns/Manifest @@ -1,6 +1,7 @@ +AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805 DIST getdns-1.4.2.tar.gz 1059122 BLAKE2B 79399bb70e58bf449e99052c9f32ebb9d4e6ac26c753d99963d591661ee04ccfaf58e4f35589187a9a89fd9bccc0bff9d319c8b11da9522fbb17a915612ce9bd SHA512 fbbbe80df0f66e295c590c1751c11fcfc66efa200203ce1fdc11a471130fbaa837fa6bade076e17e1dac03d71c3522a67a660f2bdb4766aead19119da355bdd4 -EBUILD getdns-1.4.2.ebuild 1884 BLAKE2B 18700c0594d4a5110b821ec97a38bb33130af3b0d7dca311a4fa18442cc88feec11775f7781878d56b6462566c35a0691dca117a056a99cfdcc18a63a2ea61e0 SHA512 89bf649f84c0774189048cdc2608504aeffdf34759e6914c0b75a13b2abd8a5f8ca9c5321f6e06dd872a1acbb58e4f657a80d608c602d4bb5dd713a6abcce4f2 +EBUILD getdns-1.4.2-r1.ebuild 1946 BLAKE2B 2df36495ee4e8f41f92f1aa052f620000bb0300652cbf176049b3b56079c7097b3161a0dacf333ed97246b6a6ea3c25cd61b6158b549ffcf84bcca2bee7c5775 SHA512 fea036ed04e79948e86dc1f8d669faed7d8cff5332958080407e60ac8a32f2fb60a29c79855c9ce3a683854b168e428fa0cfa9166e1cd1dc39a2e3749aaf989e MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1 diff --git a/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch new file mode 100644 index 000000000000..2bb7546fcfa5 --- /dev/null +++ b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch @@ -0,0 +1,16 @@ +diff -ur a/stubby/systemd/stubby.service b/stubby/systemd/stubby.service +--- a/stubby/systemd/stubby.service 2018-05-11 13:25:22.000000000 +0200 ++++ b/stubby/systemd/stubby.service 2018-06-20 15:40:23.650164668 +0200 +@@ -3,9 +3,11 @@ + + [Service] + User=stubby +-DynamicUser=yes ++DynamicUser=no + CacheDirectory=stubby + WorkingDirectory=/var/cache/stubby ++ExecStartPre=/bin/mkdir -p /var/cache/stubby ++ExecStartPre=/bin/chown stubby:stubby /var/cache/stubby + ExecStart=/usr/bin/stubby + AmbientCapabilities=CAP_NET_BIND_SERVICE + CapabilityBoundingSet=CAP_NET_BIND_SERVICE diff --git a/net-dns/getdns/getdns-1.4.2-r1.ebuild b/net-dns/getdns/getdns-1.4.2-r1.ebuild new file mode 100644 index 000000000000..28d7a6c9c3c9 --- /dev/null +++ b/net-dns/getdns/getdns-1.4.2-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user fcaps systemd + +DESCRIPTION="Modern asynchronous DNS API" +HOMEPAGE="https://getdnsapi.net/" +SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs" + +DEPEND=" + dev-libs/libbsd:= + dev-libs/libyaml:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + idn? ( net-dns/libidn2:= ) + unbound? ( >=net-dns/unbound-1.4.16:= ) + libevent? ( dev-libs/libevent:= ) + libev? ( dev-libs/libev:= ) + libuv? ( dev-libs/libuv:= ) +" +RDEPEND=" + ${DEPEND} + stubby? ( sys-libs/libcap:= ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" ) + +src_configure() { + econf \ + --runstatedir=/var/run \ + --with-piddir=/var/run/stubby \ + $(use_with stubby) \ + $(use_with getdns_query) \ + $(use_with getdns_server_mon) \ + $(use_with idn libidn2) \ + --without-libidn \ + $(use_with unbound libunbound) \ + $(use_with libevent) \ + $(use_with libev) \ + $(use_with libuv) \ + $(use_with threads libpthread) \ + $(use_enable static-libs static) +} + +src_install() { + default + if use stubby; then + newinitd "${FILESDIR}"/stubby.initd-r1 stubby + newconfd "${FILESDIR}"/stubby.confd-r1 stubby + insinto /etc/logrotate.d + newins "${FILESDIR}"/stubby.logrotate stubby + systemd_dounit "${S}"/stubby/systemd/stubby.service + systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf + fi +} + +pkg_postinst() { + if use stubby; then + enewgroup stubby + enewuser stubby -1 -1 -1 stubby + fcaps cap_net_bind_service=ei /usr/bin/stubby + fi + + if has_version