Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Jul 2025 17:31:16 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 7b68893ffa9b - main - krb5: remove libedit from the bootstrap tools
Message-ID:  <202507291731.56THVGF6073964@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b68893ffa9b1f9961c098207124c81c10f8c2ed

commit 7b68893ffa9b1f9961c098207124c81c10f8c2ed
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2025-07-29 15:49:44 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-07-29 15:49:44 +0000

    krb5: remove libedit from the bootstrap tools
    
    libedit breaks the bootstrap on MacOS and Linux.
    
    Activate libedit only for the regular build not for the bootstrap
    tools
    
    While here fix the definition of the dependency chain between
    libkrb5ss and libedit (and libtinfow) via src.libnames.mk
    
    Remove a local patch to find the readline compatible header and
    find them via proper CFLAGS.
---
 Makefile.inc1                       | 2 --
 crypto/krb5/src/util/ss/listen.c    | 4 ----
 krb5/include/autoconf.h             | 2 +-
 krb5/usr.bin/kadmin/Makefile        | 4 ++--
 krb5/usr.bin/ktutil/Makefile        | 2 +-
 krb5/usr.sbin/kadmin.local/Makefile | 4 ++--
 krb5/util/ss/Makefile               | 5 +++++
 share/mk/src.libnames.mk            | 1 +
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 010f5ac2bb55..b66743e154eb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2627,8 +2627,6 @@ _kerberos5_bootstrap_tools= \
 	krb5/util/compile_et \
 	krb5/util/support \
 	krb5/util/et \
-	lib/ncurses/tinfo \
-	lib/libedit \
 	krb5/util/ss \
 	krb5/util/profile \
 	krb5/util/verto
diff --git a/crypto/krb5/src/util/ss/listen.c b/crypto/krb5/src/util/ss/listen.c
index 08427df1e5c7..fe18475447be 100644
--- a/crypto/krb5/src/util/ss/listen.c
+++ b/crypto/krb5/src/util/ss/listen.c
@@ -14,9 +14,6 @@
 #include <termios.h>
 #include <sys/param.h>
 
-#ifdef __FreeBSD__
-#include <edit/readline/readline.h>
-#else
 #if defined(HAVE_LIBEDIT)
 #include <editline/readline.h>
 #elif defined(HAVE_READLINE)
@@ -25,7 +22,6 @@
 #else
 #define NO_READLINE
 #endif
-#endif
 
 static ss_data *current_info;
 static jmp_buf listen_jmpb;
diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h
index a5e2ea5838b0..fe281d136954 100644
--- a/krb5/include/autoconf.h
+++ b/krb5/include/autoconf.h
@@ -260,7 +260,7 @@
 #define HAVE_LIBCRYPTO 1
 
 /* Define if building with libedit. */
-#define HAVE_LIBEDIT 1
+/* #undef HAVE_LIBEDIT */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
diff --git a/krb5/usr.bin/kadmin/Makefile b/krb5/usr.bin/kadmin/Makefile
index b2a094795d48..182cabb8f9f6 100644
--- a/krb5/usr.bin/kadmin/Makefile
+++ b/krb5/usr.bin/kadmin/Makefile
@@ -9,8 +9,8 @@
 
 PROG=	kadmin
 
-LIBADD=	kadmin_common edit kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
-	com_err krb5ss krb5profile krb5support tinfow sys
+LIBADD=	kadmin_common kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
+	com_err krb5ss krb5profile krb5support sys
 
 SRCS=	keytab.c
 
diff --git a/krb5/usr.bin/ktutil/Makefile b/krb5/usr.bin/ktutil/Makefile
index 6bcb4877ed6f..15991cb49bce 100644
--- a/krb5/usr.bin/ktutil/Makefile
+++ b/krb5/usr.bin/ktutil/Makefile
@@ -9,7 +9,7 @@
 
 PROG=	ktutil
 
-LIBADD=	edit krb5 k5crypto com_err krb5profile krb5support krb5ss tinfow sys
+LIBADD=	krb5 k5crypto com_err krb5profile krb5support krb5ss sys
 
 SRCS=	ktutil.c \
 	ktutil_ct.c \
diff --git a/krb5/usr.sbin/kadmin.local/Makefile b/krb5/usr.sbin/kadmin.local/Makefile
index 4b99f490bd7b..3930c0fc4694 100644
--- a/krb5/usr.sbin/kadmin.local/Makefile
+++ b/krb5/usr.sbin/kadmin.local/Makefile
@@ -11,8 +11,8 @@ PACKAGE=	kerberos-kdc
 
 PROG=	kadmin.local
 
-LIBADD=	kadmin_common edit kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 \
-	k5crypto com_err krb5profile krb5support krb5ss tinfow sys
+LIBADD=	kadmin_common kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 \
+	k5crypto com_err krb5profile krb5support krb5ss sys
 
 SRCS=	keytab_local.c
 
diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile
index e7e025184284..2c43f2b5934f 100644
--- a/krb5/util/ss/Makefile
+++ b/krb5/util/ss/Makefile
@@ -47,6 +47,11 @@ CFLAGS+=-I${KRB5_DIR}/util/ss \
 	-I${.OBJDIR:H} \
 	-I${.OBJDIR}
 
+.if !defined(BOOTSTRAPPING)
+CFLAGS+= -DHAVE_READLINE=1 \
+	 -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
+.endif
+
 GEN=	std_rqs.c ${GEN_SS_ERR_C} ${GEN_SS_ERR_H}
 GEN_SCRIPTS=	ct_c.awk ct_c.sed mk_cmds
 GEN_SS_ERR_C=	${GEN_SS_ERR:S/.et$/.c/}
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index f21d519160d2..88202aeb78fe 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -487,6 +487,7 @@ _DP_be=		zfs spl nvpair zfsbootenv
 _DP_netmap=
 _DP_ifconfig=	m
 _DP_pfctl=	nv
+_DP_krb5ss=		edit
 
 # OFED support
 .if ${MK_OFED} != "no"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507291731.56THVGF6073964>