Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Upgrade Heimdal to 1.5pre1 by switching the build from crypt...
details: https://anonhg.NetBSD.org/src/rev/a7028918ad6d
branches: trunk
changeset: 764305:a7028918ad6d
user: elric <elric%NetBSD.org@localhost>
date: Fri Apr 15 18:05:42 2011 +0000
description:
Upgrade Heimdal to 1.5pre1 by switching the build from crypto/dist/heimdal
to crypto/external/bsd/heimdal. The latter was just imported as the head
of the Heimdal tree as of a few days ago.
diffstat:
crypto/external/bsd/Makefile | 4 +-
crypto/external/bsd/libsaslc/lib/Makefile | 4 +-
distrib/sets/lists/base/md.amd64 | 58 +-
distrib/sets/lists/base/mi | 11 +-
distrib/sets/lists/base/shl.mi | 63 +-
distrib/sets/lists/comp/md.amd64 | 27 +-
distrib/sets/lists/comp/mi | 1325 ++++++++++++++--------------
distrib/sets/lists/comp/shl.mi | 7 +-
distrib/sets/lists/man/mi | 17 +-
lib/Makefile | 33 +-
lib/libpam/modules/pam_afslog/Makefile | 17 +-
lib/libpam/modules/pam_krb5/Makefile | 15 +-
lib/libpam/modules/pam_ksu/Makefile | 15 +-
libexec/Makefile | 7 +-
libexec/telnetd/Makefile | 6 +-
share/mk/bsd.own.mk | 3 +-
tools/Makefile | 4 +-
tools/asn1_compile/Makefile | 4 +-
tools/compile_et/Makefile | 19 +-
usr.bin/Makefile | 7 +-
usr.sbin/Makefile | 6 +-
21 files changed, 832 insertions(+), 820 deletions(-)
diffs (truncated from 2809 to 300 lines):
diff -r e89bd5cbd679 -r a7028918ad6d crypto/external/bsd/Makefile
--- a/crypto/external/bsd/Makefile Fri Apr 15 17:57:39 2011 +0000
+++ b/crypto/external/bsd/Makefile Fri Apr 15 18:05:42 2011 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2011/02/12 19:07:35 christos Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/15 18:05:42 elric Exp $
.include <bsd.own.mk>
.if (${MKCRYPTO} != "no")
-SUBDIR+= openssl .WAIT netpgp openssh libsaslc
+SUBDIR+= openssl .WAIT heimdal netpgp openssh libsaslc
.endif
.include <bsd.subdir.mk>
diff -r e89bd5cbd679 -r a7028918ad6d crypto/external/bsd/libsaslc/lib/Makefile
--- a/crypto/external/bsd/libsaslc/lib/Makefile Fri Apr 15 17:57:39 2011 +0000
+++ b/crypto/external/bsd/libsaslc/lib/Makefile Fri Apr 15 18:05:42 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/12 22:23:11 matt Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/15 18:05:42 elric Exp $
.include <bsd.own.mk>
@@ -39,7 +39,7 @@
LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
.if (${MKKERBEROS} != "no")
-LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/lib/libgssapi
+LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
.endif
.include <bsd.lib.mk>
diff -r e89bd5cbd679 -r a7028918ad6d distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64 Fri Apr 15 17:57:39 2011 +0000
+++ b/distrib/sets/lists/base/md.amd64 Fri Apr 15 18:05:42 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.118 2011/03/24 17:05:40 bouyer Exp $
+# $NetBSD: md.amd64,v 1.119 2011/04/15 18:05:42 elric Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -56,8 +56,8 @@
./usr/lib/i386/libamu.so.4.0 base-compat-shlib compat,pic
./usr/lib/i386/libarchive.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libarchive.so.3.1 base-compat-shlib compat,pic
-./usr/lib/i386/libasn1.so.8 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libasn1.so.9 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libasn1.so.9.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libbfd.so.11 base-compat-shlib compat,pic,binutils
./usr/lib/i386/libbfd.so.11.0 base-compat-shlib compat,pic,binutils
./usr/lib/i386/libbind9.so.5 base-compat-shlib compat,pic
@@ -70,8 +70,8 @@
./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic
./usr/lib/i386/libc.so.12.177 base-compat-shlib compat,pic
-./usr/lib/i386/libcom_err.so.6 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libcrypt.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libcrypto.so.6 base-compat-shlib compat,pic
@@ -104,14 +104,16 @@
./usr/lib/i386/libgcc_s.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libgnumalloc.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libgnumalloc.so.1.0 base-compat-shlib compat,pic
-./usr/lib/i386/libgssapi.so.9 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libgssapi.so.9.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libhdb.so.13 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libhdb.so.13.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libheimntlm.so.3 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libheimntlm.so.3.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libhx509.so.4 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libhx509.so.4.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libgssapi.so.10 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libgssapi.so.10.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libhdb.so.14 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libhdb.so.14.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libheimbase.so.1 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libheimbase.so.1.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libheimntlm.so.4 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libheimntlm.so.4.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libhx509.so.5 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libhx509.so.5.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libi386.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libi386.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libintl.so.1 base-compat-shlib compat,pic
@@ -128,14 +130,16 @@
./usr/lib/i386/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi
./usr/lib/i386/libisns.so.0 base-compat-shlib compat,pic
./usr/lib/i386/libisns.so.0.0 base-compat-shlib compat,pic
-./usr/lib/i386/libkadm5clnt.so.12 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkadm5clnt.so.12.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkadm5srv.so.13 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkadm5srv.so.13.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkafs.so.11 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkafs.so.11.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkrb5.so.24 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libkrb5.so.24.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkadm5clnt.so.13 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkadm5clnt.so.13.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkadm5srv.so.14 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkadm5srv.so.14.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkafs.so.12 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkafs.so.12.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkdc.so.2 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkdc.so.2.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkrb5.so.26 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libkrb5.so.26.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libkvm.so.6 base-compat-shlib compat,pic
./usr/lib/i386/libkvm.so.6.0 base-compat-shlib compat,pic
./usr/lib/i386/liblber.so.3 base-compat-shlib compat,pic,ldap
@@ -197,8 +201,8 @@
./usr/lib/i386/librefuse.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libresolv.so.2 base-compat-shlib compat,pic
./usr/lib/i386/libresolv.so.2.0 base-compat-shlib compat,pic
-./usr/lib/i386/libroken.so.14 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libroken.so.14.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libroken.so.19 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libroken.so.19.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/librpcsvc.so.1 base-compat-shlib compat,pic
./usr/lib/i386/librpcsvc.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/librt.so.1 base-compat-shlib compat,pic
@@ -223,10 +227,8 @@
./usr/lib/i386/libsaslc.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/i386/libskey.so.2 base-compat-shlib compat,pic,skey
./usr/lib/i386/libskey.so.2.0 base-compat-shlib compat,pic,skey
-./usr/lib/i386/libsl.so.4 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libsl.so.4.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libss.so.6 base-compat-shlib compat,pic,kerberos
-./usr/lib/i386/libss.so.6.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libsl.so.5 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libsl.so.5.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libssh.so.16 base-compat-shlib compat,pic
./usr/lib/i386/libssh.so.16.0 base-compat-shlib compat,pic
./usr/lib/i386/libssl.so.8 base-compat-shlib compat,pic
@@ -247,6 +249,8 @@
./usr/lib/i386/libusbhid.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libutil.so.7 base-compat-shlib compat,pic
./usr/lib/i386/libutil.so.7.17 base-compat-shlib compat,pic
+./usr/lib/i386/libwind.so.0 base-compat-shlib compat,pic,kerberos
+./usr/lib/i386/libwind.so.0.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libwrap.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libwrap.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libz.so.1 base-compat-shlib compat,pic
diff -r e89bd5cbd679 -r a7028918ad6d distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Fri Apr 15 17:57:39 2011 +0000
+++ b/distrib/sets/lists/base/mi Fri Apr 15 18:05:42 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.929 2011/04/15 13:42:22 joerg Exp $
+# $NetBSD: mi,v 1.930 2011/04/15 18:05:42 elric Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -395,7 +395,7 @@
./usr/bin/colrm base-util-bin
./usr/bin/column base-util-bin
./usr/bin/comm base-util-bin
-./usr/bin/compile_et base-krb5-bin kerberos
+./usr/bin/compile_et base-obsolete obsolete
./usr/bin/compress base-util-bin
./usr/bin/cpio base-util-bin
./usr/bin/cpp base-util-bin gcccmds
@@ -419,7 +419,8 @@
./usr/bin/error base-util-bin
./usr/bin/ex base-util-bin
./usr/bin/expand base-util-bin
-./usr/bin/gss base-krb5-bin kerberos
+./usr/bin/gss base-obsolete obsolete
+./usr/bin/gsstool base-krb5-bin kerberos
./usr/bin/false base-util-bin
./usr/bin/fgrep base-util-bin
./usr/bin/file base-util-bin
@@ -465,6 +466,7 @@
./usr/bin/ipcs base-util-bin
./usr/bin/join base-util-bin
./usr/bin/jot base-util-bin
+./usr/bin/kcc base-krb5-bin kerberos
./usr/bin/kdestroy base-krb5-bin kerberos
./usr/bin/kdump base-debug-bin
./usr/bin/kf base-obsolete obsolete
@@ -523,7 +525,7 @@
./usr/bin/mesg base-util-bin
./usr/bin/midiplay base-audio-bin
./usr/bin/mixerctl base-audio-bin
-./usr/bin/mk_cmds base-krb5-bin kerberos
+./usr/bin/mk_cmds base-obsolete obsolete
./usr/bin/mkcsmapper base-util-bin
./usr/bin/mkdep base-c-bin
./usr/bin/mkesdb base-util-bin
@@ -976,6 +978,7 @@
./usr/libexec/ching base-games-usr
./usr/libexec/comsat base-mail-bin
./usr/libexec/cpp0 base-obsolete obsolete
+./usr/libexec/digest-service base-krb5-bin kerberos
./usr/libexec/dnskeygen base-obsolete obsolete
./usr/libexec/fingerd base-netutil-bin
./usr/libexec/ftp-proxy base-obsolete obsolete
diff -r e89bd5cbd679 -r a7028918ad6d distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Fri Apr 15 17:57:39 2011 +0000
+++ b/distrib/sets/lists/base/shl.mi Fri Apr 15 18:05:42 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.580 2011/03/31 08:25:30 pooka Exp $
+# $NetBSD: shl.mi,v 1.581 2011/04/15 18:05:43 elric Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -149,8 +149,8 @@
./usr/lib/libarchive.so.3 base-sys-shlib
./usr/lib/libarchive.so.3.1 base-sys-shlib
./usr/lib/libasn1.so base-krb5-shlib kerberos
-./usr/lib/libasn1.so.8 base-krb5-shlib kerberos
-./usr/lib/libasn1.so.8.0 base-krb5-shlib kerberos
+./usr/lib/libasn1.so.9 base-krb5-shlib kerberos
+./usr/lib/libasn1.so.9.0 base-krb5-shlib kerberos
./usr/lib/libavl.so base-zfs-shlib dynamicroot,zfs
./usr/lib/libavl.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libavl.so.0.0 base-zfs-shlib zfs,dynamicroot
@@ -173,8 +173,8 @@
./usr/lib/libc.so.12.177 base-sys-shlib
./usr/lib/libcdk.so base-obsolete obsolete
./usr/lib/libcom_err.so base-krb5-shlib kerberos
-./usr/lib/libcom_err.so.6 base-krb5-shlib kerberos
-./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos
+./usr/lib/libcom_err.so.7 base-krb5-shlib kerberos
+./usr/lib/libcom_err.so.7.0 base-krb5-shlib kerberos
./usr/lib/libcrypt.so base-sys-shlib
./usr/lib/libcrypt.so.1 base-sys-shlib
./usr/lib/libcrypt.so.1.0 base-sys-shlib
@@ -233,17 +233,20 @@
./usr/lib/libgnumalloc.so.1 base-sys-shlib
./usr/lib/libgnumalloc.so.1.0 base-sys-shlib
./usr/lib/libgssapi.so base-krb5-shlib kerberos
-./usr/lib/libgssapi.so.9 base-krb5-shlib kerberos
-./usr/lib/libgssapi.so.9.0 base-krb5-shlib kerberos
+./usr/lib/libgssapi.so.10 base-krb5-shlib kerberos
+./usr/lib/libgssapi.so.10.0 base-krb5-shlib kerberos
./usr/lib/libhdb.so base-krb5-shlib kerberos
-./usr/lib/libhdb.so.13 base-krb5-shlib kerberos
-./usr/lib/libhdb.so.13.0 base-krb5-shlib kerberos
+./usr/lib/libhdb.so.14 base-krb5-shlib kerberos
+./usr/lib/libhdb.so.14.0 base-krb5-shlib kerberos
+./usr/lib/libheimbase.so base-krb5-shlib kerberos
+./usr/lib/libheimbase.so.1 base-krb5-shlib kerberos
+./usr/lib/libheimbase.so.1.0 base-krb5-shlib kerberos
./usr/lib/libheimntlm.so base-krb5-shlib kerberos
-./usr/lib/libheimntlm.so.3 base-krb5-shlib kerberos
-./usr/lib/libheimntlm.so.3.0 base-krb5-shlib kerberos
+./usr/lib/libheimntlm.so.4 base-krb5-shlib kerberos
+./usr/lib/libheimntlm.so.4.0 base-krb5-shlib kerberos
./usr/lib/libhx509.so base-krb5-shlib kerberos
-./usr/lib/libhx509.so.4 base-krb5-shlib kerberos
-./usr/lib/libhx509.so.4.0 base-krb5-shlib kerberos
+./usr/lib/libhx509.so.5 base-krb5-shlib kerberos
+./usr/lib/libhx509.so.5.0 base-krb5-shlib kerberos
./usr/lib/libintl.so base-sys-shlib
./usr/lib/libintl.so.1 base-sys-shlib
./usr/lib/libintl.so.1.0 base-sys-shlib
@@ -267,19 +270,22 @@
./usr/lib/libisns.so.0.0 base-isns-shlib
./usr/lib/libkadm.so base-obsolete obsolete
./usr/lib/libkadm5clnt.so base-krb5-shlib kerberos
-./usr/lib/libkadm5clnt.so.12 base-krb5-shlib kerberos
-./usr/lib/libkadm5clnt.so.12.0 base-krb5-shlib kerberos
+./usr/lib/libkadm5clnt.so.13 base-krb5-shlib kerberos
+./usr/lib/libkadm5clnt.so.13.0 base-krb5-shlib kerberos
./usr/lib/libkadm5srv.so base-krb5-shlib kerberos
-./usr/lib/libkadm5srv.so.13 base-krb5-shlib kerberos
-./usr/lib/libkadm5srv.so.13.0 base-krb5-shlib kerberos
+./usr/lib/libkadm5srv.so.14 base-krb5-shlib kerberos
+./usr/lib/libkadm5srv.so.14.0 base-krb5-shlib kerberos
./usr/lib/libkafs.so base-krb5-shlib kerberos
-./usr/lib/libkafs.so.11 base-krb5-shlib kerberos
-./usr/lib/libkafs.so.11.0 base-krb5-shlib kerberos
+./usr/lib/libkafs.so.12 base-krb5-shlib kerberos
+./usr/lib/libkafs.so.12.0 base-krb5-shlib kerberos
+./usr/lib/libkdc.so base-krb5-shlib kerberos
+./usr/lib/libkdc.so.2 base-krb5-shlib kerberos
+./usr/lib/libkdc.so.2.0 base-krb5-shlib kerberos
./usr/lib/libkdb.so base-obsolete obsolete
./usr/lib/libkrb.so base-obsolete obsolete
./usr/lib/libkrb5.so base-krb5-shlib kerberos
-./usr/lib/libkrb5.so.24 base-krb5-shlib kerberos
-./usr/lib/libkrb5.so.24.0 base-krb5-shlib kerberos
+./usr/lib/libkrb5.so.26 base-krb5-shlib kerberos
+./usr/lib/libkrb5.so.26.0 base-krb5-shlib kerberos
./usr/lib/libkstream.so base-obsolete obsolete
./usr/lib/libkvm.so base-sys-shlib
./usr/lib/libkvm.so.6 base-sys-shlib
@@ -376,8 +382,8 @@
./usr/lib/libresolv.so.2 base-net-shlib
./usr/lib/libresolv.so.2.0 base-net-shlib
./usr/lib/libroken.so base-krb5-shlib kerberos
-./usr/lib/libroken.so.14 base-krb5-shlib kerberos
-./usr/lib/libroken.so.14.0 base-krb5-shlib kerberos
+./usr/lib/libroken.so.19 base-krb5-shlib kerberos
+./usr/lib/libroken.so.19.0 base-krb5-shlib kerberos
./usr/lib/librpcsvc.so base-net-shlib
Home |
Main Index |
Thread Index |
Old Index