commit: f6f972a12cad856d4208af146ee6d47ee2b4168c Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net> AuthorDate: Thu Sep 26 18:23:13 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Thu Sep 26 18:26:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f6f972a1
app-crypt/autofirma: Remove bypass for upstream download restrictions. It's inappropriate and broken. Closes: https://bugs.gentoo.org/show_bug.cgi?id=936243 Closes: https://bugs.gentoo.org/show_bug.cgi?id=937486 Signed-off-by: Jesus P Rey (Chuso) <gentoo <AT> chuso.net> app-crypt/autofirma/Manifest | 2 +- app-crypt/autofirma/autofirma-1.8.3.ebuild | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app-crypt/autofirma/Manifest b/app-crypt/autofirma/Manifest index 34b8bca25..bcdfc3111 100644 --- a/app-crypt/autofirma/Manifest +++ b/app-crypt/autofirma/Manifest @@ -1,2 +1,2 @@ DIST autofirma-1.8.2.zip 51224492 BLAKE2B 22dcf856a9fae720f978976a7e6ac6e55af7b0e4d590ea2f2fe29021af3544600b5fa90460a6a30bdbe44803b8c719e80bfef0638513f8b47a98efc757e611ef SHA512 119bb55726f790eb432cf571ab3e30bf2f7eb166fcaa66c01b77eceba093ee5a10987dfbd73b67524e0bfc8a84e043b8b50ad3553e4364d50d46e3bcfd66103c -DIST autofirma-1.8.3.zip 51229179 BLAKE2B 6638ba177e9e924de41bc3b4188f503ecf9135f86036540a29592eee861e9453e2a14e56c686130b056900c4560ecc689a6613e701f5203413ee79c1cf0d9718 SHA512 d31650b6ce051700f77b9011b8ca4e01ac28dcbf8fc4c8badd867f0eee6ab91d05222b9d7eac8df64772f7ec956935d4a2dce2ad7201d5b83acd70b78de4ea90 +DIST autofirma-1.8.3.zip 51230663 BLAKE2B cf7523675cfb2782e5bc0cab3fe96e1650607b0709c2276862c984c30c8aee73470df30b338509ee2587fcfc6d83197f3b04dc6991685d357d93f5765d6d5c6d SHA512 d605881c36ee29aa7fa89ebbfeb54bce79e5a9563e5aa5d9e88f68d9a6574195a0ddaf45ca2ac71b1201cde287fd49dd28593fa06588a573dbdd14baec84d058 diff --git a/app-crypt/autofirma/autofirma-1.8.3.ebuild b/app-crypt/autofirma/autofirma-1.8.3.ebuild index a80ade533..0e5c3753f 100644 --- a/app-crypt/autofirma/autofirma-1.8.3.ebuild +++ b/app-crypt/autofirma/autofirma-1.8.3.ebuild @@ -10,10 +10,9 @@ HOMEPAGE=" https://administracionelectronica.gob.es/ctt/clienteafirma https://github.com/ctt-gob-es/clienteafirma " - -# Upstream blocks wget with no User Agent. It can be addressed globally (see https://wiki.gentoo.org/wiki/FETCHCOMMAND). -# If Gentoo's default configuration is in place, pkg_pretend() and pkg_nofetch() provide fallback options. -SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${PF}.zip" +# Upstream blocks wget, so we need a fallback option +SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${P}.zip + https://distfiles.chuso.net/distfiles/${P}.zip" S="${WORKDIR}" @@ -24,14 +23,6 @@ KEYWORDS="~amd64" RDEPEND="virtual/jre:1.8" BDEPEND="app-arch/unzip" -pkg_pretend() { - # Upstream blocks vanilla wget, so we set up a browser User-Agent as a fallback. - local URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip" - local USER_AGENT="Mozilla/5.0 (X11; Gentoo; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0" - local DISTFILE="${PORTAGE_ACTUAL_DISTDIR}/${PF}.zip" - [[ -f "${DISTFILE}" ]] || /usr/sbin/wget --user-agent="${USER_AGENT}" "${URI}" -O "${DISTFILE}" -} - pkg_nofetch() { einfo "Please download:" einfo " https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"