CVS commit: src/crypto/external/bsd/heimdal

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    src
Committed By:   he
Date:           Wed May 25 19:21:20 UTC 2011

Modified Files:
        src/crypto/external/bsd/heimdal/bin: Makefile.inc
        src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
        src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
        src/crypto/external/bsd/heimdal/bin/kcc: Makefile
        src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
        src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
        src/crypto/external/bsd/heimdal/bin/kinit: Makefile
        src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
        src/crypto/external/bsd/heimdal/bin/string2key: Makefile
        src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
        src/crypto/external/bsd/heimdal/dist/lib/hx509: sel.h
        src/crypto/external/bsd/heimdal/dist/lib/krb5: version-script.map
        src/crypto/external/bsd/heimdal/lib: Makefile
        src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
        src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
        src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
        src/crypto/external/bsd/heimdal/libexec: Makefile.inc
        src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
        src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
        src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
        src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
        src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
        src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
        src/crypto/external/bsd/heimdal/sbin: Makefile.inc
        src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
        src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
        src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
        src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
        src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
        src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
        src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
        src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
        src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
Fix up Heimdal so that it can be built statically, allowing the
sun2 port to proceed beyond trying and failing to build Heimdal.
This is done by:

1) Stop pretending that libipc is a separate library, and instead
   build it as part of libkrb5.  The version map for libkrb5 needed
   to be updated to expose the required symbols from libipc.

2) The lexer in libhx509 needs to use its own prefix, so that the
   resulting library can be statically linked with a lexer which
   uses the default prefix.  This was hidden because libhx509's
   version map file (which is only used for the shared libs) hid
   away the lexer symbols.  Some defines needed tweaking as well
   to restore buildability.

3) Excplicitly mention all the required libraries in LDADD+= and
   make sure DPADD is set to correspond.  This allows static linking;
   earlier this relied on shared library dependencies to have all the
   libs pulled in.  In the process, convert to single-line LDADD+=
   and DPADD+= settings.  Use Makefile.inc for the common libraries
   to the extent possible.

Successfully built from scratch for i386 and sun2 several times,
and for lots of other ports as well.

Discussed with elric@ and christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.