From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 May 2024 08:38:46 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s78Hm-00FRnH-0f for lore@lore.pengutronix.de; Wed, 15 May 2024 08:38:46 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1s78Hl-0001nH-IS; Wed, 15 May 2024 08:38:45 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s78Hc-0001n6-04; Wed, 15 May 2024 08:38:36 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1s78Hb-001ULk-Jo; Wed, 15 May 2024 08:38:35 +0200 Received: from mol by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1s78Hb-00CzE5-1j; Wed, 15 May 2024 08:38:35 +0200 Date: Wed, 15 May 2024 08:38:35 +0200 From: Michael Olbrich To: Lucas Stach Message-ID: Mail-Followup-To: Lucas Stach , ptxdist@pengutronix.de References: <20240514203552.1297323-1-l.stach@pengutronix.de> <20240514203552.1297323-21-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240514203552.1297323-21-l.stach@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH 20/20] ptxd_make_get: remove FTP support X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 > --- > 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 |