commit:     bc99722035755f79b31af732be908e217f8fb710
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 21 22:18:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 21 22:18:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc997220

net-dns/dnscrypt-proxy: drop 2.1.5, 2.1.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnscrypt-proxy/Manifest                    |   2 -
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild | 102 ---------------------
 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild | 102 ---------------------
 .../dnscrypt-proxy-2.1.5-config-full-paths.patch   |  92 -------------------
 4 files changed, 298 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index fe3e7b0a4c9d..c3a448780563 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1 @@
-DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B 
f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c
 SHA512 
2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
-DIST dnscrypt-proxy-2.1.7.tar.gz 4195998 BLAKE2B 
2b8e979a178301eb560d7f3be33755401a9fd1808dcd5919c9513a7f2f5513c4d12606af0b38dc6cabdf4f243d69df8a61f2af30071634251309721144521b1d
 SHA512 
53b100d5238186ae99add2a8aff4069e6491f9d687e63cc3e5648630626c86ff4f9d246789ae40490030b20584a3c82e1abce8a8ca685f18111a2bcfa0519c09
 DIST dnscrypt-proxy-2.1.8.tar.gz 4185376 BLAKE2B 
bf2c6e8fbe83980579a4ba460d7648647b998bd589ad83c633f6fc9f6e855d846fa7a867df6d7c7b6331070999b643c0114d805739ad53dc8173cb63f2b74536
 SHA512 
249e2d22b4b7f2c7142a7a626aa13fd80e5e250e2c84093e74360c895b0b8a7105d413fcd78e118bf51ffbf887fde654a7277f34bb6beb7b11a25531895edb6e

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
deleted file mode 100644
index 84145490ad5e..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module prefix systemd
-
-DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git";
-       inherit git-r3
-else
-       
SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-
-RDEPEND="
-       acct-group/dnscrypt-proxy
-       acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch
-)
-
-src_compile() {
-       pushd "${PN}" >/dev/null || die
-       ego build -v -x -mod=readonly -mod=vendor
-       popd >/dev/null || die
-}
-
-src_test() {
-       cd "${PN}" || die
-       ego test -mod=vendor
-}
-
-src_install() {
-       pushd "${PN}" >/dev/null || die
-
-       dobin dnscrypt-proxy
-
-       eprefixify example-dnscrypt-proxy.toml
-       insinto /etc/dnscrypt-proxy
-       newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-       doins example-{allowed,blocked}-{ips.txt,names.txt}
-       doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-       popd >/dev/null || die
-
-       insinto /usr/share/dnscrypt-proxy
-       doins -r "utils/generate-domains-blocklist/."
-
-       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 "${EROOT}/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/DNSCrypt/${PN}/wiki";
-}

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
deleted file mode 100644
index b73e7059b219..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module prefix systemd
-
-DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy";
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git";
-       inherit git-r3
-else
-       
SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-
-RDEPEND="
-       acct-group/dnscrypt-proxy
-       acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.1.7-config-full-paths.patch
-)
-
-src_compile() {
-       pushd "${PN}" >/dev/null || die
-       ego build -v -x -mod=readonly -mod=vendor
-       popd >/dev/null || die
-}
-
-src_test() {
-       cd "${PN}" || die
-       ego test -mod=vendor
-}
-
-src_install() {
-       pushd "${PN}" >/dev/null || die
-
-       dobin dnscrypt-proxy
-
-       eprefixify example-dnscrypt-proxy.toml
-       insinto /etc/dnscrypt-proxy
-       newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-       doins example-{allowed,blocked}-{ips.txt,names.txt}
-       doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-       popd >/dev/null || die
-
-       insinto /usr/share/dnscrypt-proxy
-       doins -r "utils/generate-domains-blocklist/."
-
-       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 "${EROOT}/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/DNSCrypt/${PN}/wiki";
-}

diff --git 
a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch 
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch
deleted file mode 100644
index 31c927484d90..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
-+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-@@ -372,7 +372,7 @@ reject_ttl = 10
- 
- ## See the `example-forwarding-rules.txt` file for an example
- 
--# forwarding_rules = 'forwarding-rules.txt'
-+# forwarding_rules = 
'@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/forwarding-rules.txt'
- 
- 
- 
-@@ -388,7 +388,7 @@ reject_ttl = 10
- ##
- ## See the `example-cloaking-rules.txt` file for an example
- 
--# cloaking_rules = 'cloaking-rules.txt'
-+# cloaking_rules = 
'@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/cloaking-rules.txt'
- 
- ## TTL used when serving entries in cloaking-rules.txt
- 
-@@ -442,7 +442,7 @@ cache_neg_max_ttl = 600
- ## check for connectivity and captive portals, along with hard-coded
- ## IP addresses to return.
- 
--# map_file = 'example-captive-portals.txt'
-+# map_file = 
'@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt'
- 
- 
- 
-@@ -474,8 +474,8 @@ cache_neg_max_ttl = 600
- ## openssl req -x509 -nodes -newkey rsa:2048 -days 5000 -sha256 -keyout 
localhost.pem -out localhost.pem
- ## See the documentation (wiki) for more information.
- 
--# cert_file = 'localhost.pem'
--# cert_key_file = 'localhost.pem'
-+# cert_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
-+# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
- 
- 
- 
-@@ -706,7 +706,7 @@ format = 'tsv'
- 
-   [sources.public-resolvers]
-     urls = 
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md',
 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
--    cache_file = 'public-resolvers.md'
-+    cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md'
-     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
-     prefix = ''
-@@ -715,7 +715,7 @@ format = 'tsv'
- 
-   [sources.relays]
-     urls = 
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md',
 'https://download.dnscrypt.info/resolvers-list/v3/relays.md']
--    cache_file = 'relays.md'
-+    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md'
-     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
-     prefix = ''
-@@ -724,13 +724,13 @@ format = 'tsv'
- 
-   # [sources.odoh-servers]
-   #   urls = 
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md',
 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
--  #   cache_file = 'odoh-servers.md'
-+  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md'
-   #   minisign_key = 
'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-   # [sources.odoh-relays]
-   #   urls = 
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md',
 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md']
--  #   cache_file = 'odoh-relays.md'
-+  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md'
-   #   minisign_key = 
'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-@@ -740,7 +740,7 @@ format = 'tsv'
-   # [sources.quad9-resolvers]
-   #   urls = ['https://www.quad9.net/quad9-resolvers.md']
-   #   minisign_key = 
'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
--  #   cache_file = 'quad9-resolvers.md'
-+  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/quad9-resolvers.md'
-   #   prefix = 'quad9-'
- 
-   ### Another example source, with resolvers censoring some websites not 
appropriate for children
-@@ -748,7 +748,7 @@ format = 'tsv'
- 
-   # [sources.parental-control]
-   #   urls = 
['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md',
 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md']
--  #   cache_file = 'parental-control.md'
-+  #   cache_file = 
'@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/parental-control.md'
-   #   minisign_key = 
'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 

Reply via email to