[ptxdist] [PATCH 1/6] grub: replace download URL with HTTPS

[ptxdist] [PATCH 1/6] grub: replace download URL with HTTPS

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/grub.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/grub.make b/rules/grub.make
index 63b93c2d7ba9..ce0280e2fae6 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_GRUB) += grub
 GRUB_VERSION		:= 0.97
 GRUB_MD5		:= cd3f3eb54446be6003156158d51f4884
 GRUB			:= grub-$(GRUB_VERSION)
-GRUB_URL		:= ftp://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz
+GRUB_URL		:= https://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz
 GRUB_SOURCE		:= $(SRCDIR)/$(GRUB).tar.gz
 GRUB_DIR		:= $(BUILDDIR)/$(GRUB)
 
-- 
2.39.2

[ptxdist] [PATCH 2/6] efax: replace download URL with HTTPS

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/efax.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/efax.make b/rules/efax.make
index 80d0abddb07d..ebd2ea65a73e 100644
--- a/rules/efax.make
+++ b/rules/efax.make
@@ -19,7 +19,7 @@ EFAX_VERSION	:= 0.9
 EFAX_MD5	:= 23bd3767f87c455c58ccae7f88bce725
 EFAX		:= efax-$(EFAX_VERSION)
 EFAX_SUFFIX	:= tar.gz
-EFAX_URL	:= ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX)
+EFAX_URL	:= https://www.ibiblio.org/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX)
 EFAX_SOURCE	:= $(SRCDIR)/$(EFAX).$(EFAX_SUFFIX)
 EFAX_DIR	:= $(BUILDDIR)/$(EFAX)
 EFAX_LICENSE	:= unknown
-- 
2.39.2

[ptxdist] [PATCH 3/6] gdb: replace download URL with HTTPS

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/gdb.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/gdb.make b/rules/gdb.make
index c1337427b605..558bad163d1b 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -26,7 +26,7 @@ GDB_LICENSE	:= GPL-3.0-or-later
 
 GDB_URL := \
 	$(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \
-	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX)
+	https://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX)
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.2

[ptxdist] [PATCH 4/6] gdbserver: replace download URL with HTTPS

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/gdbserver.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index 2ff2f15395c4..0cbe6773e380 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -29,7 +29,7 @@ GDBSERVER_LICENSE_FILES	:= \
 
 GDBSERVER_URL := \
 	$(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \
-	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
+	https://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.2

[ptxdist] [PATCH 5/6] ptxd_make_get: drop passive FTP options

[Lucas Stach]

They are the default in both curl and wget anyway and wget2
doesn't understand the option, failing the download when this
option is specified.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 scripts/lib/ptxd_make_get.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index c06257ee6ebb..22fc0d0834fb 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 \
-- 
2.39.2

[ptxdist] [PATCH 6/6] ptxd_make_world_lint: check for usage of deprecated FTP protocol

[Lucas Stach]

FTP is on its way out, so it should not be used in package URLs
anymore. Add a lint check to ensure that.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 scripts/lib/ptxd_make_world_lint.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/lib/ptxd_make_world_lint.sh b/scripts/lib/ptxd_make_world_lint.sh
index 01a35d4801b8..94d43d6bee4f 100644
--- a/scripts/lib/ptxd_make_world_lint.sh
+++ b/scripts/lib/ptxd_make_world_lint.sh
@@ -281,6 +281,23 @@ ptxd_make_world_lint_credits() {
 export -f ptxd_make_world_lint_credits
 PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} credits"
 
+ptxd_make_world_lint_ftp() {
+    local filefd file
+
+    echo "Checking for deprecated FTP protocol use in package URL ..."
+
+    exec {filefd}< <(ptxd_make_world_lint_makefiles)
+    while read file <&${filefd}; do
+        if grep -q "URL.*ftp://" "${file}"; then
+            ptxd_lint_error "'$(ptxd_print_path "${file}")' contains deprecated FTP URL."
+        fi
+    done
+    exec {filefd}<&-
+    echo
+}
+export -f ptxd_make_world_lint_ftp
+PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} ftp"
+
 unset ptxd_make_world_lint_cross_whitelist
 # we don't care about the initmethod
 ptxd_make_world_lint_cross_whitelist+="INITMETHOD_BBINIT INITMETHOD_SYSTEMD "
-- 
2.39.2

Re: [ptxdist] [PATCH 6/6] ptxd_make_world_lint: check for usage of deprecated FTP protocol

[Michael Olbrich]

On Mon, May 27, 2024 at 10:13:47PM +0200, Lucas Stach wrote:
> FTP is on its way out, so it should not be used in package URLs
> anymore. Add a lint check to ensure that.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  scripts/lib/ptxd_make_world_lint.sh | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/scripts/lib/ptxd_make_world_lint.sh b/scripts/lib/ptxd_make_world_lint.sh
> index 01a35d4801b8..94d43d6bee4f 100644
> --- a/scripts/lib/ptxd_make_world_lint.sh
> +++ b/scripts/lib/ptxd_make_world_lint.sh
> @@ -281,6 +281,23 @@ ptxd_make_world_lint_credits() {
>  export -f ptxd_make_world_lint_credits
>  PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} credits"
>  
> +ptxd_make_world_lint_ftp() {
> +    local filefd file
> +
> +    echo "Checking for deprecated FTP protocol use in package URL ..."
> +
> +    exec {filefd}< <(ptxd_make_world_lint_makefiles)
> +    while read file <&${filefd}; do
> +        if grep -q "URL.*ftp://" "${file}"; then

This will not detect multiline URL patterns. How about this:

        if grep -qzP '_URL\b.*=(.*\\\n)*.*\bftp://' "${file}"; then

Michael

> +            ptxd_lint_error "'$(ptxd_print_path "${file}")' contains deprecated FTP URL."
> +        fi
> +    done
> +    exec {filefd}<&-
> +    echo
> +}
> +export -f ptxd_make_world_lint_ftp
> +PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} ftp"
> +
>  unset ptxd_make_world_lint_cross_whitelist
>  # we don't care about the initmethod
>  ptxd_make_world_lint_cross_whitelist+="INITMETHOD_BBINIT INITMETHOD_SYSTEMD "
> -- 
> 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 |

Re: [ptxdist] [APPLIED] grub: replace download URL with HTTPS

[Michael Olbrich]

Thanks, applied as 23e6762fb5f261be74d4b66a948f665f02820f21.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:28 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/grub.make b/rules/grub.make
> index 63b93c2d7ba9..ce0280e2fae6 100644
> --- a/rules/grub.make
> +++ b/rules/grub.make
> @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_GRUB) += grub
>  GRUB_VERSION		:= 0.97
>  GRUB_MD5		:= cd3f3eb54446be6003156158d51f4884
>  GRUB			:= grub-$(GRUB_VERSION)
> -GRUB_URL		:= ftp://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz
> +GRUB_URL		:= https://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz
>  GRUB_SOURCE		:= $(SRCDIR)/$(GRUB).tar.gz
>  GRUB_DIR		:= $(BUILDDIR)/$(GRUB)
>  

Re: [ptxdist] [APPLIED] efax: replace download URL with HTTPS

[Michael Olbrich]

Thanks, applied as a78ea1061ed27cecfbd2c89c67aaab61262d38b5.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:29 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/efax.make b/rules/efax.make
> index 80d0abddb07d..ebd2ea65a73e 100644
> --- a/rules/efax.make
> +++ b/rules/efax.make
> @@ -19,7 +19,7 @@ EFAX_VERSION	:= 0.9
>  EFAX_MD5	:= 23bd3767f87c455c58ccae7f88bce725
>  EFAX		:= efax-$(EFAX_VERSION)
>  EFAX_SUFFIX	:= tar.gz
> -EFAX_URL	:= ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX)
> +EFAX_URL	:= https://www.ibiblio.org/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX)
>  EFAX_SOURCE	:= $(SRCDIR)/$(EFAX).$(EFAX_SUFFIX)
>  EFAX_DIR	:= $(BUILDDIR)/$(EFAX)
>  EFAX_LICENSE	:= unknown

Re: [ptxdist] [APPLIED] gdb: replace download URL with HTTPS

[Michael Olbrich]

Thanks, applied as c214d3eb7ecb261522c22148bc714ccc9f033158.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:30 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-3-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gdb.make b/rules/gdb.make
> index c1337427b605..558bad163d1b 100644
> --- a/rules/gdb.make
> +++ b/rules/gdb.make
> @@ -26,7 +26,7 @@ GDB_LICENSE	:= GPL-3.0-or-later
>  
>  GDB_URL := \
>  	$(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \
> -	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX)
> +	https://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX)
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] gdbserver: replace download URL with HTTPS

[Michael Olbrich]

Thanks, applied as 625d4fe07532b1793381c3c3353bea935683b944.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:31 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gdbserver.make b/rules/gdbserver.make
> index 2ff2f15395c4..0cbe6773e380 100644
> --- a/rules/gdbserver.make
> +++ b/rules/gdbserver.make
> @@ -29,7 +29,7 @@ GDBSERVER_LICENSE_FILES	:= \
>  
>  GDBSERVER_URL := \
>  	$(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \
> -	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
> +	https://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] ptxd_make_get: drop passive FTP options

[Michael Olbrich]

Thanks, applied as 7caf620b4cd50d16b24fb56740d5fa9dcb711b82.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:32 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> They are the default in both curl and wget anyway and wget2
> doesn't understand the option, failing the download when this
> option is specified.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-5-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index c06257ee6ebb..22fc0d0834fb 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 \

Re: [ptxdist] [APPLIED] ptxd_make_world_lint: check for usage of deprecated FTP protocol

[Michael Olbrich]

Thanks, applied as 25569bfbd9aa26d3f5eb7635ae421c216211511b.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:33 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> FTP is on its way out, so it should not be used in package URLs
> anymore. Add a lint check to ensure that.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240527201347.673604-6-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_world_lint.sh b/scripts/lib/ptxd_make_world_lint.sh
> index 01a35d4801b8..42785f186d77 100644
> --- a/scripts/lib/ptxd_make_world_lint.sh
> +++ b/scripts/lib/ptxd_make_world_lint.sh
> @@ -281,6 +281,23 @@ ptxd_make_world_lint_credits() {
>  export -f ptxd_make_world_lint_credits
>  PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} credits"
>  
> +ptxd_make_world_lint_ftp() {
> +    local filefd file
> +
> +    echo "Checking for deprecated FTP protocol use in package URL ..."
> +
> +    exec {filefd}< <(ptxd_make_world_lint_makefiles)
> +    while read file <&${filefd}; do
> +	if grep -q "URL.*ftp://" "${file}"; then
> +	    ptxd_lint_error "'$(ptxd_print_path "${file}")' contains deprecated FTP URL."
> +	fi
> +    done
> +    exec {filefd}<&-
> +    echo
> +}
> +export -f ptxd_make_world_lint_ftp
> +PTXDIST_LINT_COMMANDS="${PTXDIST_LINT_COMMANDS} ftp"
> +
>  unset ptxd_make_world_lint_cross_whitelist
>  # we don't care about the initmethod
>  ptxd_make_world_lint_cross_whitelist+="INITMETHOD_BBINIT INITMETHOD_SYSTEMD "