diff options
| -rw-r--r-- | security/heimdal/Makefile | 115 | ||||
| -rw-r--r-- | security/heimdal/PLIST | 170 | ||||
| -rw-r--r-- | security/heimdal/buildlink3.mk | 4 | ||||
| -rw-r--r-- | security/heimdal/distinfo | 22 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ac | 6 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ad | 41 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-al | 6 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-am | 25 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-an | 145 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ao | 44 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ap | 16 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-aq | 16 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-ar | 8 | ||||
| -rw-r--r-- | security/heimdal/patches/patch-as | 25 |
14 files changed, 255 insertions, 388 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index ffd412ba0de..5528cda621f 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.64 2008/01/18 05:09:37 tnn Exp $ +# $NetBSD: Makefile,v 1.65 2008/02/28 08:14:41 jlam Exp $ -DISTNAME= heimdal-0.7.2 -PKGREVISION= 4 +DISTNAME= heimdal-1.1 CATEGORIES= security -MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \ - ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/ +MASTER_SITES= http://www.h5l.org/dist/src/ MAINTAINER= lha@NetBSD.org -HOMEPAGE= http://www.pdc.kth.se/heimdal/ +HOMEPAGE= http://www.h5l.org/ COMMENT= Kerberos 5 implementation CONFLICTS+= arla-[0-9]* @@ -15,86 +13,46 @@ CONFLICTS+= mit-krb5-[0-9]* CONFLICTS+= openafs-[0-9]* CONFLICTS+= gss-[0-9]* -PKG_INSTALLATION_TYPES= overwrite pkgviews +#LICENSE= modified-bsd + +PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes USE_TOOLS+= bison flex +PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in MAKE_ENV+= INSTALL_CATPAGES=no -HEIMDAL_STATEDIR?= ${VARBASE}/heimdal +.include "../../mk/bsd.prefs.mk" +.include "options.mk" + +HEIMDAL_HDB_DIR= ${VARBASE}/heimdal GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${HEIMDAL_STATEDIR:Q} CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5 +CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR:H:Q} CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-krb4 CONFIGURE_ARGS+= --enable-kcm +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}} +CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1) CFLAGS.Darwin+= -DBIND_8_COMPAT # Though Solaris has a <vis.h> header, it does something very unrelated # to the BSD <vis.h> header. +# OPSYSVARS+= CONFIGURE_ENV CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no -# Force building and installing Heimdal's own compile_et. -CONFIGURE_ENV+= COMPILE_ET=no - -.include "../../mk/bsd.prefs.mk" - -.if defined(ABI) -CONFIGURE_ARGS+= --with-mips-abi=${ABI} -.endif - # Heimdal's configure script expects to find the readline.h header as -# <readline.h>. +# <readline.h>. Also force the configure script to use the terminal +# library needed by the readline library. # +CONFIGURE_ENV+= ac_cv_funclib_tgetent=${BUILDLINK_LDADD.termlib:Q} CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline -BROKEN_READLINE_DETECTION= yes -.include "../../devel/readline/buildlink3.mk" - -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -.include "../../security/openssl/buildlink3.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal -PKG_SUPPORTED_OPTIONS= kerberos-prefix-cmds ldap - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-openldap=${BUILDLINK_PREFIX.openldap-client} -PLIST_SUBST+= LDAP="" - -post-install: heimdal-ldap-schema -heimdal-ldap-schema: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heimdal - ${INSTALL_DATA} ${WRKSRC}/lib/hdb/hdb.schema \ - ${PREFIX}/share/examples/heimdal -.else -PLIST_SUBST+= LDAP="@comment " -.endif - -# Rename some of Heimdal's applications so they won't conflict with -# other packages. -# -.if !empty(PKG_OPTIONS:Mkerberos-prefix-cmds) -KRB5_PREFIX= k -HEIMDAL_TRANSFORM= s/^ftp/${KRB5_PREFIX}&/; \ - s/^login/${KRB5_PREFIX}&/; \ - s/^${KRB5_PREFIX}login.access/login.access/; \ - s/^rcp/${KRB5_PREFIX}&/; \ - s/^rsh/${KRB5_PREFIX}&/; \ - s/^su/${KRB5_PREFIX}&/; \ - s/^telnet/${KRB5_PREFIX}&/ -.else -KRB5_PREFIX= # empty -HEIMDAL_TRANSFORM= s/^ftp/k&/ -.endif -PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q} -CONFIGURE_ARGS+= --program-transform-name=${HEIMDAL_TRANSFORM:Q} .if ${OPSYS} == "IRIX" PLIST_SUBST+= IF_IRIX="" @@ -102,40 +60,21 @@ PLIST_SUBST+= IF_IRIX="" PLIST_SUBST+= IF_IRIX="@comment " .endif -OWN_DIRS_PERMS= ${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700 +OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700 +SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} RCD_SCRIPTS= kadmind kcm kdc kpasswdd INFO_FILES= # PLIST -# Dynamically determine the "replacement" headers for things missing -# in the base system and add them to the PLIST. +# Dynamically determine the "replacement" headers for bits needed by +# Heimdal but are missing in the base system and add them to the PLIST. # GENERATE_PLIST+= \ - ( cd ${WRKSRC}/lib/roken && ${MAKE_PROGRAM} print-xheaders | \ + ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/," ); \ ${ECHO} "@dirrm include/krb5"; -# Fix some places in the Heimdal sources that don't point to the correct -# Kerberized binaries when exec'ing programs. -# -SUBST_CLASSES+= heimdal -SUBST_STAGE.heimdal= pre-configure -SUBST_FILES.heimdal= appl/rcp/rcp.c appl/rcp/rcp_locl.h \ - appl/rsh/rsh_locl.h \ - appl/telnet/telnetd/telnetd.h -SUBST_SED.heimdal= \ - -e "/RSH_PROGRAM/s,rsh,${KRB5_PREFIX}rsh,g" \ - -e "/PATH_RSH/s,\"/usr/bin/rsh\",BINDIR \"${KRB5_PREFIX}rsh\",g" \ - -e "/PATH_RSH/s,/rsh,/${KRB5_PREFIX}rsh,g" \ - -e "/PATH_LOGIN/s,/login,/${KRB5_PREFIX}login,g" - +.include "../../devel/readline/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" - -pre-configure: - cd ${WRKSRC}; for f in lib/hdb/hdb.h; do \ - ${SED} -e "s|/var/heimdal|${HEIMDAL_STATEDIR}|g" \ - $$f > $$f.new; \ - ${MV} -f $$f.new $$f; \ - done - .include "../../mk/bsd.pkg.mk" diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST index d74b4b9f5be..9099fee3228 100644 --- a/security/heimdal/PLIST +++ b/security/heimdal/PLIST @@ -1,11 +1,8 @@ -@comment $NetBSD: PLIST,v 1.12 2007/02/20 10:17:14 rillig Exp $ -bin/${KRB5_PREFIX}login -bin/${KRB5_PREFIX}rcp -bin/${KRB5_PREFIX}rsh -bin/${KRB5_PREFIX}su -bin/${KRB5_PREFIX}telnet +@comment $NetBSD: PLIST,v 1.13 2008/02/28 08:14:41 jlam Exp $ bin/afslog bin/compile_et +bin/gss +bin/hxtool bin/kauth bin/kdestroy bin/kf @@ -15,28 +12,45 @@ bin/kinit bin/klist bin/kpasswd bin/krb5-config +bin/${KRB5_PREFIX}login bin/mk_cmds bin/otp bin/otpprint bin/pagsh bin/pfrom +bin/${KRB5_PREFIX}rcp +bin/${KRB5_PREFIX}rsh bin/string2key +bin/${KRB5_PREFIX}su +bin/${KRB5_PREFIX}telnet bin/verify_krb5_conf include/krb5/asn1_err.h include/krb5/base64.h +include/krb5/cms_asn1.h include/krb5/com_err.h include/krb5/com_right.h +include/krb5/der-protos.h include/krb5/der.h +include/krb5/digest_asn1.h include/krb5/editline.h include/krb5/getarg.h include/krb5/gssapi.h -include/krb5/hdb-private.h +include/krb5/gssapi/gkrb5_err.h +include/krb5/gssapi/gssapi.h +include/krb5/gssapi/gssapi_krb5.h +include/krb5/gssapi/gssapi_spnego.h include/krb5/hdb-protos.h include/krb5/hdb.h include/krb5/hdb_asn1.h include/krb5/hdb_err.h +include/krb5/heim_asn1.h include/krb5/heim_err.h +include/krb5/heimntlm-protos.h +include/krb5/heimntlm.h include/krb5/hex.h +include/krb5/hx509-protos.h +include/krb5/hx509.h +include/krb5/hx509_err.h include/krb5/k524_err.h include/krb5/kadm5/admin.h include/krb5/kadm5/kadm5-private.h @@ -44,18 +58,28 @@ include/krb5/kadm5/kadm5-protos.h include/krb5/kadm5/kadm5_err.h include/krb5/kadm5/private.h include/krb5/kafs.h +include/krb5/kdc-protos.h +include/krb5/kdc.h include/krb5/krb5-private.h include/krb5/krb5-protos.h include/krb5/krb5-types.h include/krb5/krb5.h +include/krb5/krb5/locate_plugin.h +include/krb5/krb5/windc_plugin.h include/krb5/krb5_asn1.h include/krb5/krb5_ccapi.h include/krb5/krb5_err.h +include/krb5/kx509_asn1.h include/krb5/otp.h include/krb5/parse_bytes.h include/krb5/parse_time.h include/krb5/parse_units.h +include/krb5/pkcs12_asn1.h +include/krb5/pkcs8_asn1.h +include/krb5/pkcs9_asn1.h +include/krb5/pkinit_asn1.h include/krb5/resolve.h +include/krb5/rfc2459_asn1.h include/krb5/roken-common.h include/krb5/roken.h include/krb5/rtbl.h @@ -63,22 +87,26 @@ include/krb5/sl.h include/krb5/ss/ss.h include/krb5/xdbm.h info/heimdal.info +info/hx509.info ${IF_IRIX}lib/afskauthlib.so lib/libasn1.la lib/libcom_err.la lib/libeditline.la lib/libgssapi.la lib/libhdb.la +lib/libheimntlm.la +lib/libhx509.la lib/libkadm5clnt.la lib/libkadm5srv.la lib/libkafs.la +lib/libkdc.la lib/libkrb5.la lib/libotp.la lib/libroken.la lib/libsl.la lib/libss.la -libexec/${KRB5_PREFIX}rshd -libexec/${KRB5_PREFIX}telnetd +lib/pkgconfig/heimdal-gssapi.pc +lib/windc.la libexec/hprop libexec/hpropd libexec/ipropd-master @@ -86,36 +114,49 @@ libexec/ipropd-slave libexec/kadmind libexec/kcm libexec/kdc +libexec/kdigest libexec/kfd libexec/kftpd +libexec/kimpersonate libexec/kpasswdd libexec/popper libexec/push -man/man1/${KRB5_PREFIX}login.1 -man/man1/${KRB5_PREFIX}rsh.1 -man/man1/${KRB5_PREFIX}telnet.1 -man/man1/${KRB5_PREFIX}su.1 +libexec/${KRB5_PREFIX}rshd +libexec/${KRB5_PREFIX}telnetd man/man1/afslog.1 man/man1/kauth.1 man/man1/kdestroy.1 man/man1/kf.1 man/man1/kftp.1 man/man1/kgetcred.1 +man/man1/kimpersonate.1 man/man1/kinit.1 man/man1/klist.1 man/man1/kpasswd.1 man/man1/krb5-config.1 man/man1/kx.1 +man/man1/${KRB5_PREFIX}login.1 man/man1/otp.1 man/man1/otpprint.1 man/man1/pagsh.1 man/man1/pfrom.1 +man/man1/${KRB5_PREFIX}rcp.1 +man/man1/${KRB5_PREFIX}rsh.1 man/man1/rxtelnet.1 man/man1/rxterm.1 +man/man1/${KRB5_PREFIX}su.1 +man/man1/${KRB5_PREFIX}telnet.1 man/man1/tenletxr.1 man/man1/xnlock.1 man/man3/arg_printusage.3 +man/man3/ecalloc.3 man/man3/editline.3 +man/man3/emalloc.3 +man/man3/eread.3 +man/man3/erealloc.3 +man/man3/esetenv.3 +man/man3/estrdup.3 +man/man3/ewrite.3 man/man3/getarg.3 man/man3/gss_accept_sec_context.3 man/man3/gss_acquire_cred.3 @@ -145,6 +186,8 @@ man/man3/gss_krb5_ccache_name.3 man/man3/gss_krb5_compat_des3_mic.3 man/man3/gss_krb5_copy_ccache.3 man/man3/gss_krb5_get_tkt_flags.3 +man/man3/gss_krb5_import_ccache.3 +man/man3/gss_krb5_import_cred.3 man/man3/gss_process_context_token.3 man/man3/gss_release_buffer.3 man/man3/gss_release_cred.3 @@ -161,8 +204,10 @@ man/man3/gss_wrap.3 man/man3/gss_wrap_size_limit.3 man/man3/gssapi.3 man/man3/gsskrb5_extract_authz_data_from_sec_context.3 +man/man3/gsskrb5_register_acceptor_identity.3 man/man3/k_afs_cell_of_file.3 man/man3/k_hasafs.3 +man/man3/k_hasafs_recheck.3 man/man3/k_pioctl.3 man/man3/k_setpag.3 man/man3/k_unlog.3 @@ -238,6 +283,7 @@ man/man3/krb5_auth_setcksumtype.3 man/man3/krb5_auth_setkeytype.3 man/man3/krb5_auth_setlocalseqnumber.3 man/man3/krb5_auth_setremoteseqnumber.3 +man/man3/krb5_build_ap_req.3 man/man3/krb5_build_principal.3 man/man3/krb5_build_principal_ext.3 man/man3/krb5_build_principal_va.3 @@ -251,6 +297,7 @@ man/man3/krb5_c_enctype_compare.3 man/man3/krb5_c_get_checksum.3 man/man3/krb5_c_is_coll_proof_cksum.3 man/man3/krb5_c_is_keyed_cksum.3 +man/man3/krb5_c_keylength.3 man/man3/krb5_c_make_checksum.3 man/man3/krb5_c_make_random_key.3 man/man3/krb5_c_set_checksum.3 @@ -266,6 +313,7 @@ man/man3/krb5_cc_default_name.3 man/man3/krb5_cc_destroy.3 man/man3/krb5_cc_end_seq_get.3 man/man3/krb5_cc_gen_new.3 +man/man3/krb5_cc_get_full_name.3 man/man3/krb5_cc_get_name.3 man/man3/krb5_cc_get_ops.3 man/man3/krb5_cc_get_prefix_ops.3 @@ -283,6 +331,7 @@ man/man3/krb5_cc_resolve.3 man/man3/krb5_cc_retrieve_cred.3 man/man3/krb5_cc_set_default_name.3 man/man3/krb5_cc_set_flags.3 +man/man3/krb5_cc_start_seq_get.3 man/man3/krb5_cc_store_cred.3 man/man3/krb5_ccache.3 man/man3/krb5_change_password.3 @@ -347,8 +396,10 @@ man/man3/krb5_crypto_getconfoundersize.3 man/man3/krb5_crypto_getenctype.3 man/man3/krb5_crypto_getpadsize.3 man/man3/krb5_crypto_init.3 +man/man3/krb5_crypto_overhead.3 man/man3/krb5_data.3 man/man3/krb5_data_alloc.3 +man/man3/krb5_data_cmp.3 man/man3/krb5_data_copy.3 man/man3/krb5_data_free.3 man/man3/krb5_data_realloc.3 @@ -357,6 +408,35 @@ man/man3/krb5_decrypt.3 man/man3/krb5_decrypt_EncryptedData.3 man/man3/krb5_decrypt_ivec.3 man/man3/krb5_decrypt_ticket.3 +man/man3/krb5_digest.3 +man/man3/krb5_digest_alloc.3 +man/man3/krb5_digest_free.3 +man/man3/krb5_digest_get_a1_hash.3 +man/man3/krb5_digest_get_client_binding.3 +man/man3/krb5_digest_get_identifier.3 +man/man3/krb5_digest_get_opaque.3 +man/man3/krb5_digest_get_responseData.3 +man/man3/krb5_digest_get_rsp.3 +man/man3/krb5_digest_get_server_nonce.3 +man/man3/krb5_digest_get_tickets.3 +man/man3/krb5_digest_init_request.3 +man/man3/krb5_digest_request.3 +man/man3/krb5_digest_set_authentication_user.3 +man/man3/krb5_digest_set_authid.3 +man/man3/krb5_digest_set_client_nonce.3 +man/man3/krb5_digest_set_digest.3 +man/man3/krb5_digest_set_hostname.3 +man/man3/krb5_digest_set_identifier.3 +man/man3/krb5_digest_set_method.3 +man/man3/krb5_digest_set_nonceCount.3 +man/man3/krb5_digest_set_opaque.3 +man/man3/krb5_digest_set_qop.3 +man/man3/krb5_digest_set_realm.3 +man/man3/krb5_digest_set_server_cb.3 +man/man3/krb5_digest_set_server_nonce.3 +man/man3/krb5_digest_set_type.3 +man/man3/krb5_digest_set_uri.3 +man/man3/krb5_digest_set_username.3 man/man3/krb5_domain_x500_decode.3 man/man3/krb5_domain_x500_encode.3 man/man3/krb5_eai_to_heim_errno.3 @@ -408,11 +488,21 @@ man/man3/krb5_get_cred_from_kdc.3 man/man3/krb5_get_cred_from_kdc_opt.3 man/man3/krb5_get_credentials.3 man/man3/krb5_get_credentials_with_flags.3 +man/man3/krb5_get_creds.3 +man/man3/krb5_get_creds_opt_add_options.3 +man/man3/krb5_get_creds_opt_alloc.3 +man/man3/krb5_get_creds_opt_free.3 +man/man3/krb5_get_creds_opt_set_enctype.3 +man/man3/krb5_get_creds_opt_set_impersonate.3 +man/man3/krb5_get_creds_opt_set_options.3 +man/man3/krb5_get_creds_opt_set_ticket.3 man/man3/krb5_get_default_config_files.3 man/man3/krb5_get_default_principal.3 man/man3/krb5_get_default_realm.3 man/man3/krb5_get_default_realms.3 +man/man3/krb5_get_dns_canonize_hostname.3 man/man3/krb5_get_err_text.3 +man/man3/krb5_get_error_message.3 man/man3/krb5_get_error_string.3 man/man3/krb5_get_extra_addresses.3 man/man3/krb5_get_fcache_version.3 @@ -431,7 +521,9 @@ man/man3/krb5_get_init_creds_opt_alloc.3 man/man3/krb5_get_init_creds_opt_free.3 man/man3/krb5_get_init_creds_opt_init.3 man/man3/krb5_get_init_creds_opt_set_address_list.3 +man/man3/krb5_get_init_creds_opt_set_addressless.3 man/man3/krb5_get_init_creds_opt_set_anonymous.3 +man/man3/krb5_get_init_creds_opt_set_canonicalize.3 man/man3/krb5_get_init_creds_opt_set_default_flags.3 man/man3/krb5_get_init_creds_opt_set_etype_list.3 man/man3/krb5_get_init_creds_opt_set_forwardable.3 @@ -439,18 +531,23 @@ man/man3/krb5_get_init_creds_opt_set_pa_password.3 man/man3/krb5_get_init_creds_opt_set_paq_request.3 man/man3/krb5_get_init_creds_opt_set_preauth_list.3 man/man3/krb5_get_init_creds_opt_set_proxiable.3 -man/man3/krb5_get_init_creds_opt_set_rewew_life.3 +man/man3/krb5_get_init_creds_opt_set_renew_life.3 man/man3/krb5_get_init_creds_opt_set_salt.3 man/man3/krb5_get_init_creds_opt_set_tkt_life.3 +man/man3/krb5_get_init_creds_opt_set_win2k.3 man/man3/krb5_get_init_creds_password.3 man/man3/krb5_get_kdc_cred.3 +man/man3/krb5_get_kdc_sec_offset.3 man/man3/krb5_get_krb524hst.3 man/man3/krb5_get_krb_admin_hst.3 man/man3/krb5_get_krb_changepw_hst.3 man/man3/krb5_get_krbhst.3 +man/man3/krb5_get_max_time_skew.3 man/man3/krb5_get_pw_salt.3 +man/man3/krb5_get_renewed_creds.3 man/man3/krb5_get_server_rcache.3 man/man3/krb5_get_use_admin_kdc.3 +man/man3/krb5_get_warn_dest.3 man/man3/krb5_get_wrapped_length.3 man/man3/krb5_getportbyname.3 man/man3/krb5_h_addr2addr.3 @@ -503,10 +600,20 @@ man/man3/krb5_make_addrport.3 man/man3/krb5_make_principal.3 man/man3/krb5_max_sockaddr_size.3 man/man3/krb5_mcc_ops.3 +man/man3/krb5_mk_priv.3 +man/man3/krb5_mk_rep.3 +man/man3/krb5_mk_rep_exact.3 +man/man3/krb5_mk_rep_extended.3 +man/man3/krb5_mk_req.3 +man/man3/krb5_mk_req_exact.3 +man/man3/krb5_mk_req_extended.3 +man/man3/krb5_mk_safe.3 man/man3/krb5_openlog.3 man/man3/krb5_padata_add.3 man/man3/krb5_parse_address.3 man/man3/krb5_parse_name.3 +man/man3/krb5_parse_name_flags.3 +man/man3/krb5_parse_nametype.3 man/man3/krb5_passwd_result_to_string.3 man/man3/krb5_password_key_proc.3 man/man3/krb5_prepend_config_files.3 @@ -543,6 +650,11 @@ man/man3/krb5_rc_resolve_type.3 man/man3/krb5_rc_store.3 man/man3/krb5_rcache.3 man/man3/krb5_rd_error.3 +man/man3/krb5_rd_priv.3 +man/man3/krb5_rd_rep.3 +man/man3/krb5_rd_req.3 +man/man3/krb5_rd_req_with_keyblock.3 +man/man3/krb5_rd_safe.3 man/man3/krb5_realm_compare.3 man/man3/krb5_ret_address.3 man/man3/krb5_ret_addrs.3 @@ -555,14 +667,20 @@ man/man3/krb5_ret_int8.3 man/man3/krb5_ret_keyblock.3 man/man3/krb5_ret_principal.3 man/man3/krb5_ret_string.3 +man/man3/krb5_ret_stringnl.3 man/man3/krb5_ret_stringz.3 man/man3/krb5_ret_times.3 +man/man3/krb5_ret_uint16.3 +man/man3/krb5_ret_uint32.3 +man/man3/krb5_ret_uint8.3 man/man3/krb5_set_config_files.3 man/man3/krb5_set_default_realm.3 +man/man3/krb5_set_dns_canonize_hostname.3 man/man3/krb5_set_error_string.3 man/man3/krb5_set_extra_addresses.3 man/man3/krb5_set_fcache_version.3 man/man3/krb5_set_ignore_addresses.3 +man/man3/krb5_set_max_time_skew.3 man/man3/krb5_set_password.3 man/man3/krb5_set_password_using_ccache.3 man/man3/krb5_set_real_time.3 @@ -600,33 +718,42 @@ man/man3/krb5_store_int8.3 man/man3/krb5_store_keyblock.3 man/man3/krb5_store_principal.3 man/man3/krb5_store_string.3 +man/man3/krb5_store_stringnl.3 man/man3/krb5_store_stringz.3 man/man3/krb5_store_times.3 +man/man3/krb5_store_uint16.3 +man/man3/krb5_store_uint32.3 +man/man3/krb5_store_uint8.3 man/man3/krb5_string_to_deltat.3 man/man3/krb5_string_to_enctype.3 man/man3/krb5_string_to_key.3 man/man3/krb5_string_to_key_data.3 man/man3/krb5_string_to_key_data_salt.3 man/man3/krb5_string_to_key_data_salt_opaque.3 -man/man3/krb5_string_to_key_derived.3 man/man3/krb5_string_to_key_salt.3 man/man3/krb5_string_to_key_salt_opaque.3 man/man3/krb5_ticket.3 man/man3/krb5_ticket_get_authorization_data_type.3 man/man3/krb5_ticket_get_client.3 +man/man3/krb5_ticket_get_endtime.3 man/man3/krb5_ticket_get_server.3 man/man3/krb5_timeofday.3 man/man3/krb5_unparse_name.3 man/man3/krb5_unparse_name_fixed.3 +man/man3/krb5_unparse_name_fixed_flags.3 man/man3/krb5_unparse_name_fixed_short.3 +man/man3/krb5_unparse_name_flags.3 man/man3/krb5_unparse_name_short.3 man/man3/krb5_us_timeofday.3 man/man3/krb5_vabort.3 man/man3/krb5_vabortx.3 +man/man3/krb5_verify_ap_req.3 man/man3/krb5_verify_checksum.3 man/man3/krb5_verify_init_creds.3 man/man3/krb5_verify_init_creds_opt_init.3 man/man3/krb5_verify_init_creds_opt_set_ap_req_nofail.3 +man/man3/krb5_verify_opt_alloc.3 +man/man3/krb5_verify_opt_free.3 man/man3/krb5_verify_opt_init.3 man/man3/krb5_verify_opt_set_ccache.3 man/man3/krb5_verify_opt_set_flags.3 @@ -669,10 +796,11 @@ man/man3/unparse_time_approx.3 man/man5/kftpusers.5 man/man5/krb5.conf.5 man/man5/login.access.5 -man/man8/${KRB5_PREFIX}rshd.8 -man/man8/${KRB5_PREFIX}telnetd.8 +man/man5/mech.5 +man/man5/qop.5 man/man8/hprop.8 man/man8/hpropd.8 +man/man8/iprop-log.8 man/man8/iprop.8 man/man8/ipropd-master.8 man/man8/ipropd-slave.8 @@ -689,19 +817,19 @@ man/man8/ktutil.8 man/man8/kxd.8 man/man8/popper.8 man/man8/push.8 +man/man8/${KRB5_PREFIX}rshd.8 +man/man8/${KRB5_PREFIX}telnetd.8 man/man8/string2key.8 man/man8/verify_krb5_conf.8 -sbin/dump_log +sbin/iprop-log sbin/kadmin sbin/kstash sbin/ktutil -sbin/replay_log -sbin/truncate_log ${LDAP}share/examples/heimdal/hdb.schema share/examples/rc.d/kadmind share/examples/rc.d/kcm share/examples/rc.d/kdc share/examples/rc.d/kpasswdd ${LDAP}@dirrm share/examples/heimdal -@dirrm include/krb5/ss @dirrm include/krb5/kadm5 +@dirrm include/krb5/ss diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index 2a251815fdb..ecd3766230e 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2008/01/18 05:09:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2008/02/28 08:14:41 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -15,7 +15,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}heimdal .if !empty(HEIMDAL_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.4e -BUILDLINK_ABI_DEPENDS.heimdal+= heimdal>=0.7.2nb4 +BUILDLINK_ABI_DEPENDS.heimdal+= heimdal>=1.1 BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal BUILDLINK_INCDIRS.heimdal?= include/krb5 .endif # HEIMDAL_BUILDLINK3_MK diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index ab8cdc18a57..c8ec1fbaca5 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1,14 +1,10 @@ -$NetBSD: distinfo,v 1.22 2007/02/20 10:17:14 rillig Exp $ +$NetBSD: distinfo,v 1.23 2008/02/28 08:14:41 jlam Exp $ -SHA1 (heimdal-0.7.2.tar.gz) = a902e6ad7c31d940b588dc0235b348936f0d719d -RMD160 (heimdal-0.7.2.tar.gz) = 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 -Size (heimdal-0.7.2.tar.gz) = 4525734 bytes -SHA1 (patch-ac) = 313c0a1f91e4f9546ae906f981adae0d499dd9cf -SHA1 (patch-ad) = fe6a0f6de436182d4960058911142786c945aa89 -SHA1 (patch-al) = 6035ef920b1a005902ae021b307fc4c3efc77449 -SHA1 (patch-am) = 538c0c3bb8806bdd3691d490ea4ceafc7acc0ca7 -SHA1 (patch-an) = 2f414a50520a345f3c875220d2b001516933fbac -SHA1 (patch-ao) = 7401ad7a47ed8541663193f71bd52feafeeeb045 -SHA1 (patch-ap) = 4c28d64ecf1c55d7eb02d0be1cf3efeff81339c6 -SHA1 (patch-aq) = 3ac32c49d5880813998b5bfe8c474fbb87218cba -SHA1 (patch-ar) = d00a5786098607f81700ea147eb8acdd882bd27c +SHA1 (heimdal-1.1.tar.gz) = 64ddb2a2c47f732b2d9bbf2621062eaffa32e10f +RMD160 (heimdal-1.1.tar.gz) = fecda9ca4db5b11c680aa3cccd705d22f98f25b7 +Size (heimdal-1.1.tar.gz) = 3622005 bytes +SHA1 (patch-ac) = d5df5fbd77d1750eef9359ceac907547175e11dd +SHA1 (patch-ad) = 671f68d337029b1dc935d48ce3ae458355376c6b +SHA1 (patch-al) = 2e92de5779abf7455d1bea79999949faa0417945 +SHA1 (patch-ar) = 05564ffaf170c13187c66e45f1f124352bfc092e +SHA1 (patch-as) = dc314360d65b6acf1c23ffcbef23a4f750c62dab diff --git a/security/heimdal/patches/patch-ac b/security/heimdal/patches/patch-ac index e34eaf84cc7..56468576e11 100644 --- a/security/heimdal/patches/patch-ac +++ b/security/heimdal/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2005/10/26 15:12:45 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2008/02/28 08:14:41 jlam Exp $ ---- configure.in.orig 2005-09-09 08:13:10.000000000 -0400 +--- configure.in.orig 2008-01-24 08:13:51.000000000 -0500 +++ configure.in -@@ -15,9 +15,6 @@ AM_MAINTAINER_MODE +@@ -16,9 +16,6 @@ AC_PROG_CPP AC_PREFIX_DEFAULT(/usr/heimdal) diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad index 4d5f341607d..9a5986b9d98 100644 --- a/security/heimdal/patches/patch-ad +++ b/security/heimdal/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.8 2007/02/20 10:17:14 rillig Exp $ +$NetBSD: patch-ad,v 1.9 2008/02/28 08:14:41 jlam Exp $ ---- configure.orig Mon Feb 6 08:29:16 2006 -+++ configure Mon Feb 19 18:06:05 2007 -@@ -3182,9 +3182,6 @@ +--- configure.orig 2008-01-24 08:14:11.000000000 -0500 ++++ configure +@@ -3928,9 +3928,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -10,13 +10,38 @@ $NetBSD: patch-ad,v 1.8 2007/02/20 10:17:14 rillig Exp $ -test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal' - # Make sure we can run config.sub. - $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -@@ -4199,7 +4196,6 @@ + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +@@ -4902,7 +4899,11 @@ fi #if test -n "$GCC"; then esac CC="$CC $abi" -libdir="$libdir$abilibdirext" ++# ++# Comment out the following line for pkgsrc as pkgsrc always installs ++# libraries into .../lib, not .../lib{32,64}. ++# ++#libdir="$libdir$abilibdirext" - echo "$as_me:$LINENO: checking for __attribute__" >&5 + { echo "$as_me:$LINENO: checking for __attribute__" >&5 +@@ -29714,6 +29715,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif + #ifdef HAVE_SYS_BSWAP_H + #include <sys/bswap.h> + #endif +@@ -29925,6 +29929,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif + #ifdef HAVE_SYS_BSWAP_H + #include <sys/bswap.h> + #endif diff --git a/security/heimdal/patches/patch-al b/security/heimdal/patches/patch-al index 4d9892d20b9..8a73a278690 100644 --- a/security/heimdal/patches/patch-al +++ b/security/heimdal/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1 2006/07/05 04:39:15 jlam Exp $ +$NetBSD: patch-al,v 1.2 2008/02/28 08:14:41 jlam Exp $ ---- lib/roken/Makefile.in.orig 2006-02-06 08:32:11.000000000 -0500 +--- lib/roken/Makefile.in.orig 2008-01-24 08:14:23.000000000 -0500 +++ lib/roken/Makefile.in -@@ -1654,6 +1654,9 @@ roken.h: make-roken$(EXEEXT) +@@ -1421,6 +1421,9 @@ roken.h: make-roken$(EXEEXT) make-roken.c: roken.h.in roken.awk $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c diff --git a/security/heimdal/patches/patch-am b/security/heimdal/patches/patch-am deleted file mode 100644 index b55e4f44837..00000000000 --- a/security/heimdal/patches/patch-am +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/08/09 17:58:09 salo Exp $ - -Security fix for SA21436. - ---- appl/dceutils/k5dcecon.c.orig 2002-08-09 15:19:41.000000000 +0200 -+++ appl/dceutils/k5dcecon.c 2006-08-09 19:42:15.000000000 +0200 -@@ -71,7 +71,7 @@ - #endif - - #ifdef __hpux --#define seteuid(A) setresuid(-1,A,-1); -+#define seteuid(A) setresuid(-1,A,-1) - #endif - - -@@ -549,7 +549,8 @@ int k5dcecreate(luid, luser, pname, krbt - */ - - if (uid == 0) { -- seteuid(luid); -+ if (seteuid(luid) < 0) -+ goto abort; - } - - cp = strchr(pname,'@'); diff --git a/security/heimdal/patches/patch-an b/security/heimdal/patches/patch-an deleted file mode 100644 index 78879014233..00000000000 --- a/security/heimdal/patches/patch-an +++ /dev/null @@ -1,145 +0,0 @@ -$NetBSD: patch-an,v 1.1 2006/08/09 17:58:09 salo Exp $ - -Security fix for SA21436. - ---- appl/ftp/ftpd/ftpd.c.orig 2005-06-02 12:41:28.000000000 +0200 -+++ appl/ftp/ftpd/ftpd.c 2006-08-09 19:42:15.000000000 +0200 -@@ -138,9 +138,9 @@ static int handleoobcmd(void); - static int checkuser (char *, char *); - static int checkaccess (char *); - static FILE *dataconn (const char *, off_t, const char *); --static void dolog (struct sockaddr *sa, int len); -+static void dolog (struct sockaddr *, int); - static void end_login (void); --static FILE *getdatasock (const char *); -+static FILE *getdatasock (const char *, int); - static char *gunique (char *); - static RETSIGTYPE lostconn (int); - static int receive_data (FILE *, FILE *); -@@ -835,7 +835,8 @@ static void - end_login(void) - { - -- seteuid((uid_t)0); -+ if (seteuid((uid_t)0) < 0) -+ fatal("Failed to seteuid"); - if (logged_in) - ftpd_logwtmp(ttyline, "", ""); - pw = NULL; -@@ -1208,14 +1209,15 @@ done: - } - - static FILE * --getdatasock(const char *mode) -+getdatasock(const char *mode, int domain) - { - int s, t, tries; - - if (data >= 0) - return (fdopen(data, mode)); -- seteuid(0); -- s = socket(ctrl_addr->sa_family, SOCK_STREAM, 0); -+ if (seteuid(0) < 0) -+ fatal("Failed to seteuid"); -+ s = socket(domain, SOCK_STREAM, 0); - if (s < 0) - goto bad; - socket_set_reuseaddr (s, 1); -@@ -1232,7 +1234,8 @@ getdatasock(const char *mode) - goto bad; - sleep(tries); - } -- seteuid(pw->pw_uid); -+ if (seteuid(pw->pw_uid) < 0) -+ fatal("Failed to seteuid"); - #ifdef IPTOS_THROUGHPUT - socket_set_tos (s, IPTOS_THROUGHPUT); - #endif -@@ -1240,7 +1243,8 @@ getdatasock(const char *mode) - bad: - /* Return the real value of errno (close may change it) */ - t = errno; -- seteuid((uid_t)pw->pw_uid); -+ if (seteuid((uid_t)pw->pw_uid) < 0) -+ fatal("Failed to seteuid"); - close(s); - errno = t; - return (NULL); -@@ -1271,7 +1275,7 @@ dataconn(const char *name, off_t size, c - { - char sizebuf[32]; - FILE *file; -- int retry = 0; -+ int domain, retry = 0; - - file_size = size; - byte_count = 0; -@@ -1318,7 +1322,15 @@ dataconn(const char *name, off_t size, c - if (usedefault) - data_dest = his_addr; - usedefault = 1; -- file = getdatasock(mode); -+ /* -+ * Default to using the same socket type as the ctrl address, -+ * unless we know the type of the data address. -+ */ -+ domain = data_dest->sa_family; -+ if (domain == PF_UNSPEC) -+ domain = ctrl_addr->sa_family; -+ -+ file = getdatasock(mode, domain); - if (file == NULL) { - char data_addr[256]; - -@@ -1889,11 +1901,11 @@ dologout(int status) - transflag = 0; - urgflag = 0; - if (logged_in) { -- seteuid((uid_t)0); -- ftpd_logwtmp(ttyline, "", ""); - #ifdef KRB4 - cond_kdestroy(); - #endif -+ seteuid((uid_t)0); /* No need to check, we call exit() below */ -+ ftpd_logwtmp(ttyline, "", ""); - } - /* beware of flushing buffers after a SIGPIPE */ - #ifdef XXX -@@ -2006,12 +2018,15 @@ pasv(void) - 0); - socket_set_portrange(pdata, restricted_data_ports, - pasv_addr->sa_family); -- seteuid(0); -+ if (seteuid(0) < 0) -+ fatal("Failed to seteuid"); - if (bind(pdata, pasv_addr, socket_sockaddr_size (pasv_addr)) < 0) { -- seteuid(pw->pw_uid); -+ if (seteuid(pw->pw_uid) < 0) -+ fatal("Failed to seteuid"); - goto pasv_error; - } -- seteuid(pw->pw_uid); -+ if (seteuid(pw->pw_uid) < 0) -+ fatal("Failed to seteuid"); - len = sizeof(pasv_addr_ss); - if (getsockname(pdata, pasv_addr, &len) < 0) - goto pasv_error; -@@ -2050,12 +2065,15 @@ epsv(char *proto) - 0); - socket_set_portrange(pdata, restricted_data_ports, - pasv_addr->sa_family); -- seteuid(0); -+ if (seteuid(0) < 0) -+ fatal("Failed to seteuid"); - if (bind(pdata, pasv_addr, socket_sockaddr_size (pasv_addr)) < 0) { -- seteuid(pw->pw_uid); -+ if (seteuid(pw->pw_uid)) -+ fatal("Failed to seteuid"); - goto pasv_error; - } -- seteuid(pw->pw_uid); -+ if (seteuid(pw->pw_uid) < 0) -+ fatal("Failed to seteuid"); - len = sizeof(pasv_addr_ss); - if (getsockname(pdata, pasv_addr, &len) < 0) - goto pasv_error; diff --git a/security/heimdal/patches/patch-ao b/security/heimdal/patches/patch-ao deleted file mode 100644 index 342e457a8f8..00000000000 --- a/security/heimdal/patches/patch-ao +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2006/08/09 17:58:09 salo Exp $ - -Security fix for SA21436. - ---- appl/rcp/rcp.c.orig 2005-05-11 13:04:30.000000000 +0200 -+++ appl/rcp/rcp.c 2006-08-09 19:42:15.000000000 +0200 -@@ -119,13 +119,15 @@ main(int argc, char **argv) - - if (fflag) { /* Follow "protocol", send data. */ - response(); -- setuid(userid); -+ if (setuid(userid) < 0) -+ errx(1, "setuid failed"); - source(argc, argv); - exit(errs); - } - - if (tflag) { /* Receive data. */ -- setuid(userid); -+ if (setuid(userid) < 0) -+ errx(1, "setuid failed"); - sink(argc, argv); - exit(errs); - } -@@ -221,7 +223,8 @@ toremote(char *targ, int argc, char **ar - if (response() < 0) - exit(1); - free(bp); -- setuid(userid); -+ if (setuid(userid) < 0) -+ errx(1, "setuid failed"); - } - source(1, argv+i); - } -@@ -270,7 +273,8 @@ tolocal(int argc, char **argv) - } - free(bp); - sink(1, argv + argc - 1); -- seteuid(0); -+ if (seteuid(0) < 0) -+ exit(1); - close(remin); - remin = remout = -1; - } diff --git a/security/heimdal/patches/patch-ap b/security/heimdal/patches/patch-ap deleted file mode 100644 index 0cf6ab9a525..00000000000 --- a/security/heimdal/patches/patch-ap +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2006/08/09 17:58:09 salo Exp $ - -Security fix for SA21436. - ---- appl/rcp/util.c.orig 2005-04-18 09:52:58.000000000 +0200 -+++ appl/rcp/util.c 2006-08-09 19:42:15.000000000 +0200 -@@ -112,7 +112,8 @@ susystem(s, userid) - return (127); - - case 0: -- (void)setuid(userid); -+ if (setuid(userid) < 0) -+ _exit(127); - execl(_PATH_BSHELL, "sh", "-c", s, NULL); - _exit(127); - } diff --git a/security/heimdal/patches/patch-aq b/security/heimdal/patches/patch-aq deleted file mode 100644 index eeb146f1426..00000000000 --- a/security/heimdal/patches/patch-aq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2006/08/09 17:58:09 salo Exp $ - -Security fix for SA21436. - ---- lib/roken/iruserok.c.orig 2005-04-12 13:28:54.000000000 +0200 -+++ lib/roken/iruserok.c 2006-08-09 19:42:15.000000000 +0200 -@@ -250,7 +250,8 @@ again: - * are protected read/write owner only. - */ - uid = geteuid(); -- seteuid(pwd->pw_uid); -+ if (seteuid(pwd->pw_uid) < 0) -+ return (-1); - hostf = fopen(pbuf, "r"); - seteuid(uid); - diff --git a/security/heimdal/patches/patch-ar b/security/heimdal/patches/patch-ar index 835804e9e59..7bd16c282e7 100644 --- a/security/heimdal/patches/patch-ar +++ b/security/heimdal/patches/patch-ar @@ -1,11 +1,11 @@ -$NetBSD: patch-ar,v 1.1 2007/02/20 10:17:14 rillig Exp $ +$NetBSD: patch-ar,v 1.2 2008/02/28 08:14:41 jlam Exp $ Why should anyone want to install the libtool wrapper for a library, but not the library itself? ---- lib/auth/afskauthlib/Makefile.in.orig Mon Feb 6 08:31:49 2006 -+++ lib/auth/afskauthlib/Makefile.in Tue Feb 20 04:20:05 2007 -@@ -347,7 +347,7 @@ +--- lib/auth/afskauthlib/Makefile.in.orig 2008-01-24 08:14:21.000000000 -0500 ++++ lib/auth/afskauthlib/Makefile.in +@@ -317,7 +317,7 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la foodir = $(libdir) diff --git a/security/heimdal/patches/patch-as b/security/heimdal/patches/patch-as new file mode 100644 index 00000000000..0f5c3a3ec67 --- /dev/null +++ b/security/heimdal/patches/patch-as @@ -0,0 +1,25 @@ +$NetBSD: patch-as,v 1.1 2008/02/28 08:14:41 jlam Exp $ + +--- cf/roken-frag.m4.orig 2008-01-24 08:13:43.000000000 -0500 ++++ cf/roken-frag.m4 +@@ -243,12 +243,18 @@ AC_FOREACH([rk_func], [asprintf vasprint + rk_func)]) + + AC_FIND_FUNC_NO_LIBS(bswap16,, +-[#ifdef HAVE_SYS_BSWAP_H ++[#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_BSWAP_H + #include <sys/bswap.h> + #endif],0) + + AC_FIND_FUNC_NO_LIBS(bswap32,, +-[#ifdef HAVE_SYS_BSWAP_H ++[#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_BSWAP_H + #include <sys/bswap.h> + #endif],0) + |