On Tue, May 14, 2024 at 10:35:52PM +0200, Lucas Stach wrote: > wget2 as an (almost) drop-in replacement to wget doesn't support the > FTP(S) protocol. Instead of trying to fix FTP downloads via other > tools simply remove the support, as it's not really needed anymore > due to available alternatives. > > Signed-off-by: Lucas Stach <[email protected]> > --- > scripts/lib/ptxd_make_get.sh | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh > index c06257ee6ebb..615809125932 100644 > --- a/scripts/lib/ptxd_make_get.sh > +++ b/scripts/lib/ptxd_make_get.sh > @@ -75,7 +75,6 @@ ptxd_make_get_http() { > echo "Checking URL '${url}'..." > temp_header="$(mktemp "${PTXDIST_TEMPDIR}/urlcheck.XXXXXX")" || > ptxd_bailout "failed to create tempfile" > curl \ > - --ftp-pasv \ > --connect-timeout 30 \ > --retry 5 \ > --user-agent "PTXdist ${PTXDIST_VERSION_FULL}" \ > @@ -101,7 +100,6 @@ ptxd_make_get_http() { > progress=bar:force > fi > wget \ > - --passive-ftp \ > --progress="${progress}" \ > --timeout=30 \ > --tries=5 \ > @@ -526,7 +524,7 @@ ptxd_make_get() { > ptxd_make_get_download_permitted && > ptxd_make_get_svn && return > ;; > - http://*|https://*|ftp://*) > + http://*|https://*)
I think we can drop the options above. Passive FTP is the default anyways for both curl and wget nowadays. But keep the pattern here for now. I think we should have a "ptxdist lint" check instead. Michael > ptxd_make_get_download_permitted && > ptxd_make_get_http && return > ;; > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
