[Midnightbsd-cvs] mports [16031] trunk/security/gnutls/pkg-plist: security patch for recent gnutls vulnerability.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 7 07:51:56 EST 2014
Revision: 16031
http://svnweb.midnightbsd.org/mports/?rev=16031
Author: laffer1
Date: 2014-03-07 07:51:54 -0500 (Fri, 07 Mar 2014)
Log Message:
-----------
security patch for recent gnutls vulnerability. please update
Modified Paths:
--------------
trunk/security/gnutls/Makefile
trunk/security/gnutls/pkg-descr
trunk/security/gnutls/pkg-plist
Added Paths:
-----------
trunk/security/gnutls/files/
trunk/security/gnutls/files/patch-doc-scripts-gdoc
trunk/security/gnutls/files/patch-lib-gnutls_cipher.c
trunk/security/gnutls/files/patch-lib__x509__verify.c
Removed Paths:
-------------
trunk/security/gnutls/Makefile.man
Property Changed:
----------------
trunk/security/gnutls/pkg-descr
Modified: trunk/security/gnutls/Makefile
===================================================================
--- trunk/security/gnutls/Makefile 2014-03-04 01:36:25 UTC (rev 16030)
+++ trunk/security/gnutls/Makefile 2014-03-07 12:51:54 UTC (rev 16031)
@@ -2,12 +2,15 @@
PORTNAME= gnutls
PORTVERSION= 2.12.23
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security net
-MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/
+MASTER_SITES= \
+ ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/ \
+ http://www.ring.gr.jp/pub/net/gnupg/gnutls/v${PORTVERSION:C/.[0-9]+$//}/
-MAINTAINER= ports at MidnightBSD.org
+MAINTAINER= novel at FreeBSD.org
COMMENT= GNU Transport Layer Security library
+
LICENSE= gpl3
LIB_DEPENDS= nettle:${PORTSDIR}/security/nettle \
@@ -16,22 +19,23 @@
CONFLICTS= gnutls-devel-[0-9]*
-USE_PATHFIX= yes
+USES= pathfix pkgconfig iconv gmake shebangfix
+USE_PERL5_BUILD= yes
USE_BZIP2= yes
-USE_ICONV= yes
-USE_PKGCONFIG= build
-USE_GNOME= ltverhack gnomehack
+USE_GNOME= ltverhack
GNU_CONFIGURE= yes
-MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure lib/configure libextra/configure
+SHEBANG_FILES= doc/scripts/gdoc doc/scripts/sort2.pl
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-guile
-MANCOMPRESSED= no
+
+INFO= gnutls
+
OPTIONS_DEFINE= LIBTASN1 CXX LZO NLS
LIBTASN1_DESC= Use system libtasn1 instead of local one
@@ -43,7 +47,7 @@
.include <bsd.mport.options.mk>
.if ${PORT_OPTIONS:MLIBTASN1}
-LIB_DEPENDS+= tasn1:${PORTSDIR}/security/libtasn1
+LIB_DEPENDS+= tasn1:${PORTSDIR}/security/libtasn1
.else
CONFIGURE_ARGS+= --with-included-libtasn1
.endif
@@ -51,21 +55,23 @@
.if ${PORT_OPTIONS:MLZO}
LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2
CONFIGURE_ARGS+= --with-lzo
+.else
+CONFIGURE_ARGS+= --with-lzo=no
.endif
.if ${PORT_OPTIONS:MCXX}
+PLIST_SUB+= CXX=""
+.else
CONFIGURE_ARGS+= --disable-cxx
PLIST_SUB+= CXX="@comment "
-.else
-PLIST_SUB+= CXX=""
.endif
.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
+PLIST_SUB+= NLS=""
+.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
-.else
-USES+= gettext
-PLIST_SUB+= NLS=""
.endif
PORTDOCS= AUTHORS NEWS README THANKS
@@ -72,16 +78,18 @@
PORTEXAMPLES= *.c
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} \
- -e 's|[$$][(]LTLIBPTHREAD[)]||g'
+ @${FIND} ${WRKSRC} -name "Makefile.in" -type f |\
+ ${XARGS} ${REINPLACE_CMD} -e 's|[$$][(]LTLIBPTHREAD[)]||g'
+ @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PREFIX}/bin/perl|g' \
+ ${WRKSRC}/doc/doxygen/Doxyfile.in
post-install:
-.if !defined (NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES:C,^,doc/examples/,} \
${EXAMPLESDIR}
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -88,5 +96,4 @@
.endfor
.endif
-.include "Makefile.man"
.include <bsd.port.mk>
Deleted: trunk/security/gnutls/Makefile.man
===================================================================
--- trunk/security/gnutls/Makefile.man 2014-03-04 01:36:25 UTC (rev 16030)
+++ trunk/security/gnutls/Makefile.man 2014-03-07 12:51:54 UTC (rev 16031)
@@ -1,664 +0,0 @@
-# vi:ft=make
-# $FreeBSD$
-
-INFO= gnutls
-
-MAN1= \
- certtool.1 \
- gnutls-cli-debug.1 \
- gnutls-cli.1 \
- gnutls-serv.1 \
- p11tool.1 \
- psktool.1 \
- srptool.1
-
-MAN3= \
- gnutls_alert_get.3 \
- gnutls_alert_get_name.3 \
- gnutls_alert_send.3 \
- gnutls_alert_send_appropriate.3 \
- gnutls_anon_allocate_client_credentials.3 \
- gnutls_anon_allocate_server_credentials.3 \
- gnutls_anon_free_client_credentials.3 \
- gnutls_anon_free_server_credentials.3 \
- gnutls_anon_set_params_function.3 \
- gnutls_anon_set_server_dh_params.3 \
- gnutls_anon_set_server_params_function.3 \
- gnutls_auth_client_get_type.3 \
- gnutls_auth_get_type.3 \
- gnutls_auth_server_get_type.3 \
- gnutls_bye.3 \
- gnutls_certificate_activation_time_peers.3 \
- gnutls_certificate_allocate_credentials.3 \
- gnutls_certificate_client_get_request_status.3 \
- gnutls_certificate_client_set_retrieve_function.3 \
- gnutls_certificate_expiration_time_peers.3 \
- gnutls_certificate_free_ca_names.3 \
- gnutls_certificate_free_cas.3 \
- gnutls_certificate_free_credentials.3 \
- gnutls_certificate_free_crls.3 \
- gnutls_certificate_free_keys.3 \
- gnutls_certificate_get_issuer.3 \
- gnutls_certificate_get_openpgp_keyring.3 \
- gnutls_certificate_get_ours.3 \
- gnutls_certificate_get_peers.3 \
- gnutls_certificate_get_x509_cas.3 \
- gnutls_certificate_get_x509_crls.3 \
- gnutls_certificate_send_x509_rdn_sequence.3 \
- gnutls_certificate_server_set_request.3 \
- gnutls_certificate_server_set_retrieve_function.3 \
- gnutls_certificate_set_dh_params.3 \
- gnutls_certificate_set_openpgp_key.3 \
- gnutls_certificate_set_openpgp_key_file.3 \
- gnutls_certificate_set_openpgp_key_file2.3 \
- gnutls_certificate_set_openpgp_key_mem.3 \
- gnutls_certificate_set_openpgp_key_mem2.3 \
- 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 \
- gnutls_certificate_set_x509_crl_mem.3 \
- gnutls_certificate_set_x509_key.3 \
- gnutls_certificate_set_x509_key_file.3 \
- gnutls_certificate_set_x509_key_mem.3 \
- gnutls_certificate_set_x509_simple_pkcs12_file.3 \
- gnutls_certificate_set_x509_simple_pkcs12_mem.3 \
- gnutls_certificate_set_x509_trust.3 \
- gnutls_certificate_set_x509_trust_file.3 \
- gnutls_certificate_set_x509_trust_mem.3 \
- gnutls_certificate_type_get.3 \
- gnutls_certificate_type_get_id.3 \
- gnutls_certificate_type_get_name.3 \
- gnutls_certificate_type_list.3 \
- gnutls_certificate_type_set_priority.3 \
- 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 \
- gnutls_cipher_suite_info.3 \
- gnutls_compression_get.3 \
- gnutls_compression_get_id.3 \
- gnutls_compression_get_name.3 \
- gnutls_compression_list.3 \
- gnutls_compression_set_priority.3 \
- gnutls_credentials_clear.3 \
- gnutls_credentials_set.3 \
- gnutls_crypto_bigint_register2.3 \
- gnutls_crypto_cipher_register2.3 \
- gnutls_crypto_digest_register2.3 \
- gnutls_crypto_mac_register2.3 \
- gnutls_crypto_pk_register2.3 \
- gnutls_crypto_rnd_register2.3 \
- gnutls_crypto_single_cipher_register2.3 \
- gnutls_crypto_single_digest_register2.3 \
- gnutls_crypto_single_mac_register2.3 \
- gnutls_db_check_entry.3 \
- gnutls_db_get_ptr.3 \
- gnutls_db_remove_session.3 \
- gnutls_db_set_cache_expiration.3 \
- gnutls_db_set_ptr.3 \
- gnutls_db_set_remove_function.3 \
- gnutls_db_set_retrieve_function.3 \
- gnutls_db_set_store_function.3 \
- gnutls_deinit.3 \
- gnutls_dh_get_group.3 \
- gnutls_dh_get_peers_public_bits.3 \
- gnutls_dh_get_prime_bits.3 \
- gnutls_dh_get_pubkey.3 \
- gnutls_dh_get_secret_bits.3 \
- gnutls_dh_params_cpy.3 \
- gnutls_dh_params_deinit.3 \
- gnutls_dh_params_export_pkcs3.3 \
- gnutls_dh_params_export_raw.3 \
- gnutls_dh_params_generate2.3 \
- gnutls_dh_params_import_pkcs3.3 \
- gnutls_dh_params_import_raw.3 \
- gnutls_dh_params_init.3 \
- gnutls_dh_set_prime_bits.3 \
- gnutls_error_is_fatal.3 \
- gnutls_error_to_alert.3 \
- gnutls_ext_register.3 \
- gnutls_extra_check_version.3 \
- gnutls_fingerprint.3 \
- gnutls_free.3 \
- gnutls_global_deinit.3 \
- gnutls_global_init.3 \
- gnutls_global_init_extra.3 \
- gnutls_global_set_log_function.3 \
- gnutls_global_set_log_level.3 \
- gnutls_global_set_mem_functions.3 \
- gnutls_global_set_mutex.3 \
- gnutls_global_set_time_function.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 \
- gnutls_ia_endphase_send.3 \
- gnutls_ia_extract_inner_secret.3 \
- gnutls_ia_free_client_credentials.3 \
- gnutls_ia_free_server_credentials.3 \
- gnutls_ia_generate_challenge.3 \
- gnutls_ia_get_client_avp_ptr.3 \
- gnutls_ia_get_server_avp_ptr.3 \
- gnutls_ia_handshake.3 \
- gnutls_ia_handshake_p.3 \
- gnutls_ia_permute_inner_secret.3 \
- gnutls_ia_recv.3 \
- gnutls_ia_send.3 \
- gnutls_ia_set_client_avp_function.3 \
- gnutls_ia_set_client_avp_ptr.3 \
- gnutls_ia_set_server_avp_function.3 \
- gnutls_ia_set_server_avp_ptr.3 \
- gnutls_ia_verify_endphase.3 \
- gnutls_init.3 \
- gnutls_kx_get.3 \
- gnutls_kx_get_id.3 \
- gnutls_kx_get_name.3 \
- gnutls_kx_list.3 \
- gnutls_kx_set_priority.3 \
- gnutls_mac_get.3 \
- gnutls_mac_get_id.3 \
- gnutls_mac_get_key_size.3 \
- gnutls_mac_get_name.3 \
- gnutls_mac_list.3 \
- gnutls_mac_set_priority.3 \
- gnutls_malloc.3 \
- gnutls_openpgp_crt_check_hostname.3 \
- gnutls_openpgp_crt_deinit.3 \
- gnutls_openpgp_crt_export.3 \
- gnutls_openpgp_crt_get_auth_subkey.3 \
- gnutls_openpgp_crt_get_creation_time.3 \
- gnutls_openpgp_crt_get_expiration_time.3 \
- gnutls_openpgp_crt_get_fingerprint.3 \
- gnutls_openpgp_crt_get_key_id.3 \
- gnutls_openpgp_crt_get_key_usage.3 \
- gnutls_openpgp_crt_get_name.3 \
- gnutls_openpgp_crt_get_pk_algorithm.3 \
- gnutls_openpgp_crt_get_pk_dsa_raw.3 \
- gnutls_openpgp_crt_get_pk_rsa_raw.3 \
- gnutls_openpgp_crt_get_preferred_key_id.3 \
- gnutls_openpgp_crt_get_revoked_status.3 \
- gnutls_openpgp_crt_get_subkey_count.3 \
- gnutls_openpgp_crt_get_subkey_creation_time.3 \
- gnutls_openpgp_crt_get_subkey_expiration_time.3 \
- gnutls_openpgp_crt_get_subkey_fingerprint.3 \
- gnutls_openpgp_crt_get_subkey_id.3 \
- gnutls_openpgp_crt_get_subkey_idx.3 \
- gnutls_openpgp_crt_get_subkey_pk_algorithm.3 \
- gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3 \
- gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3 \
- gnutls_openpgp_crt_get_subkey_revoked_status.3 \
- gnutls_openpgp_crt_get_subkey_usage.3 \
- gnutls_openpgp_crt_get_version.3 \
- gnutls_openpgp_crt_import.3 \
- gnutls_openpgp_crt_init.3 \
- gnutls_openpgp_crt_print.3 \
- gnutls_openpgp_crt_set_preferred_key_id.3 \
- gnutls_openpgp_crt_verify_ring.3 \
- gnutls_openpgp_crt_verify_self.3 \
- gnutls_openpgp_keyring_check_id.3 \
- gnutls_openpgp_keyring_deinit.3 \
- gnutls_openpgp_keyring_get_crt.3 \
- gnutls_openpgp_keyring_get_crt_count.3 \
- gnutls_openpgp_keyring_import.3 \
- gnutls_openpgp_keyring_init.3 \
- gnutls_openpgp_privkey_deinit.3 \
- gnutls_openpgp_privkey_export.3 \
- gnutls_openpgp_privkey_export_dsa_raw.3 \
- gnutls_openpgp_privkey_export_rsa_raw.3 \
- gnutls_openpgp_privkey_export_subkey_dsa_raw.3 \
- gnutls_openpgp_privkey_export_subkey_rsa_raw.3 \
- gnutls_openpgp_privkey_get_fingerprint.3 \
- gnutls_openpgp_privkey_get_key_id.3 \
- gnutls_openpgp_privkey_get_pk_algorithm.3 \
- gnutls_openpgp_privkey_get_preferred_key_id.3 \
- gnutls_openpgp_privkey_get_revoked_status.3 \
- gnutls_openpgp_privkey_get_subkey_count.3 \
- gnutls_openpgp_privkey_get_subkey_creation_time.3 \
- gnutls_openpgp_privkey_get_subkey_expiration_time.3 \
- gnutls_openpgp_privkey_get_subkey_fingerprint.3 \
- gnutls_openpgp_privkey_get_subkey_id.3 \
- gnutls_openpgp_privkey_get_subkey_idx.3 \
- gnutls_openpgp_privkey_get_subkey_pk_algorithm.3 \
- 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_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 \
- gnutls_pkcs12_bag_get_count.3 \
- gnutls_pkcs12_bag_get_data.3 \
- gnutls_pkcs12_bag_get_friendly_name.3 \
- gnutls_pkcs12_bag_get_key_id.3 \
- gnutls_pkcs12_bag_get_type.3 \
- gnutls_pkcs12_bag_init.3 \
- gnutls_pkcs12_bag_set_crl.3 \
- gnutls_pkcs12_bag_set_crt.3 \
- gnutls_pkcs12_bag_set_data.3 \
- gnutls_pkcs12_bag_set_friendly_name.3 \
- gnutls_pkcs12_bag_set_key_id.3 \
- gnutls_pkcs12_deinit.3 \
- gnutls_pkcs12_export.3 \
- gnutls_pkcs12_generate_mac.3 \
- gnutls_pkcs12_get_bag.3 \
- gnutls_pkcs12_import.3 \
- gnutls_pkcs12_init.3 \
- gnutls_pkcs12_set_bag.3 \
- gnutls_pkcs12_verify_mac.3 \
- gnutls_pkcs7_deinit.3 \
- gnutls_pkcs7_delete_crl.3 \
- gnutls_pkcs7_delete_crt.3 \
- gnutls_pkcs7_export.3 \
- gnutls_pkcs7_get_crl_count.3 \
- gnutls_pkcs7_get_crl_raw.3 \
- gnutls_pkcs7_get_crt_count.3 \
- gnutls_pkcs7_get_crt_raw.3 \
- gnutls_pkcs7_import.3 \
- gnutls_pkcs7_init.3 \
- gnutls_pkcs7_set_crl.3 \
- gnutls_pkcs7_set_crl_raw.3 \
- gnutls_pkcs7_set_crt.3 \
- gnutls_pkcs7_set_crt_raw.3 \
- gnutls_prf.3 \
- gnutls_prf_raw.3 \
- gnutls_priority_deinit.3 \
- 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 \
- gnutls_protocol_list.3 \
- gnutls_protocol_set_priority.3 \
- gnutls_psk_allocate_client_credentials.3 \
- gnutls_psk_allocate_server_credentials.3 \
- gnutls_psk_client_get_hint.3 \
- gnutls_psk_free_client_credentials.3 \
- gnutls_psk_free_server_credentials.3 \
- gnutls_psk_netconf_derive_key.3 \
- gnutls_psk_server_get_username.3 \
- gnutls_psk_set_client_credentials.3 \
- gnutls_psk_set_client_credentials_function.3 \
- gnutls_psk_set_params_function.3 \
- gnutls_psk_set_server_credentials_file.3 \
- gnutls_psk_set_server_credentials_function.3 \
- 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 \
- gnutls_record_get_max_size.3 \
- gnutls_record_recv.3 \
- gnutls_record_send.3 \
- 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 \
- gnutls_rsa_params_deinit.3 \
- gnutls_rsa_params_export_pkcs1.3 \
- gnutls_rsa_params_export_raw.3 \
- gnutls_rsa_params_generate2.3 \
- 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_data.3 \
- gnutls_session_get_data2.3 \
- gnutls_session_get_id.3 \
- gnutls_session_get_ptr.3 \
- gnutls_session_is_resumed.3 \
- gnutls_session_set_data.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 \
- gnutls_sign_get_name.3 \
- gnutls_sign_list.3 \
- gnutls_srp_allocate_client_credentials.3 \
- gnutls_srp_allocate_server_credentials.3 \
- gnutls_srp_base64_decode.3 \
- gnutls_srp_base64_decode_alloc.3 \
- gnutls_srp_base64_encode.3 \
- gnutls_srp_base64_encode_alloc.3 \
- gnutls_srp_free_client_credentials.3 \
- gnutls_srp_free_server_credentials.3 \
- gnutls_srp_server_get_username.3 \
- gnutls_srp_set_client_credentials.3 \
- gnutls_srp_set_client_credentials_function.3 \
- gnutls_srp_set_prime_bits.3 \
- gnutls_srp_set_server_credentials_file.3 \
- gnutls_srp_set_server_credentials_function.3 \
- 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 \
- gnutls_x509_crl_get_authority_key_id.3 \
- gnutls_x509_crl_get_crt_count.3 \
- gnutls_x509_crl_get_crt_serial.3 \
- gnutls_x509_crl_get_dn_oid.3 \
- gnutls_x509_crl_get_extension_data.3 \
- gnutls_x509_crl_get_extension_info.3 \
- gnutls_x509_crl_get_extension_oid.3 \
- gnutls_x509_crl_get_issuer_dn.3 \
- 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 \
- gnutls_x509_crl_get_version.3 \
- 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 \
- gnutls_x509_crl_set_next_update.3 \
- gnutls_x509_crl_set_number.3 \
- gnutls_x509_crl_set_this_update.3 \
- gnutls_x509_crl_set_version.3 \
- gnutls_x509_crl_sign.3 \
- gnutls_x509_crl_sign2.3 \
- gnutls_x509_crl_verify.3 \
- gnutls_x509_crq_deinit.3 \
- gnutls_x509_crq_export.3 \
- gnutls_x509_crq_get_attribute_by_oid.3 \
- gnutls_x509_crq_get_attribute_data.3 \
- gnutls_x509_crq_get_attribute_info.3 \
- gnutls_x509_crq_get_basic_constraints.3 \
- gnutls_x509_crq_get_challenge_password.3 \
- gnutls_x509_crq_get_dn.3 \
- gnutls_x509_crq_get_dn_by_oid.3 \
- gnutls_x509_crq_get_dn_oid.3 \
- gnutls_x509_crq_get_extension_by_oid.3 \
- gnutls_x509_crq_get_extension_data.3 \
- gnutls_x509_crq_get_extension_info.3 \
- gnutls_x509_crq_get_key_id.3 \
- gnutls_x509_crq_get_key_purpose_oid.3 \
- gnutls_x509_crq_get_key_rsa_raw.3 \
- gnutls_x509_crq_get_key_usage.3 \
- gnutls_x509_crq_get_pk_algorithm.3 \
- gnutls_x509_crq_get_subject_alt_name.3 \
- gnutls_x509_crq_get_subject_alt_othername_oid.3 \
- gnutls_x509_crq_get_version.3 \
- 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 \
- gnutls_x509_crq_set_dn_by_oid.3 \
- gnutls_x509_crq_set_key.3 \
- 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 \
- gnutls_x509_crq_sign2.3 \
- gnutls_x509_crq_verify.3 \
- gnutls_x509_crt_check_hostname.3 \
- gnutls_x509_crt_check_issuer.3 \
- gnutls_x509_crt_check_revocation.3 \
- gnutls_x509_crt_cpy_crl_dist_points.3 \
- gnutls_x509_crt_deinit.3 \
- gnutls_x509_crt_export.3 \
- gnutls_x509_crt_get_activation_time.3 \
- gnutls_x509_crt_get_authority_key_id.3 \
- gnutls_x509_crt_get_basic_constraints.3 \
- gnutls_x509_crt_get_ca_status.3 \
- gnutls_x509_crt_get_crl_dist_points.3 \
- gnutls_x509_crt_get_dn.3 \
- gnutls_x509_crt_get_dn_by_oid.3 \
- gnutls_x509_crt_get_dn_oid.3 \
- gnutls_x509_crt_get_expiration_time.3 \
- gnutls_x509_crt_get_extension_by_oid.3 \
- gnutls_x509_crt_get_extension_data.3 \
- gnutls_x509_crt_get_extension_info.3 \
- 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 \
- gnutls_x509_crt_get_serial.3 \
- gnutls_x509_crt_get_signature.3 \
- gnutls_x509_crt_get_signature_algorithm.3 \
- gnutls_x509_crt_get_subject.3 \
- gnutls_x509_crt_get_subject_alt_name.3 \
- 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 \
- gnutls_x509_crt_set_ca_status.3 \
- gnutls_x509_crt_set_crl_dist_points.3 \
- gnutls_x509_crt_set_crl_dist_points2.3 \
- gnutls_x509_crt_set_crq.3 \
- gnutls_x509_crt_set_crq_extensions.3 \
- gnutls_x509_crt_set_dn_by_oid.3 \
- gnutls_x509_crt_set_expiration_time.3 \
- gnutls_x509_crt_set_extension_by_oid.3 \
- gnutls_x509_crt_set_issuer_dn_by_oid.3 \
- gnutls_x509_crt_set_key.3 \
- gnutls_x509_crt_set_key_purpose_oid.3 \
- 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 \
- gnutls_x509_crt_set_subject_key_id.3 \
- gnutls_x509_crt_set_version.3 \
- gnutls_x509_crt_sign.3 \
- gnutls_x509_crt_sign2.3 \
- gnutls_x509_crt_verify.3 \
- gnutls_x509_crt_verify_data.3 \
- gnutls_x509_crt_verify_hash.3 \
- gnutls_x509_dn_deinit.3 \
- gnutls_x509_dn_export.3 \
- gnutls_x509_dn_get_rdn_ava.3 \
- gnutls_x509_dn_import.3 \
- gnutls_x509_dn_init.3 \
- gnutls_x509_dn_oid_known.3 \
- gnutls_x509_privkey_cpy.3 \
- gnutls_x509_privkey_deinit.3 \
- gnutls_x509_privkey_export.3 \
- 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 \
- gnutls_x509_privkey_get_pk_algorithm.3 \
- gnutls_x509_privkey_import.3 \
- 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 \
- gnutls_x509_rdn_get.3 \
- gnutls_x509_rdn_get_by_oid.3 \
- gnutls_x509_rdn_get_oid.3
Added: trunk/security/gnutls/files/patch-doc-scripts-gdoc
===================================================================
--- trunk/security/gnutls/files/patch-doc-scripts-gdoc (rev 0)
+++ trunk/security/gnutls/files/patch-doc-scripts-gdoc 2014-03-07 12:51:54 UTC (rev 16031)
@@ -0,0 +1,612 @@
+--- doc/scripts/gdoc.orig 2014-01-13 15:08:22.000000000 +0400
++++ doc/scripts/gdoc 2014-01-13 15:10:10.000000000 +0400
+@@ -7,6 +7,8 @@
+ ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
+ ## added -tex
+ ## Copyright (c) 1998 Michael Zucchi
++## Copyright (c) 2013 Adam Sampson
++## made highlighting not depend on hash order, for Perl 5.18
+
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -132,57 +134,59 @@
+ use POSIX qw(strftime);
+
+ # match expressions used to find embedded type information
+-$type_constant = "((?<!\")\\\%(\\w+))";
+-$type_func = "(\\w+\\(\\))";
+-$type_param = "\\\@(\\w+)";
+-$type_struct = "\\\#(\\w+)";
+-$type_env = "(\\\$\\w+)";
++$type_constant = "\\\%([A-Za-z0-9_]+)";
++$type_func = "([A-Za-z0-9_]+\\(\\))";
++$type_param = '\@([A-Za-z0-9_]+)\s*';
++$type_struct = "\\\#([A-Za-z0-9_]+)";
++$type_env = "(\\\$[A-Za-z0-9_]+)";
+
+
+ # Output conversion substitutions.
+ # One for each output format
+
+ # these work fairly well
+-%highlights_html = ( $type_constant, "<i>\$2</i>",
+- $type_func, "<b>\$1</b>",
+- $type_struct, "<i>\$1</i>",
+- $type_param, "<tt><b>\$1</b></tt>" );
++ at highlights_html = ( [$type_constant, '"<i>$1</i>"'],
++ [$type_func, '"<b>$1</b>"'],
++ [$type_struct, '"<i>$1</i>"'],
++ [$type_param, '" <tt><b>$1</b></tt> "'] );
+ $blankline_html = "<p>";
+
+-%highlights_texinfo = ( $type_constant, "\\\@code{\$2}",
+- $type_func, "\\\@code{\$1}",
+- $type_struct, "\\\@code{\$1}",
+- $type_param, "\\\@code{\$1}" );
++ at highlights_texinfo = ( [$type_param, '" \@code{$1} "'],
++ [$type_constant, '"\@code{$1} "'],
++ [$type_func, '"\@code{$1} "'],
++ [$type_struct, '"\@code{$1} "'],
++ );
+ $blankline_texinfo = "";
+
+-%highlights_tex = ( $type_constant, "{\\\\it \$2}",
+- $type_func, "{\\\\bf \$1}",
+- $type_struct, "{\\\\it \$1}",
+- $type_param, "{\\\\bf \$1}" );
++ at highlights_tex = ( [$type_param, '" {\\\bf $1} "'],
++ [$type_constant, '"{\\\it $1}"'],
++ [$type_func, '"{\\\bf $1}"'],
++ [$type_struct, '"{\\\it $1}"'],
++ );
+ $blankline_tex = "\\\\";
+
+ # sgml, docbook format
+-%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$2</replaceable>",
+- $type_func, "<function>\$1</function>",
+- $type_struct, "<structname>\$1</structname>",
+- $type_env, "<envar>\$1</envar>",
+- $type_param, "<parameter>\$1</parameter>" );
++ at highlights_sgml = ( [$type_constant, '"<replaceable class=\"option\">$1</replaceable>"'],
++ [$type_func, '"<function>$1</function>"'],
++ [$type_struct, '"<structname>$1</structname>"'],
++ [$type_env, '"<envar>$1</envar>"'],
++ [$type_param, '" <parameter>$1</parameter> "'] );
+ $blankline_sgml = "</para><para>\n";
+
+ # these are pretty rough
+-%highlights_man = ( $type_constant, "\\\\fB\$2\\\\fP",
+- $type_func, "\\\\fB\$1\\\\fP",
+- $type_struct, "\\\\fB\$1\\\\fP",
+- $type_param, "\\\\fI\$1\\\\fP" );
++ at highlights_man = ( [$type_constant, '"\\\fB$1\\\fP"'],
++ [$type_func, '"\\\fB$1\\\fP"'],
++ [$type_struct, '"\\\fB$1\\\fP"'],
++ [$type_param, '" \\\fI$1\\\fP "'] );
+ $blankline_man = "";
+
+ # text-mode
+-%highlights_text = ( $type_constant, "\$2",
+- $type_func, "\$1",
+- $type_struct, "\$1",
+- $type_param, "\$1" );
++ at highlights_text = ( [$type_constant, '"$1"'],
++ [$type_func, '"$1"'],
++ [$type_struct, '"$1"'],
++ [$type_param, '"$1 "'] );
+ $blankline_text = "";
+-
++my $lineprefix = "";
+
+ sub usage {
+ print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | -texinfo -listfunc ]\n";
+@@ -201,7 +205,7 @@
+
+ $verbose = 0;
+ $output_mode = "man";
+-%highlights = %highlights_man;
++ at highlights = @highlights_man;
+ $blankline = $blankline_man;
+ $modulename = "API Documentation";
+ $sourceversion = strftime "%Y-%m-%d", localtime;
+@@ -210,27 +214,27 @@
+ $cmd = shift @ARGV;
+ if ($cmd eq "-html") {
+ $output_mode = "html";
+- %highlights = %highlights_html;
++ @highlights = @highlights_html;
+ $blankline = $blankline_html;
+ } elsif ($cmd eq "-man") {
+ $output_mode = "man";
+- %highlights = %highlights_man;
++ @highlights = @highlights_man;
+ $blankline = $blankline_man;
+ } elsif ($cmd eq "-tex") {
+ $output_mode = "tex";
+- %highlights = %highlights_tex;
++ @highlights = @highlights_tex;
+ $blankline = $blankline_tex;
+ } elsif ($cmd eq "-texinfo") {
+ $output_mode = "texinfo";
+- %highlights = %highlights_texinfo;
++ @highlights = @highlights_texinfo;
+ $blankline = $blankline_texinfo;
+ } elsif ($cmd eq "-text") {
+ $output_mode = "text";
+- %highlights = %highlights_text;
++ @highlights = @highlights_text;
+ $blankline = $blankline_text;
+ } elsif ($cmd eq "-docbook") {
+ $output_mode = "sgml";
+- %highlights = %highlights_sgml;
++ @highlights = @highlights_sgml;
+ $blankline = $blankline_sgml;
+ } elsif ($cmd eq "-listfunc") {
+ $output_mode = "listfunc";
+@@ -270,6 +274,8 @@
+ my $name = shift @_;
+ my $contents = join "\n", @_;
+
++ $name = " $name";
++
+ if ($name =~ m/$type_constant/) {
+ $name = $1;
+ # print STDERR "constant section '$1' = '$contents'\n";
+@@ -280,6 +286,7 @@
+ $parameters{$name} = $contents;
+ } else {
+ # print STDERR "other section '$name' = '$contents'\n";
++ $name =~ tr/ //d;
+ $sections{$name} = $contents;
+ push @sectionlist, $name;
+ }
+@@ -296,35 +303,15 @@
+ # sections => %descriont descriptions
+ #
+
+-sub repstr {
+- $pattern = shift;
+- $repl = shift;
+- $match1 = shift;
+- $match2 = shift;
+- $match3 = shift;
+- $match4 = shift;
+-
+- $output = $repl;
+- $output =~ s,\$1,$match1,g;
+- $output =~ s,\$2,$match2,g;
+- $output =~ s,\$3,$match3,g;
+- $output =~ s,\$4,$match4,g;
+-
+- eval "\$return = qq/$output/";
+-
+-# print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 replace $repl yielded $output interpolated $return\n";
+-
+- $return;
+-}
+-
+ sub just_highlight {
+ my $contents = join "\n", @_;
+ my $line;
+ my $ret = "";
+
+- foreach $pattern (keys %highlights) {
+-# print "scanning pattern $pattern ($highlights{$pattern})\n";
+- $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
++ foreach $highlight (@highlights) {
++ my ($pattern, $replace) = @$highlight;
++ #print "scanning pattern $pattern ($replace)\n";
++ $contents =~ s/$pattern/$replace/gees;
+ }
+ foreach $line (split "\n", $contents) {
+ if ($line eq ""){
+@@ -370,13 +357,45 @@
+ }
+ }
+ foreach $section (@{$args{'sectionlist'}}) {
++ $section =~ s/\@//g;
+ print "\n\@strong{$section:} " if $section ne $section_default;
+- $args{'sections'}{$section} =~ s:([{}]):\@\1:gs;
++ $args{'sections'}{$section} =~ s:([{}]):\@$1:gs;
+ output_highlight($args{'sections'}{$section});
+ }
+ print "\@end deftypefun\n\n";
+ }
+
++sub output_enum_texinfo {
++ my %args = %{$_[0]};
++ my ($parameter, $section);
++ my $count;
++ my $name = $args{'enum'};
++ my $param;
++ my $param2;
++ my $sec;
++ my $check;
++ my $type;
++
++ print "\n\@c $name\n";
++ print "\@table \@code\n";
++
++ $check=0;
++ foreach $parameter (@{$args{'parameterlist'}}) {
++ $param1 = $parameter;
++ $param1 =~ s/_/_\@-/g;
++
++ $check = 1;
++ print "\@item ".$param1."\n";
++# print "\n";
++
++ $param2 = $args{'parameters'}{$parameter};
++ $out = just_highlight($param2);
++ chomp $out;
++ print $out . "\n";
++ }
++ print "\@end table\n";
++}
++
+ # output in html
+ sub output_html {
+ my %args = %{$_[0]};
+@@ -428,7 +447,9 @@
+
+ $func =~ s/_/\\_/g;
+
+- print "\n\n\\subsection{". $func . "}\n\\label{" . $args{'function'} . "}\n";
++ print "\n\n\\begin{function}\n";
++ print "\\functionTitle{". $func . "}\n";
++ print "\\index{". $func . "}\n";
+
+ $type = $args{'functiontype'};
+ $type =~ s/_/\\_/g;
+@@ -451,9 +472,8 @@
+ }
+ print ")\n";
+
+- print "\n{\\large{Arguments}}\n";
++ print "\n\\begin{functionArguments}\n";
+
+- print "\\begin{itemize}\n";
+ $check=0;
+ foreach $parameter (@{$args{'parameterlist'}}) {
+ $param1 = $args{'parametertypes'}{$parameter};
+@@ -462,11 +482,12 @@
+ $param2 =~ s/_/\\_/g;
+
+ $check = 1;
+- print "\\item {\\it ".$param1."} {\\bf ".$param2."}: \n";
++ print "\\functionArgument {\\it ".$param1."} {\\bf ".$param2."}: \n";
+ # print "\n";
+
+ $param3 = $args{'parameters'}{$parameter};
+- $param3 =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
++ $param3 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
++ $param3 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
+
+ $out = just_highlight($param3);
+ $out =~ s/_/\\_/g;
+@@ -475,31 +496,72 @@
+ if ($check==0) {
+ print "\\item void\n";
+ }
+- print "\\end{itemize}\n";
++ print "\\end{functionArguments}\n";
+
+ foreach $section (@{$args{'sectionlist'}}) {
+ $sec = $section;
+ $sec =~ s/_/\\_/g;
+- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
++ $sec =~ s/#([a-zA-Z\_]+)/{\\it $1}/g;
+
+- print "\n{\\large{$sec}}\\\\\n";
+- print "\\begin{rmfamily}\n";
++ print "\n\\begin{function${sec}}\n";
++ $out = $args{'sections'}{$section};
+
+- $sec = $args{'sections'}{$section};
+- $sec =~ s/\\:/:/g;
+- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
+- $sec =~ s/->/\$\\rightarrow\$/g;
+- $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
+-
+- $out = just_highlight($sec);
+- $out =~ s/_/\\_/g;
++ $out =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
++ $out =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
++ $out =~ s/\@([a-zA-Z\_]+)/{\\bf $1}/g;
++ $out =~ s/_/\\_\\-/g;
++ $out =~ s/\$/\\\$/g;
++ $out =~ s/#/\\#/g;
++ $out =~ s/\n\n/\n/g;
++ $out =~ s/\\:/:/g;
++ $out =~ s/\-\>/\$\\rightarrow\$/g;
++ $out =~ s/([0-9]+)\^([0-9]+)/\$\{$1\}\^\{$2\}\$/g;
+
+ print $out;
+- print "\\end{rmfamily}\n";
++ print "\\end{function${sec}}\n";
+ }
+- print "\n";
++ print "\\end{function}\n\n";
+ }
+
++sub output_enum_tex {
++ my %args = %{$_[0]};
++ my ($parameter, $section);
++ my $count;
++ my $name = $args{'enum'};
++ my $param;
++ my $param2;
++ my $sec;
++ my $check;
++ my $type;
++
++ print "\n\n\\begin{enum}\n";
++ $name =~ s/_/\\_/g;
++ print "\\enumTitle{". $name . "}\n";
++ print "\\index{". $name . "}\n";
++
++ print "\n\\begin{enumList}\n";
++
++ $check=0;
++ foreach $parameter (@{$args{'parameterlist'}}) {
++ $param1 = $parameter;
++ $param1 =~ s/_/\\_\\-/g;
++
++ $check = 1;
++ print "\\enumElement{".$param1."}{";
++# print "\n";
++
++ $param2 = $args{'parameters'}{$parameter};
++ $param2 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
++ $param2 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
++ $out = just_highlight($param2);
++ $out =~ s/_/\\_/g;
++ chomp $out;
++ print $out . "}\n";
++ }
++ print "\\end{enumList}\n";
++
++ print "\\end{enum}\n\n";
++}
+
+ # output in sgml DocBook
+ sub output_sgml {
+@@ -639,11 +701,14 @@
+ if ($args{'bugsto'}) {
+ print ".SH \"REPORTING BUGS\"\n";
+ print "Report bugs to <". $args{'bugsto'} . ">.\n";
++ print ".br\n";
++ print "General guidelines for reporting bugs: http://www.gnu.org/gethelp/\n";
++ print ".br\n";
+ if ($args{'pkgname'}) {
+ print $args{'pkgname'} . " home page: " .
+ "http://www.gnu.org/software/" . $args{'module'} . "/\n";
+ }
+- print "General help using GNU software: http://www.gnu.org/gethelp/\n";
++ print "\n";
+ }
+
+ if ($args{'copyright'}) {
+@@ -670,6 +735,10 @@
+ print ".B info " . $args{'seeinfo'} . "\n";
+ print ".PP\n";
+ print "should give you access to the complete manual.\n";
++ print "As an alternative you may obtain the manual from:\n";
++ print ".IP\n";
++ print ".B http://www.gnu.org/software/" . $args{'module'} . "/manual/\n";
++ print ".PP\n";
+ }
+ }
+
+@@ -705,6 +774,10 @@
+ eval "output_".$output_mode."(\@_);";
+ }
+
++sub output_enum {
++ eval "output_enum_".$output_mode."(\@_);";
++}
++
+
+ ##
+ # takes a function prototype and spits out all the details
+@@ -744,7 +817,7 @@
+ # print STDERR " :> @args\n";
+ $type = join " ", @args;
+
+- if ($parameters{$param} eq "" && $param != "void") {
++ if ((!defined($parameters{$param}) || $parameters{$param} eq "") && $param ne "void") {
+ $parameters{$param} = "-- undescribed --";
+ print STDERR "warning: $lineno: Function parameter '$param' not described in '$function_name'\n";
+ }
+@@ -781,6 +854,56 @@
+ }
+ }
+
++sub dump_enum {
++ my $prototype = shift @_;
++
++ if (($prototype =~ m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/)) {
++# || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
++ $args = $1;
++ $name = $2;
++
++ foreach $arg (split ',', $args) {
++ # strip leading/trailing spaces
++ $arg =~ s/^\s*//;
++ $arg =~ s/\s*$//;
++ $arg =~ s/([A-Za-z0-9_]+)\s*=.*/$1/g;
++# print STDERR "SCAN ARG: '$arg'\n";
++
++ next if $arg eq '';
++ if ((!defined($parameters{$arg}) || $parameters{$arg} eq "")) {
++ $parameters{$arg} = "-- undescribed --";
++ print STDERR "warning: $lineno: Enumeration parameter '$arg' not described in '$name'\n";
++ }
++
++ push @parameterlist, $arg;
++
++# print STDERR "param = '$arg'\n";
++ }
++ } else {
++# print STDERR "warning: $lineno: Cannot understand enumeration: '$prototype'\n";
++ return;
++ }
++
++ output_enum({'enum' => $name,
++ 'module' => $modulename,
++ 'sourceversion' => $sourceversion,
++ 'include' => $include,
++ 'includefuncprefix' => $includefuncprefix,
++ 'bugsto' => $bugsto,
++ 'pkgname' => $pkgname,
++ 'copyright' => $copyright,
++ 'verbatimcopying' => $verbatimcopying,
++ 'seeinfo' => $seeinfo,
++ 'functiontype' => $return_type,
++ 'parameterlist' => \@parameterlist,
++ 'parameters' => \%parameters,
++ 'parametertypes' => \%parametertypes,
++ 'sectionlist' => \@sectionlist,
++ 'sections' => \%sections,
++ 'purpose' => $function_purpose
++ });
++}
++
+ ######################################################################
+ # main
+ # states
+@@ -797,7 +920,7 @@
+ $doc_end = "\\*/";
+ $doc_com = "\\s*\\*\\s*";
+ $doc_func = $doc_com."(\\w+):?";
+-$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w ]+):\\s*(.*)";
++$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w]+):\\s*(.*)";
+ $doc_content = $doc_com."(.*)";
+
+ %constants = ();
+@@ -809,6 +932,7 @@
+ $contents = "";
+ $section_default = "Description"; # default section
+ $section = $section_default;
++$enum = 0;
+
+ $lineno = 0;
+ foreach $file (@ARGV) {
+@@ -816,18 +940,21 @@
+ print STDERR "Error: Cannot open file $file\n";
+ next;
+ }
+- while (<IN>) {
++ while ($line = <IN>) {
+ $lineno++;
+
+ if ($state == 0) {
+- if (/$doc_start/o) {
++ if ($line =~ /$doc_start/o) {
+ $state = 1; # next line is always the function name
++# print STDERR "XXX: start of doc comment\n";
+ }
+ } elsif ($state == 1) { # this line is the function name (always)
+- if (/$doc_func/o) {
++ if ($line =~ /$doc_func/o) {
+ $function = $1;
+ $state = 2;
+- if (/-\s*(.*)/) {
++# print STDERR "XXX: start of doc comment, looking for prototype\n";
++
++ if ($line =~ /-\s*(.*)/) {
+ $function_purpose = $1;
+ } else {
+ $function_purpose = "";
+@@ -841,11 +968,11 @@
+ $state = 0;
+ }
+ } elsif ($state == 2) { # look for head: lines, and include content
+- if (/$doc_sect/o) {
++ if ($line =~ /$doc_sect/o) {
+ $newsection = $1;
+ $newcontents = $2;
+
+- if ($contents ne "") {
++ if ($contents ne '') {
+ dump_section($section, $contents);
+ $section = $section_default;
+ }
+@@ -855,7 +982,7 @@
+ $contents .= "\n";
+ }
+ $section = $newsection;
+- } elsif (/$doc_end/) {
++ } elsif ($line =~ /$doc_end/) {
+
+ if ($contents ne "") {
+ dump_section($section, $contents);
+@@ -863,13 +990,12 @@
+ $contents = "";
+ }
+
+-# print STDERR "end of doc comment, looking for prototype\n";
+ $prototype = "";
+ $state = 3;
+- } elsif (/$doc_content/) {
++ } elsif ($line =~ /$doc_content/) {
+ # miguel-style comment kludge, look for blank lines after
+ # @parameter line to signify start of description
+- if ($1 eq "" && $section =~ m/^@/) {
++ if ($1 eq '' && $section =~ m/^@/) {
+ dump_section($section, $contents);
+ $section = $section_default;
+ $contents = "";
+@@ -881,13 +1007,16 @@
+ print STDERR "warning: $lineno: Bad line: $_";
+ }
+ } elsif ($state == 3) { # scanning for function { (end of prototype)
+- if (m#\s*/\*\s+MACDOC\s*#io) {
++ if ($line =~ m#\s*/\*\s+MACDOC\s*#io) {
+ # do nothing
+ }
+- elsif (/([^\{]*)/) {
++ elsif ($enum == 1 && $line =~ /(^\s*\{).*/) {
++ $prototype .= "{";
++ }
++ elsif ($line =~ /([^\{]*)/) {
+ $prototype .= $1;
+ }
+- if (/\{/) {
++ if ($enum == 0 && $line =~ /\{/) {
+ $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
+ $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
+ $prototype =~ s@^ +@@gos; # strip leading spaces
+@@ -901,9 +1030,32 @@
+ %sections = ();
+ @sectionlist = ();
+ $prototype = "";
++ $enum = 0;
+
+ $state = 0;
+ }
++ elsif ($enum == 1 && $line =~ /\}/) {
++ $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
++ $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
++ $prototype =~ s@^ +@@gos; # strip leading spaces
++ dump_enum($prototype);
++
++ $function = "";
++ %constants = ();
++ %parameters = ();
++ %parametertypes = ();
++ @parameterlist = ();
++ %sections = ();
++ @sectionlist = ();
++ $prototype = "";
++ $enum = 0;
++
++ $state = 0;
++ }
++ elsif ($line =~ /([a-zA-Z\s]+)enum(.*)$/) {
++ $enum = 1;
++ }
++
+ }
+ }
+ }
Added: trunk/security/gnutls/files/patch-lib-gnutls_cipher.c
===================================================================
--- trunk/security/gnutls/files/patch-lib-gnutls_cipher.c (rev 0)
+++ trunk/security/gnutls/files/patch-lib-gnutls_cipher.c 2014-03-07 12:51:54 UTC (rev 16031)
@@ -0,0 +1,11 @@
+--- lib/gnutls_cipher.c.orig 2013-02-04 12:53:03.000000000 +0400
++++ lib/gnutls_cipher.c 2013-02-04 12:53:03.000000000 +0400
+@@ -561,6 +561,8 @@
+ return GNUTLS_E_DECRYPTION_FAILED;
+ }
+ pad = ciphertext.data[ciphertext.size - 1]; /* pad */
++ if (pad+1 > ciphertext.size-hash_size)
++ pad_failed = GNUTLS_E_DECRYPTION_FAILED;
+
+ /* Check the pading bytes (TLS 1.x).
+ * Note that we access all 256 bytes of ciphertext for padding check
Added: trunk/security/gnutls/files/patch-lib__x509__verify.c
===================================================================
--- trunk/security/gnutls/files/patch-lib__x509__verify.c (rev 0)
+++ trunk/security/gnutls/files/patch-lib__x509__verify.c 2014-03-07 12:51:54 UTC (rev 16031)
@@ -0,0 +1,103 @@
+CVE-2014-0092
+CVE-2014-1959
+
+--- ./lib/x509/verify.c.orig 2012-05-24 11:19:05.000000000 -0500
++++ ./lib/x509/verify.c 2014-03-04 16:43:13.053087407 -0600
+@@ -141,7 +141,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -150,7 +150,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -158,7 +158,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -166,7 +166,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ /* If the subject certificate is the same as the issuer
+@@ -206,6 +206,7 @@
+ else
+ gnutls_assert ();
+
++fail:
+ result = 0;
+
+ cleanup:
+@@ -330,7 +331,7 @@
+ gnutls_datum_t cert_signed_data = { NULL, 0 };
+ gnutls_datum_t cert_signature = { NULL, 0 };
+ gnutls_x509_crt_t issuer = NULL;
+- int issuer_version, result;
++ int issuer_version, result = 0;
+
+ if (output)
+ *output = 0;
+@@ -363,7 +364,7 @@
+ if (issuer_version < 0)
+ {
+ gnutls_assert ();
+- return issuer_version;
++ return 0;
+ }
+
+ if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) &&
+@@ -385,6 +386,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
++ result = 0;
+ goto cleanup;
+ }
+
+@@ -393,6 +395,7 @@
+ if (result < 0)
+ {
+ gnutls_assert ();
++ result = 0;
+ goto cleanup;
+ }
+
+@@ -410,6 +413,7 @@
+ else if (result < 0)
+ {
+ gnutls_assert();
++ result = 0;
+ goto cleanup;
+ }
+
+@@ -644,8 +648,10 @@
+ /* note that here we disable this V1 CA flag. So that no version 1
+ * certificates can exist in a supplied chain.
+ */
+- if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT))
++ if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT)) {
+ flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
++ flags |= GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT;
++ }
+ if ((ret =
+ _gnutls_verify_certificate2 (certificate_list[i - 1],
+ &certificate_list[i], 1, flags,
Modified: trunk/security/gnutls/pkg-descr
===================================================================
--- trunk/security/gnutls/pkg-descr 2014-03-04 01:36:25 UTC (rev 16030)
+++ trunk/security/gnutls/pkg-descr 2014-03-07 12:51:54 UTC (rev 16031)
@@ -14,4 +14,4 @@
Additionaly GnuTLS provides an emulation API for the widely used
OpenSSL library, to ease integration with existing applications.
-WWW: http://www.gnutls.org/
+WWW: http://www.gnutls.org/
Property changes on: trunk/security/gnutls/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/security/gnutls/pkg-plist
===================================================================
--- trunk/security/gnutls/pkg-plist 2014-03-04 01:36:25 UTC (rev 16030)
+++ trunk/security/gnutls/pkg-plist 2014-03-07 12:51:54 UTC (rev 16031)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
bin/certtool
bin/gnutls-cli
bin/gnutls-cli-debug
@@ -60,4 +59,8 @@
%%NLS%%share/locale/sv/LC_MESSAGES/libgnutls.mo
%%NLS%%share/locale/vi/LC_MESSAGES/libgnutls.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgnutls.mo
+%%NLS%%@dirrmtry share/locale/en at quot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en at quot
+%%NLS%%@dirrmtry share/locale/en at boldquot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en at boldquot
@dirrm include/gnutls
More information about the Midnightbsd-cvs
mailing list