Attachment 224351 Details for Bug 252479 – Update patch

[patch] Update patch

nuster.diff (text/plain), 3.95 KB, created by Felix Hanley on 2021-04-22 06:40:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Hanley

Created: 2021-04-22 06:40:22 UTC

Size: 3.95 KB

patch

obsolete

>diff --git a/net/nuster/Makefile b/net/nuster/Makefile
>index 04fa9507b9df..7aff957e0d26 100644
>--- a/net/nuster/Makefile
>+++ b/net/nuster/Makefile
>@@ -1,20 +1,21 @@
> # Created by: Felix Hanley
>+# $FreeBSD$
> 
> PORTNAME=	nuster
>-PORTVERSION=	5.0.4.21
>+PORTVERSION=	5.3.0.23
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net www
> 
>-MAINTAINER=	felix@userspace.com.au
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Web caching proxy server based on haproxy
> 
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
> USES=		compiler:c++11-lang cpe gmake
>-USE_RC_SUBR=	nuster
> USE_GITHUB=	yes
> GH_ACCOUNT=	jiangwenyuan
>+USE_RC_SUBR=	nuster
> 
> MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
> 		USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \
>@@ -23,30 +24,29 @@ MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
> PLIST_FILES=	sbin/nuster \
> 		sbin/nusterlog \
> 		man/man1/nuster.1.gz
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
> 
>+OPTIONS_DEFAULT=	SPCRE OPENSSL
> OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX
> OPTIONS_RADIO=		PCRE
> OPTIONS_RADIO_PCRE=	DPCRE SPCRE
>-DPCRE_DESC=		Link dynamically
>-SPCRE_DESC=		Link statically
> DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
>+DPCRE_DESC=		Link dynamically
> PROMEX_DESC=		Enable Prometheus exporter
>-OPTIONS_DEFAULT=	SPCRE OPENSSL
>+SPCRE_DESC=		Link statically
> 
>+DEVICEATLAS_LIB_DEPENDS=	libda.so:net/deviceatlas-enterprise-c
>+DEVICEATLAS_MAKE_ARGS=		USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
>+LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
>+LUA_USES=		lua:53
>+OPENSSL_MAKE_ARGS=	USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
>+OPENSSL_USES=		ssl
>+PROMEX_MAKE_ARGS=	EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> SPCRE_MAKE_ARGS=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
>-DEVICEATLAS_LIB_DEPENDS=	libda.so:net/deviceatlas-enterprise-c
>-DEVICEATLAS_MAKE_ARGS=		USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
>-PROMEX_MAKE_ARGS=	EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
>-OPENSSL_USES=		ssl
>-OPENSSL_MAKE_ARGS=	USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
>-LUA_USES=		lua:53
>-LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
>-
>-PORTDOCS=	*
>-PORTEXAMPLES=	*
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/net/nuster/distinfo b/net/nuster/distinfo
>index f1d034e9fc68..79037b32e65d 100644
>--- a/net/nuster/distinfo
>+++ b/net/nuster/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1587540722
>-SHA256 (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 0aa3b5cadf077e6d74a7eff0a673238b698e462e330978f300d5541d4bfd688b
>-SIZE (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 2784325
>+TIMESTAMP = 1619072718
>+SHA256 (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 44542397b75073e9092e54e23dfa2755029b3c01817ef69a699d37a9453e4094
>+SIZE (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 3017428
>diff --git a/net/nuster/files/patch-include-common-hathreads.h b/net/nuster/files/patch-include-haproxy-atomic.h
>similarity index 70%
>rename from net/nuster/files/patch-include-common-hathreads.h
>rename to net/nuster/files/patch-include-haproxy-atomic.h
>index 7c8dc57522b2..d8b7c8ea15cb 100644
>--- a/net/nuster/files/patch-include-common-hathreads.h
>+++ b/net/nuster/files/patch-include-haproxy-atomic.h
>@@ -1,6 +1,6 @@
>---- include/common/hathreads.h.orig	2018-08-15 11:14:35 UTC
>-+++ include/common/hathreads.h
>-@@ -113,7 +113,7 @@ extern THREAD_LOCAL unsigned long tid_bi
>+--- include/haproxy/atomic.h.orig	2018-02-17 18:17:22.219400000 +0000
>++++ include/haproxy/atomic.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. */
>

Flags:

felix: maintainer-approval+

Actions: View | Diff

Attachments on bug 252479: 221338 | 221810 | 224351