From 6253030148c24c38d1793bdab4a29eeca5490a3a Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 13 Oct 2010 08:14:23 +0000 Subject: The heimdal code switched to using DES from libcrypto when 0.7.2 was imported over four years ago, so we don't need to link libdes for kerberos anymore. ok mikeb@ deraadt@ --- bin/rcp/Makefile | 6 +++--- kerberosV/libexec/hprop/Makefile | 6 +++--- kerberosV/libexec/hpropd/Makefile | 6 +++--- kerberosV/libexec/ipropd-master/Makefile | 6 +++--- kerberosV/libexec/ipropd-slave/Makefile | 6 +++--- kerberosV/libexec/kadmind/Makefile | 6 +++--- kerberosV/libexec/kdc/Makefile | 6 +++--- kerberosV/libexec/kfd/Makefile | 6 +++--- kerberosV/libexec/kpasswdd/Makefile | 6 +++--- kerberosV/usr.bin/afslog/Makefile | 6 +++--- kerberosV/usr.bin/kauth/Makefile | 6 +++--- kerberosV/usr.bin/kdestroy/Makefile | 6 +++--- kerberosV/usr.bin/kf/Makefile | 6 +++--- kerberosV/usr.bin/kinit/Makefile | 6 +++--- kerberosV/usr.bin/klist/Makefile | 6 +++--- kerberosV/usr.bin/pagsh/Makefile | 6 +++--- kerberosV/usr.bin/string2key/Makefile | 6 +++--- kerberosV/usr.bin/verify_krb5_conf/Makefile | 6 +++--- kerberosV/usr.sbin/kadmin/Makefile | 6 +++--- kerberosV/usr.sbin/kstash/Makefile | 6 +++--- kerberosV/usr.sbin/ktutil/Makefile | 6 +++--- libexec/login_chpass/Makefile | 6 +++--- libexec/login_krb5-or-pwd/Makefile | 6 +++--- libexec/login_krb5/Makefile | 6 +++--- libexec/rshd/Makefile | 6 +++--- usr.bin/ssh/ssh/Makefile | 6 +++--- usr.bin/ssh/sshd/Makefile | 6 +++--- usr.sbin/afs/usr.sbin/bos/Makefile | 4 ++-- usr.sbin/afs/usr.sbin/pts/Makefile | 4 ++-- 29 files changed, 85 insertions(+), 85 deletions(-) diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index d3182cede1d..fdbf261a516 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2005/11/25 20:37:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2010/10/13 08:14:22 jsg Exp $ PROG= rcp SRCS= rcp.c util.c @@ -10,8 +10,8 @@ SRCS= rcp.c util.c #.PATH: ${.CURDIR}/../../usr.bin/rsh #SRCS+= krcmd.c kcmd.c #CFLAGS+=-DKERBEROS -#DPADD+= ${LIBKRB} ${LIBDES} -#LDADD+= -lkrb -ldes +#DPADD+= ${LIBKRB} +#LDADD+= -lkrb #.endif .include diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile index 1ccd606fbc6..35c12c6c9a5 100644 --- a/kerberosV/libexec/hprop/Makefile +++ b/kerberosV/libexec/hprop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:43 mho Exp $ +# $OpenBSD: Makefile,v 1.8 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,7 +15,7 @@ SRCS+= tm2time.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBKADM5SRV} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkadm5srv -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKADM5SRV} ${LIBCRYPTO} +LDADD+= -lkadm5srv -lkrb5 -lcrypto .include diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile index bcdb4b6cf34..42902b8fadc 100644 --- a/kerberosV/libexec/hpropd/Makefile +++ b/kerberosV/libexec/hpropd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:43 mho Exp $ +# $OpenBSD: Makefile,v 1.8 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,7 +15,7 @@ SRCS+= mini_inetd.c socket.c tm2time.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBDES} -LDADD+= -lkadm5srv -lkrb5 -lcrypto -ldes +DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkadm5srv -lkrb5 -lcrypto .include diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile index 2e428159d53..37f329216aa 100644 --- a/kerberosV/libexec/ipropd-master/Makefile +++ b/kerberosV/libexec/ipropd-master/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2006/04/23 20:46:55 biorn Exp $ +# $OpenBSD: Makefile,v 1.9 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -17,7 +17,7 @@ SRCS+= rtbl.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES} -LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil -ldes +DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil .include diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile index 39c791f6bfb..e19e45e8362 100644 --- a/kerberosV/libexec/ipropd-slave/Makefile +++ b/kerberosV/libexec/ipropd-slave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2006/04/23 20:46:55 biorn Exp $ +# $OpenBSD: Makefile,v 1.10 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -13,7 +13,7 @@ SRCS+= ${PRINTVER} CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES} -LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil -ldes +DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil .include diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile index 3099137e1ac..1e878de33de 100644 --- a/kerberosV/libexec/kadmind/Makefile +++ b/kerberosV/libexec/kadmind/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.13 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,7 +15,7 @@ SRCS+= mini_inetd.c socket.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc -DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL} -LDADD+= -lkadm5srv -lkrb5 -ldes -lcrypto -lutil +DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil .include diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile index 8a9b199e120..060aa17ca29 100644 --- a/kerberosV/libexec/kdc/Makefile +++ b/kerberosV/libexec/kdc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2006/04/14 08:28:55 biorn Exp $ +# $OpenBSD: Makefile,v 1.13 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -25,7 +25,7 @@ SRCS+= parse_bytes.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL} -LDADD+= -lkrb5 -ldes -lcrypto -lutil +DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkrb5 -lcrypto -lutil .include diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile index 9c84bd0b4bb..c1571641e4a 100644 --- a/kerberosV/libexec/kfd/Makefile +++ b/kerberosV/libexec/kfd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.6 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -12,7 +12,7 @@ SRCS= kfd.c CFLAGS+=-I${KRB5SRC}/lib/krb5 -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile index 57a5d441f4d..1fbfd264f5f 100644 --- a/kerberosV/libexec/kpasswdd/Makefile +++ b/kerberosV/libexec/kpasswdd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.11 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -13,7 +13,7 @@ SRCS+= ${PRINTVER} CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL} -LDADD+= -lkadm5srv -lkrb5 -ldes -lcrypto -lutil +DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkadm5srv -lkrb5 -lcrypto -lutil .include diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile index e62241107e6..dfa14692756 100644 --- a/kerberosV/usr.bin/afslog/Makefile +++ b/kerberosV/usr.bin/afslog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.4 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,7 +10,7 @@ PROG = afslog SRCS+= afslog.c SRCS+= ${PRINTVER} -DPADD += ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD += -lkrb5 -ldes -lcrypto +DPADD += ${LIBKRB5} ${LIBCRYPTO} +LDADD += -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile index c8f7943cbc5..61c0914406e 100644 --- a/kerberosV/usr.bin/kauth/Makefile +++ b/kerberosV/usr.bin/kauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.8 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -11,7 +11,7 @@ SRCS+= ${PRINTVER} .PATH: ${KRB5SRC}/kuser -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile index c8133152dd2..93fd73e2488 100644 --- a/kerberosV/usr.bin/kdestroy/Makefile +++ b/kerberosV/usr.bin/kdestroy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,7 +10,7 @@ SRCS+= ${PRINTVER} .PATH: ${KRB5SRC}/kuser -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile index 2817d244f42..0e40f491df4 100644 --- a/kerberosV/usr.bin/kf/Makefile +++ b/kerberosV/usr.bin/kf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.4 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,7 +9,7 @@ SRCS= kf.c .PATH: ${KRB5SRC}/appl/kf -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile index 39d81687874..5d97b64b789 100644 --- a/kerberosV/usr.bin/kinit/Makefile +++ b/kerberosV/usr.bin/kinit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.9 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -11,7 +11,7 @@ SRCS+= ${PRINTVER} .PATH: ${KRB5SRC}/kuser -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile index 23c06f8d2c1..ac197b0dfc0 100644 --- a/kerberosV/usr.bin/klist/Makefile +++ b/kerberosV/usr.bin/klist/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -12,7 +12,7 @@ SRCS+= rtbl.c .PATH: ${KRB5SRC}/kuser .PATH: ${ROKENSRC} -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile index aeaab5347b4..87af2676e5e 100644 --- a/kerberosV/usr.bin/pagsh/Makefile +++ b/kerberosV/usr.bin/pagsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $ +# $OpenBSD: Makefile,v 1.7 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -12,7 +12,7 @@ SRCS+= esetenv.c k_getpwuid.c .PATH: ${KRB5SRC}/appl/afsutil .PATH: ${ROKENSRC} -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile index 826192c2882..727268a5344 100644 --- a/kerberosV/usr.bin/string2key/Makefile +++ b/kerberosV/usr.bin/string2key/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $ +# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,7 +15,7 @@ SRCS+= estrdup.c CFLAGS+=-I${KRB5SRC}/kdc -I${KRB5SRC}/lib/krb5 -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile index 1004407f175..c25598b6200 100644 --- a/kerberosV/usr.bin/verify_krb5_conf/Makefile +++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $ +# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -13,7 +13,7 @@ SRCS+= parse_bytes.c .PATH: ${KRB5SRC}/lib/krb5 .PATH: ${ROKENSRC} -DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} -LDADD+= -lkrb5 -ldes -lcrypto +DPADD+= ${LIBKRB5} ${LIBCRYPTO} +LDADD+= -lkrb5 -lcrypto .include diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile index 7cc583f6246..e695db1c59b 100644 --- a/kerberosV/usr.sbin/kadmin/Makefile +++ b/kerberosV/usr.sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2009/08/17 09:40:37 jsg Exp $ +# $OpenBSD: Makefile,v 1.18 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -44,9 +44,9 @@ kadmin-commands.c kadmin-commands.h: kadmin-commands.in $(SLC) CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I. DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \ - ${LIBKRB5} ${LIBCRYPTO} ${LIBDES} + ${LIBKRB5} ${LIBCRYPTO} LDADD+= -ledit -lcurses -lkadm5srv -lkadm5clnt \ - -lkrb5 -lcrypto -ldes + -lkrb5 -lcrypto CLEANFILES+= kadmin-commands.c slc lc-lex.o kadmin-commands.h \ slc-lex.o slc-gram.o diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile index 260b5c2fb66..47ed299371c 100644 --- a/kerberosV/usr.sbin/kstash/Makefile +++ b/kerberosV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/08/17 09:40:37 jsg Exp $ +# $OpenBSD: Makefile,v 1.9 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,9 +15,9 @@ SRCS+= ${PRINTVER} CFLAGS+=-I${KRB5SRC}/lib/krb5 -DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \ +DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKRB5} \ ${LIBCRYPTO} -LDADD+= -ledit -lcurses -ldes -lkrb5 \ +LDADD+= -ledit -lcurses -lkrb5 \ -lcrypto .include diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile index c2725bffac8..28c22f3719f 100644 --- a/kerberosV/usr.sbin/ktutil/Makefile +++ b/kerberosV/usr.sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2009/08/17 09:40:37 jsg Exp $ +# $OpenBSD: Makefile,v 1.16 2010/10/13 08:14:22 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -43,9 +43,9 @@ ktutil-commands.c ktutil-commands.h: ktutil-commands.in $(SLC) CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I. DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \ - ${LIBCRYPTO} ${LIBDES} + ${LIBCRYPTO} LDADD+= -ledit -lcurses -lkadm5clnt -lkrb5 \ - -lcrypto -ldes + -lcrypto CLEANFILES+= ktutil-commands.c slc slc-lex.o \ ktutil-commands.h slc-gram.o stamp_grammar diff --git a/libexec/login_chpass/Makefile b/libexec/login_chpass/Makefile index a323bbf89c1..99cfa581958 100644 --- a/libexec/login_chpass/Makefile +++ b/libexec/login_chpass/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/01/02 14:33:48 millert Exp $ +# $OpenBSD: Makefile,v 1.6 2010/10/13 08:14:22 jsg Exp $ PROG= login_chpass @@ -14,8 +14,8 @@ CFLAGS+=-Wall #.if (${KERBEROS5:L} == "yes") #SRCS+= krb5_passwd.c #CFLAGS+= -DKRB5 -#DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBDES} ${LIBCRYPTO} -#LDADD+= -lkrb5 -lasn1 -ldes -lcrypto +#DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} +#LDADD+= -lkrb5 -lasn1 -lcrypto #.endif .if (${YP:L} == "yes") diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile index e8a0b414188..ec26f9e979a 100644 --- a/libexec/login_krb5-or-pwd/Makefile +++ b/libexec/login_krb5-or-pwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2006/03/09 19:14:09 millert Exp $ +# $OpenBSD: Makefile,v 1.14 2010/10/13 08:14:22 jsg Exp $ .include @@ -9,8 +9,8 @@ CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../login_passwd .if (${KERBEROS5:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES} -LDADD+= -lkrb5 -lasn1 -lcrypto -lutil -ldes +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL} +LDADD+= -lkrb5 -lasn1 -lcrypto -lutil CFLAGS+=-DKRB5 .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd .else diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile index bdf5ebbfaa4..8353d4ec512 100644 --- a/libexec/login_krb5/Makefile +++ b/libexec/login_krb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/11/20 23:23:09 avsm Exp $ +# $OpenBSD: Makefile,v 1.17 2010/10/13 08:14:22 jsg Exp $ .include @@ -10,8 +10,8 @@ CFLAGS+=-Wall -I${.CURDIR}/../login_passwd .if (${KERBEROS5:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES} -LDADD+= -lkrb5 -lasn1 -lcrypto -ldes +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} +LDADD+= -lkrb5 -lasn1 -lcrypto CFLAGS+=-DKRB5 .endif diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile index 0df4c7d7c3b..b91cfcd4ff6 100644 --- a/libexec/rshd/Makefile +++ b/libexec/rshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2003/05/14 07:35:31 mho Exp $ +# $OpenBSD: Makefile,v 1.9 2010/10/13 08:14:22 jsg Exp $ PROG= rshd SRCS= rshd.c @@ -11,8 +11,8 @@ CFLAGS+= -Wall -Wno-unused #SRCS+= des_rw.c #.PATH: ${.CURDIR}/../../usr.bin/rsh #CFLAGS+=-DKERBEROS -#DPADD+= ${LIBKRB} ${LIBDES} -#LDADD+= -lkrb -ldes +#DPADD+= ${LIBKRB} +#LDADD+= -lkrb #.endif .include diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index a4355be22b6..9d3de2ece91 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2009/10/24 11:22:37 andreas Exp $ +# $OpenBSD: Makefile,v 1.55 2010/10/13 08:14:22 jsg Exp $ .PATH: ${.CURDIR}/.. @@ -29,5 +29,5 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} LDADD+= -lgssapi -lkrb5 .endif # KERBEROS5 -DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES} -LDADD+= -lcrypto -lz -ldes +DPADD+= ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypto -lz diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 6597bd0860d..a479ec7ca21 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.71 2010/08/31 11:54:45 djm Exp $ +# $OpenBSD: Makefile,v 1.72 2010/10/13 08:14:22 jsg Exp $ .PATH: ${.CURDIR}/.. @@ -32,8 +32,8 @@ LDADD+= -lgssapi -lkrb5 -lkafs DPADD+= ${LIBGSSAPI} ${LIBKRB5} .endif -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES} -LDADD+= -lcrypto -lutil -lz -ldes +DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +LDADD+= -lcrypto -lutil -lz .if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP diff --git a/usr.sbin/afs/usr.sbin/bos/Makefile b/usr.sbin/afs/usr.sbin/bos/Makefile index a221ff887d7..e2aa4cc1117 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.4 2009/08/17 09:40:37 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $ AFSTOPDIR = ../.. .include <../../Makefile.inc> @@ -8,7 +8,7 @@ AFSTOPDIR = ../.. PROG = bos BINDIR = /usr/sbin MAN = bos.8 -LDADD += ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -ldes -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 6ff2fbc1b59..4ad779440e0 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.4 2009/08/17 09:40:37 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2010/10/13 08:14:22 jsg Exp $ AFSTOPDIR = ../.. .include <../../Makefile.inc> @@ -8,7 +8,7 @@ AFSTOPDIR = ../.. PROG = pts SRCS = pts.c \ estrdup.c -LDADD += ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -ldes -lcurses +LDADD += ${LIBARLA} -lkrb5 -lcrypto -lasn1 -ledit -lcurses DPADD += ${LIBARLA} .PATH: ${AFSSRCDIR}/appl/pts -- cgit v1.2.3