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

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

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;

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

krb5/usr.bin/kadmin/Makefile

@@ -9,8 +9,8 @@
 
 PROG=	kadmin
 
-LIBADD=	kadmin_common edit kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
+LIBADD=	kadmin_common kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
-	com_err krb5ss krb5profile krb5support tinfow sys
+	com_err krb5ss krb5profile krb5support sys
 
 SRCS=	keytab.c
 

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 \

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 \
+LIBADD=	kadmin_common kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 \
-	k5crypto com_err krb5profile krb5support krb5ss tinfow sys
+	k5crypto com_err krb5profile krb5support krb5ss sys
 
 SRCS=	keytab_local.c
 

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

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"