diff options
author | novel <novel@FreeBSD.org> | 2011-06-06 02:34:23 +0800 |
---|---|---|
committer | novel <novel@FreeBSD.org> | 2011-06-06 02:34:23 +0800 |
commit | 43b71e73bf15f993c453b54d28f8c08870b3759c (patch) | |
tree | d841af81f53bdce967942d363f441e0c3898d834 /security/gnutls | |
parent | 8410ce1b99174e871dc71c8b6e88c99a2507d0cf (diff) | |
download | freebsd-ports-gnome-43b71e73bf15f993c453b54d28f8c08870b3759c.tar.gz freebsd-ports-gnome-43b71e73bf15f993c453b54d28f8c08870b3759c.tar.zst freebsd-ports-gnome-43b71e73bf15f993c453b54d28f8c08870b3759c.zip |
Update to 2.12.6.1.
Diffstat (limited to 'security/gnutls')
-rw-r--r-- | security/gnutls/Makefile | 15 | ||||
-rw-r--r-- | security/gnutls/Makefile.man | 123 | ||||
-rw-r--r-- | security/gnutls/distinfo | 5 | ||||
-rw-r--r-- | security/gnutls/pkg-plist | 26 |
4 files changed, 136 insertions, 33 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index df415ff4920b..2752c9e9b4c1 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnutls -PORTVERSION= 2.8.6 -PORTREVISION= 2 +PORTVERSION= 2.12.6.1 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_GNUPG} @@ -23,7 +22,7 @@ CONFLICTS= gnutls-devel-[0-9]* USE_BZIP2= yes USE_ICONV= yes -USE_GNOME= pkgconfig ltverhack +USE_GNOME= pkgconfig ltverhack gnomehack GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -31,7 +30,7 @@ USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS+= --disable-guile +CONFIGURE_ARGS+= --disable-guile --with-libgcrypt MANCOMPRESSED= no .include <bsd.port.pre.mk> @@ -64,19 +63,11 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -.if defined(WITH_CAMELLIA) -CONFIGURE_ARGS+= --enable-camellia -.endif - .if !defined(NOPORTDOCS) PORTDOCS= AUTHORS NEWS README THANKS .endif EXAMPLES= doc/examples/*.c -pre-configure: - @${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \ - ${WRKSRC}/lib/Makefile.in ${WRKSRC}/libextra/Makefile.in - post-install: @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} diff --git a/security/gnutls/Makefile.man b/security/gnutls/Makefile.man index 5d5fe9b5a322..5382f8b7edc9 100644 --- a/security/gnutls/Makefile.man +++ b/security/gnutls/Makefile.man @@ -5,9 +5,10 @@ INFO= gnutls MAN1= \ certtool.1 \ - gnutls-cli.1 \ gnutls-cli-debug.1 \ + gnutls-cli.1 \ gnutls-serv.1 \ + p11tool.1 \ psktool.1 \ srptool.1 @@ -54,8 +55,10 @@ MAN3= \ gnutls_certificate_set_openpgp_keyring_file.3 \ gnutls_certificate_set_openpgp_keyring_mem.3 \ gnutls_certificate_set_params_function.3 \ + gnutls_certificate_set_retrieve_function.3 \ gnutls_certificate_set_rsa_export_params.3 \ gnutls_certificate_set_verify_flags.3 \ + gnutls_certificate_set_verify_function.3 \ gnutls_certificate_set_verify_limits.3 \ gnutls_certificate_set_x509_crl.3 \ gnutls_certificate_set_x509_crl_file.3 \ @@ -76,10 +79,17 @@ MAN3= \ gnutls_certificate_verify_peers.3 \ gnutls_certificate_verify_peers2.3 \ gnutls_check_version.3 \ + gnutls_cipher_decrypt.3 \ + gnutls_cipher_decrypt2.3 \ + gnutls_cipher_deinit.3 \ + gnutls_cipher_encrypt.3 \ + gnutls_cipher_encrypt2.3 \ gnutls_cipher_get.3 \ + gnutls_cipher_get_block_size.3 \ gnutls_cipher_get_id.3 \ gnutls_cipher_get_key_size.3 \ gnutls_cipher_get_name.3 \ + gnutls_cipher_init.3 \ gnutls_cipher_list.3 \ gnutls_cipher_set_priority.3 \ gnutls_cipher_suite_get_name.3 \ @@ -135,15 +145,28 @@ MAN3= \ gnutls_global_set_log_function.3 \ gnutls_global_set_log_level.3 \ gnutls_global_set_mem_functions.3 \ + gnutls_global_set_mutex.3 \ gnutls_handshake.3 \ gnutls_handshake_get_last_in.3 \ gnutls_handshake_get_last_out.3 \ gnutls_handshake_set_max_packet_length.3 \ gnutls_handshake_set_post_client_hello_function.3 \ gnutls_handshake_set_private_extensions.3 \ + gnutls_hash.3 \ + gnutls_hash_deinit.3 \ + gnutls_hash_fast.3 \ + gnutls_hash_get_len.3 \ + gnutls_hash_init.3 \ + gnutls_hash_output.3 \ gnutls_hex2bin.3 \ gnutls_hex_decode.3 \ gnutls_hex_encode.3 \ + gnutls_hmac.3 \ + gnutls_hmac_deinit.3 \ + gnutls_hmac_fast.3 \ + gnutls_hmac_get_len.3 \ + gnutls_hmac_init.3 \ + gnutls_hmac_output.3 \ gnutls_ia_allocate_client_credentials.3 \ gnutls_ia_allocate_server_credentials.3 \ gnutls_ia_enable.3 \ @@ -237,21 +260,50 @@ MAN3= \ gnutls_openpgp_privkey_get_subkey_revoked_status.3 \ gnutls_openpgp_privkey_import.3 \ gnutls_openpgp_privkey_init.3 \ + gnutls_openpgp_privkey_sec_param.3 \ gnutls_openpgp_privkey_set_preferred_key_id.3 \ gnutls_openpgp_privkey_sign_hash.3 \ gnutls_openpgp_send_cert.3 \ gnutls_openpgp_set_recv_key_function.3 \ - gnutls_oprfi_enable_client.3 \ - gnutls_oprfi_enable_server.3 \ gnutls_pem_base64_decode.3 \ gnutls_pem_base64_decode_alloc.3 \ gnutls_pem_base64_encode.3 \ gnutls_pem_base64_encode_alloc.3 \ gnutls_perror.3 \ gnutls_pk_algorithm_get_name.3 \ + gnutls_pk_bits_to_sec_param.3 \ gnutls_pk_get_id.3 \ gnutls_pk_get_name.3 \ gnutls_pk_list.3 \ + gnutls_pkcs11_add_provider.3 \ + gnutls_pkcs11_copy_secret_key.3 \ + gnutls_pkcs11_copy_x509_crt.3 \ + gnutls_pkcs11_copy_x509_privkey.3 \ + gnutls_pkcs11_deinit.3 \ + gnutls_pkcs11_delete_url.3 \ + gnutls_pkcs11_init.3 \ + gnutls_pkcs11_obj_deinit.3 \ + gnutls_pkcs11_obj_export.3 \ + gnutls_pkcs11_obj_export_url.3 \ + gnutls_pkcs11_obj_get_info.3 \ + gnutls_pkcs11_obj_get_type.3 \ + gnutls_pkcs11_obj_import_url.3 \ + gnutls_pkcs11_obj_init.3 \ + gnutls_pkcs11_obj_list_import_url.3 \ + gnutls_pkcs11_privkey_deinit.3 \ + gnutls_pkcs11_privkey_export_url.3 \ + gnutls_pkcs11_privkey_get_info.3 \ + gnutls_pkcs11_privkey_get_pk_algorithm.3 \ + gnutls_pkcs11_privkey_import_url.3 \ + gnutls_pkcs11_privkey_init.3 \ + gnutls_pkcs11_set_pin_function.3 \ + gnutls_pkcs11_set_token_function.3 \ + gnutls_pkcs11_token_get_flags.3 \ + gnutls_pkcs11_token_get_info.3 \ + gnutls_pkcs11_token_get_mechanism.3 \ + gnutls_pkcs11_token_get_url.3 \ + gnutls_pkcs11_token_init.3 \ + gnutls_pkcs11_token_set_pin.3 \ gnutls_pkcs12_bag_decrypt.3 \ gnutls_pkcs12_bag_deinit.3 \ gnutls_pkcs12_bag_encrypt.3 \ @@ -294,6 +346,16 @@ MAN3= \ gnutls_priority_init.3 \ gnutls_priority_set.3 \ gnutls_priority_set_direct.3 \ + gnutls_privkey_decrypt_data.3 \ + gnutls_privkey_deinit.3 \ + gnutls_privkey_get_pk_algorithm.3 \ + gnutls_privkey_get_type.3 \ + gnutls_privkey_import_openpgp.3 \ + gnutls_privkey_import_pkcs11.3 \ + gnutls_privkey_import_x509.3 \ + gnutls_privkey_init.3 \ + gnutls_privkey_sign_data.3 \ + gnutls_privkey_sign_hash.3 \ gnutls_protocol_get_id.3 \ gnutls_protocol_get_name.3 \ gnutls_protocol_get_version.3 \ @@ -314,6 +376,27 @@ MAN3= \ gnutls_psk_set_server_credentials_hint.3 \ gnutls_psk_set_server_dh_params.3 \ gnutls_psk_set_server_params_function.3 \ + gnutls_pubkey_deinit.3 \ + gnutls_pubkey_export.3 \ + gnutls_pubkey_get_key_id.3 \ + gnutls_pubkey_get_key_usage.3 \ + gnutls_pubkey_get_pk_algorithm.3 \ + gnutls_pubkey_get_pk_dsa_raw.3 \ + gnutls_pubkey_get_pk_rsa_raw.3 \ + gnutls_pubkey_get_preferred_hash_algorithm.3 \ + gnutls_pubkey_get_verify_algorithm.3 \ + gnutls_pubkey_import.3 \ + gnutls_pubkey_import_dsa_raw.3 \ + gnutls_pubkey_import_openpgp.3 \ + gnutls_pubkey_import_pkcs11.3 \ + gnutls_pubkey_import_pkcs11_url.3 \ + gnutls_pubkey_import_privkey.3 \ + gnutls_pubkey_import_rsa_raw.3 \ + gnutls_pubkey_import_x509.3 \ + gnutls_pubkey_init.3 \ + gnutls_pubkey_set_key_usage.3 \ + gnutls_pubkey_verify_data.3 \ + gnutls_pubkey_verify_hash.3 \ gnutls_record_check_pending.3 \ gnutls_record_disable_padding.3 \ gnutls_record_get_direction.3 \ @@ -323,6 +406,7 @@ MAN3= \ gnutls_record_set_max_size.3 \ gnutls_register_md5_handler.3 \ gnutls_rehandshake.3 \ + gnutls_rnd.3 \ gnutls_rsa_export_get_modulus_bits.3 \ gnutls_rsa_export_get_pubkey.3 \ gnutls_rsa_params_cpy.3 \ @@ -333,23 +417,27 @@ MAN3= \ gnutls_rsa_params_import_pkcs1.3 \ gnutls_rsa_params_import_raw.3 \ gnutls_rsa_params_init.3 \ + gnutls_safe_renegotiation_status.3 \ + gnutls_sec_param_get_name.3 \ + gnutls_sec_param_to_pk_bits.3 \ gnutls_server_name_get.3 \ gnutls_server_name_set.3 \ + gnutls_session_channel_binding.3 \ gnutls_session_enable_compatibility_mode.3 \ - gnutls_session_get_client_random.3 \ gnutls_session_get_data.3 \ gnutls_session_get_data2.3 \ gnutls_session_get_id.3 \ - gnutls_session_get_master_secret.3 \ gnutls_session_get_ptr.3 \ - gnutls_session_get_server_random.3 \ gnutls_session_is_resumed.3 \ gnutls_session_set_data.3 \ - gnutls_session_set_finished_function.3 \ gnutls_session_set_ptr.3 \ + gnutls_session_ticket_enable_client.3 \ + gnutls_session_ticket_enable_server.3 \ + gnutls_session_ticket_key_generate.3 \ gnutls_set_default_export_priority.3 \ gnutls_set_default_priority.3 \ gnutls_sign_algorithm_get_name.3 \ + gnutls_sign_algorithm_get_requested.3 \ gnutls_sign_callback_get.3 \ gnutls_sign_callback_set.3 \ gnutls_sign_get_id.3 \ @@ -372,15 +460,18 @@ MAN3= \ gnutls_srp_verifier.3 \ gnutls_strerror.3 \ gnutls_strerror_name.3 \ + gnutls_supplemental_get_name.3 \ gnutls_transport_get_ptr.3 \ gnutls_transport_get_ptr2.3 \ gnutls_transport_set_errno.3 \ + gnutls_transport_set_errno_function.3 \ gnutls_transport_set_global_errno.3 \ gnutls_transport_set_lowat.3 \ gnutls_transport_set_ptr.3 \ gnutls_transport_set_ptr2.3 \ gnutls_transport_set_pull_function.3 \ gnutls_transport_set_push_function.3 \ + gnutls_transport_set_vec_push_function.3 \ gnutls_x509_crl_check_issuer.3 \ gnutls_x509_crl_deinit.3 \ gnutls_x509_crl_export.3 \ @@ -395,6 +486,7 @@ MAN3= \ gnutls_x509_crl_get_issuer_dn_by_oid.3 \ gnutls_x509_crl_get_next_update.3 \ gnutls_x509_crl_get_number.3 \ + gnutls_x509_crl_get_raw_issuer_dn.3 \ gnutls_x509_crl_get_signature.3 \ gnutls_x509_crl_get_signature_algorithm.3 \ gnutls_x509_crl_get_this_update.3 \ @@ -402,6 +494,7 @@ MAN3= \ gnutls_x509_crl_import.3 \ gnutls_x509_crl_init.3 \ gnutls_x509_crl_print.3 \ + gnutls_x509_crl_privkey_sign.3 \ gnutls_x509_crl_set_authority_key_id.3 \ gnutls_x509_crl_set_crt.3 \ gnutls_x509_crl_set_crt_serial.3 \ @@ -436,6 +529,7 @@ MAN3= \ gnutls_x509_crq_import.3 \ gnutls_x509_crq_init.3 \ gnutls_x509_crq_print.3 \ + gnutls_x509_crq_privkey_sign.3 \ gnutls_x509_crq_set_attribute_by_oid.3 \ gnutls_x509_crq_set_basic_constraints.3 \ gnutls_x509_crq_set_challenge_password.3 \ @@ -444,6 +538,7 @@ MAN3= \ gnutls_x509_crq_set_key_purpose_oid.3 \ gnutls_x509_crq_set_key_rsa_raw.3 \ gnutls_x509_crq_set_key_usage.3 \ + gnutls_x509_crq_set_pubkey.3 \ gnutls_x509_crq_set_subject_alt_name.3 \ gnutls_x509_crq_set_version.3 \ gnutls_x509_crq_sign.3 \ @@ -469,15 +564,20 @@ MAN3= \ gnutls_x509_crt_get_extension_oid.3 \ gnutls_x509_crt_get_fingerprint.3 \ gnutls_x509_crt_get_issuer.3 \ + gnutls_x509_crt_get_issuer_alt_name.3 \ + gnutls_x509_crt_get_issuer_alt_name2.3 \ + gnutls_x509_crt_get_issuer_alt_othername_oid.3 \ gnutls_x509_crt_get_issuer_dn.3 \ gnutls_x509_crt_get_issuer_dn_by_oid.3 \ gnutls_x509_crt_get_issuer_dn_oid.3 \ + gnutls_x509_crt_get_issuer_unique_id.3 \ gnutls_x509_crt_get_key_id.3 \ gnutls_x509_crt_get_key_purpose_oid.3 \ gnutls_x509_crt_get_key_usage.3 \ gnutls_x509_crt_get_pk_algorithm.3 \ gnutls_x509_crt_get_pk_dsa_raw.3 \ gnutls_x509_crt_get_pk_rsa_raw.3 \ + gnutls_x509_crt_get_preferred_hash_algorithm.3 \ gnutls_x509_crt_get_proxy.3 \ gnutls_x509_crt_get_raw_dn.3 \ gnutls_x509_crt_get_raw_issuer_dn.3 \ @@ -489,13 +589,18 @@ MAN3= \ gnutls_x509_crt_get_subject_alt_name2.3 \ gnutls_x509_crt_get_subject_alt_othername_oid.3 \ gnutls_x509_crt_get_subject_key_id.3 \ + gnutls_x509_crt_get_subject_unique_id.3 \ gnutls_x509_crt_get_verify_algorithm.3 \ gnutls_x509_crt_get_version.3 \ gnutls_x509_crt_import.3 \ + gnutls_x509_crt_import_pkcs11.3 \ + gnutls_x509_crt_import_pkcs11_url.3 \ gnutls_x509_crt_init.3 \ gnutls_x509_crt_list_import.3 \ + gnutls_x509_crt_list_import_pkcs11.3 \ gnutls_x509_crt_list_verify.3 \ gnutls_x509_crt_print.3 \ + gnutls_x509_crt_privkey_sign.3 \ gnutls_x509_crt_set_activation_time.3 \ gnutls_x509_crt_set_authority_key_id.3 \ gnutls_x509_crt_set_basic_constraints.3 \ @@ -513,6 +618,7 @@ MAN3= \ gnutls_x509_crt_set_key_usage.3 \ gnutls_x509_crt_set_proxy.3 \ gnutls_x509_crt_set_proxy_dn.3 \ + gnutls_x509_crt_set_pubkey.3 \ gnutls_x509_crt_set_serial.3 \ gnutls_x509_crt_set_subject_alt_name.3 \ gnutls_x509_crt_set_subject_alternative_name.3 \ @@ -535,6 +641,7 @@ MAN3= \ gnutls_x509_privkey_export_dsa_raw.3 \ gnutls_x509_privkey_export_pkcs8.3 \ gnutls_x509_privkey_export_rsa_raw.3 \ + gnutls_x509_privkey_export_rsa_raw2.3 \ gnutls_x509_privkey_fix.3 \ gnutls_x509_privkey_generate.3 \ gnutls_x509_privkey_get_key_id.3 \ @@ -543,7 +650,9 @@ MAN3= \ gnutls_x509_privkey_import_dsa_raw.3 \ gnutls_x509_privkey_import_pkcs8.3 \ gnutls_x509_privkey_import_rsa_raw.3 \ + gnutls_x509_privkey_import_rsa_raw2.3 \ gnutls_x509_privkey_init.3 \ + gnutls_x509_privkey_sec_param.3 \ gnutls_x509_privkey_sign_data.3 \ gnutls_x509_privkey_sign_hash.3 \ gnutls_x509_privkey_verify_data.3 \ diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 49be8eceb826..f75b9e7f3ed4 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,3 +1,2 @@ -MD5 (gnutls-2.8.6.tar.bz2) = eb0a6d7d3cb9ac684d971c14f9f6d3ba -SHA256 (gnutls-2.8.6.tar.bz2) = d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356 -SIZE (gnutls-2.8.6.tar.bz2) = 6469369 +SHA256 (gnutls-2.12.6.1.tar.bz2) = b3c04c527076863957403246119741c3fce5ed12bf6cffcc4ab882792383499a +SIZE (gnutls-2.12.6.1.tar.bz2) = 7151787 diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist index 336692c409cc..867ad26992f0 100644 --- a/security/gnutls/pkg-plist +++ b/security/gnutls/pkg-plist @@ -3,60 +3,63 @@ bin/certtool bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv +bin/p11tool bin/psktool bin/srptool info/gnutls-certificate-user-use-case.png -info/gnutls-extensions_st.png -info/gnutls-handshake-state.png -info/gnutls-layers.png -info/gnutls-mod_auth_st.png -info/gnutls-pgp.png info/gnutls-client-server-use-case.png +info/gnutls-extensions_st.png info/gnutls-handshake-sequence.png +info/gnutls-handshake-state.png info/gnutls-internals.png +info/gnutls-layers.png info/gnutls-logo.png +info/gnutls-mod_auth_st.png info/gnutls-objects.png +info/gnutls-pgp.png info/gnutls-x509.png +info/pkcs11-vision.png +include/gnutls/abstract.h include/gnutls/compat.h include/gnutls/crypto.h include/gnutls/extra.h include/gnutls/gnutls.h include/gnutls/openpgp.h include/gnutls/openssl.h +include/gnutls/pkcs11.h include/gnutls/pkcs12.h include/gnutls/x509.h %%CXX%%include/gnutls/gnutlsxx.h -%%CXX%%lib/libgnutlsxx.so.40 +%%CXX%%lib/libgnutlsxx.so.27 %%CXX%%lib/libgnutlsxx.so %%CXX%%lib/libgnutlsxx.la %%CXX%%lib/libgnutlsxx.a lib/libgnutls-extra.a lib/libgnutls-extra.la lib/libgnutls-extra.so -lib/libgnutls-extra.so.40 +lib/libgnutls-extra.so.47 lib/libgnutls-openssl.a lib/libgnutls-openssl.la lib/libgnutls-openssl.so -lib/libgnutls-openssl.so.40 +lib/libgnutls-openssl.so.27 lib/libgnutls.a lib/libgnutls.la lib/libgnutls.so -lib/libgnutls.so.40 +lib/libgnutls.so.47 libdata/pkgconfig/gnutls-extra.pc libdata/pkgconfig/gnutls.pc %%EXAMPLESDIR%%/ex-alert.c +%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%EXAMPLESDIR%%/ex-cert-select.c %%EXAMPLESDIR%%/ex-client-psk.c %%EXAMPLESDIR%%/ex-client-resume.c %%EXAMPLESDIR%%/ex-client-srp.c -%%EXAMPLESDIR%%/ex-client-tlsia.c %%EXAMPLESDIR%%/ex-client1.c %%EXAMPLESDIR%%/ex-client2.c %%EXAMPLESDIR%%/ex-crq.c %%EXAMPLESDIR%%/ex-pkcs12.c %%EXAMPLESDIR%%/ex-rfc2818.c %%EXAMPLESDIR%%/ex-serv-anon.c -%%EXAMPLESDIR%%/ex-serv-export.c %%EXAMPLESDIR%%/ex-serv-pgp.c %%EXAMPLESDIR%%/ex-serv-psk.c %%EXAMPLESDIR%%/ex-serv-srp.c @@ -70,6 +73,7 @@ libdata/pkgconfig/gnutls.pc %%NLS%%share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/fr/LC_MESSAGES/libgnutls.mo +%%NLS%%share/locale/it/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/ms/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/nl/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/pl/LC_MESSAGES/libgnutls.mo |