From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 26 15:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BAB038F2 for ; Tue, 26 Mar 2013 15:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 9D91134E for ; Tue, 26 Mar 2013 15:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QFK0m3035314 for ; Tue, 26 Mar 2013 15:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2QFK0gJ035299; Tue, 26 Mar 2013 15:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 26 Mar 2013 15:20:00 GMT Resent-Message-Id: <201303261520.r2QFK0gJ035299@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Shane Ambler Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 187328E0 for ; Tue, 26 Mar 2013 15:18:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id ED77C344 for ; Tue, 26 Mar 2013 15:18:47 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2QFIlHZ077429 for ; Tue, 26 Mar 2013 15:18:47 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2QFIlUv077428; Tue, 26 Mar 2013 15:18:47 GMT (envelope-from nobody) Message-Id: <201303261518.r2QFIlUv077428@red.freebsd.org> Date: Tue, 26 Mar 2013 15:18:47 GMT From: Shane Ambler To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177397: [patch] fix conflict between heimdal and openssl X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 15:20:00 -0000 >Number: 177397 >Category: ports >Synopsis: [patch] fix conflict between heimdal and openssl >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 26 15:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Shane Ambler >Release: 9.1-RELEASE >Organization: >Environment: FreeBSD leader.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r246600: Sun Feb 10 16:13:27 CST 2013 shane@leader.local:/usr/obj/usr/src/sys/dtracekern amd64 >Description: Following on from an email to freebsd-questions mailing list I found that security/heimdal installs man pages for the included hcrypto lib even when libhcrypto is not used. (openssl is used when present) Some of these man pages conflict with the openssl man pages when the openssl port is installed. While the old pkg system allowed both ports to install the same files the new pkg system prevents this conflict by denying the installation of the second port. The error output -- ===> Compressing manual pages for heimdal-1.5.2_4 ===> Running ldconfig /sbin/ldconfig -m /usr/local/lib ===> Registering installation for heimdal-1.5.2_4 Installing heimdal-1.5.2_4...pkg: heimdal-1.5.2_4 conflicts with openssl-1.0.1_8 (installs files into the same place). Problematic file: /usr/local/man/man3/DES_cfb64_encrypt.3.gz *** [fake-pkg] Error code 70 >How-To-Repeat: >Fix: The attached patch prevents the installation of the hcrypto man pages, allowing both openssl and heimdal to be installed from ports. Patch attached with submission follows: diff -Nru heimdal.orig/Makefile heimdal/Makefile --- heimdal.orig/Makefile 2013-03-27 01:10:38.255923205 +1030 +++ heimdal/Makefile 2013-03-27 01:04:16.946928475 +1030 @@ -53,6 +53,7 @@ .endif .if ${OSVERSION} >= 700000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc__Makefile.in PLIST_SUB+= HCRYPTO="@comment " .else PLIST_SUB+= HCRYPTO="" diff -Nru heimdal.orig/Makefile.man heimdal/Makefile.man --- heimdal.orig/Makefile.man 2013-03-27 01:10:38.253923136 +1030 +++ heimdal/Makefile.man 2013-03-27 00:34:31.993922761 +1030 @@ -17,148 +17,148 @@ MAN1+= rsh.1 MAN1+= su.1 MAN1+= telnet.1 -MAN3+= DES_cbc_cksum.3 -MAN3+= DES_cbc_encrypt.3 -MAN3+= DES_cfb64_encrypt.3 -MAN3+= DES_check_key_parity.3 -MAN3+= DES_ecb3_encrypt.3 -MAN3+= DES_ecb_encrypt.3 -MAN3+= DES_ede3_cbc_encrypt.3 -MAN3+= DES_encrypt.3 -MAN3+= DES_init_random_number_generator.3 -MAN3+= DES_is_weak_key.3 -MAN3+= DES_key_sched.3 -MAN3+= DES_new_random_key.3 -MAN3+= DES_pcbc_encrypt.3 -MAN3+= DES_random_key.3 -MAN3+= DES_set_key.3 -MAN3+= DES_set_key_checked.3 -MAN3+= DES_set_key_unchecked.3 -MAN3+= DES_set_odd_parity.3 -MAN3+= DES_string_to_key.3 -MAN3+= DH_check_pubkey.3 -MAN3+= DH_compute_key.3 -MAN3+= DH_free.3 -MAN3+= DH_generate_key.3 -MAN3+= DH_generate_parameters_ex.3 -MAN3+= DH_get_default_method.3 -MAN3+= DH_get_ex_data.3 -MAN3+= DH_ltm_method.3 -MAN3+= DH_new.3 -MAN3+= DH_new_method.3 -MAN3+= DH_null_method.3 -MAN3+= DH_set_default_method.3 -MAN3+= DH_set_ex_data.3 -MAN3+= DH_set_method.3 -MAN3+= DH_size.3 -MAN3+= DH_up_ref.3 -MAN3+= EVP_BytesToKey.3 -MAN3+= EVP_CIPHER_CTX_block_size.3 -MAN3+= EVP_CIPHER_CTX_cipher.3 -MAN3+= EVP_CIPHER_CTX_cleanup.3 -MAN3+= EVP_CIPHER_CTX_ctrl.3 -MAN3+= EVP_CIPHER_CTX_flags.3 -MAN3+= EVP_CIPHER_CTX_get_app_data.3 -MAN3+= EVP_CIPHER_CTX_init.3 -MAN3+= EVP_CIPHER_CTX_iv_length.3 -MAN3+= EVP_CIPHER_CTX_key_length.3 -MAN3+= EVP_CIPHER_CTX_mode.3 -MAN3+= EVP_CIPHER_CTX_rand_key.3 -MAN3+= EVP_CIPHER_CTX_set_app_data.3 -MAN3+= EVP_CIPHER_CTX_set_key_length.3 -MAN3+= EVP_CIPHER_block_size.3 -MAN3+= EVP_CIPHER_iv_length.3 -MAN3+= EVP_CIPHER_key_length.3 -MAN3+= EVP_CipherFinal_ex.3 -MAN3+= EVP_CipherInit_ex.3 -MAN3+= EVP_CipherUpdate.3 -MAN3+= EVP_Digest.3 -MAN3+= EVP_DigestFinal_ex.3 -MAN3+= EVP_DigestInit_ex.3 -MAN3+= EVP_DigestUpdate.3 -MAN3+= EVP_MD_CTX_block_size.3 -MAN3+= EVP_MD_CTX_cleanup.3 -MAN3+= EVP_MD_CTX_create.3 -MAN3+= EVP_MD_CTX_destroy.3 -MAN3+= EVP_MD_CTX_init.3 -MAN3+= EVP_MD_CTX_md.3 -MAN3+= EVP_MD_CTX_size.3 -MAN3+= EVP_MD_block_size.3 -MAN3+= EVP_MD_size.3 -MAN3+= EVP_aes_128_cbc.3 -MAN3+= EVP_aes_128_cfb8.3 -MAN3+= EVP_aes_192_cbc.3 -MAN3+= EVP_aes_192_cfb8.3 -MAN3+= EVP_aes_256_cbc.3 -MAN3+= EVP_aes_256_cfb8.3 -MAN3+= EVP_camellia_128_cbc.3 -MAN3+= EVP_camellia_192_cbc.3 -MAN3+= EVP_camellia_256_cbc.3 -MAN3+= EVP_des_cbc.3 -MAN3+= EVP_des_ede3_cbc.3 -MAN3+= EVP_enc_null.3 -MAN3+= EVP_get_cipherbyname.3 -MAN3+= EVP_hcrypto_aes_128_cbc.3 -MAN3+= EVP_hcrypto_aes_128_cfb8.3 -MAN3+= EVP_hcrypto_aes_192_cbc.3 -MAN3+= EVP_hcrypto_aes_192_cfb8.3 -MAN3+= EVP_hcrypto_aes_256_cbc.3 -MAN3+= EVP_hcrypto_aes_256_cfb8.3 -MAN3+= EVP_hcrypto_camellia_128_cbc.3 -MAN3+= EVP_hcrypto_camellia_192_cbc.3 -MAN3+= EVP_hcrypto_camellia_256_cbc.3 -MAN3+= EVP_hcrypto_des_cbc.3 -MAN3+= EVP_hcrypto_des_ede3_cbc.3 -MAN3+= EVP_hcrypto_md2.3 -MAN3+= EVP_hcrypto_md4.3 -MAN3+= EVP_hcrypto_md5.3 -MAN3+= EVP_hcrypto_rc2_40_cbc.3 -MAN3+= EVP_hcrypto_rc2_64_cbc.3 -MAN3+= EVP_hcrypto_rc2_cbc.3 -MAN3+= EVP_hcrypto_sha1.3 -MAN3+= EVP_hcrypto_sha256.3 -MAN3+= EVP_hcrypto_sha384.3 -MAN3+= EVP_hcrypto_sha512.3 -MAN3+= EVP_md2.3 -MAN3+= EVP_md4.3 -MAN3+= EVP_md5.3 -MAN3+= EVP_md_null.3 -MAN3+= EVP_rc2_40_cbc.3 -MAN3+= EVP_rc2_64_cbc.3 -MAN3+= EVP_rc2_cbc.3 -MAN3+= EVP_rc4.3 -MAN3+= EVP_rc4_40.3 -MAN3+= EVP_sha.3 -MAN3+= EVP_sha1.3 -MAN3+= EVP_sha256.3 -MAN3+= EVP_sha384.3 -MAN3+= EVP_sha512.3 -MAN3+= EVP_wincrypt_des_ede3_cbc.3 +%%HCRYPTO%%MAN3+= DES_cbc_cksum.3 +%%HCRYPTO%%MAN3+= DES_cbc_encrypt.3 +%%HCRYPTO%%MAN3+= DES_cfb64_encrypt.3 +%%HCRYPTO%%MAN3+= DES_check_key_parity.3 +%%HCRYPTO%%MAN3+= DES_ecb3_encrypt.3 +%%HCRYPTO%%MAN3+= DES_ecb_encrypt.3 +%%HCRYPTO%%MAN3+= DES_ede3_cbc_encrypt.3 +%%HCRYPTO%%MAN3+= DES_encrypt.3 +%%HCRYPTO%%MAN3+= DES_init_random_number_generator.3 +%%HCRYPTO%%MAN3+= DES_is_weak_key.3 +%%HCRYPTO%%MAN3+= DES_key_sched.3 +%%HCRYPTO%%MAN3+= DES_new_random_key.3 +%%HCRYPTO%%MAN3+= DES_pcbc_encrypt.3 +%%HCRYPTO%%MAN3+= DES_random_key.3 +%%HCRYPTO%%MAN3+= DES_set_key.3 +%%HCRYPTO%%MAN3+= DES_set_key_checked.3 +%%HCRYPTO%%MAN3+= DES_set_key_unchecked.3 +%%HCRYPTO%%MAN3+= DES_set_odd_parity.3 +%%HCRYPTO%%MAN3+= DES_string_to_key.3 +%%HCRYPTO%%MAN3+= DH_check_pubkey.3 +%%HCRYPTO%%MAN3+= DH_compute_key.3 +%%HCRYPTO%%MAN3+= DH_free.3 +%%HCRYPTO%%MAN3+= DH_generate_key.3 +%%HCRYPTO%%MAN3+= DH_generate_parameters_ex.3 +%%HCRYPTO%%MAN3+= DH_get_default_method.3 +%%HCRYPTO%%MAN3+= DH_get_ex_data.3 +%%HCRYPTO%%MAN3+= DH_ltm_method.3 +%%HCRYPTO%%MAN3+= DH_new.3 +%%HCRYPTO%%MAN3+= DH_new_method.3 +%%HCRYPTO%%MAN3+= DH_null_method.3 +%%HCRYPTO%%MAN3+= DH_set_default_method.3 +%%HCRYPTO%%MAN3+= DH_set_ex_data.3 +%%HCRYPTO%%MAN3+= DH_set_method.3 +%%HCRYPTO%%MAN3+= DH_size.3 +%%HCRYPTO%%MAN3+= DH_up_ref.3 +%%HCRYPTO%%MAN3+= EVP_BytesToKey.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_block_size.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_cipher.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_cleanup.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_ctrl.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_flags.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_get_app_data.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_init.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_iv_length.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_key_length.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_mode.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_rand_key.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_set_app_data.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_CTX_set_key_length.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_block_size.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_iv_length.3 +%%HCRYPTO%%MAN3+= EVP_CIPHER_key_length.3 +%%HCRYPTO%%MAN3+= EVP_CipherFinal_ex.3 +%%HCRYPTO%%MAN3+= EVP_CipherInit_ex.3 +%%HCRYPTO%%MAN3+= EVP_CipherUpdate.3 +%%HCRYPTO%%MAN3+= EVP_Digest.3 +%%HCRYPTO%%MAN3+= EVP_DigestFinal_ex.3 +%%HCRYPTO%%MAN3+= EVP_DigestInit_ex.3 +%%HCRYPTO%%MAN3+= EVP_DigestUpdate.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_block_size.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_cleanup.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_create.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_destroy.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_init.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_md.3 +%%HCRYPTO%%MAN3+= EVP_MD_CTX_size.3 +%%HCRYPTO%%MAN3+= EVP_MD_block_size.3 +%%HCRYPTO%%MAN3+= EVP_MD_size.3 +%%HCRYPTO%%MAN3+= EVP_aes_128_cbc.3 +%%HCRYPTO%%MAN3+= EVP_aes_128_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_aes_192_cbc.3 +%%HCRYPTO%%MAN3+= EVP_aes_192_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_aes_256_cbc.3 +%%HCRYPTO%%MAN3+= EVP_aes_256_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_camellia_128_cbc.3 +%%HCRYPTO%%MAN3+= EVP_camellia_192_cbc.3 +%%HCRYPTO%%MAN3+= EVP_camellia_256_cbc.3 +%%HCRYPTO%%MAN3+= EVP_des_cbc.3 +%%HCRYPTO%%MAN3+= EVP_des_ede3_cbc.3 +%%HCRYPTO%%MAN3+= EVP_enc_null.3 +%%HCRYPTO%%MAN3+= EVP_get_cipherbyname.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_128_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_128_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_192_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_192_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_256_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_aes_256_cfb8.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_camellia_128_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_camellia_192_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_camellia_256_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_des_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_des_ede3_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_md2.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_md4.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_md5.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_rc2_40_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_rc2_64_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_rc2_cbc.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_sha1.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_sha256.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_sha384.3 +%%HCRYPTO%%MAN3+= EVP_hcrypto_sha512.3 +%%HCRYPTO%%MAN3+= EVP_md2.3 +%%HCRYPTO%%MAN3+= EVP_md4.3 +%%HCRYPTO%%MAN3+= EVP_md5.3 +%%HCRYPTO%%MAN3+= EVP_md_null.3 +%%HCRYPTO%%MAN3+= EVP_rc2_40_cbc.3 +%%HCRYPTO%%MAN3+= EVP_rc2_64_cbc.3 +%%HCRYPTO%%MAN3+= EVP_rc2_cbc.3 +%%HCRYPTO%%MAN3+= EVP_rc4.3 +%%HCRYPTO%%MAN3+= EVP_rc4_40.3 +%%HCRYPTO%%MAN3+= EVP_sha.3 +%%HCRYPTO%%MAN3+= EVP_sha1.3 +%%HCRYPTO%%MAN3+= EVP_sha256.3 +%%HCRYPTO%%MAN3+= EVP_sha384.3 +%%HCRYPTO%%MAN3+= EVP_sha512.3 +%%HCRYPTO%%MAN3+= EVP_wincrypt_des_ede3_cbc.3 MAN3+= HDB.3 -MAN3+= OpenSSL_add_all_algorithms.3 -MAN3+= OpenSSL_add_all_algorithms_conf.3 -MAN3+= OpenSSL_add_all_algorithms_noconf.3 -MAN3+= PKCS5_PBKDF2_HMAC_SHA1.3 -MAN3+= RAND_add.3 -MAN3+= RAND_bytes.3 -MAN3+= RAND_cleanup.3 -MAN3+= RAND_file_name.3 -MAN3+= RAND_get_rand_method.3 -MAN3+= RAND_load_file.3 -MAN3+= RAND_pseudo_bytes.3 -MAN3+= RAND_seed.3 -MAN3+= RAND_set_rand_engine.3 -MAN3+= RAND_set_rand_method.3 -MAN3+= RAND_status.3 -MAN3+= RAND_write_file.3 -MAN3+= RSA_free.3 -MAN3+= RSA_get_app_data.3 -MAN3+= RSA_get_method.3 -MAN3+= RSA_new.3 -MAN3+= RSA_new_method.3 -MAN3+= RSA_set_app_data.3 -MAN3+= RSA_set_method.3 -MAN3+= RSA_up_ref.3 +%%HCRYPTO%%MAN3+= OpenSSL_add_all_algorithms.3 +%%HCRYPTO%%MAN3+= OpenSSL_add_all_algorithms_conf.3 +%%HCRYPTO%%MAN3+= OpenSSL_add_all_algorithms_noconf.3 +%%HCRYPTO%%MAN3+= PKCS5_PBKDF2_HMAC_SHA1.3 +%%HCRYPTO%%MAN3+= RAND_add.3 +%%HCRYPTO%%MAN3+= RAND_bytes.3 +%%HCRYPTO%%MAN3+= RAND_cleanup.3 +%%HCRYPTO%%MAN3+= RAND_file_name.3 +%%HCRYPTO%%MAN3+= RAND_get_rand_method.3 +%%HCRYPTO%%MAN3+= RAND_load_file.3 +%%HCRYPTO%%MAN3+= RAND_pseudo_bytes.3 +%%HCRYPTO%%MAN3+= RAND_seed.3 +%%HCRYPTO%%MAN3+= RAND_set_rand_engine.3 +%%HCRYPTO%%MAN3+= RAND_set_rand_method.3 +%%HCRYPTO%%MAN3+= RAND_status.3 +%%HCRYPTO%%MAN3+= RAND_write_file.3 +%%HCRYPTO%%MAN3+= RSA_free.3 +%%HCRYPTO%%MAN3+= RSA_get_app_data.3 +%%HCRYPTO%%MAN3+= RSA_get_method.3 +%%HCRYPTO%%MAN3+= RSA_new.3 +%%HCRYPTO%%MAN3+= RSA_new_method.3 +%%HCRYPTO%%MAN3+= RSA_set_app_data.3 +%%HCRYPTO%%MAN3+= RSA_set_method.3 +%%HCRYPTO%%MAN3+= RSA_up_ref.3 MAN3+= __gss_c_attr_stream_sizes_oid_desc.3 MAN3+= challenge.3 MAN3+= context.3 @@ -229,13 +229,13 @@ MAN3+= gssapi_services_intro.3 MAN3+= gsskrb5_extract_authz_data_from_sec_context.3 MAN3+= gsskrb5_register_acceptor_identity.3 -MAN3+= hcrypto_core.3 -MAN3+= hcrypto_des.3 -MAN3+= hcrypto_dh.3 -MAN3+= hcrypto_evp.3 -MAN3+= hcrypto_misc.3 -MAN3+= hcrypto_rand.3 -MAN3+= hcrypto_rsa.3 +%%HCRYPTO%%MAN3+= hcrypto_core.3 +%%HCRYPTO%%MAN3+= hcrypto_des.3 +%%HCRYPTO%%MAN3+= hcrypto_dh.3 +%%HCRYPTO%%MAN3+= hcrypto_evp.3 +%%HCRYPTO%%MAN3+= hcrypto_misc.3 +%%HCRYPTO%%MAN3+= hcrypto_rand.3 +%%HCRYPTO%%MAN3+= hcrypto_rsa.3 MAN3+= hdb__del.3 MAN3+= hdb__get.3 MAN3+= hdb__put.3 @@ -955,19 +955,19 @@ MAN3+= page_ca.3 MAN3+= page_cert.3 MAN3+= page_cms.3 -MAN3+= page_des.3 -MAN3+= page_dh.3 +%%HCRYPTO%%MAN3+= page_des.3 +%%HCRYPTO%%MAN3+= page_dh.3 MAN3+= page_env.3 MAN3+= page_error.3 -MAN3+= page_evp.3 +%%HCRYPTO%%MAN3+= page_evp.3 MAN3+= page_keyset.3 MAN3+= page_lock.3 MAN3+= page_name.3 MAN3+= page_peer.3 MAN3+= page_print.3 -MAN3+= page_rand.3 +%%HCRYPTO%%MAN3+= page_rand.3 MAN3+= page_revoke.3 -MAN3+= page_rsa.3 +%%HCRYPTO%%MAN3+= page_rsa.3 MAN3+= parse_time.3 MAN3+= print_time_table.3 MAN3+= rtbl.3 diff -Nru heimdal.orig/files/extra-patch-doc__Makefile.in heimdal/files/extra-patch-doc__Makefile.in --- heimdal.orig/files/extra-patch-doc__Makefile.in 1970-01-01 09:30:00.000000000 +0930 +++ heimdal/files/extra-patch-doc__Makefile.in 2013-03-27 00:22:54.446922388 +1030 @@ -0,0 +1,48 @@ +--- doc/Makefile.in.orig 2013-03-26 23:18:01.813922381 +1030 ++++ doc/Makefile.in 2013-03-26 23:19:41.535922356 +1030 +@@ -386,7 +380,7 @@ + texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \ + -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' + +-PROJECTS = hcrypto hdb hx509 gssapi krb5 ntlm wind ++PROJECTS = hdb hx509 gssapi krb5 ntlm wind + heimdal_TEXINFOS = \ + ack.texi \ + apps.texi \ +@@ -409,7 +403,6 @@ + footer.html \ + gssapi.din \ + hdb.din \ +- hcrypto.din \ + header.html \ + heimdal.css \ + hx509.din \ +@@ -423,7 +416,6 @@ + vars.tin + + CLEANFILES = \ +- hcrypto.dxy* \ + hx509.dxy* \ + hdb.dxy* \ + gssapi.dxy* \ +@@ -1040,11 +1032,6 @@ + fi ; \ + done + +-hcrypto.dxy: hcrypto.din Makefile +- $(dxy_subst) < $(srcdir)/hcrypto.din > hcrypto.dxy.tmp +- chmod +x hcrypto.dxy.tmp +- mv hcrypto.dxy.tmp hcrypto.dxy +- + hdb.dxy: hdb.din Makefile + $(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp + chmod +x hdb.dxy.tmp +@@ -1080,7 +1067,7 @@ + chmod +x vars.texi.tmp + mv vars.texi.tmp vars.texi + +-doxyout doxygen: hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy ++doxyout doxygen: hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy + @find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \ + rm -rf $(srcdir)/doxyout ; \ + mkdir $(srcdir)/doxyout ; \ >Release-Note: >Audit-Trail: >Unformatted: