Attachment 137153 Details for Bug 182546 – kerberos5.patch

[patch] kerberos5.patch

kerberos5.patch (text/plain), 3.23 KB, created by Joerg Pulz on 2013-10-01 14:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joerg Pulz

Created: 2013-10-01 14:50:00 UTC

Size: 3.23 KB

patch

obsolete

>Index: kerberos5/lib/libhdb/Makefile
>===================================================================
>--- kerberos5/lib/libhdb/Makefile	(revision 255700)
>+++ kerberos5/lib/libhdb/Makefile	(working copy)
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> LIB=	hdb
>-LDFLAGS=	-Wl,--no-undefined
>+LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
> VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
>-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite
>+LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite ${LDAPLDADD}
> DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD}
> 
> MAN=	HDB.3 hdb_entry_ex.3
>Index: kerberos5/libexec/digest-service/Makefile
>===================================================================
>--- kerberos5/libexec/digest-service/Makefile	(revision 255700)
>+++ kerberos5/libexec/digest-service/Makefile	(working copy)
>@@ -9,9 +9,10 @@
> 		-I${KRB5DIR}/lib/wind \
> 		-I${KRB5DIR}/lib/roken
> DPADD=	${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
>-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
>+	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
> LDADD=	-lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
>-	${LIBVERS} -lheimntlm
>+	${LIBVERS} -lheimntlm ${LDAPLDADD}
>+LDFLAGS=${LDAPLDFLAGS}
> USEPRIVATELIB= heimipcs
> 
> .include <bsd.prog.mk>
>Index: kerberos5/libexec/kdc/Makefile
>===================================================================
>--- kerberos5/libexec/kdc/Makefile	(revision 255700)
>+++ kerberos5/libexec/kdc/Makefile	(working copy)
>@@ -11,8 +11,10 @@
> CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
> 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
> DPADD=	${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
>-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
>-LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
>+	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
>+LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} \
>+	${LDAPLDADD}
>+LDFLAGS=${LDAPLDFLAGS}
> 
> .include <bsd.prog.mk>
> 
>Index: kerberos5/usr.bin/string2key/Makefile
>===================================================================
>--- kerberos5/usr.bin/string2key/Makefile	(revision 255700)
>+++ kerberos5/usr.bin/string2key/Makefile	(working copy)
>@@ -8,8 +8,9 @@
> 		-I${KRB5DIR}/lib/roken \
> 		-I${KRB5DIR}/lib/windc
> DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
>-	${LIBCRYPT} ${LIBVERS}
>-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
>+	${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
>+LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
>+LDFLAGS=${LDAPLDFLAGS}
> 
> .include <bsd.prog.mk>
> 
>Index: kerberos5/usr.sbin/iprop-log/Makefile
>===================================================================
>--- kerberos5/usr.sbin/iprop-log/Makefile	(revision 255700)
>+++ kerberos5/usr.sbin/iprop-log/Makefile	(working copy)
>@@ -9,9 +9,10 @@
> 		-I${KRB5DIR}/lib/sl \
> 		-I.
> DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
>-	${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT}
>+	${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT} ${LDAPDPADD}
> LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
>-	${LIBVERS} -ledit
>+	${LIBVERS} -ledit ${LDAPLDADD}
>+LDFLAGS=${LDAPLDFLAGS}
> 
> iprop-commands.h: iprop-commands.in
> 	${SLC} ${.ALLSRC:M*.in}

Actions: View | Diff

Attachments on bug 182546: 137153 | 148607 | 148608