Attachment #221810 for bug #252479

Lines 1-8 Link Here

(-)b/net/nuster/Makefile (-2 / +7 lines)
1	# Created by: Felix Hanley	1	# Created by: Felix Hanley <felix@userspace.com.au>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nuster	4	PORTNAME= nuster
5	PORTVERSION= 5.0.4.21	5	PORTVERSION= 5.3.0.23
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net www	7	CATEGORIES= net www
8		8
Lines 51-56 PORTEXAMPLES= * Link Here
51		51
52	.include <bsd.port.pre.mk>	52	.include <bsd.port.pre.mk>
53		53
		54	.if ${ARCH} == "i386"
		55	MAKE_ARGS+= ARCH=i586
		56	USE_GCC= 9+
		57	.endif
		58
54	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	59	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"
55	MAKE_ARGS+= USE_REGPARM=1	60	MAKE_ARGS+= USE_REGPARM=1
56	.endif	61	.endif

Lines 1-3 Link Here

(-)b/net/nuster/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587540722	1	TIMESTAMP = 1609969571
2	SHA256 (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 0aa3b5cadf077e6d74a7eff0a673238b698e462e330978f300d5541d4bfd688b	2	SHA256 (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 44542397b75073e9092e54e23dfa2755029b3c01817ef69a699d37a9453e4094
3	SIZE (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 2784325	3	SIZE (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 3017428

Removed Link Here

(-)a/net/nuster/files/patch-include-common-hathreads.h (-11 lines)
1	--- include/common/hathreads.h.orig 2018-08-15 11:14:35 UTC
2	+++ include/common/hathreads.h
3	@@ -113,7 +113,7 @@ extern THREAD_LOCAL unsigned long tid_bi
4	/* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
5	* have a header file regrouping all functions dealing with threads. */
6
7	-#if defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
8	+#if (defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) \|\| (defined(__clang__) && defined(__i386__))
9	/* gcc < 4.7 */
10
11	#define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i)

Lines 2-8 Link Here

(-)b/net/nuster/Makefile (-16 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nuster	4	PORTNAME= nuster
5	PORTVERSION= 5.0.4.21	5	PORTVERSION= 5.3.0.23
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net www	7	CATEGORIES= net www
8		8
Lines 12-21 COMMENT= Web caching proxy server based on haproxy Link Here
12	LICENSE= GPLv2 LGPL21	12	LICENSE= GPLv2 LGPL21
13	LICENSE_COMB= multi	13	LICENSE_COMB= multi
14		14
		15	GH_ACCOUNT= jiangwenyuan
15	USES= compiler:c++11-lang cpe gmake	16	USES= compiler:c++11-lang cpe gmake
16	USE_RC_SUBR= nuster
17	USE_GITHUB= yes	17	USE_GITHUB= yes
18	GH_ACCOUNT= jiangwenyuan	18	USE_RC_SUBR= nuster
19		19
20	MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \	20	MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
21	USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \	21	USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \
Lines 24-53 MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ Link Here
24	PLIST_FILES= sbin/nuster \	24	PLIST_FILES= sbin/nuster \
25	sbin/nusterlog \	25	sbin/nusterlog \
26	man/man1/nuster.1.gz	26	man/man1/nuster.1.gz
		27	PORTDOCS= *
		28	PORTEXAMPLES= *
27		29
		30	OPTIONS_DEFAULT= SPCRE OPENSSL
28	OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX	31	OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX
29	OPTIONS_RADIO= PCRE	32	OPTIONS_RADIO= PCRE
30	OPTIONS_RADIO_PCRE= DPCRE SPCRE	33	OPTIONS_RADIO_PCRE= DPCRE SPCRE
31	DPCRE_DESC= Link dynamically
32	SPCRE_DESC= Link statically
33	DEVICEATLAS_DESC= DeviceAtlas Device Detection support	34	DEVICEATLAS_DESC= DeviceAtlas Device Detection support
		35	DPCRE_DESC= Link dynamically
34	PROMEX_DESC= Enable Prometheus exporter	36	PROMEX_DESC= Enable Prometheus exporter
35	OPTIONS_DEFAULT= SPCRE OPENSSL	37	SPCRE_DESC= Link statically
36		38
		39	DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c
		40	DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
37	DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre	41	DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
38	DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1	42	DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1
		43	LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
		44	LUA_USES= lua:53
		45	OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
		46	OPENSSL_USES= ssl
		47	PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
39	SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre	48	SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
40	SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1	49	SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
41	DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c
42	DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
43	PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
44	OPENSSL_USES= ssl
45	OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
46	LUA_USES= lua:53
47	LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
48
49	PORTDOCS= *
50	PORTEXAMPLES= *
51		50
52	.include <bsd.port.pre.mk>	51	.include <bsd.port.pre.mk>
53		52

Lines 1-3 Link Here

(-)b/net/nuster/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587540722	1	TIMESTAMP = 1611314081
2	SHA256 (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 0aa3b5cadf077e6d74a7eff0a673238b698e462e330978f300d5541d4bfd688b	2	SHA256 (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 44542397b75073e9092e54e23dfa2755029b3c01817ef69a699d37a9453e4094
3	SIZE (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 2784325	3	SIZE (jiangwenyuan-nuster-v5.3.0.23_GH0.tar.gz) = 3017428

Removed Link Here

(-)a/net/nuster/files/patch-include-common-hathreads.h (-11 lines)
1	--- include/common/hathreads.h.orig 2018-08-15 11:14:35 UTC
2	+++ include/common/hathreads.h
3	@@ -113,7 +113,7 @@ extern THREAD_LOCAL unsigned long tid_bi
4	/* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
5	* have a header file regrouping all functions dealing with threads. */
6
7	-#if defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
8	+#if (defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) \|\| (defined(__clang__) && defined(__i386__))
9	/* gcc < 4.7 */
10
11	#define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i)

Return to bug 252479