summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2015-08-06 18:41:49 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2015-08-06 18:41:49 +0000
commitbc0793319eacb472902d793ac7ac409c470d64d7 (patch)
tree59002f753cfd3dedf09ae1e6135ed04076f361e3
parentsysutils/b2sum: update 0.0.20150529 -> 0.0.20150531 (diff)
- Add a temp fix for zmq4 and ipv6
This patch is from https://github.com/freebsd/freebsd-ports/pull/31 which s based on https://github.com/zeromq/zeromq4-1/commit/81464652d2453c608bbbb52fd59e9e9f20857178 Submitted by: melvyn-sopacua (on github) Approved by: koobs (maintainer) MFH: 2015Q3
-rw-r--r--net/libzmq4/Makefile1
-rw-r--r--net/libzmq4/files/patch-ipv6-connect20
2 files changed, 21 insertions, 0 deletions
diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile
index ed7a64a9e0d2..3741ea86fce5 100644
--- a/net/libzmq4/Makefile
+++ b/net/libzmq4/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libzmq4
PORTVERSION= 4.1.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.zeromq.org/
DISTNAME= zeromq-${DISTVERSION}
diff --git a/net/libzmq4/files/patch-ipv6-connect b/net/libzmq4/files/patch-ipv6-connect
new file mode 100644
index 000000000000..482811f63335
--- /dev/null
+++ b/net/libzmq4/files/patch-ipv6-connect
@@ -0,0 +1,20 @@
+15f9ee19cb895f7fb7b6d09ec64d4b82717ee1aa
+diff --git src/socket_base.cpp src/socket_base.cpp
+index bddbaf2..79044b1 100644
+--- src/socket_base.cpp
++++ src/socket_base.cpp
+@@ -717,11 +717,12 @@ int zmq::socket_base_t::connect (const char *addr_)
+ // Following code is quick and dirty check to catch obvious errors,
+ // without trying to be fully accurate.
+ const char *check = address.c_str ();
+- if (isalnum (*check) || isxdigit (*check)) {
++ if (isalnum (*check) || isxdigit (*check) || *check == '[') {
+ check++;
+ while (isalnum (*check)
+ || isxdigit (*check)
+- || *check == '.' || *check == '-' || *check == ':'|| *check == ';')
++ || *check == '.' || *check == '-' || *check == ':'|| *check == ';'
++ || *check == ']')
+ check++;
+ }
+ // Assume the worst, now look for success