From owner-svn-src-stable@FreeBSD.ORG Tue Sep 27 18:40:14 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E28106564A; Tue, 27 Sep 2011 18:40:14 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EB3388FC0C; Tue, 27 Sep 2011 18:40:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8RIeDmF036151; Tue, 27 Sep 2011 18:40:13 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8RIeDMF036136; Tue, 27 Sep 2011 18:40:13 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201109271840.p8RIeDMF036136@svn.freebsd.org> From: Stanislav Sedov Date: Tue, 27 Sep 2011 18:40:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225811 - in stable/9: . kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb kerberos5/lib/libheimntlm ke... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Sep 2011 18:40:14 -0000 Author: stas Date: Tue Sep 27 18:40:13 2011 New Revision: 225811 URL: http://svn.freebsd.org/changeset/base/225811 Log: - MFC r225778: - Add missing interdependencies to kerberos libraries. Some of the kerberos libraries were not linked properly (missing dependencies), which causes 3rd party applications linking to fail when --as-needed ld flag is used. I also added the --no-undefined ld(1) flag to make sure that there're no missing dependencies. Approved by: re (kib) Modified: stable/9/Makefile.inc1 (contents, props changed) stable/9/kerberos5/lib/libasn1/Makefile stable/9/kerberos5/lib/libgssapi_krb5/Makefile stable/9/kerberos5/lib/libgssapi_ntlm/Makefile stable/9/kerberos5/lib/libgssapi_spnego/Makefile stable/9/kerberos5/lib/libhdb/Makefile stable/9/kerberos5/lib/libheimntlm/Makefile stable/9/kerberos5/lib/libhx509/Makefile stable/9/kerberos5/lib/libkadm5clnt/Makefile stable/9/kerberos5/lib/libkadm5srv/Makefile stable/9/kerberos5/lib/libkafs5/Makefile stable/9/kerberos5/lib/libkrb5/Makefile stable/9/kerberos5/lib/libroken/Makefile stable/9/tools/make_libdeps.sh Directory Properties: stable/9/kerberos5/ (props changed) stable/9/tools/ (props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/Makefile.inc1 Tue Sep 27 18:40:13 2011 (r225811) @@ -1218,7 +1218,8 @@ _startup_libs+= lib/libc gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ + ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ @@ -1268,6 +1269,19 @@ secure/lib/libssh__L: lib/libgssapi__L k _secure_lib= secure/lib .endif +.if ${MK_KERBEROS} != "no" +kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L +kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ + kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L +kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L +kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ + secure/lib/libcrypto__L kerberos5/lib/libroken__L +kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ + lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \ + kerberos5/lib/libroken__L +kerberos5/lib/libroken__L: lib/libcrypt__L +.endif + .if ${MK_GSSAPI} != "no" _lib_libgssapi= lib/libgssapi .endif @@ -1279,6 +1293,7 @@ _lib_libipx= lib/libipx .if ${MK_KERBEROS} != "no" _kerberos5_lib= kerberos5/lib _kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libhdb= kerberos5/lib/libhdb _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken Modified: stable/9/kerberos5/lib/libasn1/Makefile ============================================================================== --- stable/9/kerberos5/lib/libasn1/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libasn1/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,7 +1,10 @@ # $FreeBSD$ LIB= asn1 +LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h heim_asn1.h +LDADD= -lcom_err -lroken +DPADD= ${LIBCOM_ERR} ${LIBROKEN} SRCS= asn1_err.c \ asn1_err.h \ Modified: stable/9/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- stable/9/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= gssapi_krb5 -LDFLAGS= -Wl,-Bsymbolic +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBCRYPT} Modified: stable/9/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- stable/9/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,9 +1,9 @@ # $FreeBSD$ LIB= gssapi_ntlm -LDFLAGS= -Wl,-Bsymbolic -LDADD= -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken +DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} SRCS= accept_sec_context.c \ acquire_cred.c \ Modified: stable/9/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- stable/9/kerberos5/lib/libgssapi_spnego/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libgssapi_spnego/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,9 +1,9 @@ # $FreeBSD$ LIB= gssapi_spnego -LDFLAGS= -Wl,-Bsymbolic -LDADD= -lgssapi -lasn1 -DPADD= ${LIBGSSAPI} ${LIBASN1} +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDADD= -lgssapi -lasn1 -lroken +DPADD= ${LIBGSSAPI} ${LIBASN1} ${LIBROKEN} SRCS= accept_sec_context.c \ compat.c \ Modified: stable/9/kerberos5/lib/libhdb/Makefile ============================================================================== --- stable/9/kerberos5/lib/libhdb/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libhdb/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,9 @@ # $FreeBSD$ LIB= hdb +LDFLAGS= -Wl,--no-undefined +LDADD= -lasn1 -lcom_err -lkrb5 -lroken +DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} INCS= hdb-private.h \ hdb-protos.h \ Modified: stable/9/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- stable/9/kerberos5/lib/libheimntlm/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libheimntlm/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,9 @@ # $FreeBSD$ LIB= heimntlm +LDFLAGS= -Wl,--no-undefined +LDADD= -lcrypto -lkrb5 +DPADD= ${LIBCRYPTO} ${LIBKRB5} SRCS= ntlm.c INCS= heimntlm.h heimntlm-protos.h CFLAGS+=-I${KRB5DIR}/lib/ntlm Modified: stable/9/kerberos5/lib/libhx509/Makefile ============================================================================== --- stable/9/kerberos5/lib/libhx509/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libhx509/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,7 +1,10 @@ # $FreeBSD$ LIB= hx509 +LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map +LDADD= -lasn1 -lcom_err -lcrypto -lroken +DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} INCS= hx509-private.h \ hx509-protos.h \ Modified: stable/9/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- stable/9/kerberos5/lib/libkadm5clnt/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libkadm5clnt/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,9 @@ # $FreeBSD$ LIB= kadm5clnt +LDFLAGS= -Wl,--no-undefined +LDADD= -lcom_err -lkrb5 -lroken +DPADD= ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} INCS= admin.h \ kadm5-private.h \ Modified: stable/9/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- stable/9/kerberos5/lib/libkadm5srv/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libkadm5srv/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,9 @@ # $FreeBSD$ LIB= kadm5srv +LDFLAGS= -Wl,--no-undefined +LDADD= -lcom_err -lhdb -lkrb5 -lroken +DPADD= ${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map SRCS= acl.c \ Modified: stable/9/kerberos5/lib/libkafs5/Makefile ============================================================================== --- stable/9/kerberos5/lib/libkafs5/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libkafs5/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,9 @@ # $FreeBSD$ LIB= kafs5 +LDFLAGS= -Wl,--no-undefined +LDADD= -lasn1 -lkrb5 -lroken +DPADD= ${LIBASN1} ${LIBKRB5} ${LIBROKEN} INCS= kafs.h MAN= kafs5.3 Modified: stable/9/kerberos5/lib/libkrb5/Makefile ============================================================================== --- stable/9/kerberos5/lib/libkrb5/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libkrb5/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,7 +1,10 @@ # $FreeBSD$ LIB= krb5 +LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map +LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken +DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} INCS= heim_err.h \ heim_threads.h \ Modified: stable/9/kerberos5/lib/libroken/Makefile ============================================================================== --- stable/9/kerberos5/lib/libroken/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libroken/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,6 +1,8 @@ # $FreeBSD$ LIB= roken +LDADD= -lcrypt +DPADD= ${LIBCRYPT} INCS= roken.h roken-common.h SRCS= base64.c \ Modified: stable/9/tools/make_libdeps.sh ============================================================================== --- stable/9/tools/make_libdeps.sh Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/tools/make_libdeps.sh Tue Sep 27 18:40:13 2011 (r225811) @@ -52,7 +52,7 @@ sed -E -e's;-l(ncurses|termcap)!;lib/ncurses/ncurses;g' -e's;-l(gcc)!;gnu/lib/lib\1;g' -e's;-lssp_nonshared!;gnu/lib/libssp/libssp_nonshared;g' - -e's;-l(asn1|heimntlm|hx509|krb5|roken)!;kerberos5/lib/lib\1;g' + -e's;-l(asn1|hdb|heimntlm|hx509|krb5|roken)!;kerberos5/lib/lib\1;g' -e's;-l(crypto|ssh|ssl)!;secure/lib/lib\1;g' -e's;-l([^!]+)!;lib/lib\1;g' "