From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 14 May 2024 22:43:24 +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 1s6yzc-00EmSv-27 for lore@lore.pengutronix.de; Tue, 14 May 2024 22:43:24 +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 1s6yzb-0007BS-Mm; Tue, 14 May 2024 22:43:23 +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 1s6yzI-0006DM-Uf for ptxdist@pengutronix.de; Tue, 14 May 2024 22:43:04 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1s6ysM-001PpX-7Z for ptxdist@pengutronix.de; Tue, 14 May 2024 22:35:54 +0200 From: Lucas Stach To: ptxdist@pengutronix.de Date: Tue, 14 May 2024 22:35:52 +0200 Message-Id: <20240514203552.1297323-21-l.stach@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240514203552.1297323-1-l.stach@pengutronix.de> References: <20240514203552.1297323-1-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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 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 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://*) ptxd_make_get_download_permitted && ptxd_make_get_http && return ;; -- 2.39.2