d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KerberosIV is no longer compulsory. This should fix "make release".

Browse Source
This commit is contained in:
Mark Murray 2000-03-01 13:50:48 +00:00
parent 87faa07bec
commit b825cbde03
28 changed files with 58 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kerberos5/Makefile.inc
View File

@ -13,8 +13,9 @@ ROKENDIR= ${.CURDIR}/../../lib/libroken
CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
.if defined(KRB5_KRB4_COMPAT)
CFLAGS+=-DKRB5_KRB4_COMPAT
.if defined(MAKE_KERBEROS4) && \
(${MAKE_KERBEROS4} == "yes" || ${MAKE_KERBEROS4} == "yes")
CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
.endif
CFLAGS+=-DINET6

2
kerberos5/include/config.h
View File

@ -812,7 +812,7 @@
#define HAVE___ATTRIBUTE__ 1
/* Define if you have the krb4 package. */
#define KRB4 1
/* #define KRB4 1 */
/* define if krb_put_int takes four arguments. */
#define HAVE_FOUR_VALUED_KRB_PUT_INT 1

6
kerberos5/lib/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
SUBDIR= libroken libasn1 libhdb libkrb5 libkafs5 libkadm5clnt libkadm5srv libsl
SUBDIR= libroken libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl
.if defined(MAKE_KERBEROS4)
SUBDIR+=libkafs5
.endif
.include <bsd.subdir.mk>

2
kerberos5/lib/libkafs5/Makefile
View File

@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/include \
-I${KRB5OBJDIR} \
-I${ASN1OBJDIR}
SRCS= afssys.c afskrb.c afskrb5.c common.c
SRCS= afssys.c afskrb5.c common.c
.include <bsd.lib.mk>

2
kerberos5/libexec/hprop/Makefile
View File

@ -12,7 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs -lkdb
_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
.endif

4
kerberos5/libexec/hpropd/Makefile
View File

@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs -lkdb
_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \

4
kerberos5/libexec/ipropd-master/Makefile
View File

@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err

4
kerberos5/libexec/ipropd-slave/Makefile
View File

@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err

7
kerberos5/libexec/k5admind/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG= k5admind
SRCS= kadmind.c server.c version4.c \
SRCS= kadmind.c server.c \
kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
SRCS+= version4.c
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \

2
kerberos5/libexec/k5passwdd/Makefile
View File

@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif

7
kerberos5/libexec/kadmind/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG= k5admind
SRCS= kadmind.c server.c version4.c \
SRCS= kadmind.c server.c \
kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
SRCS+= version4.c
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \

6
kerberos5/libexec/kdc/Makefile
View File

@ -13,11 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \

2
kerberos5/libexec/kpasswdd/Makefile
View File

@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif

2
kerberos5/usr.bin/Makefile
View File

@ -1,5 +1,5 @@
# $FreeBSD$
SUBDIR= k5admin k5auth k5destroy k5init k5list k5passwd
SUBDIR= k5admin k5destroy k5init k5list k5passwd
.include <bsd.subdir.mk>

4
kerberos5/usr.bin/k5admin/Makefile
View File

@ -15,11 +15,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \

22
kerberos5/usr.bin/k5auth/Makefile
View File

@ -1,22 +0,0 @@
# $FreeBSD$
PROG= k5auth
SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/appl/kauth \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/appl/kauth

4
kerberos5/usr.bin/k5destroy/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

8
kerberos5/usr.bin/k5init/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.if defined(MAKE_KERBEROS4)
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

4
kerberos5/usr.bin/k5list/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

2
kerberos5/usr.bin/k5passwd/Makefile
View File

@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif

4
kerberos5/usr.bin/kadmin/Makefile
View File

@ -15,11 +15,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \

4
kerberos5/usr.bin/kdestroy/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

8
kerberos5/usr.bin/kinit/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.if defined(MAKE_KERBEROS4)
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

4
kerberos5/usr.bin/klist/Makefile
View File

@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

2
kerberos5/usr.bin/kpasswd/Makefile
View File

@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif

4
kerberos5/usr.sbin/k5stash/Makefile
View File

@ -11,11 +11,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

4
kerberos5/usr.sbin/kstash/Makefile
View File

@ -11,11 +11,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \

4
kerberos5/usr.sbin/ktutil/Makefile
View File

@ -13,11 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/admin \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
.if defined(MAKE_KERBEROS4)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
LDADD= -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
-L${KADM5COBJDIR} -lkadm5clnt \