Update to 1.2.0. From the release announcement:

We are pleased to announce the availability of GnuTLS 1.2.0!

This release is the result of the 23 development releases made on the
development branch (1.1.x).

Major changes compared to the 1.0 branch include:

* Moved SRP password authentication from the GnuTLS-extra library
  (licensed under GPL) to the core library (licensed under LGPL).

* The API has been cleaned up, and data types now use a '_t' suffix.

* Fixes to handle denial of service problem when verifying long
  certificate chains.

* The manual has been converted to Texinfo and is consequently
  available in many formats, see:
  <http://josefsson.org/gnutls/manual/>

* A reference API manual has been added, and is available in HTML and
  DevHelp formats, thanks to GTK-DOC, see:
  <http://josefsson.org/gnutls/reference/gnutls-gnutls.html>

The 1.2.0 version is intended to be stable, and to be a drop-in
replacement of the stable 1.0.x branch.

We encourage developers to move to the 1.2 branch as soon as possible,
since we will now spend less time improving version 1.0.x.

We are not planning to open a 1.3 development branch soon, because
there are no plans to start work on any major new feature today.
Instead, we will continue to carefully improve the quality of this
release over time.

Improving GnuTLS is costly, but you can help!  We are looking for
organizations that find GnuTLS useful and wish to contribute back.
You can contribute by reporting bugs, improve the software, or donate
money or equipment.

4 files changed, 371 insertions, 70 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 46abe39106b..4561df0a4a8 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2004/11/28 12:59:10 recht Exp $
+# $NetBSD: Makefile,v 1.24 2005/02/19 00:14:23 wiz Exp $
 
-DISTNAME=	gnutls-1.0.23
+DISTNAME=	gnutls-1.2.0
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
+MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
+		ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \
 		http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 		ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
@@ -17,10 +19,13 @@ USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
+INFO_FILES=		gnutls.info
+
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
 
 BUILDLINK_DEPENDS.opencdk=	opencdk>=0.5.5
+BUILDLINK_DEPENDS.libtasn1=	libtasn1>=0.2.11
 
 MAKE_ENV+=		RM="${RM}"
 
@@ -33,7 +38,7 @@ pre-install:
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DOCDIR}
-	cd ${WRKSRC}/doc/tex && ${INSTALL_DATA} *.ps *.tex *.eps ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/gnutls.ps ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${EGDIR}
 
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index b69875175e5..78d66803584 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,14 +1,12 @@
-@comment $NetBSD: PLIST,v 1.11 2004/11/08 19:34:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/02/19 00:14:23 wiz Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
-bin/gnutls-srpcrypt
 bin/libgnutls-config
 bin/libgnutls-extra-config
 bin/srptool
-include/gnutls/compat4.h
-include/gnutls/compat8.h
+include/gnutls/compat.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
 include/gnutls/openpgp.h
@@ -25,63 +23,361 @@ man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
 man/man1/srptool.1
+man/man3/_gnutls_x509_get_raw_crt_activation_time.3
+man/man3/_gnutls_x509_get_raw_crt_expiration_time.3
+man/man3/gnutls_alert_get.3
+man/man3/gnutls_alert_get_name.3
+man/man3/gnutls_alert_send.3
+man/man3/gnutls_alert_send_appropriate.3
+man/man3/gnutls_anon_allocate_client_credentials.3
+man/man3/gnutls_anon_allocate_server_credentials.3
+man/man3/gnutls_anon_free_client_credentials.3
+man/man3/gnutls_anon_free_server_credentials.3
+man/man3/gnutls_anon_set_params_function.3
+man/man3/gnutls_anon_set_server_dh_params.3
+man/man3/gnutls_auth_client_get_type.3
+man/man3/gnutls_auth_get_type.3
+man/man3/gnutls_auth_server_get_type.3
+man/man3/gnutls_bye.3
+man/man3/gnutls_certificate_activation_time_peers.3
+man/man3/gnutls_certificate_allocate_credentials.3
+man/man3/gnutls_certificate_client_get_request_status.3
+man/man3/gnutls_certificate_client_set_retrieve_function.3
+man/man3/gnutls_certificate_expiration_time_peers.3
+man/man3/gnutls_certificate_free_ca_names.3
+man/man3/gnutls_certificate_free_cas.3
+man/man3/gnutls_certificate_free_credentials.3
+man/man3/gnutls_certificate_free_crls.3
+man/man3/gnutls_certificate_free_keys.3
+man/man3/gnutls_certificate_get_ours.3
+man/man3/gnutls_certificate_get_peers.3
+man/man3/gnutls_certificate_send_x509_rdn_sequence.3
+man/man3/gnutls_certificate_server_set_request.3
+man/man3/gnutls_certificate_server_set_retrieve_function.3
+man/man3/gnutls_certificate_set_dh_params.3
+man/man3/gnutls_certificate_set_openpgp_key.3
+man/man3/gnutls_certificate_set_openpgp_key_file.3
+man/man3/gnutls_certificate_set_openpgp_key_mem.3
+man/man3/gnutls_certificate_set_openpgp_keyring_file.3
+man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
+man/man3/gnutls_certificate_set_openpgp_keyserver.3
+man/man3/gnutls_certificate_set_openpgp_trustdb.3
+man/man3/gnutls_certificate_set_params_function.3
+man/man3/gnutls_certificate_set_rsa_export_params.3
+man/man3/gnutls_certificate_set_verify_flags.3
+man/man3/gnutls_certificate_set_verify_limits.3
+man/man3/gnutls_certificate_set_x509_crl.3
+man/man3/gnutls_certificate_set_x509_crl_file.3
+man/man3/gnutls_certificate_set_x509_crl_mem.3
+man/man3/gnutls_certificate_set_x509_key.3
+man/man3/gnutls_certificate_set_x509_key_file.3
+man/man3/gnutls_certificate_set_x509_key_mem.3
+man/man3/gnutls_certificate_set_x509_trust.3
+man/man3/gnutls_certificate_set_x509_trust_file.3
+man/man3/gnutls_certificate_set_x509_trust_mem.3
+man/man3/gnutls_certificate_type_get.3
+man/man3/gnutls_certificate_type_get_name.3
+man/man3/gnutls_certificate_type_set_priority.3
+man/man3/gnutls_certificate_verify_peers2.3
+man/man3/gnutls_check_version.3
+man/man3/gnutls_cipher_get.3
+man/man3/gnutls_cipher_get_key_size.3
+man/man3/gnutls_cipher_get_name.3
+man/man3/gnutls_cipher_set_priority.3
+man/man3/gnutls_cipher_suite_get_name.3
+man/man3/gnutls_compression_get.3
+man/man3/gnutls_compression_get_name.3
+man/man3/gnutls_compression_set_priority.3
+man/man3/gnutls_credentials_clear.3
+man/man3/gnutls_credentials_set.3
+man/man3/gnutls_db_check_entry.3
+man/man3/gnutls_db_get_ptr.3
+man/man3/gnutls_db_remove_session.3
+man/man3/gnutls_db_set_cache_expiration.3
+man/man3/gnutls_db_set_ptr.3
+man/man3/gnutls_db_set_remove_function.3
+man/man3/gnutls_db_set_retrieve_function.3
+man/man3/gnutls_db_set_store_function.3
+man/man3/gnutls_deinit.3
+man/man3/gnutls_dh_get_group.3
+man/man3/gnutls_dh_get_peers_public_bits.3
+man/man3/gnutls_dh_get_prime_bits.3
+man/man3/gnutls_dh_get_pubkey.3
+man/man3/gnutls_dh_get_secret_bits.3
+man/man3/gnutls_dh_params_cpy.3
+man/man3/gnutls_dh_params_deinit.3
+man/man3/gnutls_dh_params_export_pkcs3.3
+man/man3/gnutls_dh_params_export_raw.3
+man/man3/gnutls_dh_params_generate2.3
+man/man3/gnutls_dh_params_import_pkcs3.3
+man/man3/gnutls_dh_params_import_raw.3
+man/man3/gnutls_dh_params_init.3
+man/man3/gnutls_dh_set_prime_bits.3
+man/man3/gnutls_error_is_fatal.3
+man/man3/gnutls_error_to_alert.3
+man/man3/gnutls_extra_check_version.3
+man/man3/gnutls_fingerprint.3
+man/man3/gnutls_free.3
+man/man3/gnutls_global_deinit.3
+man/man3/gnutls_global_init.3
+man/man3/gnutls_global_init_extra.3
+man/man3/gnutls_global_set_log_function.3
+man/man3/gnutls_global_set_log_level.3
+man/man3/gnutls_global_set_mem_functions.3
+man/man3/gnutls_handshake.3
+man/man3/gnutls_handshake_get_last_in.3
+man/man3/gnutls_handshake_get_last_out.3
+man/man3/gnutls_handshake_set_max_packet_length.3
+man/man3/gnutls_handshake_set_private_extensions.3
+man/man3/gnutls_init.3
+man/man3/gnutls_kx_get.3
+man/man3/gnutls_kx_get_name.3
+man/man3/gnutls_kx_set_priority.3
+man/man3/gnutls_mac_get.3
+man/man3/gnutls_mac_get_name.3
+man/man3/gnutls_mac_set_priority.3
+man/man3/gnutls_malloc.3
+man/man3/gnutls_openpgp_key_check_hostname.3
+man/man3/gnutls_openpgp_key_deinit.3
+man/man3/gnutls_openpgp_key_export.3
+man/man3/gnutls_openpgp_key_get_creation_time.3
+man/man3/gnutls_openpgp_key_get_expiration_time.3
+man/man3/gnutls_openpgp_key_get_fingerprint.3
+man/man3/gnutls_openpgp_key_get_id.3
+man/man3/gnutls_openpgp_key_get_key_usage.3
+man/man3/gnutls_openpgp_key_get_name.3
+man/man3/gnutls_openpgp_key_get_pk_algorithm.3
+man/man3/gnutls_openpgp_key_get_version.3
+man/man3/gnutls_openpgp_key_import.3
+man/man3/gnutls_openpgp_key_init.3
+man/man3/gnutls_openpgp_key_to_xml.3
+man/man3/gnutls_openpgp_key_verify_ring.3
+man/man3/gnutls_openpgp_key_verify_self.3
+man/man3/gnutls_openpgp_key_verify_trustdb.3
+man/man3/gnutls_openpgp_keyring_check_id.3
+man/man3/gnutls_openpgp_keyring_deinit.3
+man/man3/gnutls_openpgp_keyring_import.3
+man/man3/gnutls_openpgp_keyring_init.3
+man/man3/gnutls_openpgp_privkey_deinit.3
+man/man3/gnutls_openpgp_privkey_get_pk_algorithm.3
+man/man3/gnutls_openpgp_privkey_import.3
+man/man3/gnutls_openpgp_privkey_init.3
+man/man3/gnutls_openpgp_send_key.3
+man/man3/gnutls_openpgp_set_recv_key_function.3
+man/man3/gnutls_openpgp_trustdb_deinit.3
+man/man3/gnutls_openpgp_trustdb_import_file.3
+man/man3/gnutls_openpgp_trustdb_init.3
+man/man3/gnutls_pem_base64_decode.3
+man/man3/gnutls_pem_base64_decode_alloc.3
+man/man3/gnutls_pem_base64_encode.3
+man/man3/gnutls_pem_base64_encode_alloc.3
+man/man3/gnutls_perror.3
+man/man3/gnutls_pk_algorithm_get_name.3
+man/man3/gnutls_pkcs12_bag_decrypt.3
+man/man3/gnutls_pkcs12_bag_deinit.3
+man/man3/gnutls_pkcs12_bag_encrypt.3
+man/man3/gnutls_pkcs12_bag_get_count.3
+man/man3/gnutls_pkcs12_bag_get_data.3
+man/man3/gnutls_pkcs12_bag_get_friendly_name.3
+man/man3/gnutls_pkcs12_bag_get_key_id.3
+man/man3/gnutls_pkcs12_bag_get_type.3
+man/man3/gnutls_pkcs12_bag_init.3
+man/man3/gnutls_pkcs12_bag_set_crl.3
+man/man3/gnutls_pkcs12_bag_set_crt.3
+man/man3/gnutls_pkcs12_bag_set_data.3
+man/man3/gnutls_pkcs12_bag_set_friendly_name.3
+man/man3/gnutls_pkcs12_bag_set_key_id.3
+man/man3/gnutls_pkcs12_deinit.3
+man/man3/gnutls_pkcs12_export.3
+man/man3/gnutls_pkcs12_generate_mac.3
+man/man3/gnutls_pkcs12_get_bag.3
+man/man3/gnutls_pkcs12_import.3
+man/man3/gnutls_pkcs12_init.3
+man/man3/gnutls_pkcs12_set_bag.3
+man/man3/gnutls_pkcs12_verify_mac.3
+man/man3/gnutls_pkcs7_deinit.3
+man/man3/gnutls_pkcs7_delete_crl.3
+man/man3/gnutls_pkcs7_delete_crt.3
+man/man3/gnutls_pkcs7_export.3
+man/man3/gnutls_pkcs7_get_crl_count.3
+man/man3/gnutls_pkcs7_get_crl_raw.3
+man/man3/gnutls_pkcs7_get_crt_count.3
+man/man3/gnutls_pkcs7_get_crt_raw.3
+man/man3/gnutls_pkcs7_import.3
+man/man3/gnutls_pkcs7_init.3
+man/man3/gnutls_pkcs7_set_crl.3
+man/man3/gnutls_pkcs7_set_crl_raw.3
+man/man3/gnutls_pkcs7_set_crt.3
+man/man3/gnutls_pkcs7_set_crt_raw.3
+man/man3/gnutls_protocol_get_name.3
+man/man3/gnutls_protocol_get_version.3
+man/man3/gnutls_protocol_set_priority.3
+man/man3/gnutls_record_check_pending.3
+man/man3/gnutls_record_get_direction.3
+man/man3/gnutls_record_get_max_size.3
+man/man3/gnutls_record_recv.3
+man/man3/gnutls_record_send.3
+man/man3/gnutls_record_set_max_size.3
+man/man3/gnutls_rehandshake.3
+man/man3/gnutls_rsa_export_get_modulus_bits.3
+man/man3/gnutls_rsa_export_get_pubkey.3
+man/man3/gnutls_rsa_params_cpy.3
+man/man3/gnutls_rsa_params_deinit.3
+man/man3/gnutls_rsa_params_export_pkcs1.3
+man/man3/gnutls_rsa_params_export_raw.3
+man/man3/gnutls_rsa_params_generate2.3
+man/man3/gnutls_rsa_params_import_pkcs1.3
+man/man3/gnutls_rsa_params_import_raw.3
+man/man3/gnutls_rsa_params_init.3
+man/man3/gnutls_server_name_get.3
+man/man3/gnutls_server_name_set.3
+man/man3/gnutls_session_get_data.3
+man/man3/gnutls_session_get_id.3
+man/man3/gnutls_session_get_ptr.3
+man/man3/gnutls_session_is_resumed.3
+man/man3/gnutls_session_set_data.3
+man/man3/gnutls_session_set_ptr.3
+man/man3/gnutls_set_default_export_priority.3
+man/man3/gnutls_set_default_priority.3
+man/man3/gnutls_sign_algorithm_get_name.3
+man/man3/gnutls_srp_allocate_client_credentials.3
+man/man3/gnutls_srp_allocate_server_credentials.3
+man/man3/gnutls_srp_base64_decode.3
+man/man3/gnutls_srp_base64_decode_alloc.3
+man/man3/gnutls_srp_base64_encode.3
+man/man3/gnutls_srp_base64_encode_alloc.3
+man/man3/gnutls_srp_free_client_credentials.3
+man/man3/gnutls_srp_free_server_credentials.3
+man/man3/gnutls_srp_server_get_username.3
+man/man3/gnutls_srp_set_client_credentials.3
+man/man3/gnutls_srp_set_client_credentials_function.3
+man/man3/gnutls_srp_set_server_credentials_file.3
+man/man3/gnutls_srp_set_server_credentials_function.3
+man/man3/gnutls_srp_verifier.3
+man/man3/gnutls_strerror.3
+man/man3/gnutls_transport_get_ptr.3
+man/man3/gnutls_transport_get_ptr2.3
+man/man3/gnutls_transport_set_lowat.3
+man/man3/gnutls_transport_set_ptr.3
+man/man3/gnutls_transport_set_ptr2.3
+man/man3/gnutls_transport_set_pull_function.3
+man/man3/gnutls_transport_set_push_function.3
+man/man3/gnutls_x509_crl_check_issuer.3
+man/man3/gnutls_x509_crl_deinit.3
+man/man3/gnutls_x509_crl_export.3
+man/man3/gnutls_x509_crl_get_crt_count.3
+man/man3/gnutls_x509_crl_get_crt_serial.3
+man/man3/gnutls_x509_crl_get_dn_oid.3
+man/man3/gnutls_x509_crl_get_issuer_dn.3
+man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
+man/man3/gnutls_x509_crl_get_next_update.3
+man/man3/gnutls_x509_crl_get_signature_algorithm.3
+man/man3/gnutls_x509_crl_get_this_update.3
+man/man3/gnutls_x509_crl_get_version.3
+man/man3/gnutls_x509_crl_import.3
+man/man3/gnutls_x509_crl_init.3
+man/man3/gnutls_x509_crl_set_crt.3
+man/man3/gnutls_x509_crl_set_crt_serial.3
+man/man3/gnutls_x509_crl_set_next_update.3
+man/man3/gnutls_x509_crl_set_this_update.3
+man/man3/gnutls_x509_crl_set_version.3
+man/man3/gnutls_x509_crl_sign.3
+man/man3/gnutls_x509_crl_sign2.3
+man/man3/gnutls_x509_crl_verify.3
+man/man3/gnutls_x509_crq_deinit.3
+man/man3/gnutls_x509_crq_export.3
+man/man3/gnutls_x509_crq_get_challenge_password.3
+man/man3/gnutls_x509_crq_get_dn.3
+man/man3/gnutls_x509_crq_get_dn_by_oid.3
+man/man3/gnutls_x509_crq_get_dn_oid.3
+man/man3/gnutls_x509_crq_get_pk_algorithm.3
+man/man3/gnutls_x509_crq_get_version.3
+man/man3/gnutls_x509_crq_import.3
+man/man3/gnutls_x509_crq_init.3
+man/man3/gnutls_x509_crq_set_challenge_password.3
+man/man3/gnutls_x509_crq_set_dn_by_oid.3
+man/man3/gnutls_x509_crq_set_key.3
+man/man3/gnutls_x509_crq_set_version.3
+man/man3/gnutls_x509_crq_sign.3
+man/man3/gnutls_x509_crq_sign2.3
+man/man3/gnutls_x509_crt_check_hostname.3
+man/man3/gnutls_x509_crt_check_issuer.3
+man/man3/gnutls_x509_crt_check_revocation.3
+man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
+man/man3/gnutls_x509_crt_deinit.3
+man/man3/gnutls_x509_crt_export.3
+man/man3/gnutls_x509_crt_get_activation_time.3
+man/man3/gnutls_x509_crt_get_authority_key_id.3
+man/man3/gnutls_x509_crt_get_ca_status.3
+man/man3/gnutls_x509_crt_get_crl_dist_points.3
+man/man3/gnutls_x509_crt_get_dn.3
+man/man3/gnutls_x509_crt_get_dn_by_oid.3
+man/man3/gnutls_x509_crt_get_dn_oid.3
+man/man3/gnutls_x509_crt_get_expiration_time.3
+man/man3/gnutls_x509_crt_get_extension_by_oid.3
+man/man3/gnutls_x509_crt_get_extension_oid.3
+man/man3/gnutls_x509_crt_get_fingerprint.3
+man/man3/gnutls_x509_crt_get_issuer_dn.3
+man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
+man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
+man/man3/gnutls_x509_crt_get_key_id.3
+man/man3/gnutls_x509_crt_get_key_purpose_oid.3
+man/man3/gnutls_x509_crt_get_key_usage.3
+man/man3/gnutls_x509_crt_get_pk_algorithm.3
+man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
+man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
+man/man3/gnutls_x509_crt_get_serial.3
+man/man3/gnutls_x509_crt_get_signature_algorithm.3
+man/man3/gnutls_x509_crt_get_subject_alt_name.3
+man/man3/gnutls_x509_crt_get_subject_key_id.3
+man/man3/gnutls_x509_crt_get_version.3
+man/man3/gnutls_x509_crt_import.3
+man/man3/gnutls_x509_crt_init.3
+man/man3/gnutls_x509_crt_list_verify.3
+man/man3/gnutls_x509_crt_set_activation_time.3
+man/man3/gnutls_x509_crt_set_authority_key_id.3
+man/man3/gnutls_x509_crt_set_ca_status.3
+man/man3/gnutls_x509_crt_set_crl_dist_points.3
+man/man3/gnutls_x509_crt_set_crq.3
+man/man3/gnutls_x509_crt_set_dn_by_oid.3
+man/man3/gnutls_x509_crt_set_expiration_time.3
+man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
+man/man3/gnutls_x509_crt_set_key.3
+man/man3/gnutls_x509_crt_set_key_purpose_oid.3
+man/man3/gnutls_x509_crt_set_key_usage.3
+man/man3/gnutls_x509_crt_set_serial.3
+man/man3/gnutls_x509_crt_set_subject_alternative_name.3
+man/man3/gnutls_x509_crt_set_subject_key_id.3
+man/man3/gnutls_x509_crt_set_version.3
+man/man3/gnutls_x509_crt_sign.3
+man/man3/gnutls_x509_crt_sign2.3
+man/man3/gnutls_x509_crt_to_xml.3
+man/man3/gnutls_x509_crt_verify.3
+man/man3/gnutls_x509_crt_verify_data.3
+man/man3/gnutls_x509_dn_oid_known.3
+man/man3/gnutls_x509_privkey_cpy.3
+man/man3/gnutls_x509_privkey_deinit.3
+man/man3/gnutls_x509_privkey_export.3
+man/man3/gnutls_x509_privkey_export_dsa_raw.3
+man/man3/gnutls_x509_privkey_export_pkcs8.3
+man/man3/gnutls_x509_privkey_export_rsa_raw.3
+man/man3/gnutls_x509_privkey_generate.3
+man/man3/gnutls_x509_privkey_get_key_id.3
+man/man3/gnutls_x509_privkey_get_pk_algorithm.3
+man/man3/gnutls_x509_privkey_import.3
+man/man3/gnutls_x509_privkey_import_dsa_raw.3
+man/man3/gnutls_x509_privkey_import_pkcs8.3
+man/man3/gnutls_x509_privkey_import_rsa_raw.3
+man/man3/gnutls_x509_privkey_init.3
+man/man3/gnutls_x509_privkey_sign_data.3
+man/man3/gnutls_x509_privkey_verify_data.3
+man/man3/gnutls_x509_rdn_get.3
+man/man3/gnutls_x509_rdn_get_by_oid.3
+man/man3/gnutls_x509_rdn_get_oid.3
 share/aclocal/libgnutls-extra.m4
 share/aclocal/libgnutls.m4
 share/doc/gnutls/TODO
-share/doc/gnutls/alert.tex
-share/doc/gnutls/appendix.tex
-share/doc/gnutls/auth.tex
-share/doc/gnutls/callbacks.tex
-share/doc/gnutls/cert_auth.tex
-share/doc/gnutls/certificate.tex
-share/doc/gnutls/ciphers.tex
-share/doc/gnutls/ciphersuites.tex
-share/doc/gnutls/compression.tex
-share/doc/gnutls/cover.tex
-share/doc/gnutls/errors.tex
-share/doc/gnutls/ex-alert.tex
-share/doc/gnutls/ex-cert-select.tex
-share/doc/gnutls/ex-client-resume.tex
-share/doc/gnutls/ex-client-srp.tex
-share/doc/gnutls/ex-client2.tex
-share/doc/gnutls/ex-crq.tex
-share/doc/gnutls/ex-pkcs12.tex
-share/doc/gnutls/ex-serv-export.tex
-share/doc/gnutls/ex-serv-pgp.tex
-share/doc/gnutls/ex-serv-srp.tex
-share/doc/gnutls/ex-serv1.tex
-share/doc/gnutls/ex-session-info.tex
-share/doc/gnutls/ex-verify.tex
-share/doc/gnutls/ex-x509-info.tex
-share/doc/gnutls/examples.tex
-share/doc/gnutls/fdl.tex
-share/doc/gnutls/funcs.tex
-share/doc/gnutls/gnutls-logo.ps
 share/doc/gnutls/gnutls.ps
-share/doc/gnutls/gnutls.tex
-share/doc/gnutls/handshake.tex
-share/doc/gnutls/howto.tex
-share/doc/gnutls/internals.eps
-share/doc/gnutls/layers.eps
-share/doc/gnutls/layers.tex
-share/doc/gnutls/library.tex
-share/doc/gnutls/macros.tex
-share/doc/gnutls/memory.tex
-share/doc/gnutls/openssl.tex
-share/doc/gnutls/pgp-fig1.eps
-share/doc/gnutls/pgpcert.xml.tex
-share/doc/gnutls/preface.tex
-share/doc/gnutls/preparation.tex
-share/doc/gnutls/programs.tex
-share/doc/gnutls/record.tex
-share/doc/gnutls/record_weaknesses.tex
-share/doc/gnutls/srp.tex
-share/doc/gnutls/supported_ciphersuites.tex
-share/doc/gnutls/tls_extensions.tex
-share/doc/gnutls/tlsintro.tex
-share/doc/gnutls/translayer.tex
-share/doc/gnutls/x509-1.eps
-share/doc/gnutls/x509cert.xml.tex
 share/examples/gnutls/ex-alert.c
 share/examples/gnutls/ex-cert-select.c
 share/examples/gnutls/ex-client-resume.c
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index cb487500ddf..6180d8c59b8 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2004/11/28 12:59:10 recht Exp $
+$NetBSD: distinfo,v 1.12 2005/02/19 00:14:23 wiz Exp $
 
-SHA1 (gnutls-1.0.23.tar.gz) = 4fa06b07263ba8fb5fe31482374629d20c2e4aa6
-Size (gnutls-1.0.23.tar.gz) = 1630814 bytes
-SHA1 (patch-aa) = 1d8a1b8345fa66adb35c7a3c6c05f7ecf61f4620
+SHA1 (gnutls-1.2.0.tar.bz2) = 618d502fc872530b726e791a818af5a95ee39d00
+Size (gnutls-1.2.0.tar.bz2) = 2417909 bytes
+SHA1 (patch-aa) = 3b4adf0b6acde5a56c0a7f3003a0a1e90bfbd672
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
index 5b5da3c748b..52cedce1fe8 100644
--- a/security/gnutls/patches/patch-aa
+++ b/security/gnutls/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2004/11/28 12:59:10 recht Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/19 00:14:23 wiz Exp $
 
---- configure.orig	Sat Nov 13 22:54:25 2004
-+++ configure	Sat Nov 27 22:31:53 2004
-@@ -3632,8 +3632,6 @@
- 
+--- configure.orig	2005-01-27 14:16:39.000000000 +0100
++++ configure
+@@ -3651,8 +3651,6 @@ rm -f conftest.err conftest.$ac_objext c
+ if test $ac_cv_c_compiler_gnu != no; then
  	if test x$opt_developer_mode = xyes; then
  	  CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
 -	else