- Add a "real" symbol version map to libasn1. The upstream version

of the version map just exported all the symbols, which caused a
  binutils bug being triggered when ld fails to link two objects, one
  of which exports a versioned version of the symbol, and another --
  unversioned. [1]
- Also add version map for libkafs5.

Submitted by:	jchandra@ (based on)

kerberos5/lib/libasn1/Makefile

@@ -5,7 +5,7 @@ LDFLAGS=	-Wl,--no-undefined
 INCS=	asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
 LDADD=	-lcom_err -lroken
 DPADD=	${LIBCOM_ERR} ${LIBROKEN}
-VERSION_MAP=	${KRB5DIR}/lib/asn1/version-script.map
+VERSION_MAP=	${.CURDIR}/version.map
 
 SRCS=	asn1_err.c \
 	asn1_err.h \

kerberos5/lib/libkafs5/Makefile

@@ -1,19 +1,12 @@
 # $FreeBSD$
 
 LIB=	kafs5
-LDADD=	-lasn1 -lroken
+LDADD=	-lasn1 -lroken -lkrb5
+LDFLAGS=	-Wl,--no-undefined
 DPADD=	${LIBASN1} ${LIBKRB5} ${LIBROKEN}
 INCS=	kafs.h
 MAN=	kafs5.3
-
-#
-# Linking with libkrb5 uncovers a bug in binutils.
-# See http://repo.or.cz/w/binutils.git/commit/ee05170bf71819c99cb5a36a44735c231ae03c56 .
-#
-.if ${MACHINE} != "mips"
-LDADD+=	-lkrb5
-LDFLAGS=	-Wl,--no-undefined
-.endif
+VERSION_MAP=	${.CURDIR}/version.map
 
 MLINKS=	kafs5.3 k_afs_cell_of_file.3 \
 	kafs5.3 k_hasafs.3 \

kerberos5/lib/libkafs5/version.map

@@ -0,0 +1,22 @@
+#
+# $FreeBSD$
+#
+HEIMDAL_KAFS5_1.0 {
+	global:
+		k_afs_cell_of_file;
+		k_hasafs;
+		k_hasafs_recheck;
+		k_pioctl;
+		k_setpag;
+		k_unlog;
+		kafs_set_verbose;
+		kafs_settoken5;
+		kafs_settoken_rxkad;
+		krb5_afslog;
+		krb5_afslog_home;
+		krb5_afslog_uid;
+		krb5_afslog_uid_home;
+		krb5_realm_of_cell;
+	local:
+		*;
+};