Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Oct 2015 11:59:56 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398270 - in head/net/haproxy-devel: . files
Message-ID:  <201510011159.t91BxuTt061024@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Thu Oct  1 11:59:55 2015
New Revision: 398270
URL: https://svnweb.freebsd.org/changeset/ports/398270

Log:
  Update to -dev6.

Added:
  head/net/haproxy-devel/files/patch-src-proto_tcp.c   (contents, props changed)
Deleted:
  head/net/haproxy-devel/files/patch-src-dns.c
Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy-devel/distinfo
  head/net/haproxy-devel/pkg-plist

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Thu Oct  1 11:55:23 2015	(r398269)
+++ head/net/haproxy-devel/Makefile	Thu Oct  1 11:59:55 2015	(r398270)
@@ -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

Modified: head/net/haproxy-devel/distinfo
==============================================================================
--- head/net/haproxy-devel/distinfo	Thu Oct  1 11:55:23 2015	(r398269)
+++ head/net/haproxy-devel/distinfo	Thu Oct  1 11:59:55 2015	(r398270)
@@ -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

Added: head/net/haproxy-devel/files/patch-src-proto_tcp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/haproxy-devel/files/patch-src-proto_tcp.c	Thu Oct  1 11:59:55 2015	(r398270)
@@ -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 */

Modified: head/net/haproxy-devel/pkg-plist
==============================================================================
--- head/net/haproxy-devel/pkg-plist	Thu Oct  1 11:55:23 2015	(r398269)
+++ head/net/haproxy-devel/pkg-plist	Thu Oct  1 11:59:55 2015	(r398270)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510011159.t91BxuTt061024>