Date: Fri, 30 Jan 2026 08:36:45 +0000 From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0662d2c06471 - main - net/haproxy: fix config test for TCP DNS resolvers Message-ID: <697c6d9d.2682a.6b24d728@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=0662d2c06471c76d3604efffe341c331d6283fdc commit 0662d2c06471c76d3604efffe341c331d6283fdc Author: Dmitry Sivachenko <demon@FreeBSD.org> AuthorDate: 2026-01-30 08:33:28 +0000 Commit: Dmitry Sivachenko <demon@FreeBSD.org> CommitDate: 2026-01-30 08:36:41 +0000 net/haproxy: fix config test for TCP DNS resolvers PR: 292815 Submitted by: Frank Wall <freebsd@moov.de> --- net/haproxy/Makefile | 2 +- net/haproxy/files/patch-src_tools.c | 72 +++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 97ee8594c1f2..e09db895cdaf 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,6 +1,6 @@ PORTNAME= haproxy DISTVERSION= 3.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/3.2/src/ diff --git a/net/haproxy/files/patch-src_tools.c b/net/haproxy/files/patch-src_tools.c new file mode 100644 index 000000000000..a15d5840928a --- /dev/null +++ b/net/haproxy/files/patch-src_tools.c @@ -0,0 +1,72 @@ +--- src/tools.c.orig 2021-12-23 16:47:51 UTC ++++ src/tools.c +@@ -1015,12 +1015,14 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + } else { + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + + if (strncmp(str2, "stream+", 7) == 0) { + str2 += 7; + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "dgram+", 6) == 0) { + str2 += 6; +@@ -1032,6 +1034,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + str2 += 5; + proto_type = PROTO_TYPE_DGRAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + + if (strncmp(str2, "unix@", 5) == 0) { +@@ -1050,6 +1053,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + ss.ss_family = AF_UNIX; + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "abns@", 5) == 0) { + str2 += 5; +@@ -1076,6 +1080,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + ss.ss_family = AF_INET; + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "mptcp4@", 7) == 0) { + str2 += 7; +@@ -1096,6 +1101,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + ss.ss_family = AF_INET6; + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "mptcp6@", 7) == 0) { + str2 += 7; +@@ -1116,6 +1122,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + ss.ss_family = AF_UNSPEC; + proto_type = PROTO_TYPE_STREAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "mptcp@", 6) == 0) { + str2 += 6; +@@ -1136,12 +1143,14 @@ struct sockaddr_storage *str2sa_range(const char *str, int *port, int *low, int + ss.ss_family = AF_INET; + proto_type = PROTO_TYPE_DGRAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "quic6@", 6) == 0) { + str2 += 6; + ss.ss_family = AF_INET6; + proto_type = PROTO_TYPE_DGRAM; + ctrl_type = SOCK_STREAM; ++ alt_proto = 0; + } + else if (strncmp(str2, "fd@", 3) == 0) { + str2 += 3;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697c6d9d.2682a.6b24d728>