[ptxdist] [PATCH 00/20] remove FTP support

[ptxdist] [PATCH 00/20] remove FTP support

[Lucas Stach]

Fedora 40 decided to ship wget2 as wget replacement [1], which does not
support the FTP(S) protocol, with no progress on the issue tracking the
implementation since a few years. While the change is quite questionable,
with even upstream disagreeing [3], it may be a hint that it's finally
time to phase out FTP usage.

As wget2 doesn't understand the passive-ftp option, all downloads using
the wget based handler are broken, not just the packages actually using
FTP.

[1] https://discussion.fedoraproject.org/t/f40-change-proposal-wget2-as-wget/96422
[2] https://gitlab.com/gnuwget/wget2/-/issues/3
[3] https://gitlab.com/gnuwget/wget2/-/issues/661

Lucas Stach (20):
  alsa-lib: remove FTP URL
  alsa-utils: remove FTP URL
  ckermit: replace download URL with HTTP
  dialog: remove FTP URL
  efax: replace download URL with HTTPS
  fftw: remove FTP URL
  figlet: replace URL with HTTPS
  gdb: remove FTP URL
  gdbserver: remove FTP URL
  glu: replace download URL with HTTPS
  gnupg: remove FTP URL
  libffi: remove FTP URL
  libgpg-error: remove FTP URL
  libksba: remove FTP URL
  mesa-demos: replace download URL with HTTPS
  netkit-ftp: remove FTP URL
  npth: remove FTP URL
  nvmetcli: version bump 0.7 -> 0.8
  proftpd: move to staging
  ptxd_make_get: remove FTP support

 rules/alsa-lib.make          | 4 +---
 rules/alsa-utils.make        | 4 +---
 rules/ckermit.make           | 2 +-
 rules/dialog.make            | 4 +---
 rules/efax.in                | 6 ++++++
 rules/efax.make              | 2 +-
 rules/fftw.make              | 4 +---
 rules/figlet.make            | 2 +-
 rules/gdb.make               | 4 +---
 rules/gdbserver.make         | 4 +---
 rules/glu.make               | 2 +-
 rules/gnupg.make             | 4 +---
 rules/libffi.make            | 4 +---
 rules/libgpg-error.make      | 3 +--
 rules/libksba.make           | 4 +---
 rules/mesa-demos.make        | 2 +-
 rules/netkit-ftp.make        | 4 +---
 rules/npth.make              | 4 +---
 rules/nvmetcli.make          | 6 +++---
 rules/proftpd.in             | 7 ++++++-
 scripts/lib/ptxd_make_get.sh | 4 +---
 21 files changed, 33 insertions(+), 47 deletions(-)

-- 
2.39.2

[ptxdist] [PATCH 01/20] alsa-lib: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/alsa-lib.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index ffc75b3ae9d1..fc9b4c51787e 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -19,9 +19,7 @@ ALSA_LIB_VERSION	:= 1.2.11
 ALSA_LIB_MD5		:= 1c5870770047b6a520d18a43f49e42ea
 ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
 ALSA_LIB_SUFFIX		:= tar.bz2
-ALSA_LIB_URL		:= \
-	https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
-	ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
+ALSA_LIB_URL		:= https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
 ALSA_LIB_SOURCE		:= $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
 ALSA_LIB_DIR		:= $(BUILDDIR)/$(ALSA_LIB)
 ALSA_LIB_LICENSE	:= LGPL-2.1-or-later
-- 
2.39.2

Re: [ptxdist] [APPLIED] alsa-lib: remove FTP URL

[Michael Olbrich]

Thanks, applied as 9b72223de67b3d8b574d2c21aace655c0b666436.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:07 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> index ffc75b3ae9d1..fc9b4c51787e 100644
> --- a/rules/alsa-lib.make
> +++ b/rules/alsa-lib.make
> @@ -19,9 +19,7 @@ ALSA_LIB_VERSION	:= 1.2.11
>  ALSA_LIB_MD5		:= 1c5870770047b6a520d18a43f49e42ea
>  ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
>  ALSA_LIB_SUFFIX		:= tar.bz2
> -ALSA_LIB_URL		:= \
> -	https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
> -	ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
> +ALSA_LIB_URL		:= https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
>  ALSA_LIB_SOURCE		:= $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
>  ALSA_LIB_DIR		:= $(BUILDDIR)/$(ALSA_LIB)
>  ALSA_LIB_LICENSE	:= LGPL-2.1-or-later

[ptxdist] [PATCH 02/20] alsa-utils: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/alsa-utils.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index c5d06853ba1b..0ff6f11c2980 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -19,9 +19,7 @@ ALSA_UTILS_VERSION	:= 1.2.11
 ALSA_UTILS_MD5		:= 36676025301315789306e99e39154732
 ALSA_UTILS		:= alsa-utils-$(ALSA_UTILS_VERSION)
 ALSA_UTILS_SUFFIX	:= tar.bz2
-ALSA_UTILS_URL		:= \
-	https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) \
-	ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
+ALSA_UTILS_URL		:= https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
 ALSA_UTILS_SOURCE	:= $(SRCDIR)/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
 ALSA_UTILS_DIR		:= $(BUILDDIR)/$(ALSA_UTILS)
 ALSA_UTILS_LICENSE	:= GPL-2.0-or-later
-- 
2.39.2

Re: [ptxdist] [APPLIED] alsa-utils: remove FTP URL

[Michael Olbrich]

Thanks, applied as af4f835db47fb1857a78d01bef831f72b4d8e22c.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:08 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-3-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
> index c5d06853ba1b..0ff6f11c2980 100644
> --- a/rules/alsa-utils.make
> +++ b/rules/alsa-utils.make
> @@ -19,9 +19,7 @@ ALSA_UTILS_VERSION	:= 1.2.11
>  ALSA_UTILS_MD5		:= 36676025301315789306e99e39154732
>  ALSA_UTILS		:= alsa-utils-$(ALSA_UTILS_VERSION)
>  ALSA_UTILS_SUFFIX	:= tar.bz2
> -ALSA_UTILS_URL		:= \
> -	https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) \
> -	ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
> +ALSA_UTILS_URL		:= https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
>  ALSA_UTILS_SOURCE	:= $(SRCDIR)/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX)
>  ALSA_UTILS_DIR		:= $(BUILDDIR)/$(ALSA_UTILS)
>  ALSA_UTILS_LICENSE	:= GPL-2.0-or-later

[ptxdist] [PATCH 03/20] ckermit: replace download URL with HTTP

[Lucas Stach]

The site hosting ckermit has retired the FTP server and does not
yet provide HTTPS, so fall back to a HTTP URL.

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

diff --git a/rules/ckermit.make b/rules/ckermit.make
index ecf1df5a7988..b9bd3dbd2b9f 100644
--- a/rules/ckermit.make
+++ b/rules/ckermit.make
@@ -20,7 +20,7 @@ CKERMIT_VERSION		:= 302
 CKERMIT_MD5		:= eac4dbf18b45775e4cdee5a7c74762b0
 CKERMIT			:= cku$(CKERMIT_VERSION)
 CKERMIT_SUFFIX		:= tar.gz
-CKERMIT_URL		:= ftp://ftp.kermitproject.org/kermit/archives/$(CKERMIT).$(CKERMIT_SUFFIX)
+CKERMIT_URL		:= http://www.columbia.edu/kermit/ftp/archives/$(CKERMIT).$(CKERMIT_SUFFIX)
 CKERMIT_SOURCE		:= $(SRCDIR)/$(CKERMIT).$(CKERMIT_SUFFIX)
 CKERMIT_DIR		:= $(BUILDDIR)/$(CKERMIT)
 CKERMIT_STRIP_LEVEL	:= 0
-- 
2.39.2

Re: [ptxdist] [APPLIED] ckermit: replace download URL with HTTP

[Michael Olbrich]

Thanks, applied as cd8e04787286578ca94a25796108c81a6ea8c9df.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:09 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> The site hosting ckermit has retired the FTP server and does not
> yet provide HTTPS, so fall back to a HTTP URL.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/ckermit.make b/rules/ckermit.make
> index ecf1df5a7988..b9bd3dbd2b9f 100644
> --- a/rules/ckermit.make
> +++ b/rules/ckermit.make
> @@ -20,7 +20,7 @@ CKERMIT_VERSION		:= 302
>  CKERMIT_MD5		:= eac4dbf18b45775e4cdee5a7c74762b0
>  CKERMIT			:= cku$(CKERMIT_VERSION)
>  CKERMIT_SUFFIX		:= tar.gz
> -CKERMIT_URL		:= ftp://ftp.kermitproject.org/kermit/archives/$(CKERMIT).$(CKERMIT_SUFFIX)
> +CKERMIT_URL		:= http://www.columbia.edu/kermit/ftp/archives/$(CKERMIT).$(CKERMIT_SUFFIX)
>  CKERMIT_SOURCE		:= $(SRCDIR)/$(CKERMIT).$(CKERMIT_SUFFIX)
>  CKERMIT_DIR		:= $(BUILDDIR)/$(CKERMIT)
>  CKERMIT_STRIP_LEVEL	:= 0

[ptxdist] [PATCH 04/20] dialog: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/dialog.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/dialog.make b/rules/dialog.make
index cc8980fc8a7d..6ab97bde0073 100644
--- a/rules/dialog.make
+++ b/rules/dialog.make
@@ -18,9 +18,7 @@ DIALOG_VERSION	:= 1.3-20171209
 DIALOG_MD5	:= f66f28beca900b54f5fc90fdcce93508
 DIALOG		:= dialog-$(DIALOG_VERSION)
 DIALOG_SUFFIX	:= tgz
-DIALOG_URL	:= \
-	ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX) \
-	https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX)
+DIALOG_URL	:= https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX)
 DIALOG_SOURCE	:= $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX)
 DIALOG_DIR	:= $(BUILDDIR)/$(DIALOG)
 DIALOG_LICENSE	:= LGPL-2.1-only
-- 
2.39.2

Re: [ptxdist] [APPLIED] dialog: remove FTP URL

[Michael Olbrich]

Thanks, applied as 7f4a0d6b49191f4e5d5a77de6902e12c2182f090.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:09 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-5-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dialog.make b/rules/dialog.make
> index cc8980fc8a7d..6ab97bde0073 100644
> --- a/rules/dialog.make
> +++ b/rules/dialog.make
> @@ -18,9 +18,7 @@ DIALOG_VERSION	:= 1.3-20171209
>  DIALOG_MD5	:= f66f28beca900b54f5fc90fdcce93508
>  DIALOG		:= dialog-$(DIALOG_VERSION)
>  DIALOG_SUFFIX	:= tgz
> -DIALOG_URL	:= \
> -	ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX) \
> -	https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX)
> +DIALOG_URL	:= https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX)
>  DIALOG_SOURCE	:= $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX)
>  DIALOG_DIR	:= $(BUILDDIR)/$(DIALOG)
>  DIALOG_LICENSE	:= LGPL-2.1-only

[ptxdist] [PATCH 05/20] efax: replace download URL with HTTPS

[Lucas Stach]

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

diff --git a/rules/efax.in b/rules/efax.in
index ff45094a762e..55379a249aee 100644
--- a/rules/efax.in
+++ b/rules/efax.in
@@ -1,3 +1,5 @@
+## SECTION=staging
+## old section:
 ## SECTION=communication
 config EFAX
 	tristate
@@ -16,3 +18,7 @@ config EFAX
 	  files as faxes and receive, print or preview
 	  received faxes.
 
+	  STAGING: remove in PTXdist 2025.06.0
+	  Unmaintained in PTXdist. Old upstream and URL are
+	  dead. "New" development release from 2008 can be found
+	  here: https://www.cce.com/efax
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

Re: [ptxdist] [PATCH 05/20] efax: replace download URL with HTTPS

[Michael Olbrich]

On Tue, May 14, 2024 at 10:35:37PM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/efax.in   | 6 ++++++
>  rules/efax.make | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/efax.in b/rules/efax.in
> index ff45094a762e..55379a249aee 100644
> --- a/rules/efax.in
> +++ b/rules/efax.in
> @@ -1,3 +1,5 @@
> +## SECTION=staging
> +## old section:

That deserves a comment in the commit message.

>  ## SECTION=communication

You need to add an extra '#' here, otherwise the package is in both
sections.

Michael

>  config EFAX
>  	tristate
> @@ -16,3 +18,7 @@ config EFAX
>  	  files as faxes and receive, print or preview
>  	  received faxes.
>  
> +	  STAGING: remove in PTXdist 2025.06.0
> +	  Unmaintained in PTXdist. Old upstream and URL are
> +	  dead. "New" development release from 2008 can be found
> +	  here: https://www.cce.com/efax
> 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
> 
> 
> 

-- 
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 |

[ptxdist] [PATCH 06/20] fftw: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/fftw.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/fftw.make b/rules/fftw.make
index 8c1a8fff93d0..7fd9c49a70f2 100644
--- a/rules/fftw.make
+++ b/rules/fftw.make
@@ -21,9 +21,7 @@ FFTW		:= fftw-$(FFTW_VERSION)
 FFTW_SUFFIX	:= tar.gz
 FFTW_SOURCE	:= $(SRCDIR)/$(FFTW).$(FFTW_SUFFIX)
 FFTW_DIR	:= $(BUILDDIR)/$(FFTW)
-FFTW_URL	:= \
-	http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX) \
-	ftp://ftp.fftw.org/pub/fftw/old/$(FFTW).$(FFTW_SUFFIX)
+FFTW_URL	:= http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX)
 FFTW_LICENSE	:= GPL-2.0-or-later
 FFTW_LICENSE_FILES	:= \
 	file://COPYRIGHT;md5=f19d163a5d9bc582a8ba578f591eab80 \
-- 
2.39.2

Re: [ptxdist] [APPLIED] fftw: remove FTP URL

[Michael Olbrich]

Thanks, applied as 13dee8507d3da001ebc1195aa95d8ada99590f18.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:10 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-7-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/fftw.make b/rules/fftw.make
> index 8c1a8fff93d0..7fd9c49a70f2 100644
> --- a/rules/fftw.make
> +++ b/rules/fftw.make
> @@ -21,9 +21,7 @@ FFTW		:= fftw-$(FFTW_VERSION)
>  FFTW_SUFFIX	:= tar.gz
>  FFTW_SOURCE	:= $(SRCDIR)/$(FFTW).$(FFTW_SUFFIX)
>  FFTW_DIR	:= $(BUILDDIR)/$(FFTW)
> -FFTW_URL	:= \
> -	http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX) \
> -	ftp://ftp.fftw.org/pub/fftw/old/$(FFTW).$(FFTW_SUFFIX)
> +FFTW_URL	:= http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX)
>  FFTW_LICENSE	:= GPL-2.0-or-later
>  FFTW_LICENSE_FILES	:= \
>  	file://COPYRIGHT;md5=f19d163a5d9bc582a8ba578f591eab80 \

[ptxdist] [PATCH 07/20] figlet: replace URL with HTTPS

[Lucas Stach]

As the figlet page only provides FTP downloads, point the download
URL to the github repository of the maintainer, which is also linked
from the homepage.

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

diff --git a/rules/figlet.make b/rules/figlet.make
index 3dad77154430..c6d2fb38ea06 100644
--- a/rules/figlet.make
+++ b/rules/figlet.make
@@ -20,7 +20,7 @@ FIGLET_VERSION		:= 2.2.5
 FIGLET_MD5		:= d88cb33a14f1469fff975d021ae2858e
 FIGLET			:= figlet-$(FIGLET_VERSION)
 FIGLET_SUFFIX		:= tar.gz
-FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
+FIGLET_URL		:= https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX)
 FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
 FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
 FIGLET_LICENSE		:= BSD-3-clause
-- 
2.39.2

Re: [ptxdist] [APPLIED] figlet: replace URL with HTTPS

[Michael Olbrich]

Thanks, applied as 6e138365d117723938385c41f6ccc3d282b22937.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:11 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> As the figlet page only provides FTP downloads, point the download
> URL to the github repository of the maintainer, which is also linked
> from the homepage.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-8-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/figlet.make b/rules/figlet.make
> index 3dad77154430..c6d2fb38ea06 100644
> --- a/rules/figlet.make
> +++ b/rules/figlet.make
> @@ -20,7 +20,7 @@ FIGLET_VERSION		:= 2.2.5
>  FIGLET_MD5		:= d88cb33a14f1469fff975d021ae2858e
>  FIGLET			:= figlet-$(FIGLET_VERSION)
>  FIGLET_SUFFIX		:= tar.gz
> -FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> +FIGLET_URL		:= https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX)
>  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
>  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
>  FIGLET_LICENSE		:= BSD-3-clause

Re: [ptxdist] [PATCH 07/20] figlet: replace URL with HTTPS

[Alexander Dahl]

Hei hei,

sorry for being late to the party, but we just discussed this in IRC …

Am Tue, May 14, 2024 at 10:35:39PM +0200 schrieb Lucas Stach:
> As the figlet page only provides FTP downloads, point the download
> URL to the github repository of the maintainer, which is also linked
> from the homepage.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/figlet.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/figlet.make b/rules/figlet.make
> index 3dad77154430..c6d2fb38ea06 100644
> --- a/rules/figlet.make
> +++ b/rules/figlet.make
> @@ -20,7 +20,7 @@ FIGLET_VERSION		:= 2.2.5
>  FIGLET_MD5		:= d88cb33a14f1469fff975d021ae2858e
>  FIGLET			:= figlet-$(FIGLET_VERSION)
>  FIGLET_SUFFIX		:= tar.gz
> -FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> +FIGLET_URL		:= https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX)

This is replacing a probably handcrafted tarball from 10+ years ago
with a machine generated tarball from today.  Although the content
looks similar, the md5sum is not the same.

What about using this instead?

http://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz

Greets
Alex

>  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
>  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
>  FIGLET_LICENSE		:= BSD-3-clause
> -- 
> 2.39.2
> 
> 

Re: [ptxdist] [PATCH 07/20] figlet: replace URL with HTTPS

[Michael Olbrich]

On Wed, Jun 12, 2024 at 02:32:59PM +0200, Alexander Dahl wrote:
> Hei hei,
> 
> sorry for being late to the party, but we just discussed this in IRC …
> 
> Am Tue, May 14, 2024 at 10:35:39PM +0200 schrieb Lucas Stach:
> > As the figlet page only provides FTP downloads, point the download
> > URL to the github repository of the maintainer, which is also linked
> > from the homepage.
> > 
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> >  rules/figlet.make | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/rules/figlet.make b/rules/figlet.make
> > index 3dad77154430..c6d2fb38ea06 100644
> > --- a/rules/figlet.make
> > +++ b/rules/figlet.make
> > @@ -20,7 +20,7 @@ FIGLET_VERSION		:= 2.2.5
> >  FIGLET_MD5		:= d88cb33a14f1469fff975d021ae2858e
> >  FIGLET			:= figlet-$(FIGLET_VERSION)
> >  FIGLET_SUFFIX		:= tar.gz
> > -FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> > +FIGLET_URL		:= https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX)
> 
> This is replacing a probably handcrafted tarball from 10+ years ago
> with a machine generated tarball from today.  Although the content
> looks similar, the md5sum is not the same.
> 
> What about using this instead?
> 
> http://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz

For the record: I decided to add the md5sum for the new tarball instead.

Michael

> >  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
> >  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
> >  FIGLET_LICENSE		:= BSD-3-clause
> > -- 
> > 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 |

[ptxdist] [PATCH 08/20] gdb: remove FTP URL

[Lucas Stach]

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

diff --git a/rules/gdb.make b/rules/gdb.make
index c1337427b605..085e1f66fc98 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -24,9 +24,7 @@ GDB_SOURCE	:= $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
 GDB_DIR		:= $(BUILDDIR)/$(GDB)
 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)
+GDB_URL := $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX))
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.2

Re: [ptxdist] [PATCH 08/20] gdb: remove FTP URL

[Alexander Dahl]

Am Tue, May 14, 2024 at 10:35:40PM +0200 schrieb Lucas Stach:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/gdb.make | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/rules/gdb.make b/rules/gdb.make
> index c1337427b605..085e1f66fc98 100644
> --- a/rules/gdb.make
> +++ b/rules/gdb.make
> @@ -24,9 +24,7 @@ GDB_SOURCE	:= $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
>  GDB_DIR		:= $(BUILDDIR)/$(GDB)
>  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)
> +GDB_URL := $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX))

Reviewed-by: Alexander Dahl <ada@thorsis.com>

Greets
Alex

Re: [ptxdist] [PATCH 08/20] gdb: remove FTP URL

[Michael Olbrich]

On Tue, May 14, 2024 at 10:35:40PM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/gdb.make | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/rules/gdb.make b/rules/gdb.make
> index c1337427b605..085e1f66fc98 100644
> --- a/rules/gdb.make
> +++ b/rules/gdb.make
> @@ -24,9 +24,7 @@ GDB_SOURCE	:= $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
>  GDB_DIR		:= $(BUILDDIR)/$(GDB)
>  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)

This URL is for pre-release snapshots. Please turn it into a https URL
instead.

Michael

> +GDB_URL := $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX))
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 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 |

[ptxdist] [PATCH 09/20] gdbserver: remove FTP URL

[Lucas Stach]

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

diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index 2ff2f15395c4..7937158a9851 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -27,9 +27,7 @@ GDBSERVER_LICENSE_FILES	:= \
 	file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
 	file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6
 
-GDBSERVER_URL := \
-	$(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \
-	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
+GDBSERVER_URL := $(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX))
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.2

Re: [ptxdist] [PATCH 09/20] gdbserver: remove FTP URL

[Alexander Dahl]

Hello,

Am Tue, May 14, 2024 at 10:35:41PM +0200 schrieb Lucas Stach:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/gdbserver.make | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/rules/gdbserver.make b/rules/gdbserver.make
> index 2ff2f15395c4..7937158a9851 100644
> --- a/rules/gdbserver.make
> +++ b/rules/gdbserver.make
> @@ -27,9 +27,7 @@ GDBSERVER_LICENSE_FILES	:= \
>  	file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
>  	file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6
>  
> -GDBSERVER_URL := \
> -	$(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \
> -	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)
> +GDBSERVER_URL := $(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX))
>  

Reviewed-by: Alexander Dahl <ada@thorsis.com>

Greets

Re: [ptxdist] [PATCH 09/20] gdbserver: remove FTP URL

[Michael Olbrich]

On Tue, May 14, 2024 at 10:35:41PM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/gdbserver.make | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/rules/gdbserver.make b/rules/gdbserver.make
> index 2ff2f15395c4..7937158a9851 100644
> --- a/rules/gdbserver.make
> +++ b/rules/gdbserver.make
> @@ -27,9 +27,7 @@ GDBSERVER_LICENSE_FILES	:= \
>  	file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
>  	file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6
>  
> -GDBSERVER_URL := \
> -	$(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \
> -	ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX)

Same as gdb.

Michael

> +GDBSERVER_URL := $(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX))
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 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 |

[ptxdist] [PATCH 10/20] glu: replace download URL with HTTPS

[Lucas Stach]

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

diff --git a/rules/glu.make b/rules/glu.make
index 6eab71036597..1b36cf1feb70 100644
--- a/rules/glu.make
+++ b/rules/glu.make
@@ -18,7 +18,7 @@ GLU_VERSION	:= 9.0.2
 GLU_MD5		:= 2b0f13fa5b949bfb3a995927c6e35125
 GLU		:= glu-$(GLU_VERSION)
 GLU_SUFFIX	:= tar.xz
-GLU_URL		:= ftp://ftp.freedesktop.org/pub/mesa/glu/$(GLU).$(GLU_SUFFIX)
+GLU_URL		:= https://mesa.freedesktop.org/archive/glu/$(GLU).$(GLU_SUFFIX)
 GLU_SOURCE	:= $(SRCDIR)/$(GLU).$(GLU_SUFFIX)
 GLU_DIR		:= $(BUILDDIR)/$(GLU)
 GLU_LICENSE	:= SGI-B-2.0 AND SGI-B-1.1
-- 
2.39.2

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

[Michael Olbrich]

Thanks, applied as f3bc12d3784bbc00da0584f9563d9887ef333c67.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:12 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-11-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/glu.make b/rules/glu.make
> index 6eab71036597..1b36cf1feb70 100644
> --- a/rules/glu.make
> +++ b/rules/glu.make
> @@ -18,7 +18,7 @@ GLU_VERSION	:= 9.0.2
>  GLU_MD5		:= 2b0f13fa5b949bfb3a995927c6e35125
>  GLU		:= glu-$(GLU_VERSION)
>  GLU_SUFFIX	:= tar.xz
> -GLU_URL		:= ftp://ftp.freedesktop.org/pub/mesa/glu/$(GLU).$(GLU_SUFFIX)
> +GLU_URL		:= https://mesa.freedesktop.org/archive/glu/$(GLU).$(GLU_SUFFIX)
>  GLU_SOURCE	:= $(SRCDIR)/$(GLU).$(GLU_SUFFIX)
>  GLU_DIR		:= $(BUILDDIR)/$(GLU)
>  GLU_LICENSE	:= SGI-B-2.0 AND SGI-B-1.1

[ptxdist] [PATCH 11/20] gnupg: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/gnupg.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index 1a90f472f9bf..5fbb6543cb9d 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -19,9 +19,7 @@ GNUPG_VERSION	:= 2.4.3
 GNUPG_MD5	:= e21ab42c629af80f19f813eeb61aa939
 GNUPG		:= gnupg-$(GNUPG_VERSION)
 GNUPG_SUFFIX	:= tar.bz2
-GNUPG_URL	:= \
-	https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) \
-	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
+GNUPG_URL	:= https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
 GNUPG_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND BSD-2-Clause-Views AND Unicode-DFS-2016
-- 
2.39.2

Re: [ptxdist] [APPLIED] gnupg: remove FTP URL

[Michael Olbrich]

Thanks, applied as 77c19b9887ef3580e3ed34bdd10e67cc7c5d9484.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:13 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-12-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gnupg.make b/rules/gnupg.make
> index 1a90f472f9bf..5fbb6543cb9d 100644
> --- a/rules/gnupg.make
> +++ b/rules/gnupg.make
> @@ -19,9 +19,7 @@ GNUPG_VERSION	:= 2.4.3
>  GNUPG_MD5	:= e21ab42c629af80f19f813eeb61aa939
>  GNUPG		:= gnupg-$(GNUPG_VERSION)
>  GNUPG_SUFFIX	:= tar.bz2
> -GNUPG_URL	:= \
> -	https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) \
> -	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
> +GNUPG_URL	:= https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
>  GNUPG_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND BSD-2-Clause-Views AND Unicode-DFS-2016

[ptxdist] [PATCH 12/20] libffi: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/libffi.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/libffi.make b/rules/libffi.make
index df6ca0a5c9d6..4ccc437d5e99 100644
--- a/rules/libffi.make
+++ b/rules/libffi.make
@@ -21,9 +21,7 @@ LIBFFI			:= libffi-$(LIBFFI_VERSION)
 LIBFFI_SUFFIX		:= tar.gz
 LIBFFI_SOURCE		:= $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
 LIBFFI_DIR		:= $(BUILDDIR)/$(LIBFFI)
-LIBFFI_URL		:= \
-	https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX) \
-	ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX)
+LIBFFI_URL		:= https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX)
 LIBFFI_LICENSE		:= MIT
 LIBFFI_LICENSE_FILES	:= \
 	file://LICENSE;md5=1db54c9fd307a12218766c3c7f650ca7
-- 
2.39.2

Re: [ptxdist] [APPLIED] libffi: remove FTP URL

[Michael Olbrich]

Thanks, applied as e90fb377c0099e07e615eedee1d54dfdec19dbde.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:14 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-13-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libffi.make b/rules/libffi.make
> index df6ca0a5c9d6..4ccc437d5e99 100644
> --- a/rules/libffi.make
> +++ b/rules/libffi.make
> @@ -21,9 +21,7 @@ LIBFFI			:= libffi-$(LIBFFI_VERSION)
>  LIBFFI_SUFFIX		:= tar.gz
>  LIBFFI_SOURCE		:= $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
>  LIBFFI_DIR		:= $(BUILDDIR)/$(LIBFFI)
> -LIBFFI_URL		:= \
> -	https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX) \
> -	ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX)
> +LIBFFI_URL		:= https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX)
>  LIBFFI_LICENSE		:= MIT
>  LIBFFI_LICENSE_FILES	:= \
>  	file://LICENSE;md5=1db54c9fd307a12218766c3c7f650ca7

[ptxdist] [PATCH 13/20] libgpg-error: remove FTP URL

[Lucas Stach]

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

diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 32f1390d1774..8e8097999e9a 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -21,8 +21,7 @@ LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SUFFIX	:= tar.bz2
 LIBGPG_ERROR_URL	:= \
 	http://artfiles.org/gnupg.org/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
-	https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
-	ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
+	https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
 LIBGPG_ERROR_SOURCE	:= $(SRCDIR)/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
 LIBGPG_ERROR_DIR	:= $(BUILDDIR)/$(LIBGPG_ERROR)
 LIBGPG_ERROR_LICENSE	:= GPL-2.0-only AND LGPL-2.0-only
-- 
2.39.2

Re: [ptxdist] [APPLIED] libgpg-error: remove FTP URL

[Michael Olbrich]

Thanks, applied as 24e3ff61328fd30cb750def2adda89f26e079d1b.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:15 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-14-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
> index 32f1390d1774..8e8097999e9a 100644
> --- a/rules/libgpg-error.make
> +++ b/rules/libgpg-error.make
> @@ -21,8 +21,7 @@ LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
>  LIBGPG_ERROR_SUFFIX	:= tar.bz2
>  LIBGPG_ERROR_URL	:= \
>  	http://artfiles.org/gnupg.org/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
> -	https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
> -	ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
> +	https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
>  LIBGPG_ERROR_SOURCE	:= $(SRCDIR)/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
>  LIBGPG_ERROR_DIR	:= $(BUILDDIR)/$(LIBGPG_ERROR)
>  LIBGPG_ERROR_LICENSE	:= GPL-2.0-only AND LGPL-2.0-only

[ptxdist] [PATCH 14/20] libksba: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/libksba.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/libksba.make b/rules/libksba.make
index 853fe90abc07..4aae3745b021 100644
--- a/rules/libksba.make
+++ b/rules/libksba.make
@@ -18,9 +18,7 @@ LIBKSBA_VERSION	:= 1.6.5
 LIBKSBA_MD5	:= 57b88e5d24c8705d9a3ba3832140d188
 LIBKSBA		:= libksba-$(LIBKSBA_VERSION)
 LIBKSBA_SUFFIX	:= tar.bz2
-LIBKSBA_URL	:= \
-	https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) \
-	ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
+LIBKSBA_URL	:= https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
 LIBKSBA_SOURCE	:= $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX)
 LIBKSBA_DIR	:= $(BUILDDIR)/$(LIBKSBA)
 LIBKSBA_LICENSE	:= GPL-2.0-only AND GPL-3.0-only AND LGPL-3.0-only
-- 
2.39.2

Re: [ptxdist] [APPLIED] libksba: remove FTP URL

[Michael Olbrich]

Thanks, applied as 600f24b4dd50670e3d64d307e0a2d6bb27a0bae1.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:16 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-15-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libksba.make b/rules/libksba.make
> index 853fe90abc07..4aae3745b021 100644
> --- a/rules/libksba.make
> +++ b/rules/libksba.make
> @@ -18,9 +18,7 @@ LIBKSBA_VERSION	:= 1.6.5
>  LIBKSBA_MD5	:= 57b88e5d24c8705d9a3ba3832140d188
>  LIBKSBA		:= libksba-$(LIBKSBA_VERSION)
>  LIBKSBA_SUFFIX	:= tar.bz2
> -LIBKSBA_URL	:= \
> -	https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) \
> -	ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
> +LIBKSBA_URL	:= https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
>  LIBKSBA_SOURCE	:= $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX)
>  LIBKSBA_DIR	:= $(BUILDDIR)/$(LIBKSBA)
>  LIBKSBA_LICENSE	:= GPL-2.0-only AND GPL-3.0-only AND LGPL-3.0-only

[ptxdist] [PATCH 15/20] mesa-demos: replace download URL with HTTPS

[Lucas Stach]

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

diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
index 2b7180a979ef..42337a3a011b 100644
--- a/rules/mesa-demos.make
+++ b/rules/mesa-demos.make
@@ -18,7 +18,7 @@ MESA_DEMOS_VERSION	:= 8.3.0
 MESA_DEMOS_MD5		:= 628e75c23c17394f11a316c36f8e4164
 MESA_DEMOS		:= mesa-demos-$(MESA_DEMOS_VERSION)
 MESA_DEMOS_SUFFIX	:= tar.bz2
-MESA_DEMOS_URL		:= ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
+MESA_DEMOS_URL		:= https://mesa.freedesktop.org/archive/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
 MESA_DEMOS_SOURCE	:= $(SRCDIR)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
 MESA_DEMOS_DIR		:= $(BUILDDIR)/$(MESA_DEMOS)
 MESA_DEMOS_LICENSE	:= unknown
-- 
2.39.2

Re: [ptxdist] [APPLIED] mesa-demos: replace download URL with HTTPS

[Michael Olbrich]

Thanks, applied as c5282c392930ed8b2640c590134661e2ccde59a6.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:17 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-16-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
> index 2b7180a979ef..42337a3a011b 100644
> --- a/rules/mesa-demos.make
> +++ b/rules/mesa-demos.make
> @@ -18,7 +18,7 @@ MESA_DEMOS_VERSION	:= 8.3.0
>  MESA_DEMOS_MD5		:= 628e75c23c17394f11a316c36f8e4164
>  MESA_DEMOS		:= mesa-demos-$(MESA_DEMOS_VERSION)
>  MESA_DEMOS_SUFFIX	:= tar.bz2
> -MESA_DEMOS_URL		:= ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
> +MESA_DEMOS_URL		:= https://mesa.freedesktop.org/archive/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
>  MESA_DEMOS_SOURCE	:= $(SRCDIR)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX)
>  MESA_DEMOS_DIR		:= $(BUILDDIR)/$(MESA_DEMOS)
>  MESA_DEMOS_LICENSE	:= unknown

[ptxdist] [PATCH 16/20] netkit-ftp: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/netkit-ftp.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make
index a6470ffc3311..a8e5126d5054 100644
--- a/rules/netkit-ftp.make
+++ b/rules/netkit-ftp.make
@@ -19,9 +19,7 @@ NETKIT_FTP_VERSION	:= 0.17
 NETKIT_FTP_MD5		:= 94441610c9b86ef45c4c6ec609444060
 NETKIT_FTP		:= netkit-ftp-$(NETKIT_FTP_VERSION)
 NETKIT_FTP_SUFFIX	:= tar.gz
-NETKIT_FTP_URL		:= \
-	ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) \
-	http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
+NETKIT_FTP_URL		:= http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
 NETKIT_FTP_SOURCE	:= $(SRCDIR)/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
 NETKIT_FTP_DIR		:= $(BUILDDIR)/$(NETKIT_FTP)
 NETKIT_FTP_LICENSE	:= BSD
-- 
2.39.2

Re: [ptxdist] [APPLIED] netkit-ftp: remove FTP URL

[Michael Olbrich]

Thanks, applied as 53e528857cac6030381dc8d7bbf997c0f427ac27.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:18 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-17-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make
> index a6470ffc3311..a8e5126d5054 100644
> --- a/rules/netkit-ftp.make
> +++ b/rules/netkit-ftp.make
> @@ -19,9 +19,7 @@ NETKIT_FTP_VERSION	:= 0.17
>  NETKIT_FTP_MD5		:= 94441610c9b86ef45c4c6ec609444060
>  NETKIT_FTP		:= netkit-ftp-$(NETKIT_FTP_VERSION)
>  NETKIT_FTP_SUFFIX	:= tar.gz
> -NETKIT_FTP_URL		:= \
> -	ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) \
> -	http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
> +NETKIT_FTP_URL		:= http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
>  NETKIT_FTP_SOURCE	:= $(SRCDIR)/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
>  NETKIT_FTP_DIR		:= $(BUILDDIR)/$(NETKIT_FTP)
>  NETKIT_FTP_LICENSE	:= BSD

[ptxdist] [PATCH 17/20] npth: remove FTP URL

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/npth.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/npth.make b/rules/npth.make
index 48b7501a5587..3d657c0a7e1b 100644
--- a/rules/npth.make
+++ b/rules/npth.make
@@ -18,9 +18,7 @@ NPTH_VERSION		:= 1.6
 NPTH_MD5		:= 375d1a15ad969f32d25f1a7630929854
 NPTH			:= npth-$(NPTH_VERSION)
 NPTH_SUFFIX		:= tar.bz2
-NPTH_URL		:= \
-	https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) \
-	ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
+NPTH_URL		:= https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
 NPTH_SOURCE		:= $(SRCDIR)/$(NPTH).$(NPTH_SUFFIX)
 NPTH_DIR		:= $(BUILDDIR)/$(NPTH)
 NPTH_LICENSE		:= LGPL-2.1-only
-- 
2.39.2

Re: [ptxdist] [APPLIED] npth: remove FTP URL

[Michael Olbrich]

Thanks, applied as d974f6bf603743ca20b93fd1470d697a35121de8.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:19 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-18-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/npth.make b/rules/npth.make
> index 48b7501a5587..3d657c0a7e1b 100644
> --- a/rules/npth.make
> +++ b/rules/npth.make
> @@ -18,9 +18,7 @@ NPTH_VERSION		:= 1.6
>  NPTH_MD5		:= 375d1a15ad969f32d25f1a7630929854
>  NPTH			:= npth-$(NPTH_VERSION)
>  NPTH_SUFFIX		:= tar.bz2
> -NPTH_URL		:= \
> -	https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) \
> -	ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
> +NPTH_URL		:= https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
>  NPTH_SOURCE		:= $(SRCDIR)/$(NPTH).$(NPTH_SUFFIX)
>  NPTH_DIR		:= $(BUILDDIR)/$(NPTH)
>  NPTH_LICENSE		:= LGPL-2.1-only

[ptxdist] [PATCH 18/20] nvmetcli: version bump 0.7 -> 0.8

[Lucas Stach]

Bump to latest tagged release. Switch to git URL, as there is no
alternative location to FTP available.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/nvmetcli.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/nvmetcli.make b/rules/nvmetcli.make
index b9e30a673e98..6d8169fb1673 100644
--- a/rules/nvmetcli.make
+++ b/rules/nvmetcli.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_NVMETCLI) += nvmetcli
 #
 # Paths and names
 #
-NVMETCLI_VERSION	:= 0.7
-NVMETCLI_MD5		:= eed70ef32d327c814345178dd35d088b
+NVMETCLI_VERSION	:= 0.8
+NVMETCLI_MD5		:= acc0b236485f1a08ce9a70113abe55cc
 NVMETCLI		:= nvmetcli-$(NVMETCLI_VERSION)
 NVMETCLI_SUFFIX		:= tar.gz
-NVMETCLI_URL		:= ftp://ftp.infradead.org/pub/nvmetcli/$(NVMETCLI).$(NVMETCLI_SUFFIX)
+NVMETCLI_URL		:= git://git.infradead.org/users/hch/nvmetcli.git;tag=v$(NVMETCLI_VERSION)
 NVMETCLI_SOURCE		:= $(SRCDIR)/$(NVMETCLI).$(NVMETCLI_SUFFIX)
 NVMETCLI_DIR		:= $(BUILDDIR)/$(NVMETCLI)
 NVMETCLI_LICENSE	:= Apache-2.0
-- 
2.39.2

Re: [ptxdist] [APPLIED] nvmetcli: version bump 0.7 -> 0.8

[Michael Olbrich]

Thanks, applied as 849506ab98a2b81f35aec6f28b360ba093b9b035.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:20 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Bump to latest tagged release. Switch to git URL, as there is no
> alternative location to FTP available.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-19-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/nvmetcli.make b/rules/nvmetcli.make
> index b9e30a673e98..6d8169fb1673 100644
> --- a/rules/nvmetcli.make
> +++ b/rules/nvmetcli.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_NVMETCLI) += nvmetcli
>  #
>  # Paths and names
>  #
> -NVMETCLI_VERSION	:= 0.7
> -NVMETCLI_MD5		:= eed70ef32d327c814345178dd35d088b
> +NVMETCLI_VERSION	:= 0.8
> +NVMETCLI_MD5		:= acc0b236485f1a08ce9a70113abe55cc
>  NVMETCLI		:= nvmetcli-$(NVMETCLI_VERSION)
>  NVMETCLI_SUFFIX		:= tar.gz
> -NVMETCLI_URL		:= ftp://ftp.infradead.org/pub/nvmetcli/$(NVMETCLI).$(NVMETCLI_SUFFIX)
> +NVMETCLI_URL		:= git://git.infradead.org/users/hch/nvmetcli.git;tag=v$(NVMETCLI_VERSION)
>  NVMETCLI_SOURCE		:= $(SRCDIR)/$(NVMETCLI).$(NVMETCLI_SUFFIX)
>  NVMETCLI_DIR		:= $(BUILDDIR)/$(NVMETCLI)
>  NVMETCLI_LICENSE	:= Apache-2.0

[ptxdist] [PATCH 19/20] proftpd: move to staging

[Lucas Stach]

The package has had its last real version bump in 2015, so there
are probably quite a few security issues with it and nobody seems
to care.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/proftpd.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/proftpd.in b/rules/proftpd.in
index 9740ab655696..145c80e80e93 100644
--- a/rules/proftpd.in
+++ b/rules/proftpd.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
 menuconfig PROFTPD
 	tristate
 	prompt "proftpd                       "
@@ -23,6 +25,9 @@ menuconfig PROFTPD
 	  multiple password files and upload/download ratios are also
 	  supported.
 
+	  STAGING: remove in PTXdist 2025.06.0
+	  Package is unmaintained in PTXdist.
+
 if PROFTPD
 
 config PROFTPD_PAM
-- 
2.39.2

Re: [ptxdist] [APPLIED] proftpd: move to staging

[Michael Olbrich]

Thanks, applied as 0bb1d3a12745f2522a9bc4fcba09d82760bc66d4.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:21 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> The package has had its last real version bump in 2015, so there
> are probably quite a few security issues with it and nobody seems
> to care.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20240514203552.1297323-20-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/proftpd.in b/rules/proftpd.in
> index 9740ab655696..145c80e80e93 100644
> --- a/rules/proftpd.in
> +++ b/rules/proftpd.in
> @@ -1,4 +1,6 @@
> -## SECTION=networking
> +## SECTION=staging
> +## old section:
> +### SECTION=networking
>  menuconfig PROFTPD
>  	tristate
>  	prompt "proftpd                       "
> @@ -23,6 +25,9 @@ menuconfig PROFTPD
>  	  multiple password files and upload/download ratios are also
>  	  supported.
>  
> +	  STAGING: remove in PTXdist 2025.06.0
> +	  Package is unmaintained in PTXdist.
> +
>  if PROFTPD
>  
>  config PROFTPD_PAM

[ptxdist] [PATCH 20/20] ptxd_make_get: remove FTP support

[Lucas Stach]

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 <l.stach@pengutronix.de>
---
 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

Re: [ptxdist] [PATCH 20/20] ptxd_make_get: remove FTP support

[Michael Olbrich]

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 <l.stach@pengutronix.de>
> ---
>  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 |