diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-12-16 13:51:28 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-12-16 13:51:28 +0000 |
| commit | e18bbb441d38545e7d8a1b12c31fa32295f4febd (patch) | |
| tree | 3be7c9dd3d3269b2d094b2105549def89f52b43d /net | |
| parent | - Change MAINTAINER mail address. (diff) | |
- Update to 1.1.2
Notes
Notes:
svn path=/head/; revision=203853
Diffstat (limited to 'net')
| -rw-r--r-- | net/wire/Makefile | 2 | ||||
| -rw-r--r-- | net/wire/distinfo | 6 | ||||
| -rw-r--r-- | net/wire/files/patch-wire-client.c | 38 |
3 files changed, 42 insertions, 4 deletions
diff --git a/net/wire/Makefile b/net/wire/Makefile index d696614a66d7..334ae72ae07c 100644 --- a/net/wire/Makefile +++ b/net/wire/Makefile @@ -6,7 +6,7 @@ # PORTNAME= wire -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= net MASTER_SITES= http://www.zankasoftware.com/dist/ \ ${MASTER_SITE_LOCAL} diff --git a/net/wire/distinfo b/net/wire/distinfo index 74f97d7a7e72..3fde0c0ab312 100644 --- a/net/wire/distinfo +++ b/net/wire/distinfo @@ -1,3 +1,3 @@ -MD5 (wire-1.1.1.tar.gz) = 982c80ef9b539f2e81a0fdd63db82340 -SHA256 (wire-1.1.1.tar.gz) = 62c7923e967d13513bd9397e41613e31d8432b7c0816eb09f457290e69e1864c -SIZE (wire-1.1.1.tar.gz) = 698584 +MD5 (wire-1.1.2.tar.gz) = 3984b88c8c56e31e87b2fd69a265465f +SHA256 (wire-1.1.2.tar.gz) = a8c940888338eacd4022267b26ac168347bb64032bf73594a20bd319d81947ab +SIZE (wire-1.1.2.tar.gz) = 295643 diff --git a/net/wire/files/patch-wire-client.c b/net/wire/files/patch-wire-client.c new file mode 100644 index 000000000000..e076b510a556 --- /dev/null +++ b/net/wire/files/patch-wire-client.c @@ -0,0 +1,38 @@ +--- wire/client.c (revision 5082) ++++ wire/client.c (revision 5145) +@@ -216,13 +216,20 @@ + + wi_address_set_port(address, port); + +- socket = wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP); ++ socket = wi_autorelease(wi_socket_init_with_address(wi_socket_alloc(), address, WI_SOCKET_TCP)); ++ ++ if(!socket) { ++ wr_printf_prefix(WI_STR("Could not open a socket to %@: %m"), ip); ++ ++ continue; ++ } ++ + wi_socket_set_interactive(socket, true); + + if(!wi_socket_connect(socket, wr_socket_context, 10.0)) { + wr_printf_prefix(WI_STR("Could not connect to %@: %m"), ip); + +- goto next; ++ continue; + } + + wr_printf_prefix(WI_STR("Connected using %@/%@/%u bits, logging in..."), +@@ -241,11 +248,7 @@ + wr_runloop_add_socket(wr_socket, &wr_runloop_server_callback); + wr_send_command(WI_STR("HELLO")); + +-next: +- wi_release(socket); +- +- if(wr_connected) +- break; ++ break; + } + + if(wr_socket) |