From nobody Mon Sep 15 04:52:48 2025 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQCMl6LP5z6834c for ; Mon, 15 Sep 2025 04:53:07 +0000 (UTC) (envelope-from chris.torek@gmail.com) Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQCMl4DTNz3GMS for ; Mon, 15 Sep 2025 04:53:07 +0000 (UTC) (envelope-from chris.torek@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-337e5daf5f5so42030121fa.0 for ; Sun, 14 Sep 2025 21:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757911980; x=1758516780; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pFo3/wAhh74lKsWR42BArF6a1GBRQOrb6ldVLkNuhfo=; b=kxwnMMpOgW3o/qHYmfj81ALIt+bxCXcUv6S87JTnPR/p64TLEB6955aRWoHOC50Kx9 roCHMKVSJlbyOLjxNkBMzAB+RZzX9jQ+Bo99C1oDMmZEtVWlEhj2g9ia7aGT8ZV3x/rk RMtsFtNoNOpGA17ICka69tCz4WJy0fpUoY7pOS2T2npo4aywkercIelj7UC3Ci4731vp Kti52qQO/JWqGWKpiaLol2BKKJCAZAeoBJCqusXUCNDD1/WDIx+ZEokSoS+enq8NXI2z OkhKiVh7JOdCYDy526qX6ydi1stHqPsBi7aLT4F/eaHnU4V+zzT4Vn74E3K43EM2R+lY N9AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757911980; x=1758516780; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pFo3/wAhh74lKsWR42BArF6a1GBRQOrb6ldVLkNuhfo=; b=ISky7NzXJm5xOjPHeNtaSrAZXUjVhQmFDhvfIZyp0FVUlgkzno0dD/0H55oi0m/laI 9LWm/rAtmvvF/OPzroLjBZW9yFdz92HiDff0m+ugyzhgxHqaKqbKE3n+6kOfbxy3W3Ei yFw4T6aE1HbyfjJlnjRiAgUGTE/45rk2j3jXx1sV/vecn8FQlkiCcvXyQRQypbAhw0EM hvJorMGrLhvye3EagvoA/wCL/5caXfEO/4wLiH6CekyzpGaO+Tz+e819VEQ6leYbxa+9 7dhlrSDlRFHQKNmwLJa+Uw4NlDfYYu4eq56e8ZDKUxpWH/cQo7eieVpLPgFpnp91Yj0C s+6g== X-Forwarded-Encrypted: i=1; AJvYcCWg7PSVN9QCd/6x5rz7NmR8EcHqBoB3Xk4CFeug8NxdH77tbQdpOroZherwNVg8A7UBnRjxtCXlr+vY4SDRUyQ=@freebsd.org X-Gm-Message-State: AOJu0Yy3jS85OCpFkRsZcWWPJKhSXHdX5vkPzayJISqxsymS+tX6mrQy aA1aGDp+dIx0xTdJ3sAImKVTVWB0KaWu3xYwOm+Z4gFLVpsX6iP78Q5RBVqHzRksqr+ZElCuc3K snZ8glc1WVLq30HVAhRQDC09PL4PlyiI= X-Gm-Gg: ASbGnctv6JxkcIUG3gxEq1NSvXyn1jUB4pGQFtJBEqH61U0w2u/+Sn78GxG7P10ynvY +S2ELheILx2vM30c15ITQ3YeEWxhhtibuVaZhdWi0bOp+4MAuHilTqWFpQvbJS2j1MT9pgILZtq jkhxrvqfg99dMfRoIEEmPTtzfM+sh6MK9SHarkKB1KJJ7LT2uFGh2rKR1aw+iB/OsywtdhUvyLD 7DyZ+s5 X-Google-Smtp-Source: AGHT+IFG5Gb7XvsUSL2fNJAGN7WJG4xwAPju3k24LCMISBMHjZhx+KmVpyir6oB4zxA/lWarlWt9kV7izU2C18MH3cM= X-Received: by 2002:a05:651c:50b:b0:336:df07:95f5 with SMTP id 38308e7fff4ca-35115407144mr30806761fa.7.1757911980125; Sun, 14 Sep 2025 21:53:00 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 References: In-Reply-To: From: Chris Torek Date: Sun, 14 Sep 2025 21:52:48 -0700 X-Gm-Features: Ac12FXwqpTw7oGWh5Ak4pPkQ0CIfblmjUmFmPinBXWHh4P2X_bjM2x-LNlmcbZE Message-ID: Subject: Re: git is broken because curl is broken which stops me in my tracks To: Mark Millard Cc: Dennis Clarke , FreeBSD Current Content-Type: multipart/alternative; boundary="0000000000001f3297063ecfc786" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cQCMl4DTNz3GMS --0000000000001f3297063ecfc786 Content-Type: text/plain; charset="UTF-8" (libcurl requires a vanished "libkrb5.so.122") I'm going to snip all the context, but I'll note that I got myself into the same pickle and solved it by *temporarily* diking GSSAPI support entirely out of libcurl, building and installing that, then building Git with the resulting libcurl, then using Git to update the ports tree to pick up the Mk/Uses/ updates. To do that, go to /usr/ports/ftp/curl and hack out the GSSAPI selection. It's probably better to just grab the actual fix from commit d30d5dfae517a74a4a9e2a22e1cf110594bcb43d, which I've pasted below, but whitespace will probably be messed-up. (gmail is not very patch-friendly) That's not how I did it, but probably better... Chris commit d30d5dfae517a74a4a9e2a22e1cf110594bcb43d Author: Lexi Winter Date: Mon Aug 11 13:10:47 2025 +0100 Uses/gssapi.mk: Improve base Kerberos detection We can't check for /usr/libexec/krb5kdc to determine if base uses MIT Kerberos, because this is part of the kerberos-kdc package and might not be installed. Instead, pick a pkgconfig file which is only installed with MIT: /usr/libdata/pkgconfig/mit-krb5.pc. Reviewed by: des, cy Approved by: cy (ports) Differential Revision: https://reviews.freebsd.org/D51841 diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index 36fb72326868..b419a8fe27ff 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -86,7 +86,7 @@ _local:= ${_A} . if ${SSL_DEFAULT} != base IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value . endif -. if exists(/usr/libexec/krb5kdc) +. if exists(/usr/libdata/pkgconfig/mit-krb5.pc) # Base has MIT KRB5 installed KRB5_HOME?= /usr GSSAPIBASEDIR= ${KRB5_HOME} --0000000000001f3297063ecfc786 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(libcurl requires a vanished "l= ibkrb5.so.122")

I'm going to snip all the= context, but I'll note that I got myself into the same pickle and solv= ed it by *temporarily* diking GSSAPI support entirely out of libcurl, build= ing and installing that, then building Git with the resulting libcurl, then= using Git to update the ports tree to pick up the Mk/Uses/ updates.
<= div>
To do that, go to /usr/ports/ftp/curl and hack out the G= SSAPI selection.

It's probably better to just = grab the actual fix from commit=C2=A0d30d5dfae517a74a4a9e2a22e1cf110594bcb4= 3d, which I've pasted=C2=A0below, but whitespace will probably be messe= d-up. (gmail is not very patch-friendly) That's not how I did it, but p= robably better...

Chris

c= ommit d30d5dfae517a74a4a9e2a22e1cf110594bcb43d
Author: Lexi Winter <i= vy@FreeBSD.org>
Date: =C2=A0 Mon Aug 11 13:10:47 2025 +0100

= =C2=A0 =C2=A0 Uses/gssapi.mk: Improve base= Kerberos detection
=C2=A0 =C2=A0
=C2=A0 =C2=A0 We can't check f= or /usr/libexec/krb5kdc to determine if base uses
=C2=A0 =C2=A0 MIT Kerb= eros, because this is part of the kerberos-kdc package and
=C2=A0 =C2=A0= might not be installed.=C2=A0 Instead, pick a pkgconfig file which is
= =C2=A0 =C2=A0 only installed with MIT: /usr/libdata/pkgconfig/mit-krb5.pc.<= br>=C2=A0 =C2=A0
=C2=A0 =C2=A0 Reviewed by: =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0des, cy
=C2=A0 =C2=A0 Approved by: =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0cy (ports)
=C2=A0 =C2=A0 Differential Revision: =C2= =A0https://reviews.freebsd.o= rg/D51841

diff --git a/Mk/Uses/gssa= pi.mk b/Mk/Uses/gssapi.mk
index 36f= b72326868..b419a8fe27ff 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk=
@@ -86,7 +86,7 @@ _local:=3D =C2=A0 =C2=A0 =C2=A0${_A}
=C2=A0. =C2= =A0 =C2=A0 =C2=A0if ${SSL_DEFAULT} !=3D base
=C2=A0IGNORE=3D =C2=A0 =C2= =A0 =C2=A0 =C2=A0You are using OpenSSL from ports and have selected GSSAPI = from base, please select another GSSAPI value
=C2=A0. =C2=A0 =C2=A0 =C2= =A0endif
-. =C2=A0 =C2=A0 =C2=A0if exists(/usr/libexec/krb5kdc)
+. = =C2=A0 =C2=A0 =C2=A0if exists(/usr/libdata/pkgconfig/mit-krb5.pc)
=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Base has MIT KRB5 installed
=C2=A0KRB5_HO= ME?=3D =C2=A0 =C2=A0/usr
=C2=A0GSSAPIBASEDIR=3D ${KRB5_HOME}

--0000000000001f3297063ecfc786--