Sun Jul 31 21:21:01 2011 UTC ()
Adds the symbols _kdc_db_fetch and _kdc_free_ent to global
visibility, so that they can be referenced from kdc/digest-service.
Fixes build on Dragonfly. From Alex Hornung in PR pkg/45195.


(gls)
diff -r1.80 -r1.81 pkgsrc/security/heimdal/Makefile
diff -r1.28 -r1.29 pkgsrc/security/heimdal/distinfo
diff -r0 -r1.1 pkgsrc/security/heimdal/patches/patch-kdc_version-script.map
cvs diff -r1.80 -r1.81 pkgsrc/security/heimdal/Makefile (switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2011/07/08 09:49:21 1.80
+++ pkgsrc/security/heimdal/Makefile 2011/07/31 21:21:01 1.81
@@ -1,88 +1,89 @@ @@ -1,88 +1,89 @@
1# $NetBSD: Makefile,v 1.80 2011/07/08 09:49:21 adam Exp $ 1# $NetBSD: Makefile,v 1.81 2011/07/31 21:21:01 gls Exp $
2 2
3DISTNAME= heimdal-1.4 3DISTNAME= heimdal-1.4
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= http://www.h5l.org/dist/src/ 6MASTER_SITES= http://www.h5l.org/dist/src/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.h5l.org/ 9HOMEPAGE= http://www.h5l.org/
9COMMENT= Kerberos 5 implementation 10COMMENT= Kerberos 5 implementation
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12CONFLICTS+= arla-[0-9]* 13CONFLICTS+= arla-[0-9]*
13CONFLICTS+= mit-krb5-[0-9]* 14CONFLICTS+= mit-krb5-[0-9]*
14CONFLICTS+= openafs-[0-9]* 15CONFLICTS+= openafs-[0-9]*
15CONFLICTS+= gss-[0-9]* 16CONFLICTS+= gss-[0-9]*
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18 19
19MAKE_JOBS_SAFE= no 20MAKE_JOBS_SAFE= no
20 21
21USE_LIBTOOL= yes 22USE_LIBTOOL= yes
22USE_TOOLS+= bison flex 23USE_TOOLS+= bison flex
23PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in 24PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in
24MAKE_ENV+= INSTALL_CATPAGES=no 25MAKE_ENV+= INSTALL_CATPAGES=no
25 26
26.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
27.include "options.mk" 28.include "options.mk"
28 29
29HEIMDAL_HDB_DIR= ${VARBASE}/heimdal 30HEIMDAL_HDB_DIR= ${VARBASE}/heimdal
30 31
31GNU_CONFIGURE= yes 32GNU_CONFIGURE= yes
32CONFIGURE_ARGS+= --enable-kcm 33CONFIGURE_ARGS+= --enable-kcm
33CONFIGURE_ARGS+= --enable-pthread-support 34CONFIGURE_ARGS+= --enable-pthread-support
34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5 35CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 36CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
36CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR:H} 37CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR:H}
37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 38CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
38CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 39CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
39CONFIGURE_ARGS+= --without-x 40CONFIGURE_ARGS+= --without-x
40CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}} 41CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}}
41CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1) 42CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1)
42# XXX Grand Central Dispatch is broken in 1.4 43# XXX Grand Central Dispatch is broken in 1.4
43CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no 44CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no
44 45
45CFLAGS.Darwin+= -DBIND_8_COMPAT 46CFLAGS.Darwin+= -DBIND_8_COMPAT
46 47
47# Though Solaris has a <vis.h> header, it does something very unrelated 48# Though Solaris has a <vis.h> header, it does something very unrelated
48# to the BSD <vis.h> header. 49# to the BSD <vis.h> header.
49OPSYSVARS+= CONFIGURE_ENV 50OPSYSVARS+= CONFIGURE_ENV
50CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no 51CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no
51 52
52# Heimdal's configure script expects to find the readline.h header as 53# Heimdal's configure script expects to find the readline.h header as
53# <readline.h>. 54# <readline.h>.
54CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 55CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
55CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline 56CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline
56 57
57PLIST_VARS+= afskauth hcrypto 58PLIST_VARS+= afskauth hcrypto
58.if ${OPSYS} == "IRIX" 59.if ${OPSYS} == "IRIX"
59PLIST.afskauth= yes 60PLIST.afskauth= yes
60.endif 61.endif
61.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" 62.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != ""
62PLIST.hcrypto= yes 63PLIST.hcrypto= yes
63.endif 64.endif
64 65
65OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${ROOT_GROUP} 0700 66OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${ROOT_GROUP} 0700
66SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 67SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
67SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 68SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
68RCD_SCRIPTS= kadmind kcm kdc kpasswdd 69RCD_SCRIPTS= kadmind kcm kdc kpasswdd
69INFO_FILES= yes 70INFO_FILES= yes
70 71
71# Dynamically determine the "replacement" headers for bits needed by 72# Dynamically determine the "replacement" headers for bits needed by
72# Heimdal but are missing in the base system and add them to the PLIST. 73# Heimdal but are missing in the base system and add them to the PLIST.
73GENERATE_PLIST+= \ 74GENERATE_PLIST+= \
74 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ 75 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \
75 ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); 76 ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," );
76 77
77# remove manpages conficting with OpenSSL keeping only the important ones 78# remove manpages conficting with OpenSSL keeping only the important ones
78pre-configure: 79pre-configure:
79 cd ${WRKSRC}/doc/doxyout/hcrypto && \ 80 cd ${WRKSRC}/doc/doxyout/hcrypto && \
80 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \ 81 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \
81 mv manpages.new manpages 82 mv manpages.new manpages
82 83
83.include "../../databases/sqlite3/buildlink3.mk" 84.include "../../databases/sqlite3/buildlink3.mk"
84.include "../../devel/readline/buildlink3.mk" 85.include "../../devel/readline/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 86.include "../../security/openssl/buildlink3.mk"
86.include "../../mk/bdb.buildlink3.mk" 87.include "../../mk/bdb.buildlink3.mk"
87.include "../../mk/pthread.buildlink3.mk" 88.include "../../mk/pthread.buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/security/heimdal/distinfo (switch to unified diff)

--- pkgsrc/security/heimdal/distinfo 2011/07/16 11:18:32 1.28
+++ pkgsrc/security/heimdal/distinfo 2011/07/31 21:21:01 1.29
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.28 2011/07/16 11:18:32 asau Exp $ 1$NetBSD: distinfo,v 1.29 2011/07/31 21:21:01 gls Exp $
2 2
3SHA1 (heimdal-1.4.tar.gz) = b4c876df3637a11deea72f87a6e54f6caf501679 3SHA1 (heimdal-1.4.tar.gz) = b4c876df3637a11deea72f87a6e54f6caf501679
4RMD160 (heimdal-1.4.tar.gz) = 055288f1ab37781f1533299bdff9b0d1e264d470 4RMD160 (heimdal-1.4.tar.gz) = 055288f1ab37781f1533299bdff9b0d1e264d470
5Size (heimdal-1.4.tar.gz) = 6095377 bytes 5Size (heimdal-1.4.tar.gz) = 6095377 bytes
6SHA1 (patch-ad) = 37c2a7cdc4dba695a84057b40aae3c5a971cb546 6SHA1 (patch-ad) = 37c2a7cdc4dba695a84057b40aae3c5a971cb546
7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424 7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
8SHA1 (patch-ar) = 0a3e7bbd3cb04deb0f6772afd9a6b6b5353463d3 8SHA1 (patch-ar) = 0a3e7bbd3cb04deb0f6772afd9a6b6b5353463d3
 9SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
9SHA1 (patch-lib_otp_Makefile.in) = 830f0e536a103478d147bb03e7752d5d38ddf03b 10SHA1 (patch-lib_otp_Makefile.in) = 830f0e536a103478d147bb03e7752d5d38ddf03b
File Added: pkgsrc/security/heimdal/patches/Attic/patch-kdc_version-script.map
$NetBSD: patch-kdc_version-script.map,v 1.1 2011/07/31 21:21:01 gls Exp $

Adds the symbols _kdc_db_fetch and _kdc_free_ent to global
visibility, so that they can be referenced from kdc/digest-service.
Fixes build on Dragonfly. From Alex Hornung in PR pkg/45195.

--- kdc/version-script.map.orig	2010-09-13 07:23:34.000000000 +0000
+++ kdc/version-script.map
@@ -2,6 +2,8 @@
 
 HEIMDAL_KDC_1.0 {
 	global:
+		_kdc_db_fetch;
+		_kdc_free_ent;
 		kdc_log;
 		kdc_log_msg;
 		kdc_log_msg_va;