On Fri, Dec 20, 2024 at 08:56:23AM +0100, Mario Domenech Goulart wrote:
> On Fri, 20 Dec 2024 08:12:44 +0100 Peter Bex <[email protected]> wrote:
> > Maybe it's fine as it is?  I've never heard any complaints about it.
> > What prompted you to come up with this patch in the first place?
> 
> I was bootstrapping C6 on an OpenBSD box (without wget) for a salmonella
> machine, and since I saw that there's a special case for FreeBSD I
> thought it would be ok to have OpenBSD handled as well.

OK, how about the attached patch then?

Cheers,
Peter
>From 0bdd8d31253298452937eb46ffa22e8fa07358c6 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <[email protected]>
Date: Wed, 18 Dec 2024 21:04:59 +0100
Subject: [PATCH] bootstrap.sh: Use ftp instead of wget on the BSDs

NetBSD, MirBSD, OpenBSD and DragonFly BSD's base systems ship
ftp(1) (which supports HTTP[S]), but not wget.

On FreeBSD, the version of ftp(1) seems to lag behind the
upstream NetBSD version, and doesn't support HTTPS (only HTTP).
So there, we keep using fetch(1).
---
 scripts/bootstrap.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index dff029a7..93376cc4 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -9,8 +9,12 @@ mkcmd=make
 case "$(uname)" in
     FreeBSD)
         mkcmd=gmake
+       # FreeBSD's ftp doesn't support HTTPS (only HTTP)
         getcmd=fetch;;
     *BSD)
+       # Counter-intuitively, the ftp(1) program on many
+       # BSDs supports both HTTP(S) and FTP
+        getcmd=ftp;;
         mkcmd=gmake;;
 esac
 
-- 
2.47.0

Reply via email to