diff options
Diffstat (limited to 'net/haproxy-devel')
| -rw-r--r-- | net/haproxy-devel/Makefile | 2 | ||||
| -rw-r--r-- | net/haproxy-devel/distinfo | 4 | ||||
| -rw-r--r-- | net/haproxy-devel/files/patch-src-dns.c | 11 | ||||
| -rw-r--r-- | net/haproxy-devel/files/patch-src-proto_tcp.c | 11 | ||||
| -rw-r--r-- | net/haproxy-devel/pkg-plist | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index f4e56801b716..ca0f0bb1efce 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.6-dev5 +DISTVERSION= 1.6-dev6 CATEGORIES= net www MASTER_SITES= http://haproxy.1wt.eu/download/1.6/src/devel/ PKGNAMESUFFIX= -devel diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo index 2627fcab97f7..c99ffdf93dbe 100644 --- a/net/haproxy-devel/distinfo +++ b/net/haproxy-devel/distinfo @@ -1,4 +1,4 @@ -SHA256 (haproxy-1.6-dev5.tar.gz) = 82dcbad28635809c77c81fb32d7f86f842342cd7fa8b4f3b722357c57d13d62a -SIZE (haproxy-1.6-dev5.tar.gz) = 1604480 +SHA256 (haproxy-1.6-dev6.tar.gz) = 5a322a0215461cdc71c8259eb1b7f44e1002482d93c91c6f3093c45287215e67 +SIZE (haproxy-1.6-dev6.tar.gz) = 1652340 SHA256 (deviceatlas-enterprise-c-2.1.zip) = a02fc29486d245b1c8d946c663b71ba981e88fee8d037f5bc1bf255deb287974 SIZE (deviceatlas-enterprise-c-2.1.zip) = 504286 diff --git a/net/haproxy-devel/files/patch-src-dns.c b/net/haproxy-devel/files/patch-src-dns.c deleted file mode 100644 index f06fc22173a0..000000000000 --- a/net/haproxy-devel/files/patch-src-dns.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dns.c.orig 2015-09-14 15:41:48.002439000 +0300 -+++ src/dns.c 2015-09-14 15:43:01.499844000 +0300 -@@ -848,7 +848,7 @@ int dns_init_resolvers(void) - } - - /* "connect" the UDP socket to the name server IP */ -- if (connect(fd, (struct sockaddr*)&curnameserver->addr, sizeof(curnameserver->addr)) == -1) { -+ if (connect(fd, (struct sockaddr*)&curnameserver->addr, get_addr_len(&curnameserver->addr)) == -1) { - Alert("Starting [%s/%s] nameserver: can't connect socket.\n", curr_resolvers->id, - curnameserver->id); - close(fd); diff --git a/net/haproxy-devel/files/patch-src-proto_tcp.c b/net/haproxy-devel/files/patch-src-proto_tcp.c new file mode 100644 index 000000000000..c02093a446e8 --- /dev/null +++ b/net/haproxy-devel/files/patch-src-proto_tcp.c @@ -0,0 +1,11 @@ +--- src/proto_tcp.c.orig 2015-10-01 14:53:25.738017000 +0300 ++++ src/proto_tcp.c 2015-10-01 14:54:08.222037000 +0300 +@@ -1456,7 +1456,7 @@ static enum act_return tcp_exec_action_s + * network and has no effect on local net. + */ + #ifdef IP_TTL +- setsockopt(conn->t.sock.fd, SOL_IP, IP_TTL, &one, sizeof(one)); ++ setsockopt(conn->t.sock.fd, IPPROTO_IP, IP_TTL, &one, sizeof(one)); + #endif + out: + /* kill the stream if any */ diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist index 13343a38769a..4b72eec577b4 100644 --- a/net/haproxy-devel/pkg-plist +++ b/net/haproxy-devel/pkg-plist @@ -48,6 +48,7 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt %%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt %%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/list.fig %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt @@ -88,6 +89,7 @@ sbin/haproxy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-2.4.21-40.EL-custom.diff %%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.highsock +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/seamless_reload.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tarpit.cfg |