The kerberosV code switched to using the version of DES
in libcrypto when biorn imported heimdal 0.7.2 over four
years ago, the following diff removes the uneeded linking
to libdes.
As the code in OpenSSL/libcrypto is based on the code
in libdes it would be nice if we could move the following
over to libcrypto and remove libdes at some point:
libexec/login_tis
libexec/login_token
sbin/isakmpd
usr.bin/passwd
usr.bin/sectok
usr.bin/telnet
usr.bin/x99token/
usr.sbin/ppp/ppp
usr.sbin/tokenadm
usr.sbin/tokeninit
Builds work fine with the below but I'm not using kerberos/afs etc
so test reports welcome.
Index: bin/rcp/Makefile
===================================================================
RCS file: /cvs/src/bin/rcp/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- bin/rcp/Makefile 25 Nov 2005 20:37:20 -0000 1.11
+++ bin/rcp/Makefile 8 Oct 2010 15:34:41 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/hprop/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/hprop/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- kerberosV/libexec/hprop/Makefile 14 Jul 2003 16:14:43 -0000 1.7
+++ kerberosV/libexec/hprop/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/hpropd/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/hpropd/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- kerberosV/libexec/hpropd/Makefile 14 Jul 2003 16:14:43 -0000 1.7
+++ kerberosV/libexec/hpropd/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/ipropd-master/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/ipropd-master/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- kerberosV/libexec/ipropd-master/Makefile 23 Apr 2006 20:46:55 -0000
1.8
+++ kerberosV/libexec/ipropd-master/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/ipropd-slave/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/ipropd-slave/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- kerberosV/libexec/ipropd-slave/Makefile 23 Apr 2006 20:46:55 -0000
1.9
+++ kerberosV/libexec/ipropd-slave/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/kadmind/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/kadmind/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- kerberosV/libexec/kadmind/Makefile 14 Jul 2003 16:14:44 -0000 1.12
+++ kerberosV/libexec/kadmind/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/kdc/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/kdc/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- kerberosV/libexec/kdc/Makefile 14 Apr 2006 08:28:55 -0000 1.12
+++ kerberosV/libexec/kdc/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/kfd/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/kfd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- kerberosV/libexec/kfd/Makefile 14 Jul 2003 16:14:44 -0000 1.5
+++ kerberosV/libexec/kfd/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/libexec/kpasswdd/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/libexec/kpasswdd/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- kerberosV/libexec/kpasswdd/Makefile 14 Jul 2003 16:14:44 -0000 1.10
+++ kerberosV/libexec/kpasswdd/Makefile 8 Oct 2010 15:35:07 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/afslog/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/afslog/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- kerberosV/usr.bin/afslog/Makefile 14 Jul 2003 16:14:44 -0000 1.3
+++ kerberosV/usr.bin/afslog/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/kauth/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/kauth/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- kerberosV/usr.bin/kauth/Makefile 14 Jul 2003 16:14:44 -0000 1.7
+++ kerberosV/usr.bin/kauth/Makefile 8 Oct 2010 15:35:08 -0000
@@ -11,7 +11,7 @@ SRCS+= ${PRINTVER}
.PATH: ${KRB5SRC}/kuser
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
-LDADD+= -lkrb5 -ldes -lcrypto
+DPADD+= ${LIBKRB5} ${LIBCRYPTO}
+LDADD+= -lkrb5 -lcrypto
.include <bsd.prog.mk>
Index: kerberosV/usr.bin/kdestroy/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/kdestroy/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- kerberosV/usr.bin/kdestroy/Makefile 14 Jul 2003 16:14:44 -0000 1.6
+++ kerberosV/usr.bin/kdestroy/Makefile 8 Oct 2010 15:35:08 -0000
@@ -10,7 +10,7 @@ SRCS+= ${PRINTVER}
.PATH: ${KRB5SRC}/kuser
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
-LDADD+= -lkrb5 -ldes -lcrypto
+DPADD+= ${LIBKRB5} ${LIBCRYPTO}
+LDADD+= -lkrb5 -lcrypto
.include <bsd.prog.mk>
Index: kerberosV/usr.bin/kf/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/kf/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- kerberosV/usr.bin/kf/Makefile 14 Jul 2003 16:14:44 -0000 1.3
+++ kerberosV/usr.bin/kf/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/kinit/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/kinit/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- kerberosV/usr.bin/kinit/Makefile 14 Jul 2003 16:14:44 -0000 1.8
+++ kerberosV/usr.bin/kinit/Makefile 8 Oct 2010 15:35:08 -0000
@@ -11,7 +11,7 @@ SRCS+= ${PRINTVER}
.PATH: ${KRB5SRC}/kuser
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
-LDADD+= -lkrb5 -ldes -lcrypto
+DPADD+= ${LIBKRB5} ${LIBCRYPTO}
+LDADD+= -lkrb5 -lcrypto
.include <bsd.prog.mk>
Index: kerberosV/usr.bin/klist/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/klist/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- kerberosV/usr.bin/klist/Makefile 14 Jul 2003 16:14:44 -0000 1.6
+++ kerberosV/usr.bin/klist/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/pagsh/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/pagsh/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- kerberosV/usr.bin/pagsh/Makefile 14 Jul 2003 16:14:44 -0000 1.6
+++ kerberosV/usr.bin/pagsh/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/string2key/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/string2key/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- kerberosV/usr.bin/string2key/Makefile 14 Jul 2003 16:14:45 -0000
1.4
+++ kerberosV/usr.bin/string2key/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.bin/verify_krb5_conf/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.bin/verify_krb5_conf/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- kerberosV/usr.bin/verify_krb5_conf/Makefile 14 Jul 2003 16:14:45 -0000
1.4
+++ kerberosV/usr.bin/verify_krb5_conf/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.sbin/kadmin/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.sbin/kadmin/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- kerberosV/usr.sbin/kadmin/Makefile 17 Aug 2009 09:40:37 -0000 1.17
+++ kerberosV/usr.sbin/kadmin/Makefile 8 Oct 2010 15:35:08 -0000
@@ -44,9 +44,9 @@ kadmin-commands.c kadmin-commands.h: kad
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
Index: kerberosV/usr.sbin/kstash/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.sbin/kstash/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- kerberosV/usr.sbin/kstash/Makefile 17 Aug 2009 09:40:37 -0000 1.8
+++ kerberosV/usr.sbin/kstash/Makefile 8 Oct 2010 15:35:08 -0000
@@ -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 <bsd.prog.mk>
Index: kerberosV/usr.sbin/ktutil/Makefile
===================================================================
RCS file: /cvs/src/kerberosV/usr.sbin/ktutil/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- kerberosV/usr.sbin/ktutil/Makefile 17 Aug 2009 09:40:37 -0000 1.15
+++ kerberosV/usr.sbin/ktutil/Makefile 8 Oct 2010 15:35:08 -0000
@@ -43,9 +43,9 @@ ktutil-commands.c ktutil-commands.h: ktu
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
Index: libexec/login_chpass/Makefile
===================================================================
RCS file: /cvs/src/libexec/login_chpass/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- libexec/login_chpass/Makefile 2 Jan 2008 14:33:48 -0000 1.5
+++ libexec/login_chpass/Makefile 8 Oct 2010 15:35:15 -0000
@@ -15,7 +15,7 @@ CFLAGS+=-Wall
#SRCS+= krb5_passwd.c
#CFLAGS+= -DKRB5
#DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBDES} ${LIBCRYPTO}
-#LDADD+= -lkrb5 -lasn1 -ldes -lcrypto
+#LDADD+= -lkrb5 -lasn1 -lcrypto
#.endif
.if (${YP:L} == "yes")
Index: libexec/login_krb5/Makefile
===================================================================
RCS file: /cvs/src/libexec/login_krb5/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- libexec/login_krb5/Makefile 20 Nov 2003 23:23:09 -0000 1.16
+++ libexec/login_krb5/Makefile 8 Oct 2010 15:35:15 -0000
@@ -11,7 +11,7 @@ CFLAGS+=-Wall -I${.CURDIR}/../login_pass
.if (${KERBEROS5:L} == "yes")
SRCS+= login_krb5.c
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBDES}
-LDADD+= -lkrb5 -lasn1 -lcrypto -ldes
+LDADD+= -lkrb5 -lasn1 -lcrypto
CFLAGS+=-DKRB5
.endif
Index: libexec/login_krb5-or-pwd/Makefile
===================================================================
RCS file: /cvs/src/libexec/login_krb5-or-pwd/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- libexec/login_krb5-or-pwd/Makefile 9 Mar 2006 19:14:09 -0000 1.13
+++ libexec/login_krb5-or-pwd/Makefile 8 Oct 2010 15:35:15 -0000
@@ -10,7 +10,7 @@ CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../l
.if (${KERBEROS5:L} == "yes")
SRCS+= login_krb5.c
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES}
-LDADD+= -lkrb5 -lasn1 -lcrypto -lutil -ldes
+LDADD+= -lkrb5 -lasn1 -lcrypto -lutil
CFLAGS+=-DKRB5
.PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5
${.CURDIR}/../../usr.bin/passwd
.else
Index: libexec/rshd/Makefile
===================================================================
RCS file: /cvs/src/libexec/rshd/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- libexec/rshd/Makefile 14 May 2003 07:35:31 -0000 1.8
+++ libexec/rshd/Makefile 8 Oct 2010 15:35:15 -0000
@@ -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 <bsd.prog.mk>
Index: usr.bin/ssh/ssh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- usr.bin/ssh/ssh/Makefile 24 Oct 2009 11:22:37 -0000 1.54
+++ usr.bin/ssh/ssh/Makefile 8 Oct 2010 15:35:40 -0000
@@ -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
Index: usr.bin/ssh/sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- usr.bin/ssh/sshd/Makefile 31 Aug 2010 11:54:45 -0000 1.71
+++ usr.bin/ssh/sshd/Makefile 8 Oct 2010 15:35:40 -0000
@@ -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
Index: usr.sbin/afs/usr.sbin/bos/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/afs/usr.sbin/bos/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- usr.sbin/afs/usr.sbin/bos/Makefile 17 Aug 2009 09:40:37 -0000 1.4
+++ usr.sbin/afs/usr.sbin/bos/Makefile 8 Oct 2010 15:35:43 -0000
@@ -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
Index: usr.sbin/afs/usr.sbin/pts/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/afs/usr.sbin/pts/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- usr.sbin/afs/usr.sbin/pts/Makefile 17 Aug 2009 09:40:37 -0000 1.4
+++ usr.sbin/afs/usr.sbin/pts/Makefile 8 Oct 2010 15:35:43 -0000
@@ -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
