Update to gnutls-3.2.7.
This commit is contained in:
ajacoutot
parent
81537ec25d
commit
72e1ffed67
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.86 2013/11/08 10:44:30 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.87 2013/12/08 08:31:45 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNU Transport Layer Security library
|
||||
|
||||
V= 3.2.6
|
||||
V= 3.2.7
|
||||
DISTNAME= gnutls-${V}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= security
|
||||
|
||||
SHARED_LIBS += gnutls 41.0 # 55.0
|
||||
SHARED_LIBS += gnutls 41.1 # 55.0
|
||||
SHARED_LIBS += gnutlsxx 29.1 # 29.0
|
||||
SHARED_LIBS += gnutls-xssl 0.0 # 0.0
|
||||
SHARED_LIBS += gnutls-openssl 27.2 # 27.2
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gnutls-3.2.6.tar.xz) = CkXfpQ7cgJHKHCX3uunZx4C4oJxYzrPiViZNLcSTOPQ=
|
||||
SIZE (gnutls-3.2.6.tar.xz) = 4992204
|
||||
SHA256 (gnutls-3.2.7.tar.xz) = fKPiYUAukDRFhcvVzFQ3n04pRpeyzHzZeUWHB2ZqyHI=
|
||||
SIZE (gnutls-3.2.7.tar.xz) = 5098572
|
||||
|
||||
63
security/gnutls/patches/patch-lib_nettle_egd_c
Normal file
63
security/gnutls/patches/patch-lib_nettle_egd_c
Normal file
@ -0,0 +1,63 @@
|
||||
$OpenBSD: patch-lib_nettle_egd_c,v 1.1 2013/12/08 08:31:45 ajacoutot Exp $
|
||||
|
||||
https://gitorious.org/gnutls/gnutls/commit/346e323228f5cc71664c2f49541f816f88914342
|
||||
http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html
|
||||
|
||||
--- lib/nettle/egd.c.orig Sun Nov 10 18:59:14 2013
|
||||
+++ lib/nettle/egd.c Sun Dec 8 09:15:08 2013
|
||||
@@ -155,12 +155,10 @@ int _rndegd_connect_socket(void)
|
||||
|
||||
fd = socket(LOCAL_SOCKET_TYPE, SOCK_STREAM, 0);
|
||||
if (fd == -1) {
|
||||
- _gnutls_debug_log("can't create unix domain socket: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("can't create unix domain socket\n");
|
||||
return -1;
|
||||
} else if (connect(fd, (struct sockaddr *) &addr, addr_len) == -1) {
|
||||
- _gnutls_debug_log("can't connect to EGD socket `%s': %s\n",
|
||||
- name, strerror(errno));
|
||||
+ _gnutls_debug_log("can't connect to EGD socket `%s'\n", name);
|
||||
close(fd);
|
||||
fd = -1;
|
||||
}
|
||||
@@ -202,13 +200,11 @@ int _rndegd_read(int *fd, void *_output, size_t _lengt
|
||||
buffer[1] = nbytes;
|
||||
|
||||
if (do_write(*fd, buffer, 2) == -1)
|
||||
- _gnutls_debug_log("can't write to the EGD: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("can't write to the EGD\n");
|
||||
|
||||
n = do_read(*fd, buffer, 1);
|
||||
if (n == -1) {
|
||||
- _gnutls_debug_log("read error on EGD: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("read error on EGD\n");
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
@@ -217,8 +213,7 @@ int _rndegd_read(int *fd, void *_output, size_t _lengt
|
||||
if (n) {
|
||||
n = do_read(*fd, buffer, n);
|
||||
if (n == -1) {
|
||||
- _gnutls_debug_log("read error on EGD: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("read error on EGD\n");
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
@@ -240,12 +235,10 @@ int _rndegd_read(int *fd, void *_output, size_t _lengt
|
||||
buffer[0] = 2; /* blocking */
|
||||
buffer[1] = nbytes;
|
||||
if (do_write(*fd, buffer, 2) == -1)
|
||||
- _gnutls_debug_log("can't write to the EGD: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("can't write to the EGD\n");
|
||||
n = do_read(*fd, buffer, nbytes);
|
||||
if (n == -1) {
|
||||
- _gnutls_debug_log("read error on EGD: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("read error on EGD\n");
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
27
security/gnutls/patches/patch-lib_nettle_rnd_c
Normal file
27
security/gnutls/patches/patch-lib_nettle_rnd_c
Normal file
@ -0,0 +1,27 @@
|
||||
$OpenBSD: patch-lib_nettle_rnd_c,v 1.1 2013/12/08 08:31:45 ajacoutot Exp $
|
||||
|
||||
https://gitorious.org/gnutls/gnutls/commit/346e323228f5cc71664c2f49541f816f88914342
|
||||
http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html
|
||||
|
||||
--- lib/nettle/rnd.c.orig Sun Nov 10 18:59:14 2013
|
||||
+++ lib/nettle/rnd.c Sun Dec 8 09:15:12 2013
|
||||
@@ -90,8 +90,7 @@ static int do_trivia_source(int init)
|
||||
memcpy(&event.now, ¤t_time, sizeof(event.now));
|
||||
#ifdef HAVE_GETRUSAGE
|
||||
if (getrusage(RUSAGE_SELF, &event.rusage) < 0) {
|
||||
- _gnutls_debug_log("getrusage failed: %s\n",
|
||||
- strerror(errno));
|
||||
+ _gnutls_debug_log("getrusage failed\n");
|
||||
abort();
|
||||
}
|
||||
#endif
|
||||
@@ -244,8 +243,7 @@ static int do_device_source_urandom(int init)
|
||||
if (res <= 0) {
|
||||
if (res < 0) {
|
||||
_gnutls_debug_log
|
||||
- ("Failed to read /dev/urandom: %s\n",
|
||||
- strerror(errno));
|
||||
+ ("Failed to read /dev/urandom\n");
|
||||
} else {
|
||||
_gnutls_debug_log
|
||||
("Failed to read /dev/urandom: end of file\n");
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.31 2013/11/03 00:31:20 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.32 2013/12/08 08:31:45 ajacoutot Exp $
|
||||
@bin bin/certtool
|
||||
@bin bin/danetool
|
||||
@bin bin/gnutls-cli
|
||||
@ -80,6 +80,7 @@ lib/pkgconfig/gnutls.pc
|
||||
@man man/man3/gnutls_certificate_activation_time_peers.3
|
||||
@man man/man3/gnutls_certificate_allocate_credentials.3
|
||||
@man man/man3/gnutls_certificate_client_get_request_status.3
|
||||
@man man/man3/gnutls_certificate_client_set_retrieve_function.3
|
||||
@man man/man3/gnutls_certificate_expiration_time_peers.3
|
||||
@man man/man3/gnutls_certificate_free_ca_names.3
|
||||
@man man/man3/gnutls_certificate_free_cas.3
|
||||
@ -93,6 +94,7 @@ lib/pkgconfig/gnutls.pc
|
||||
@man man/man3/gnutls_certificate_get_peers_subkey_id.3
|
||||
@man man/man3/gnutls_certificate_send_x509_rdn_sequence.3
|
||||
@man man/man3/gnutls_certificate_server_set_request.3
|
||||
@man man/man3/gnutls_certificate_server_set_retrieve_function.3
|
||||
@man man/man3/gnutls_certificate_set_dh_params.3
|
||||
@man man/man3/gnutls_certificate_set_key.3
|
||||
@man man/man3/gnutls_certificate_set_ocsp_status_request_file.3
|
||||
@ -353,6 +355,7 @@ lib/pkgconfig/gnutls.pc
|
||||
@man man/man3/gnutls_openpgp_privkey_get_revoked_status.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_count.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_creation_time.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_expiration_time.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_id.3
|
||||
@man man/man3/gnutls_openpgp_privkey_get_subkey_idx.3
|
||||
@ -389,10 +392,12 @@ lib/pkgconfig/gnutls.pc
|
||||
@man man/man3/gnutls_pkcs11_deinit.3
|
||||
@man man/man3/gnutls_pkcs11_delete_url.3
|
||||
@man man/man3/gnutls_pkcs11_get_pin_function.3
|
||||
@man man/man3/gnutls_pkcs11_get_raw_issuer.3
|
||||
@man man/man3/gnutls_pkcs11_init.3
|
||||
@man man/man3/gnutls_pkcs11_obj_deinit.3
|
||||
@man man/man3/gnutls_pkcs11_obj_export.3
|
||||
@man man/man3/gnutls_pkcs11_obj_export2.3
|
||||
@man man/man3/gnutls_pkcs11_obj_export3.3
|
||||
@man man/man3/gnutls_pkcs11_obj_export_url.3
|
||||
@man man/man3/gnutls_pkcs11_obj_get_info.3
|
||||
@man man/man3/gnutls_pkcs11_obj_get_type.3
|
||||
@ -912,6 +917,18 @@ lib/pkgconfig/gnutls.pc
|
||||
@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
|
||||
@man man/man3/xssl_client_init.3
|
||||
@man man/man3/xssl_cred_deinit.3
|
||||
@man man/man3/xssl_cred_init.3
|
||||
@man man/man3/xssl_deinit.3
|
||||
@man man/man3/xssl_flush.3
|
||||
@man man/man3/xssl_get_session.3
|
||||
@man man/man3/xssl_getdelim.3
|
||||
@man man/man3/xssl_printf.3
|
||||
@man man/man3/xssl_read.3
|
||||
@man man/man3/xssl_server_init.3
|
||||
@man man/man3/xssl_sinit.3
|
||||
@man man/man3/xssl_write.3
|
||||
share/doc/gnutls/
|
||||
share/doc/gnutls/README
|
||||
share/examples/gnutls/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user