freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to version 1.8.13.

Browse Source
This commit is contained in:
Dmitry Sivachenko
2018-08-16 13:19:52 +00:00
parent 7a971b83a3
commit b5d2af6b12
4 changed files with 6 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/haproxy/Makefile
View File

@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= haproxy
PORTVERSION= 1.7.11
DISTVERSION= 1.8.13
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/1.7/src/
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MASTER_SITES= http://www.haproxy.org/download/1.8/src/
MAINTAINER= demon@FreeBSD.org
COMMENT= Reliable, high performance TCP/HTTP load balancer
@@ -13,10 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4'
BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4'
CONFLICTS_INSTALL= haproxy-devel-[0-9]*
CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]*
USES= cpe gmake
USE_RC_SUBR= haproxy

6
net/haproxy/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1525108601
SHA256 (haproxy-1.7.11.tar.gz) = d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea
SIZE (haproxy-1.7.11.tar.gz) = 1752129
TIMESTAMP = 1532977852
SHA256 (haproxy-1.8.13.tar.gz) = 2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1
SIZE (haproxy-1.8.13.tar.gz) = 2063046

26
net/haproxy/files/patch-fix-cpuaffinity
View File

@@ -1,26 +0,0 @@
X-Git-Url: http://git.haproxy.org/?p=haproxy.git;a=blobdiff_plain;f=src%2Fhaproxy.c;h=30e850c4ac4719b71adccb3b6bd41248ef5bb470;hp=7af4ab479c761a43b2fa64d2124388dbf5c21fc3;hb=97148f60b8feec39b76768d1bcfab6d755c12164;hpb=0d00593361b91017b894c4c7d5e24721a7838d6e
diff --git a/src/haproxy.c b/src/haproxy.c
index 7af4ab4..30e850c 100644
--- src/haproxy.c
+++ src/haproxy.c
@@ -2018,7 +2018,18 @@ int main(int argc, char **argv)
proc < LONGBITS && /* only the first 32/64 processes may be pinned */
global.cpu_map[proc]) /* only do this if the process has a CPU map */
#ifdef __FreeBSD__
- cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
+ {
+ cpuset_t cpuset;
+ int i;
+ unsigned long cpu_map = global.cpu_map[proc];
+
+ CPU_ZERO(&cpuset);
+ while ((i = ffsl(cpu_map)) > 0) {
+ CPU_SET(i - 1, &cpuset);
+ cpu_map &= ~(1 << (i - 1));
+ }
+ ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset), &cpuset);
+ }
#else
sched_setaffinity(0, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
#endif

45
net/haproxy/files/patch-src_ssl__sock.c
View File

@@ -1,45 +0,0 @@
--- src/ssl_sock.c.orig 2017-07-07 09:49:34 UTC
+++ src/ssl_sock.c
@@ -794,8 +794,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
ocsp = NULL;
#ifndef SSL_CTX_get_tlsext_status_cb
+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128
+#endif
# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \
- *cb = (void (*) (void))ctx->tlsext_status_cb;
+ *cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb)
#endif
SSL_CTX_get_tlsext_status_cb(ctx, &callback);
@@ -823,7 +826,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
int key_type;
EVP_PKEY *pkey;
-#ifdef SSL_CTX_get_tlsext_status_arg
+#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER)
+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129
+#endif
SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg);
#else
cb_arg = ctx->tlsext_status_arg;
@@ -3539,7 +3545,7 @@ int ssl_sock_handshake(struct connection
OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);
empty_handshake = state == TLS_ST_BEFORE;
#else
- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
#endif
if (empty_handshake) {
@@ -3617,7 +3623,7 @@ int ssl_sock_handshake(struct connection
state = SSL_get_state((SSL *)conn->xprt_ctx);
empty_handshake = state == TLS_ST_BEFORE;
#else
- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
#endif
if (empty_handshake) {
if (!errno) {