Hi,
Here's the diff to update haproxy to the 1.8 branch.
Most of the libressl stuff has been done by jsing (thanks!) but he did
the update to 1.8.13 and 13->14 needed some more fiddling. I did them
on my own so I guess a review wouldn't hurt.
The 1.8 branch brings HTTP/2 and TLS1.3 but maybe the latter won't work
because of the libressl vs openssl. I don't know.
I'm dogfooding it and so far it's been good.
I'll be kind and save some users some trouble: don't try to backport
this diff to 6.4, it won't work.
Tests? Comments? OK?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 26 May 2018 16:40:04 -0000 1.49
+++ Makefile 26 Nov 2018 23:15:06 -0000
@@ -2,7 +2,7 @@
COMMENT = reliable, high performance TCP/HTTP load balancer
-DISTNAME = haproxy-1.7.11
+DISTNAME = haproxy-1.8.14
CATEGORIES = net www
HOMEPAGE = http://www.haproxy.org/
MAINTAINER = Daniel Jakots <obsd@chown.me>
@@ -10,9 +10,9 @@ MAINTAINER = Daniel Jakots <obsd@chown.m
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c crypto pcre pcreposix ssl
+WANTLIB += c crypto pcre pcreposix pthread ssl
-MASTER_SITES = ${HOMEPAGE}/download/1.7/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.8/src/
HAPROXYCONF = ${SYSCONFDIR}/haproxy
HAPROXYSTATE = /var/haproxy
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo 26 May 2018 16:40:04 -0000 1.29
+++ distinfo 26 Nov 2018 23:15:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.7.11.tar.gz) = 1WS46UKdHo4Ty2SL9GlJJrRy422hB535RrtzKSeyMuo=
-SIZE (haproxy-1.7.11.tar.gz) = 1752129
+SHA256 (haproxy-1.8.14.tar.gz) = sX5AJXi+heWK96PqyZsfZ1lTvqn2evLpZM+L29G9P98=
+SIZE (haproxy-1.8.14.tar.gz) = 2070813
Index: patches/patch-doc_haproxy_1
===================================================================
RCS file: /cvs/ports/net/haproxy/patches/patch-doc_haproxy_1,v
retrieving revision 1.4
diff -u -p -r1.4 patch-doc_haproxy_1
--- patches/patch-doc_haproxy_1 12 Aug 2017 14:20:11 -0000 1.4
+++ patches/patch-doc_haproxy_1 26 Nov 2018 23:15:06 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-doc_haproxy_1,v 1.4 2017
Index: doc/haproxy.1
--- doc/haproxy.1.orig
+++ doc/haproxy.1
-@@ -190,8 +190,7 @@ This signal is intercepted and ignored on systems with
+@@ -196,8 +196,7 @@ This signal is intercepted and ignored on systems with
.SH SEE ALSO
Index: patches/patch-include_proto_openssl-compat_h
===================================================================
RCS file: /cvs/ports/net/haproxy/patches/patch-include_proto_openssl-compat_h,v
retrieving revision 1.6
diff -u -p -r1.6 patch-include_proto_openssl-compat_h
--- patches/patch-include_proto_openssl-compat_h 20 Mar 2018 21:57:55 -0000 1.6
+++ patches/patch-include_proto_openssl-compat_h 26 Nov 2018 23:15:06 -0000
@@ -3,13 +3,26 @@ $OpenBSD: patch-include_proto_openssl-co
Index: include/proto/openssl-compat.h
--- include/proto/openssl-compat.h.orig
+++ include/proto/openssl-compat.h
-@@ -89,7 +89,8 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS
+@@ -89,7 +89,7 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS
}
No comments:
Post a Comment