From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- net-dns/dnscrypt-proxy/Manifest | 15 +-- .../dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild | 98 -------------------- .../dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild | 98 -------------------- .../dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild | 98 -------------------- .../dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild | 98 -------------------- .../dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild | 101 +++++++++++++++++++++ .../dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild | 2 +- net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild | 12 +-- .../dnscrypt-proxy/files/dnscrypt-proxy.logrotate | 7 +- 9 files changed, 116 insertions(+), 413 deletions(-) delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild create mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild (limited to 'net-dns/dnscrypt-proxy') diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest index e31ad245858e..3cc9db10ee66 100644 --- a/net-dns/dnscrypt-proxy/Manifest +++ b/net-dns/dnscrypt-proxy/Manifest @@ -1,20 +1,13 @@ AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072 -AUX dnscrypt-proxy.logrotate 92 BLAKE2B d8946a3bee8fc3a9ee6fbcf569b05ad801ea6990a407958139e69e683cd06d2cc122d803418948f7371a3dbf50edef20259cecceaf9a154ff8de18a66c8a6188 SHA512 6b65c9ab0902ad65326de7c78304d6b1153538be7f70429813fc4065a970932047c42696dc5f5722022de47c82a99192e47ed3a35fe689d9017bb7f17491c860 +AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36 DIST dnscrypt-proxy-2.0.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6 -DIST dnscrypt-proxy-2.0.21.tar.gz 2189155 BLAKE2B 3cab3ec4208e93733cefad49732c3fde644aac5401191d53a8c5962a1173456c09e12eaadeba6e086c078968b9467743cba7167ff0c84af2cf2f1d2209edd49f SHA512 e01869b963ef7454f9136d8ececc4e541dae489524e03cc2906fc3b661281bd6ebf5ef8b6dc29a6bcc1dabb638b9e74200b3ed48ebcd69cd3306e8bab5dd248a -DIST dnscrypt-proxy-2.0.22.tar.gz 2192330 BLAKE2B 7688354d50a9c80368881be622ca8ef9cebd901a7023e071bb7eba603c876bf496f017a0abb5d9c6591fd4c31aad748c574a34ff47c5462c7417124282aaa37e SHA512 ea2641e79739e75e8a7e6bc24a788488537ffa823e18a3585f95ca1ae90bef9890c65eaf7feb80cc5ad09165cef9513d4025e96367ca87fc59333534f8856102 -DIST dnscrypt-proxy-2.0.23.tar.gz 2552615 BLAKE2B fe59304d431a006fa8cf09cee97fcb62a2ea04306fd5b632a22c66fd7c0894ca4cac27280dc3eb2470cc1a503da9e0bc4316fe43c6c77391f305618137361a20 SHA512 d4eeaf20a397c8aed08a7a91a720637bb49395488eb1f7ab4a52ca8832d3e0b98fb320b86ca30ad19e1e3504e226379e5d325891a68624532493fc4796959462 -DIST dnscrypt-proxy-2.0.24.tar.gz 2596668 BLAKE2B 6a736d2d1ef11c88191f21bf631d54f6687250841e0b9ed2893b940915fc8b7c5d70f4a6c9dfa06ade97bde4c943d9615725475c4d880033228f247658a879c8 SHA512 f345fe9d299dc7fa876de686e5d9c471041f00e8297dcff31787a246caaecd150a762222c7e417815181e678ab2b222623dbf6a111c529c40a4f7e17dc7467a2 DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8 SHA512 74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133 EBUILD dnscrypt-proxy-2.0.19.ebuild 3048 BLAKE2B 37463586ec37f3bb80ade8fa943eb2e9b0dc35e06ddcc6d6eff45bd7f8c9f26bfc793508d3390e3e498a8f99e95b0e203f9d2f7c3441ddb068d43d677d0ac81e SHA512 724395be46a0100b9a9dcbbcbff1313ed03a028f99c0c348a55e8c87909fee5fd452b642b42ee202e52084604ae7bfb96edd3ed888b314914a234efaaec93824 -EBUILD dnscrypt-proxy-2.0.21.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a -EBUILD dnscrypt-proxy-2.0.22.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a -EBUILD dnscrypt-proxy-2.0.23.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a -EBUILD dnscrypt-proxy-2.0.24.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a -EBUILD dnscrypt-proxy-2.0.25.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a -EBUILD dnscrypt-proxy-9999.ebuild 2841 BLAKE2B 0e18db90c357cde0f8321c3d77869d56b188d1ec10904190e5e4123725f9bf066c5dfe07bcb98e6eef0577aa1893834e68a1390002d67dbc423b1caee2c24c83 SHA512 630d824f63c551f4526649ec600fdb0957c461fed423fb88c332fd26f658aba308e79a419c31537b6a3a765ca2dd95a02ae0e20e017f6bf66a980d20b9575b4c +EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2802 BLAKE2B 9ef59ca6f1c1420b0e78e485200f77e82a21943ea3def958cc57eb2eee711d2163c0a09ea6879633bca586125ac0a4adecfbbff836b37c9fd77d233d5635db8a SHA512 a3145859567cf38cdeeb8ac46e15c5d09ac4fd2e18b917a17a282df0517bdedd8e4966bb053a1cff153910fe807499fb766144807f23b8aabc817df76f253ea2 +EBUILD dnscrypt-proxy-2.0.25.ebuild 2751 BLAKE2B 66312945aa9e10440e95397b43568cc5c88132b478f14d6c8db858d74ad0c264be7b403e4e0dedf86d2113ba47a9a903ed01801aaf074e7b222dde03cdc948d0 SHA512 b0beba09050c01099059b5bb83ed1ba235a0cd20bd4633c2ccbfb89f7ed8d57f3270c1da1b61b2cf7d283d39dcf22325b503b955e381ab3b1779c2a5610e303c +EBUILD dnscrypt-proxy-9999.ebuild 2802 BLAKE2B 9ef59ca6f1c1420b0e78e485200f77e82a21943ea3def958cc57eb2eee711d2163c0a09ea6879633bca586125ac0a4adecfbbff836b37c9fd77d233d5635db8a SHA512 a3145859567cf38cdeeb8ac46e15c5d09ac4fd2e18b917a17a282df0517bdedd8e4966bb053a1cff153910fe807499fb766144807f23b8aabc817df76f253ea2 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild deleted file mode 100644 index 419d40281c69..000000000000 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="pie" - -DEPEND=">=dev-lang/go-1.12" - -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 - # fixes $GOPATH/go.mod exists but should not - rm go.mod || die - mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/" || die -} - -src_configure() { - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" -} - -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 - - 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.22.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild deleted file mode 100644 index 419d40281c69..000000000000 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="pie" - -DEPEND=">=dev-lang/go-1.12" - -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 - # fixes $GOPATH/go.mod exists but should not - rm go.mod || die - mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/" || die -} - -src_configure() { - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" -} - -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 - - 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.23.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild deleted file mode 100644 index 419d40281c69..000000000000 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="pie" - -DEPEND=">=dev-lang/go-1.12" - -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 - # fixes $GOPATH/go.mod exists but should not - rm go.mod || die - mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/" || die -} - -src_configure() { - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" -} - -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 - - 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.24.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild deleted file mode 100644 index 419d40281c69..000000000000 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="pie" - -DEPEND=">=dev-lang/go-1.12" - -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 - # fixes $GOPATH/go.mod exists but should not - rm go.mod || die - mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/" || die -} - -src_configure() { - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" -} - -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 - - 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.25-r2.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild new file mode 100644 index 000000000000..44a5c203f652 --- /dev/null +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_PN="github.com/jedisct1/${PN}" + +inherit fcaps golang-build systemd + +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="pie" + +DEPEND=">=dev-lang/go-1.12" + +RDEPEND=" + acct-group/dnscrypt-proxy + acct-user/dnscrypt-proxy +" + +FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) +PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) + +src_prepare() { + default + # Create directory structure suitable for building + mkdir -p "src/${EGO_PN%/*}" || die + # fixes $GOPATH/go.mod exists but should not + rm go.mod || die + mv "${PN}" "src/${EGO_PN}" || die + mv "vendor" "src/" || die +} + +src_configure() { + EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" +} + +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 + + insinto /etc/logrotate.d + newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy + + 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 + + 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.25.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild index 419d40281c69..257c123d9b07 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://${EGO_PN}.git" else SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" fi DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild index 721259c1364f..44a5c203f652 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 EGO_PN="github.com/jedisct1/${PN}" -inherit fcaps golang-build systemd user +inherit fcaps golang-build systemd if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -24,14 +24,14 @@ IUSE="pie" DEPEND=">=dev-lang/go-1.12" +RDEPEND=" + acct-group/dnscrypt-proxy + acct-user/dnscrypt-proxy +" + 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 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate index dcc603284a85..ff58fbeab1ea 100644 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate @@ -1,5 +1,6 @@ /var/log/dnscrypt-proxy/*.log { - copytruncate - missingok - notifempty + su dnscrypt-proxy dnscrypt-proxy + copytruncate + missingok + notifempty } -- cgit v1.2.3