Attachment 193610 Details for Bug 228424 – nuster-1.8.8.1 patch

[patch] nuster-1.8.8.1 patch

nuster-1.8.8.1.diff (text/plain), 5.97 KB, created by Felix Hanley on 2018-05-22 14:38:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Hanley

Created: 2018-05-22 14:38:47 UTC

Size: 5.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 470618)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nuster
>-PORTVERSION=	1.7.10.1
>+PORTVERSION=	1.8.8.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net www
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 470618)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1522091814
>-SHA256 (jiangwenyuan-nuster-v1.7.10.1_GH0.tar.gz) = 0cf75205ef39db10700abc4307cab5fa410d612c8b096d14adb99cd8775b22d1
>-SIZE (jiangwenyuan-nuster-v1.7.10.1_GH0.tar.gz) = 1795433
>+SHA256 (jiangwenyuan-nuster-v1.8.8.1_GH0.tar.gz) = 984dfcfbc9c6f9c45ce666ccc38a96f5794925862aba83558c3f0945d1a6ebb4
>+SIZE (jiangwenyuan-nuster-v1.8.8.1_GH0.tar.gz) = 2101541
>Index: files/patch-include-common-hathreads.h
>===================================================================
>--- files/patch-include-common-hathreads.h	(nonexistent)
>+++ files/patch-include-common-hathreads.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/common/hathreads.h.orig	2018-02-17 18:17:22.219400000 +0000
>++++ include/common/hathreads.h	2018-02-17 18:18:44.598422000 +0000
>+@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit 
>+ /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
>+  * have a header file regrouping all functions dealing with threads. */
>+ 
>+-#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
>++#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__))
>+ /* gcc < 4.7 */
>+ 
>+ #define HA_ATOMIC_ADD(val, i)        __sync_add_and_fetch(val, i)
>
>Property changes on: files/patch-include-common-hathreads.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_haproxy.c
>===================================================================
>--- files/patch-src_haproxy.c	(revision 470618)
>+++ files/patch-src_haproxy.c	(nonexistent)
>@@ -1,24 +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
>-
>---- src/haproxy.c.orig	2018-02-05 02:24:58 UTC
>-+++ src/haproxy.c
>-@@ -2031,7 +2031,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
>
>Property changes on: files/patch-src_haproxy.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_ssl__sock.c
>===================================================================
>--- files/patch-src_ssl__sock.c	(revision 470618)
>+++ files/patch-src_ssl__sock.c	(nonexistent)
>@@ -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) {
>
>Property changes on: files/patch-src_ssl__sock.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 228424: 193610