From 7ced100b6a1bede473556d225908a9aca0e8fd0a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 23 Mar 2013 13:25:04 +0000 Subject: [PATCH] Update to gnutls-3.1.10. --- security/gnutls/Makefile | 6 +++--- security/gnutls/distinfo | 4 ++-- security/gnutls/patches/patch-gl_unistd_in_h | 10 +++++----- security/gnutls/pkg/PLIST | 12 +++++++++++- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 5353cb138f5..577fb8d79de 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.74 2013/03/21 08:48:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.75 2013/03/23 13:25:04 ajacoutot Exp $ # XXX check why our getopt_long(3) fails the configure test # + rm patch-gl_unistd_in_h COMMENT= GNU Transport Layer Security library -V= 3.1.9 +V= 3.1.10 DISTNAME= gnutls-${V} EXTRACT_SUFX= .tar.xz CATEGORIES= security -SHARED_LIBS += gnutls 39.3 # 44.0 +SHARED_LIBS += gnutls 39.4 # 46.0 SHARED_LIBS += gnutlsxx 29.1 # 29.0 SHARED_LIBS += gnutls-xssl 0.0 # 0.0 SHARED_LIBS += gnutls-openssl 27.2 # 27.2 diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 279140a98f4..5615862f4f1 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnutls-3.1.9.tar.xz) = CQDEri4CakxxTYjhqhNNsuC+ns3fC+lkGt5dr8+HfD4= -SIZE (gnutls-3.1.9.tar.xz) = 5058704 +SHA256 (gnutls-3.1.10.tar.xz) = U1Nz9ZyIwXFCntPEd33HEmaBtZfjrcqVqojsu2nnxkY= +SIZE (gnutls-3.1.10.tar.xz) = 5084932 diff --git a/security/gnutls/patches/patch-gl_unistd_in_h b/security/gnutls/patches/patch-gl_unistd_in_h index be1f298cfbf..25540cb2488 100644 --- a/security/gnutls/patches/patch-gl_unistd_in_h +++ b/security/gnutls/patches/patch-gl_unistd_in_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-gl_unistd_in_h,v 1.1 2012/09/05 07:15:50 ajacoutot Exp $ ---- gl/unistd.in.h.orig Mon Sep 3 15:41:14 2012 -+++ gl/unistd.in.h Mon Sep 3 15:41:28 2012 -@@ -123,7 +123,7 @@ +$OpenBSD: patch-gl_unistd_in_h,v 1.2 2013/03/23 13:25:04 ajacoutot Exp $ +--- gl/unistd.in.h.orig Thu Mar 21 21:42:28 2013 ++++ gl/unistd.in.h Sat Mar 23 14:06:39 2013 +@@ -109,7 +109,7 @@ /* Get getopt(), optarg, optind, opterr, optopt. But avoid namespace pollution on glibc systems. */ -#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT +#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT && !defined __OpenBSD__ + # define __need_getopt # include #endif - diff --git a/security/gnutls/pkg/PLIST b/security/gnutls/pkg/PLIST index 3221c7dfbe2..130981432de 100644 --- a/security/gnutls/pkg/PLIST +++ b/security/gnutls/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.23 2013/03/02 14:07:22 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.24 2013/03/23 13:25:04 ajacoutot Exp $ @bin bin/certtool @bin bin/crywrap @bin bin/danetool @@ -476,6 +476,8 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_privkey_set_pin_function.3 @man man/man3/gnutls_privkey_sign_data.3 @man man/man3/gnutls_privkey_sign_hash.3 +@man man/man3/gnutls_privkey_sign_raw_data.3 +@man man/man3/gnutls_privkey_status.3 @man man/man3/gnutls_protocol_get_id.3 @man man/man3/gnutls_protocol_get_name.3 @man man/man3/gnutls_protocol_get_version.3 @@ -573,6 +575,7 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_session_force_valid.3 @man man/man3/gnutls_session_get_data.3 @man man/man3/gnutls_session_get_data2.3 +@man man/man3/gnutls_session_get_desc.3 @man man/man3/gnutls_session_get_id.3 @man man/man3/gnutls_session_get_id2.3 @man man/man3/gnutls_session_get_ptr.3 @@ -664,6 +667,7 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_x509_crl_get_extension_info.3 @man man/man3/gnutls_x509_crl_get_extension_oid.3 @man man/man3/gnutls_x509_crl_get_issuer_dn.3 +@man man/man3/gnutls_x509_crl_get_issuer_dn2.3 @man man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3 @man man/man3/gnutls_x509_crl_get_next_update.3 @man man/man3/gnutls_x509_crl_get_number.3 @@ -697,6 +701,7 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_x509_crq_get_basic_constraints.3 @man man/man3/gnutls_x509_crq_get_challenge_password.3 @man man/man3/gnutls_x509_crq_get_dn.3 +@man man/man3/gnutls_x509_crq_get_dn2.3 @man man/man3/gnutls_x509_crq_get_dn_by_oid.3 @man man/man3/gnutls_x509_crq_get_dn_oid.3 @man man/man3/gnutls_x509_crq_get_extension_by_oid.3 @@ -746,6 +751,7 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_x509_crt_get_ca_status.3 @man man/man3/gnutls_x509_crt_get_crl_dist_points.3 @man man/man3/gnutls_x509_crt_get_dn.3 +@man man/man3/gnutls_x509_crt_get_dn2.3 @man man/man3/gnutls_x509_crt_get_dn_by_oid.3 @man man/man3/gnutls_x509_crt_get_dn_oid.3 @man man/man3/gnutls_x509_crt_get_expiration_time.3 @@ -759,6 +765,7 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_x509_crt_get_issuer_alt_name2.3 @man man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3 @man man/man3/gnutls_x509_crt_get_issuer_dn.3 +@man man/man3/gnutls_x509_crt_get_issuer_dn2.3 @man man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3 @man man/man3/gnutls_x509_crt_get_issuer_dn_oid.3 @man man/man3/gnutls_x509_crt_get_issuer_unique_id.3 @@ -878,6 +885,9 @@ lib/pkgconfig/gnutls.pc @man man/man3/gnutls_x509_trust_list_deinit.3 @man man/man3/gnutls_x509_trust_list_get_issuer.3 @man man/man3/gnutls_x509_trust_list_init.3 +@man man/man3/gnutls_x509_trust_list_remove_cas.3 +@man man/man3/gnutls_x509_trust_list_remove_trust_file.3 +@man man/man3/gnutls_x509_trust_list_remove_trust_mem.3 @man man/man3/gnutls_x509_trust_list_verify_crt.3 @man man/man3/gnutls_x509_trust_list_verify_named_crt.3 share/doc/gnutls/