Switch several kerberos/afs tools from using using libreadline

to libedit to prevent the resulting binaries from falling under
the GPL.  Prototypes are internally defined so no includes have
to be changed.

ok miod@ reyk@ "I very much approve" deraadt@

7 files changed, 17 insertions, 17 deletions

diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index 7a110c7ac1a..7cc583f6246 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/10/18 18:20:20 deraadt Exp $
+# $OpenBSD: Makefile,v 1.17 2009/08/17 09:40:37 jsg Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -43,9 +43,9 @@ kadmin-commands.c kadmin-commands.h:	kadmin-commands.in $(SLC)
 	./$(SLC) $(KRB5SRC)/kadmin/kadmin-commands.in
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I.
 
-DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
+DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
 	${LIBKRB5} ${LIBCRYPTO} ${LIBDES}
-LDADD+=	-lreadline -lcurses -lkadm5srv -lkadm5clnt \
+LDADD+=	-ledit -lcurses -lkadm5srv -lkadm5clnt \
 	-lkrb5 -lcrypto -ldes
 
 CLEANFILES+=	kadmin-commands.c slc lc-lex.o kadmin-commands.h \
diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile
index 043c52b7361..260b5c2fb66 100644
--- a/kerberosV/usr.sbin/kstash/Makefile
+++ b/kerberosV/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2006/04/23 21:25:11 biorn Exp $
+# $OpenBSD: Makefile,v 1.8 2009/08/17 09:40:37 jsg Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -15,9 +15,9 @@ SRCS+=	${PRINTVER}
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5
 
-DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \
+DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \
 	${LIBCRYPTO}
-LDADD+=	-lreadline -lcurses -ldes -lkrb5 \
+LDADD+=	-ledit -lcurses -ldes -lkrb5 \
 	-lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index f857c10b8fa..c2725bffac8 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2008/01/29 00:29:34 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2009/08/17 09:40:37 jsg Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -42,9 +42,9 @@ ktutil-commands.c ktutil-commands.h:	ktutil-commands.in $(SLC)
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I.
 
-DPADD+=	${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \
+DPADD+=	${LIBEDIT} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \
 	${LIBCRYPTO} ${LIBDES}
-LDADD+=	-lreadline -lcurses -lkadm5clnt -lkrb5 \
+LDADD+=	-ledit -lcurses -lkadm5clnt -lkrb5 \
 	-lcrypto -ldes
 
 CLEANFILES+=	ktutil-commands.c slc slc-lex.o \
diff --git a/usr.sbin/afs/usr.sbin/bos/Makefile b/usr.sbin/afs/usr.sbin/bos/Makefile
index 9807ceccc67..a221ff887d7 100644
--- a/usr.sbin/afs/usr.sbin/bos/Makefile
+++ b/usr.sbin/afs/usr.sbin/bos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2009/08/17 09:40:37 jsg Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
@@ -8,7 +8,7 @@ AFSTOPDIR	= ../..
 PROG	= bos
 BINDIR	= /usr/sbin
 MAN	= bos.8
-LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -ldes -lcurses
 DPADD	+= ${LIBARLA}
 
 CFLAGS	+= -I${AFSSRC}/appl/lib
diff --git a/usr.sbin/afs/usr.sbin/fs/Makefile b/usr.sbin/afs/usr.sbin/fs/Makefile
index d2203048bee..e235f28113a 100644
--- a/usr.sbin/afs/usr.sbin/fs/Makefile
+++ b/usr.sbin/afs/usr.sbin/fs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2009/08/17 09:40:37 jsg Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
@@ -7,7 +7,7 @@ AFSTOPDIR	= ../..
 
 PROG	= fs
 BINDIR	= /usr/sbin
-LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -lcurses
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -lcurses
 DPADD	+= ${LIBARLA}
 
 CFLAGS	+= -I${AFSSRC}/appl/lib
diff --git a/usr.sbin/afs/usr.sbin/pts/Makefile b/usr.sbin/afs/usr.sbin/pts/Makefile
index 57e3ad4f061..6ff2fbc1b59 100644
--- a/usr.sbin/afs/usr.sbin/pts/Makefile
+++ b/usr.sbin/afs/usr.sbin/pts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2009/08/17 09:40:37 jsg Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
@@ -8,7 +8,7 @@ AFSTOPDIR	= ../..
 PROG	= pts
 SRCS	= pts.c \
 	  estrdup.c
-LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -ldes -lcurses
 DPADD	+= ${LIBARLA}
 
 .PATH: ${AFSSRCDIR}/appl/pts
diff --git a/usr.sbin/afs/usr.sbin/vos/Makefile b/usr.sbin/afs/usr.sbin/vos/Makefile
index 2e63281c72d..f662dd1c122 100644
--- a/usr.sbin/afs/usr.sbin/vos/Makefile
+++ b/usr.sbin/afs/usr.sbin/vos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2009/08/17 09:40:37 jsg Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
@@ -30,7 +30,7 @@ SRCS	= vos.c \
 	  emalloc.c \
 	  estrdup.c
 
-LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -lcurses
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -lcurses
 DPADD	+= ${LIBARLA}
 
 .PATH: ${AFSSRC}/appl/vos