mirror of
https://github.com/openbsd/src.git
synced 2024-12-22 07:27:59 -08:00
Remove KERBEROS5 from the Makefiles (except ssh for now, where it is
already manually disabled). ok deraadt@
This commit is contained in:
reyk
parent
c0c47f9e35
commit
84fc8f7ce6
10
Makefile
10
Makefile
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.120 2013/07/23 22:37:02 todd Exp $
|
||||
# $OpenBSD: Makefile,v 1.121 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
#
|
||||
# For more information on building in tricky environments, please see
|
||||
@ -41,14 +41,6 @@ SUBDIR+= gnu
|
||||
|
||||
SUBDIR+= sys
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
SUBDIR+=kerberosV/tools
|
||||
SUBDIR+=kerberosV/libexec
|
||||
SUBDIR+=kerberosV/usr.bin
|
||||
SUBDIR+=kerberosV/usr.sbin
|
||||
SUBDIR+=kerberosV/doc
|
||||
.endif
|
||||
|
||||
.if make(clean) || make(cleandir) || make(obj)
|
||||
SUBDIR+= distrib regress
|
||||
.endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.50 2014/04/15 20:55:42 miod Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.51 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -12,14 +12,6 @@ CLEANFILES= src/version.c lib/getdate.c lib/getdate.h macintosh/Makefile \
|
||||
doc/cvs.info-8 doc/cvs.info-9 doc/cvsclient.info \
|
||||
doc/cvsclient.info-1 doc/cvsclient.info-2 doc/cvsclient.info-3
|
||||
|
||||
# KRB=--without-krb4
|
||||
#
|
||||
# .if (${KERBEROS5:L} == "yes")
|
||||
# KRB5=--with-gssapi=/usr --enable-encryption
|
||||
# .else
|
||||
KRB5=
|
||||
# .endif
|
||||
|
||||
LDFLAGS=${LDSTATIC}
|
||||
|
||||
all: config.status
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.188 2014/04/19 15:58:56 henning Exp $
|
||||
# $OpenBSD: Makefile,v 1.189 2014/04/22 10:21:56 reyk Exp $
|
||||
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
|
||||
|
||||
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
|
||||
@ -66,20 +66,6 @@ NOOBJ= noobj
|
||||
# Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
|
||||
SYS_INCLUDE?= copies
|
||||
|
||||
.if ${KERBEROS5:L} == "yes"
|
||||
RDIRS+=../kerberosV/lib/libasn1
|
||||
RDIRS+=../kerberosV/lib/libgssapi
|
||||
RDIRS+=../kerberosV/lib/libhdb
|
||||
RDIRS+=../kerberosV/lib/libkadm5clnt
|
||||
RDIRS+=../kerberosV/lib/libkafs
|
||||
RDIRS+=../kerberosV/lib/libkrb5
|
||||
RDIRS+=../kerberosV/lib/libroken
|
||||
RDIRS+=../kerberosV/lib/libkdc
|
||||
RDIRS+=../kerberosV/lib/libwind
|
||||
RDIRS+=../kerberosV/lib/libheimbase
|
||||
RDIRS+=../kerberosV/lib/libcom_err
|
||||
.endif
|
||||
|
||||
RUN_MAKE = if test -f Makefile.bsd-wrapper; then ${MAKE} -f Makefile.bsd-wrapper $@; else ${MAKE} $@; fi
|
||||
|
||||
prereq:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.66 2014/04/11 22:51:52 miod Exp $
|
||||
# $OpenBSD: Makefile,v 1.67 2014/04/22 10:21:56 reyk Exp $
|
||||
# $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
|
||||
|
||||
SUBDIR= csu libarch libc libcrypto libcurses libedit libevent libexpat \
|
||||
@ -6,10 +6,4 @@ SUBDIR= csu libarch libc libcrypto libcurses libedit libevent libexpat \
|
||||
libocurses libossaudio libpanel libpcap librthread librpcsvc \
|
||||
libskey libsndio libsqlite3 libssl libusbhid libutil liby libz
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
SUBDIR+=../kerberosV/lib
|
||||
.endif
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# from: @(#)Makefile 5.7 (Berkeley) 4/1/91
|
||||
# $OpenBSD: Makefile,v 1.59 2014/04/18 15:57:12 tedu Exp $
|
||||
# $OpenBSD: Makefile,v 1.60 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -13,8 +13,4 @@ SUBDIR= comsat fingerd ftpd getty ld.so lockspool login_chpass \
|
||||
SUBDIR+=rpc.yppasswdd
|
||||
.endif
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
SUBDIR+=login_krb5 login_krb5-or-pwd
|
||||
.endif
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2010/10/13 08:14:22 jsg Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
|
||||
PROG= login_chpass
|
||||
@ -7,17 +7,10 @@ MAN= login_chpass.8
|
||||
|
||||
.PATH: ${.CURDIR}/../../usr.bin/passwd
|
||||
|
||||
.include <bsd.own.mk> # For KERBEROS5 and YP
|
||||
.include <bsd.own.mk> # For YP
|
||||
|
||||
CFLAGS+=-Wall
|
||||
|
||||
#.if (${KERBEROS5:L} == "yes")
|
||||
#SRCS+= krb5_passwd.c
|
||||
#CFLAGS+= -DKRB5
|
||||
#DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
|
||||
#LDADD+= -lkrb5 -lasn1 -lcrypto
|
||||
#.endif
|
||||
|
||||
.if (${YP:L} == "yes")
|
||||
CFLAGS+=-DYP
|
||||
SRCS+= yp_passwd.c pwd_check.c pwd_gensalt.c
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2014/04/15 20:55:42 miod Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,18 +7,10 @@ SRCS= login.c login_passwd.c pwd_gensalt.c
|
||||
MAN= ${PROG}.8
|
||||
CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../login_passwd
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
SRCS+= login_krb5.c
|
||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL}
|
||||
LDADD+= -lkrb5 -lasn1 -lcrypto -lutil
|
||||
LDADD+= -lwind -lroken -lcom_err -lheimbase
|
||||
CFLAGS+=-DKRB5
|
||||
.PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd
|
||||
.else
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
|
||||
.PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../../usr.bin/passwd
|
||||
.endif
|
||||
|
||||
BINOWN= root
|
||||
BINGRP= auth
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.37 2014/04/15 20:55:42 miod Exp $
|
||||
# $OpenBSD: Makefile,v 1.38 2014/04/22 10:21:56 reyk Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -15,16 +15,6 @@ CFLAGS+=-I${.CURDIR}/../../lib/libc/include
|
||||
CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp
|
||||
.endif
|
||||
|
||||
.include <bsd.own.mk> # For Kerberos
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
SRCS+= krb5_passwd.c
|
||||
CFLAGS+= -DKRB5
|
||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
|
||||
LDADD+= -lkrb5 -lasn1 -lcrypto
|
||||
LDADD+= -lwind -lroken -lcom_err -lheimbase
|
||||
.endif
|
||||
|
||||
BINMODE=4555
|
||||
BINOWN=root
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2014/04/15 20:55:42 miod Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2014/04/22 10:21:56 reyk Exp $
|
||||
#
|
||||
# Copyright (c) 1990 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
@ -41,14 +41,4 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
|
||||
terminal.c tn3270.c utilities.c auth.c encrypt.c genget.c getent.c \
|
||||
misc.c
|
||||
|
||||
.include <bsd.own.mk> # for KERBEROS
|
||||
|
||||
.if (${KERBEROS5:L} == "yes")
|
||||
CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION
|
||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
|
||||
LDADD+= -lkrb5 -lasn1 -lcrypto
|
||||
LDADD+= -lwind -lroken -lcom_err -lheimbase
|
||||
SRCS+= kerberos5.c enc_des.c
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user