From 400101de7bfe6c125ed96aae4ca450d414d2effc Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 17 Aug 2009 09:40:38 +0000 Subject: 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@ --- usr.sbin/afs/usr.sbin/bos/Makefile | 4 ++-- usr.sbin/afs/usr.sbin/fs/Makefile | 4 ++-- usr.sbin/afs/usr.sbin/pts/Makefile | 4 ++-- usr.sbin/afs/usr.sbin/vos/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.sbin') 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 -- cgit v1.2.3