summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2015-10-06 14:09:18 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2015-10-06 14:09:18 +0000
commit51e3e1e1d68d60dd8e24664a73e3b6952b9a3120 (patch)
treed6cb09e67127e59da9c580f14dfe16c8a7af4868
parentUpgrade from version 1.4.7 to 1.4.8.2 (diff)
Update to -dev7
Notes
Notes: svn path=/head/; revision=398699
-rw-r--r--net/haproxy-devel/Makefile2
-rw-r--r--net/haproxy-devel/distinfo4
-rw-r--r--net/haproxy-devel/files/patch-src-proto_tcp.c11
3 files changed, 3 insertions, 14 deletions
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index ca0f0bb1efce..bfe293d7d994 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haproxy
-DISTVERSION= 1.6-dev6
+DISTVERSION= 1.6-dev7
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 c99ffdf93dbe..0ee4d61efabe 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (haproxy-1.6-dev6.tar.gz) = 5a322a0215461cdc71c8259eb1b7f44e1002482d93c91c6f3093c45287215e67
-SIZE (haproxy-1.6-dev6.tar.gz) = 1652340
+SHA256 (haproxy-1.6-dev7.tar.gz) = 1d2a86f035e5bcda9d20c98084329c68a36f72d4095b93198e4acafd048c1372
+SIZE (haproxy-1.6-dev7.tar.gz) = 1653547
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-proto_tcp.c b/net/haproxy-devel/files/patch-src-proto_tcp.c
deleted file mode 100644
index c02093a446e8..000000000000
--- a/net/haproxy-devel/files/patch-src-proto_tcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 */