Update build infrastructure for Heimdal 0.6.
This commit is contained in:
Jacques Vidrine
parent
2d4851347d
commit
f0a7f80d65
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $FreeBSD$
|
||||
|
||||
.if exists(${.OBJDIR}/../../include)
|
||||
INCLUDEOBJDIR= ${.OBJDIR}/../include
|
||||
|
||||
@ -318,7 +318,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#endif
|
||||
|
||||
/* Define to 1 if you have the `getpwnam_r' function. */
|
||||
/* #undef HAVE_GETPWNAM_R */
|
||||
#if __FreeBSD_version >= 500112
|
||||
#define HAVE_GETPWNAM_R 1
|
||||
#endif
|
||||
|
||||
/* Define to 1 if you have the `getrlimit' function. */
|
||||
#define HAVE_GETRLIMIT 1
|
||||
@ -346,7 +348,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#define HAVE_GLOB 1
|
||||
|
||||
/* Define to 1 if you have the `grantpt' function. */
|
||||
/* #undef HAVE_GRANTPT */
|
||||
#if __FreeBSD_version >= 500100
|
||||
#define HAVE_GRANTPT 1
|
||||
#endif
|
||||
|
||||
/* Define to 1 if you have the <grp.h> header file. */
|
||||
#define HAVE_GRP_H 1
|
||||
@ -412,19 +416,19 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#define HAVE_ISSETUGID 1
|
||||
|
||||
/* Define to 1 if you have the `krb_disable_debug' function. */
|
||||
#define HAVE_KRB_DISABLE_DEBUG 1
|
||||
/* #undef HAVE_KRB_DISABLE_DEBUG */
|
||||
|
||||
/* Define to 1 if you have the `krb_enable_debug' function. */
|
||||
#define HAVE_KRB_ENABLE_DEBUG 1
|
||||
/* #undef HAVE_KRB_ENABLE_DEBUG */
|
||||
|
||||
/* Define to 1 if you have the `krb_get_kdc_time_diff' function. */
|
||||
#define HAVE_KRB_GET_KDC_TIME_DIFF 1
|
||||
/* #undef HAVE_KRB_GET_KDC_TIME_DIFF */
|
||||
|
||||
/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
|
||||
#define HAVE_KRB_GET_OUR_IP_FOR_REALM 1
|
||||
/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
|
||||
|
||||
/* Define to 1 if you have the `krb_kdctimeofday' function. */
|
||||
#define HAVE_KRB_KDCTIMEOFDAY 1
|
||||
/* #undef HAVE_KRB_KDCTIMEOFDAY */
|
||||
|
||||
/* Define to 1 if you have the <libutil.h> header file. */
|
||||
#define HAVE_LIBUTIL_H 1
|
||||
@ -553,7 +557,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#define HAVE_PTHREAD_H 1
|
||||
|
||||
/* Define to 1 if you have the `ptsname' function. */
|
||||
/* #undef HAVE_PTSNAME */
|
||||
#if __FreeBSD_version >= 500100
|
||||
#define HAVE_PTSNAME 1
|
||||
#endif
|
||||
|
||||
/* Define to 1 if you have the <pty.h> header file. */
|
||||
/* #undef HAVE_PTY_H */
|
||||
@ -1008,7 +1014,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
/* Define to 1 if you have the `unlockpt' function. */
|
||||
/* #undef HAVE_UNLOCKPT */
|
||||
#if __FreeBSD_version >= 500100
|
||||
#define HAVE_UNLOCKPT 1
|
||||
#endif
|
||||
|
||||
/* Define if you have the function `unsetenv'. */
|
||||
#define HAVE_UNSETENV 1
|
||||
@ -1237,13 +1245,13 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
#define PACKAGE_NAME "Heimdal"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "Heimdal 0.5.1"
|
||||
#define PACKAGE_STRING "Heimdal 0.6 (FreeBSD)"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "heimdal"
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "0.5.1"
|
||||
#define PACKAGE_VERSION "0.6"
|
||||
|
||||
/* Define if getlogin has POSIX flavour (and not BSD). */
|
||||
/* #undef POSIX_GETLOGIN */
|
||||
@ -1273,7 +1281,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
/* #undef TM_IN_SYS_TIME */
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.4f"
|
||||
#define VERSION "0.6"
|
||||
|
||||
/* Define if signal handlers return void. */
|
||||
#define VOID_RETSIGTYPE 1
|
||||
|
||||
@ -1,10 +1,19 @@
|
||||
/* $FreeBSD$ */
|
||||
/* This is a generated file */
|
||||
#ifndef __krb5_private_h__
|
||||
#define __krb5_private_h__
|
||||
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
void
|
||||
_krb5_aes_cts_encrypt (
|
||||
const unsigned char */*in*/,
|
||||
unsigned char */*out*/,
|
||||
size_t /*len*/,
|
||||
const void */*aes_key*/,
|
||||
unsigned char */*ivec*/,
|
||||
const int /*enc*/);
|
||||
|
||||
void
|
||||
_krb5_crc_init_table (void);
|
||||
|
||||
@ -35,6 +44,16 @@ _krb5_get_int (
|
||||
unsigned long */*value*/,
|
||||
size_t /*size*/);
|
||||
|
||||
time_t
|
||||
_krb5_krb_life_to_time (
|
||||
int /*start*/,
|
||||
int /*life_*/);
|
||||
|
||||
int
|
||||
_krb5_krb_time_to_life (
|
||||
time_t /*start*/,
|
||||
time_t /*end*/);
|
||||
|
||||
void
|
||||
_krb5_n_fold (
|
||||
const void */*str*/,
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
/* $FreeBSD$ */
|
||||
const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5.1 (FreeBSD) $";
|
||||
const char *heimdal_version = "Heimdal 0.5.1";
|
||||
const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6 (FreeBSD) $";
|
||||
const char *heimdal_version = "Heimdal 0.6";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
|
||||
SUBDIR= libroken libvers libasn1 libhdb libkafs5 libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
SHLIB_MAJOR?= 6
|
||||
SHLIB_MAJOR?= 7
|
||||
|
||||
.include "../Makefile.inc"
|
||||
|
||||
@ -6,9 +6,11 @@ SRCS= \
|
||||
8003.c \
|
||||
accept_sec_context.c \
|
||||
acquire_cred.c \
|
||||
add_cred.c \
|
||||
add_oid_set_member.c \
|
||||
canonicalize_name.c \
|
||||
compare_name.c \
|
||||
compat.c \
|
||||
context_time.c \
|
||||
copy_ccache.c \
|
||||
create_emtpy_oid_set.c \
|
||||
@ -18,8 +20,8 @@ SRCS= \
|
||||
display_status.c \
|
||||
duplicate_name.c \
|
||||
encapsulate.c \
|
||||
export_sec_context.c \
|
||||
export_name.c \
|
||||
export_sec_context.c \
|
||||
external.c \
|
||||
get_mic.c \
|
||||
gssapi.h \
|
||||
@ -31,6 +33,10 @@ SRCS= \
|
||||
init_sec_context.c \
|
||||
inquire_context.c \
|
||||
inquire_cred.c \
|
||||
inquire_cred_by_mech.c \
|
||||
inquire_mechs_for_name.c \
|
||||
inquire_names_for_mech.c \
|
||||
process_context_token.c \
|
||||
release_buffer.c \
|
||||
release_cred.c \
|
||||
release_name.c \
|
||||
|
||||
15
kerberos5/lib/libkafs5/Makefile
Normal file
15
kerberos5/lib/libkafs5/Makefile
Normal file
@ -0,0 +1,15 @@
|
||||
# $FreeBSD$
|
||||
|
||||
LIB= kafs5
|
||||
CFLAGS+=-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/include \
|
||||
-I${KRB5OBJDIR} \
|
||||
-I${ASN1OBJDIR}
|
||||
SRCS= afssys.c afskrb5.c common.c
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
.PATH: ${KRB5DIR}/lib/kafs
|
||||
@ -3,9 +3,11 @@
|
||||
PROG= kdc
|
||||
|
||||
SRCS= \
|
||||
524.c \
|
||||
config.c \
|
||||
connect.c \
|
||||
kdc_locl.h \
|
||||
kerberos4.c \
|
||||
kerberos5.c \
|
||||
log.c \
|
||||
main.c \
|
||||
|
||||
@ -17,10 +17,10 @@ CFLAGS+=-I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
|
||||
LDADD= -lkrb5 -lroken ${LIBVERS} \
|
||||
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
|
||||
-lasn1 -lcrypto -lcrypt -lcom_err
|
||||
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
|
||||
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -17,10 +17,10 @@ CFLAGS+=-I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
|
||||
LDADD= -lkrb5 -lroken ${LIBVERS} \
|
||||
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
|
||||
-lasn1 -lcrypto -lcrypt -lcom_err
|
||||
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
|
||||
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -17,10 +17,10 @@ CFLAGS+=-I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
|
||||
LDADD= -lkrb5 -lroken ${LIBVERS} \
|
||||
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
|
||||
-lasn1 -lcrypto -lcrypt -lcom_err
|
||||
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
|
||||
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -8,7 +8,7 @@ CLEANFILES= krb5-config
|
||||
|
||||
krb5-config: krb5-config.in
|
||||
sed -e "s,@PACKAGE\@,FreeBSD heimdal,g" \
|
||||
-e "s,@VERSION\@,0.5.1,g" \
|
||||
-e "s,@VERSION\@,0.6,g" \
|
||||
-e "s,@prefix\@,/usr,g" \
|
||||
-e "s,@exec_prefix\@,/usr,g" \
|
||||
-e "s,@libdir\@,${LIBDIR},g" \
|
||||
|
||||
@ -18,10 +18,10 @@ CFLAGS+=-I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
|
||||
LDADD= -lkrb5 -lroken ${LIBVERS} \
|
||||
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
|
||||
-lasn1 -lcrypto -lcrypt -lcom_err
|
||||
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
|
||||
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
|
||||
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
|
||||
|
||||
NOMAN= true
|
||||
|
||||
@ -48,6 +48,7 @@ LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a
|
||||
LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a
|
||||
LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a # XXX in secure dist, not base
|
||||
LIBKADM5SRV?= ${DESTDIR}${LIBDIR}/libkadm5srv.a # XXX in secure dist, not base
|
||||
LIBKAFS5?= ${DESTDIR}${LIBDIR}/libkafs5.a # XXX in secure dist, not base
|
||||
LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
|
||||
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
|
||||
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a # XXX in secure dist, not base
|
||||
|
||||
Loading…
Reference in New Issue
Block a user