diff options
| -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, 4 insertions, 42 deletions
diff --git a/net/wire/Makefile b/net/wire/Makefile index 58f545bd21df..db3c919a1ae6 100644 --- a/net/wire/Makefile +++ b/net/wire/Makefile @@ -6,7 +6,7 @@ # PORTNAME= wire -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= net MASTER_SITES= http://www.zankasoftware.com/dist/ \ ${MASTER_SITE_LOCAL} diff --git a/net/wire/distinfo b/net/wire/distinfo index 3fde0c0ab312..197b3d2278c0 100644 --- a/net/wire/distinfo +++ b/net/wire/distinfo @@ -1,3 +1,3 @@ -MD5 (wire-1.1.2.tar.gz) = 3984b88c8c56e31e87b2fd69a265465f -SHA256 (wire-1.1.2.tar.gz) = a8c940888338eacd4022267b26ac168347bb64032bf73594a20bd319d81947ab -SIZE (wire-1.1.2.tar.gz) = 295643 +MD5 (wire-1.1.3.tar.gz) = e89e73d486ac89de20b52e1150bc099a +SHA256 (wire-1.1.3.tar.gz) = d2e66377c0dd54028e1188b62c05845225e9e166cec0b5ea76cc0e6a96b681be +SIZE (wire-1.1.3.tar.gz) = 339306 diff --git a/net/wire/files/patch-wire-client.c b/net/wire/files/patch-wire-client.c deleted file mode 100644 index e076b510a556..000000000000 --- a/net/wire/files/patch-wire-client.c +++ /dev/null @@ -1,38 +0,0 @@ ---- 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) |