upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

krb5: remove libedit from the bootstrap tools

Browse source 
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.
This commit is contained in:
Baptiste Daroussin 2025-07-29 17:49:44 +02:00
parent 2bc355c018
commit 7b68893ffa
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.inc1
View file

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

4
crypto/krb5/src/util/ss/listen.c
View file

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

2
krb5/include/autoconf.h
View file

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

4
krb5/usr.bin/kadmin/Makefile
View file

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

2
krb5/usr.bin/ktutil/Makefile
View file

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

4
krb5/usr.sbin/kadmin.local/Makefile
View file

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

5
krb5/util/ss/Makefile
View file

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

1
share/mk/src.libnames.mk
View file

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