Attachment #204774 for bug #238127




# Created by: Martin Matuska <mm@FreeBSD.org>
# $FreeBSD$

PORTNAME=	libevent
PORTVERSION=	2.1.8
PORTREVISION=	3
DISTVERSIONPREFIX=	release-
DISTVERSION=	2.1.10
DISTVERSIONSUFFIX=	-stable
CATEGORIES=	devel
MASTER_SITES=	https://github.com/libevent/libevent/releases/download/release-2.1.10-stable/

MAINTAINER=	mm@FreeBSD.org
COMMENT=	API for executing callback functions on events or timeouts

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cmake
SHEBANG_FILES=	event_rpcgen.py
USE_GITHUB=	yes
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
TEST_TARGET=	check
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	DEBUG OPENSSL TEST THREADS
### Just added for make test, not sure if its needed or not but it seems so...
OPTIONS_DEFAULT=	OPENSSL THREADS
OPTIONS_SUB=	yes

CMAKE_ARGS=	-DEVENT__LIBRARY_TYPE:STRING=BOTH
CMAKE_ON=	EVENT__DISABLE_BENCHMARK EVENT__DISABLE_SAMPLES
OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
OPENSSL_CONFIGURE_ENABLE=	openssl

DEBUG_CMAKE_BOOL_OFF=	EVENT__DISABLE_DEBUG_MODE
OPENSSL_USES=	ssl
OPENSSL_CMAKE_BOOL_OFF=	EVENT__DISABLE_OPENSSL
TEST_USES=	python
TEST_CMAKE_BOOL_OFF=	EVENT__DISABLE_TESTS EVENT__DISABLE_REGRESS
TEST_CMAKE_OFF=	-DBUILD_TESTING:BOOL=false
TEST_CMAKE_ON=	-DBUILD_TESTING:BOOL=true
THREADS_CMAKE_BOOL_OFF=	EVENT__DISABLE_THREAD_SUPPORT

TEST_TARGET=	test

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/libevent/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485387435	1	TIMESTAMP = 1559365825
2	SHA256 (libevent-libevent-release-2.1.8-stable_GH0.tar.gz) = 316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d	2	SHA256 (libevent-libevent-release-2.1.10-stable_GH0.tar.gz) = 52c9db0bc5b148f146192aa517db0762b2a5b3060ccc63b2c470982ec72b9a79
3	SIZE (libevent-libevent-release-2.1.8-stable_GH0.tar.gz) = 700896	3	SIZE (libevent-libevent-release-2.1.10-stable_GH0.tar.gz) = 718638




--- evutil_rand.c.orig	2017-01-25 23:37:15 UTC
+++ evutil_rand.c
@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
 void
 evutil_secure_rng_add_bytes(const char *buf, size_t n)
 {
+#ifdef arc4random_addrandom
 	arc4random_addrandom((unsigned char*)buf,
 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
+#endif
 }
 
 void




Fix -Werror=implicit-fallthrough (fixes gcc-7)

https://github.com/libevent/libevent/commit/94e7dcebc320
https://github.com/libevent/libevent/commit/ffbce578c40a

--- bufferevent_filter.c.orig	2017-01-25 23:37:15 UTC
+++ bufferevent_filter.c
@@ -612,9 +612,12 @@ be_filter_ctrl(struct bufferevent *bev, 
 			bevf->underlying->be_ops->ctrl) {
 		    return (bevf->underlying->be_ops->ctrl)(bevf->underlying, op, data);
 		}
+		EVUTIL_FALLTHROUGH;
 
 	case BEV_CTRL_GET_FD:
+		EVUTIL_FALLTHROUGH;
 	case BEV_CTRL_CANCEL_ALL:
+		EVUTIL_FALLTHROUGH;
 	default:
 		return -1;
 	}
--- evdns.c.orig	2017-01-25 23:37:15 UTC
+++ evdns.c
@@ -2265,10 +2265,11 @@ evdns_request_transmit(struct request *r
 		nameserver_write_waiting(req->ns, 1);
 		return 1;
 	case 2:
-		/* failed to transmit the request entirely. */
+		/* failed to transmit the request entirely. we can fallthrough since
+		 * we'll set a timeout, which will time out, and make us retransmit the
+		 * request anyway. */
 		retcode = 1;
-		/* fall through: we'll set a timeout, which will time out,
-		 * and make us retransmit the request anyway. */
+		EVUTIL_FALLTHROUGH;
 	default:
 		/* all ok */
 		log(EVDNS_LOG_DEBUG,
--- event.c.orig	2017-01-25 23:37:15 UTC
+++ event.c
@@ -2960,6 +2960,7 @@ event_callback_activate_nolock_(struct e
 	switch (evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)) {
 	default:
 		EVUTIL_ASSERT(0);
+		EVUTIL_FALLTHROUGH;
 	case EVLIST_ACTIVE_LATER:
 		event_queue_remove_active_later(base, evcb);
 		r = 0;
--- util-internal.h.orig	2017-01-25 23:37:15 UTC
+++ util-internal.h
@@ -50,6 +50,20 @@
 extern "C" {
 #endif
 
+/* __has_attribute() wrapper */
+#ifdef __has_attribute
+#define EVUTIL_HAS_ATTRIBUTE __has_attribute
+#endif
+/** clang 3 __has_attribute misbehaves in some versions */
+#if defined(__clang__) && \
+	__clang__ == 1 && __clang_major__ == 3 && \
+	(__clang_minor__ >= 2 && __clang_minor__ <= 5)
+#undef EVUTIL_HAS_ATTRIBUTE
+#endif
+#ifndef EVUTIL_HAS_ATTRIBUTE
+#define EVUTIL_HAS_ATTRIBUTE(x) 0
+#endif
+
 /* If we need magic to say "inline", get it for free internally. */
 #ifdef EVENT__inline
 #define inline EVENT__inline
@@ -308,6 +322,12 @@ ev_int32_t evutil_weakrand_range_(struct
 #define EVUTIL_UNLIKELY(p) (p)
 #endif
 
+#if EVUTIL_HAS_ATTRIBUTE(fallthrough)
+#define EVUTIL_FALLTHROUGH __attribute__((fallthrough))
+#else
+#define EVUTIL_FALLTHROUGH /* fallthrough */
+#endif
+
 /* Replacement for assert() that calls event_errx on failure. */
 #ifdef NDEBUG
 #define EVUTIL_ASSERT(cond) EVUTIL_NIL_CONDITION_(cond)




From 28b8075400c70b2d2da2ce07e590c2ec6d11783d Mon Sep 17 00:00:00 2001
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Mon, 2 Apr 2018 13:18:27 +0200
Subject: [PATCH] Fix build with LibreSSL 2.7

LibreSSL 2.7 implements OpenSSL 1.1 API except for BIO_get_init()

See also: https://bugs.freebsd.org/226900
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
Closes: #617 (cherry-pick)
--- openssl-compat.h.orig	2017-01-25 23:37:15 UTC
+++ openssl-compat.h
@@ -1,7 +1,8 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 
 static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
 {
@@ -30,6 +31,11 @@ static inline BIO_METHOD *BIO_meth_new(i
 
 #define TLS_method SSLv23_method
 
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
+
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+#define BIO_get_init(b) (b)->init
+#endif
 
 #endif /* OPENSSL_COMPAT_H */
--- sample/https-client.c.orig	2017-01-25 23:37:15 UTC
+++ sample/https-client.c
@@ -312,7 +312,8 @@ main(int argc, char **argv)
 	}
 	uri[sizeof(uri) - 1] = '\0';
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)	
 	// Initialize OpenSSL
 	SSL_library_init();
 	ERR_load_crypto_strings();
@@ -480,7 +481,8 @@ cleanup:
 		SSL_CTX_free(ssl_ctx);
 	if (type == HTTP && ssl)
 		SSL_free(ssl);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 	EVP_cleanup();
 	ERR_free_strings();
 
@@ -492,7 +494,8 @@ cleanup:
 	CRYPTO_cleanup_all_ex_data();
 
 	sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
 
 #ifdef _WIN32
 	WSACleanup();
--- sample/le-proxy.c.orig	2017-01-25 23:37:15 UTC
+++ sample/le-proxy.c
@@ -259,7 +259,8 @@ main(int argc, char **argv)
 
 	if (use_ssl) {
 		int r;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 		SSL_library_init();
 		ERR_load_crypto_strings();
 		SSL_load_error_strings();
--- sample/openssl_hostname_validation.c.orig	2017-01-25 23:37:15 UTC
+++ sample/openssl_hostname_validation.c
@@ -48,7 +48,8 @@ SOFTWARE.
 
 #define HOSTNAME_MAX_SIZE 255
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 #define ASN1_STRING_get0_data ASN1_STRING_data
 #endif
 
--- test/regress_ssl.c.orig	2017-01-25 23:37:15 UTC
+++ test/regress_ssl.c
@@ -186,7 +186,8 @@ get_ssl_ctx(void)
 void
 init_ssl(void)
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 	SSL_library_init();
 	ERR_load_crypto_strings();
 	SSL_load_error_strings();




Fix feature conditionals in bench tests.

https://github.com/libevent/libevent/commit/d9118c8daa0e
https://github.com/libevent/libevent/commit/77ec05e50dfe

--- configure.ac.orig	2017-01-25 23:37:15 UTC
+++ configure.ac
@@ -715,8 +715,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_add
 #endif
 ])
 
-AC_CHECK_TYPES([struct so_linger],
-[#define HAVE_SO_LINGER], ,
+AC_CHECK_TYPES([struct linger],,,
 [
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
--- test/bench.c.orig	2017-01-25 23:37:15 UTC
+++ test/bench.c
@@ -136,7 +136,7 @@ run_once(void)
 int
 main(int argc, char **argv)
 {
-#ifdef HAVE_SETRLIMIT 
+#ifdef EVENT__HAVE_SETRLIMIT
 	struct rlimit rl;
 #endif
 	int i, c;
@@ -167,7 +167,7 @@ main(int argc, char **argv)
 		}
 	}
 
-#ifdef HAVE_SETRLIMIT
+#ifdef EVENT__HAVE_SETRLIMIT
 	rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50;
 	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
 		perror("setrlimit");
--- test/bench_cascade.c.orig	2017-01-25 23:37:15 UTC
+++ test/bench_cascade.c
@@ -139,7 +139,7 @@ run_once(int num_pipes)
 int
 main(int argc, char **argv)
 {
-#ifdef HAVE_SETRLIMIT
+#ifdef EVENT__HAVE_SETRLIMIT
 	struct rlimit rl;
 #endif
 	int i, c;
@@ -162,7 +162,7 @@ main(int argc, char **argv)
 		}
 	}
 
-#ifdef HAVE_SETRLIMIT 
+#ifdef EVENT__HAVE_SETRLIMIT
 	rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50;
 	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
 		perror("setrlimit");
--- test/bench_httpclient.c.orig	2017-01-25 23:37:15 UTC
+++ test/bench_httpclient.c
@@ -113,13 +113,13 @@ errorcb(struct bufferevent *b, short wha
 static void
 frob_socket(evutil_socket_t sock)
 {
-#ifdef HAVE_SO_LINGER
+#ifdef EVENT__HAVE_STRUCT_LINGER
 	struct linger l;
 #endif
 	int one = 1;
 	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one))<0)
 		perror("setsockopt(SO_REUSEADDR)");
-#ifdef HAVE_SO_LINGER
+#ifdef EVENT__HAVE_STRUCT_LINGER
 	l.l_onoff = 1;
 	l.l_linger = 0;
 	if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&l, sizeof(l))<0)




regress runs multiple tests, don't silence it completely.

https://github.com/libevent/libevent/pull/446

--- test/test.sh.orig	2017-01-25 23:37:15 UTC
+++ test/test.sh
@@ -99,10 +99,10 @@ run_tests () {
 	fi
 
 	test -x $TEST_DIR/regress || return
-	announce_n " regress: "
+	announce " regress: [multiple tests]"
 	if test "$TEST_OUTPUT_FILE" = "/dev/null" ;
 	then
-		$TEST_DIR/regress --quiet $REGRESS_ARGS
+		$TEST_DIR/regress $REGRESS_ARGS
 	else
 		$TEST_DIR/regress $REGRESS_ARGS >>"$TEST_OUTPUT_FILE"
 	fi
@@ -114,10 +114,10 @@ run_tests () {
 		FAILED=yes
 	fi
 
-	announce_n " regress_debug: "
+	announce " regress_debug: [multiple tests]"
 	if test "$TEST_OUTPUT_FILE" = "/dev/null" ;
 	then
-		EVENT_DEBUG_MODE=1 $TEST_DIR/regress --quiet $REGRESS_ARGS
+		EVENT_DEBUG_MODE=1 $TEST_DIR/regress $REGRESS_ARGS
 	else
 		EVENT_DEBUG_MODE=1 $TEST_DIR/regress $REGRESS_ARGS >>"$TEST_OUTPUT_FILE"
 	fi




bin/event_rpcgen.py
include/evdns.h
include/event.h
include/event2/buffer.h
include/event2/buffer_compat.h
include/event2/bufferevent.h
include/event2/bufferevent_compat.h
%%OPENSSL%%include/event2/bufferevent_ssl.h
include/event2/bufferevent_struct.h
include/event2/dns.h
include/event2/dns_compat.h
include/event2/dns_struct.h
include/event2/event-config.h
include/event2/event.h
include/event2/event_compat.h
include/event2/event_struct.h
include/event2/http.h
include/event2/http_compat.h
include/event2/http_struct.h
include/event2/keyvalq_struct.h
include/event2/listener.h
include/event2/rpc.h
include/event2/rpc_compat.h
include/event2/rpc_struct.h
include/event2/tag.h
include/event2/tag_compat.h
include/event2/thread.h
include/event2/util.h
include/event2/visibility.h
include/evhttp.h
include/evrpc.h
include/evutil.h
lib/cmake/libevent/LibeventConfig.cmake
lib/cmake/libevent/LibeventConfigVersion.cmake
lib/cmake/libevent/LibeventTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libevent/LibeventTargets.cmake
lib/libevent.a
lib/libevent.so
lib/libevent.so.2.1.10
lib/libevent_core-2.1.so.6.0.2
lib/libevent_core.a
lib/libevent_core.so
lib/libevent_core.so.2.1.10
lib/libevent_extra-2.1.so.6.0.2
lib/libevent_extra.a
lib/libevent_extra.so
lib/libevent_extra.so.2.1.10
%%OPENSSL%%lib/libevent_openssl-2.1.so.6.0.2
%%OPENSSL%%lib/libevent_openssl.a
%%OPENSSL%%lib/libevent_openssl.so
%%OPENSSL%%lib/libevent_openssl.so.2.1.10
%%THREADS%%lib/libevent_pthreads-2.1.so.6.0.2
%%THREADS%%lib/libevent_pthreads.a
%%THREADS%%lib/libevent_pthreads.so
%%THREADS%%lib/libevent_pthreads.so.2.1.10
libdata/pkgconfig/libevent.pc
libdata/pkgconfig/libevent_core.pc
libdata/pkgconfig/libevent_extra.pc
%%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc

Return to bug 238127

Lines 1-36 Link Here

(-)b/devel/libevent/Makefile (-13 / +17 lines)
1	# Created by: Martin Matuska <mm@FreeBSD.org>	1	# Created by: Martin Matuska <mm@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libevent	4	PORTNAME= libevent
5	PORTVERSION= 2.1.8
6	PORTREVISION= 3
7	DISTVERSIONPREFIX= release-	5	DISTVERSIONPREFIX= release-
		6	DISTVERSION= 2.1.10
8	DISTVERSIONSUFFIX= -stable	7	DISTVERSIONSUFFIX= -stable
9	CATEGORIES= devel	8	CATEGORIES= devel
		9	MASTER_SITES= https://github.com/libevent/libevent/releases/download/release-2.1.10-stable/
10		10
11	MAINTAINER= mm@FreeBSD.org	11	MAINTAINER= mm@FreeBSD.org
12	COMMENT= API for executing callback functions on events or timeouts	12	COMMENT= API for executing callback functions on events or timeouts
13		13
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
16		16
17	USES= autoreconf libtool pathfix pkgconfig python:2.7,env shebangfix	17	USES= cmake
18	SHEBANG_FILES= event_rpcgen.py
19	USE_GITHUB= yes	18	USE_GITHUB= yes
20	GNU_CONFIGURE= yes
21	INSTALL_TARGET= install-strip
22	TEST_TARGET= check
23	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
24		20
25	OPTIONS_DEFINE= OPENSSL THREADS	21	OPTIONS_DEFINE= DEBUG OPENSSL TEST THREADS
		22	### Just added for make test, not sure if its needed or not but it seems so...
26	OPTIONS_DEFAULT= OPENSSL THREADS	23	OPTIONS_DEFAULT= OPENSSL THREADS
27	OPTIONS_SUB= yes	24	OPTIONS_SUB= yes
28		25
29	OPENSSL_USES= ssl	26	CMAKE_ARGS= -DEVENT__LIBRARY_TYPE:STRING=BOTH
30	OPENSSL_CPPFLAGS= -I${OPENSSLINC}	27	CMAKE_ON= EVENT__DISABLE_BENCHMARK EVENT__DISABLE_SAMPLES
31	OPENSSL_LDFLAGS= -L${OPENSSLLIB}
32	OPENSSL_CONFIGURE_ENABLE= openssl
33		28
34	THREADS_CONFIGURE_ENABLE= thread-support	29	DEBUG_CMAKE_BOOL_OFF= EVENT__DISABLE_DEBUG_MODE
		30	OPENSSL_USES= ssl
		31	OPENSSL_CMAKE_BOOL_OFF= EVENT__DISABLE_OPENSSL
		32	TEST_USES= python
		33	TEST_CMAKE_BOOL_OFF= EVENT__DISABLE_TESTS EVENT__DISABLE_REGRESS
		34	TEST_CMAKE_OFF= -DBUILD_TESTING:BOOL=false
		35	TEST_CMAKE_ON= -DBUILD_TESTING:BOOL=true
		36	THREADS_CMAKE_BOOL_OFF= EVENT__DISABLE_THREAD_SUPPORT
		37
		38	TEST_TARGET= test
35		39
36	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/libevent/files/patch-evutil__rand.c (-13 lines)
1	--- evutil_rand.c.orig 2017-01-25 23:37:15 UTC
2	+++ evutil_rand.c
3	@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
4	void
5	evutil_secure_rng_add_bytes(const char *buf, size_t n)
6	{
7	+#ifdef arc4random_addrandom
8	arc4random_addrandom((unsigned char*)buf,
9	n>(size_t)INT_MAX ? INT_MAX : (int)n);
10	+#endif
11	}
12
13	void

Removed Link Here

(-)a/devel/libevent/files/patch-gcc7 (-83 lines)
1	Fix -Werror=implicit-fallthrough (fixes gcc-7)
2
3	https://github.com/libevent/libevent/commit/94e7dcebc320
4	https://github.com/libevent/libevent/commit/ffbce578c40a
5
6	--- bufferevent_filter.c.orig 2017-01-25 23:37:15 UTC
7	+++ bufferevent_filter.c
8	@@ -612,9 +612,12 @@ be_filter_ctrl(struct bufferevent *bev,
9	bevf->underlying->be_ops->ctrl) {
10	return (bevf->underlying->be_ops->ctrl)(bevf->underlying, op, data);
11	}
12	+ EVUTIL_FALLTHROUGH;
13
14	case BEV_CTRL_GET_FD:
15	+ EVUTIL_FALLTHROUGH;
16	case BEV_CTRL_CANCEL_ALL:
17	+ EVUTIL_FALLTHROUGH;
18	default:
19	return -1;
20	}
21	--- evdns.c.orig 2017-01-25 23:37:15 UTC
22	+++ evdns.c
23	@@ -2265,10 +2265,11 @@ evdns_request_transmit(struct request *r
24	nameserver_write_waiting(req->ns, 1);
25	return 1;
26	case 2:
27	- /* failed to transmit the request entirely. */
28	+ /* failed to transmit the request entirely. we can fallthrough since
29	+ * we'll set a timeout, which will time out, and make us retransmit the
30	+ * request anyway. */
31	retcode = 1;
32	- /* fall through: we'll set a timeout, which will time out,
33	- * and make us retransmit the request anyway. */
34	+ EVUTIL_FALLTHROUGH;
35	default:
36	/* all ok */
37	log(EVDNS_LOG_DEBUG,
38	--- event.c.orig 2017-01-25 23:37:15 UTC
39	+++ event.c
40	@@ -2960,6 +2960,7 @@ event_callback_activate_nolock_(struct e
41	switch (evcb->evcb_flags & (EVLIST_ACTIVE\|EVLIST_ACTIVE_LATER)) {
42	default:
43	EVUTIL_ASSERT(0);
44	+ EVUTIL_FALLTHROUGH;
45	case EVLIST_ACTIVE_LATER:
46	event_queue_remove_active_later(base, evcb);
47	r = 0;
48	--- util-internal.h.orig 2017-01-25 23:37:15 UTC
49	+++ util-internal.h
50	@@ -50,6 +50,20 @@
51	extern "C" {
52	#endif
53
54	+/* __has_attribute() wrapper */
55	+#ifdef __has_attribute
56	+#define EVUTIL_HAS_ATTRIBUTE __has_attribute
57	+#endif
58	+/** clang 3 __has_attribute misbehaves in some versions */
59	+#if defined(__clang__) && \
60	+ __clang__ == 1 && __clang_major__ == 3 && \
61	+ (__clang_minor__ >= 2 && __clang_minor__ <= 5)
62	+#undef EVUTIL_HAS_ATTRIBUTE
63	+#endif
64	+#ifndef EVUTIL_HAS_ATTRIBUTE
65	+#define EVUTIL_HAS_ATTRIBUTE(x) 0
66	+#endif
67	+
68	/* If we need magic to say "inline", get it for free internally. */
69	#ifdef EVENT__inline
70	#define inline EVENT__inline
71	@@ -308,6 +322,12 @@ ev_int32_t evutil_weakrand_range_(struct
72	#define EVUTIL_UNLIKELY(p) (p)
73	#endif
74
75	+#if EVUTIL_HAS_ATTRIBUTE(fallthrough)
76	+#define EVUTIL_FALLTHROUGH __attribute__((fallthrough))
77	+#else
78	+#define EVUTIL_FALLTHROUGH /* fallthrough */
79	+#endif
80	+
81	/* Replacement for assert() that calls event_errx on failure. */
82	#ifdef NDEBUG
83	#define EVUTIL_ASSERT(cond) EVUTIL_NIL_CONDITION_(cond)

Removed Link Here

(-)a/devel/libevent/files/patch-libressl (-103 lines)
1	From 28b8075400c70b2d2da2ce07e590c2ec6d11783d Mon Sep 17 00:00:00 2001
2	From: Bernard Spil <brnrd@FreeBSD.org>
3	Date: Mon, 2 Apr 2018 13:18:27 +0200
4	Subject: [PATCH] Fix build with LibreSSL 2.7
5
6	LibreSSL 2.7 implements OpenSSL 1.1 API except for BIO_get_init()
7
8	See also: https://bugs.freebsd.org/226900
9	Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
10	Closes: #617 (cherry-pick)
11	--- openssl-compat.h.orig 2017-01-25 23:37:15 UTC
12	+++ openssl-compat.h
13	@@ -1,7 +1,8 @@
14	#ifndef OPENSSL_COMPAT_H
15	#define OPENSSL_COMPAT_H
16
17	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
18	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
19	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
20
21	static inline BIO_METHOD BIO_meth_new(int type, const char name)
22	{
23	@@ -30,6 +31,11 @@ static inline BIO_METHOD *BIO_meth_new(i
24
25	#define TLS_method SSLv23_method
26
27	-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
28	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
29	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
30	+
31	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
32	+#define BIO_get_init(b) (b)->init
33	+#endif
34
35	#endif /* OPENSSL_COMPAT_H */
36	--- sample/https-client.c.orig 2017-01-25 23:37:15 UTC
37	+++ sample/https-client.c
38	@@ -312,7 +312,8 @@ main(int argc, char **argv)
39	}
40	uri[sizeof(uri) - 1] = '\0';
41
42	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
43	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
44	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
45	// Initialize OpenSSL
46	SSL_library_init();
47	ERR_load_crypto_strings();
48	@@ -480,7 +481,8 @@ cleanup:
49	SSL_CTX_free(ssl_ctx);
50	if (type == HTTP && ssl)
51	SSL_free(ssl);
52	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
53	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
54	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
55	EVP_cleanup();
56	ERR_free_strings();
57
58	@@ -492,7 +494,8 @@ cleanup:
59	CRYPTO_cleanup_all_ex_data();
60
61	sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
62	-#endif /OPENSSL_VERSION_NUMBER < 0x10100000L /
63	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
64	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
65
66	#ifdef _WIN32
67	WSACleanup();
68	--- sample/le-proxy.c.orig 2017-01-25 23:37:15 UTC
69	+++ sample/le-proxy.c
70	@@ -259,7 +259,8 @@ main(int argc, char **argv)
71
72	if (use_ssl) {
73	int r;
74	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
75	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
76	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
77	SSL_library_init();
78	ERR_load_crypto_strings();
79	SSL_load_error_strings();
80	--- sample/openssl_hostname_validation.c.orig 2017-01-25 23:37:15 UTC
81	+++ sample/openssl_hostname_validation.c
82	@@ -48,7 +48,8 @@ SOFTWARE.
83
84	#define HOSTNAME_MAX_SIZE 255
85
86	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
87	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
88	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
89	#define ASN1_STRING_get0_data ASN1_STRING_data
90	#endif
91
92	--- test/regress_ssl.c.orig 2017-01-25 23:37:15 UTC
93	+++ test/regress_ssl.c
94	@@ -186,7 +186,8 @@ get_ssl_ctx(void)
95	void
96	init_ssl(void)
97	{
98	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
99	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| \
100	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
101	SSL_library_init();
102	ERR_load_crypto_strings();
103	SSL_load_error_strings();

Removed Link Here

(-)a/devel/libevent/files/patch-test_bench (-75 lines)
1	Fix feature conditionals in bench tests.
2
3	https://github.com/libevent/libevent/commit/d9118c8daa0e
4	https://github.com/libevent/libevent/commit/77ec05e50dfe
5
6	--- configure.ac.orig 2017-01-25 23:37:15 UTC
7	+++ configure.ac
8	@@ -715,8 +715,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_add
9	#endif
10	])
11
12	-AC_CHECK_TYPES([struct so_linger],
13	-[#define HAVE_SO_LINGER], ,
14	+AC_CHECK_TYPES([struct linger],,,
15	[
16	#ifdef HAVE_SYS_SOCKET_H
17	#include <sys/socket.h>
18	--- test/bench.c.orig 2017-01-25 23:37:15 UTC
19	+++ test/bench.c
20	@@ -136,7 +136,7 @@ run_once(void)
21	int
22	main(int argc, char **argv)
23	{
24	-#ifdef HAVE_SETRLIMIT
25	+#ifdef EVENT__HAVE_SETRLIMIT
26	struct rlimit rl;
27	#endif
28	int i, c;
29	@@ -167,7 +167,7 @@ main(int argc, char **argv)
30	}
31	}
32
33	-#ifdef HAVE_SETRLIMIT
34	+#ifdef EVENT__HAVE_SETRLIMIT
35	rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50;
36	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
37	perror("setrlimit");
38	--- test/bench_cascade.c.orig 2017-01-25 23:37:15 UTC
39	+++ test/bench_cascade.c
40	@@ -139,7 +139,7 @@ run_once(int num_pipes)
41	int
42	main(int argc, char **argv)
43	{
44	-#ifdef HAVE_SETRLIMIT
45	+#ifdef EVENT__HAVE_SETRLIMIT
46	struct rlimit rl;
47	#endif
48	int i, c;
49	@@ -162,7 +162,7 @@ main(int argc, char **argv)
50	}
51	}
52
53	-#ifdef HAVE_SETRLIMIT
54	+#ifdef EVENT__HAVE_SETRLIMIT
55	rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50;
56	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
57	perror("setrlimit");
58	--- test/bench_httpclient.c.orig 2017-01-25 23:37:15 UTC
59	+++ test/bench_httpclient.c
60	@@ -113,13 +113,13 @@ errorcb(struct bufferevent *b, short wha
61	static void
62	frob_socket(evutil_socket_t sock)
63	{
64	-#ifdef HAVE_SO_LINGER
65	+#ifdef EVENT__HAVE_STRUCT_LINGER
66	struct linger l;
67	#endif
68	int one = 1;
69	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one))<0)
70	perror("setsockopt(SO_REUSEADDR)");
71	-#ifdef HAVE_SO_LINGER
72	+#ifdef EVENT__HAVE_STRUCT_LINGER
73	l.l_onoff = 1;
74	l.l_linger = 0;
75	if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&l, sizeof(l))<0)

Removed Link Here

(-)a/devel/libevent/files/patch-test_test.sh (-32 lines)
1	regress runs multiple tests, don't silence it completely.
2
3	https://github.com/libevent/libevent/pull/446
4
5	--- test/test.sh.orig 2017-01-25 23:37:15 UTC
6	+++ test/test.sh
7	@@ -99,10 +99,10 @@ run_tests () {
8	fi
9
10	test -x $TEST_DIR/regress \|\| return
11	- announce_n " regress: "
12	+ announce " regress: [multiple tests]"
13	if test "$TEST_OUTPUT_FILE" = "/dev/null" ;
14	then
15	- $TEST_DIR/regress --quiet $REGRESS_ARGS
16	+ $TEST_DIR/regress $REGRESS_ARGS
17	else
18	$TEST_DIR/regress $REGRESS_ARGS >>"$TEST_OUTPUT_FILE"
19	fi
20	@@ -114,10 +114,10 @@ run_tests () {
21	FAILED=yes
22	fi
23
24	- announce_n " regress_debug: "
25	+ announce " regress_debug: [multiple tests]"
26	if test "$TEST_OUTPUT_FILE" = "/dev/null" ;
27	then
28	- EVENT_DEBUG_MODE=1 $TEST_DIR/regress --quiet $REGRESS_ARGS
29	+ EVENT_DEBUG_MODE=1 $TEST_DIR/regress $REGRESS_ARGS
30	else
31	EVENT_DEBUG_MODE=1 $TEST_DIR/regress $REGRESS_ARGS >>"$TEST_OUTPUT_FILE"
32	fi

Lines 1-57 Link Here

(-)b/devel/libevent/pkg-plist (-12 / +10 lines)
1	bin/event_rpcgen.py
2	include/evdns.h	1	include/evdns.h
3	include/event.h	2	include/event.h
4	include/event2/buffer.h	3	include/event2/buffer.h
5	include/event2/buffer_compat.h	4	include/event2/buffer_compat.h
6	include/event2/bufferevent.h	5	include/event2/bufferevent.h
7	include/event2/bufferevent_compat.h	6	include/event2/bufferevent_compat.h
8	include/event2/bufferevent_ssl.h	7	%%OPENSSL%%include/event2/bufferevent_ssl.h
9	include/event2/bufferevent_struct.h	8	include/event2/bufferevent_struct.h
10	include/event2/dns.h	9	include/event2/dns.h
11	include/event2/dns_compat.h	10	include/event2/dns_compat.h
12	include/event2/dns_struct.h	11	include/event2/dns_struct.h
13	include/event2/event-config.h	12	include/event2/event-config.h
14	include/event2/event.h	13	include/event2/event.h
15	include/event2/event_compat.h	14	include/event2/event_compat.h
16	include/event2/event_struct.h	15	include/event2/event_struct.h
17	include/event2/http.h	16	include/event2/http.h
18	include/event2/http_compat.h	17	include/event2/http_compat.h
19	include/event2/http_struct.h	18	include/event2/http_struct.h
20	include/event2/keyvalq_struct.h	19	include/event2/keyvalq_struct.h
21	include/event2/listener.h	20	include/event2/listener.h
22	include/event2/rpc.h	21	include/event2/rpc.h
23	include/event2/rpc_compat.h	22	include/event2/rpc_compat.h
24	include/event2/rpc_struct.h	23	include/event2/rpc_struct.h
25	include/event2/tag.h	24	include/event2/tag.h
26	include/event2/tag_compat.h	25	include/event2/tag_compat.h
27	include/event2/thread.h	26	include/event2/thread.h
28	include/event2/util.h	27	include/event2/util.h
29	include/event2/visibility.h	28	include/event2/visibility.h
30	include/evhttp.h	29	include/evhttp.h
31	include/evrpc.h	30	include/evrpc.h
32	include/evutil.h	31	include/evutil.h
33	lib/libevent-2.1.so.6	32	lib/cmake/libevent/LibeventConfig.cmake
34	lib/libevent-2.1.so.6.0.2	33	lib/cmake/libevent/LibeventConfigVersion.cmake
		34	lib/cmake/libevent/LibeventTargets-%%CMAKE_BUILD_TYPE%%.cmake
		35	lib/cmake/libevent/LibeventTargets.cmake
35	lib/libevent.a	36	lib/libevent.a
36	lib/libevent.so	37	lib/libevent.so
37	lib/libevent_core-2.1.so.6	38	lib/libevent.so.2.1.10
38	lib/libevent_core-2.1.so.6.0.2
39	lib/libevent_core.a	39	lib/libevent_core.a
40	lib/libevent_core.so	40	lib/libevent_core.so
41	lib/libevent_extra-2.1.so.6	41	lib/libevent_core.so.2.1.10
42	lib/libevent_extra-2.1.so.6.0.2
43	lib/libevent_extra.a	42	lib/libevent_extra.a
44	lib/libevent_extra.so	43	lib/libevent_extra.so
45	%%OPENSSL%%lib/libevent_openssl-2.1.so.6	44	lib/libevent_extra.so.2.1.10
46	%%OPENSSL%%lib/libevent_openssl-2.1.so.6.0.2
47	%%OPENSSL%%lib/libevent_openssl.a	45	%%OPENSSL%%lib/libevent_openssl.a
48	%%OPENSSL%%lib/libevent_openssl.so	46	%%OPENSSL%%lib/libevent_openssl.so
49	%%THREADS%%lib/libevent_pthreads-2.1.so.6	47	%%OPENSSL%%lib/libevent_openssl.so.2.1.10
50	%%THREADS%%lib/libevent_pthreads-2.1.so.6.0.2
51	%%THREADS%%lib/libevent_pthreads.a	48	%%THREADS%%lib/libevent_pthreads.a
52	%%THREADS%%lib/libevent_pthreads.so	49	%%THREADS%%lib/libevent_pthreads.so
		50	%%THREADS%%lib/libevent_pthreads.so.2.1.10
53	libdata/pkgconfig/libevent.pc	51	libdata/pkgconfig/libevent.pc
54	libdata/pkgconfig/libevent_core.pc	52	libdata/pkgconfig/libevent_core.pc
55	libdata/pkgconfig/libevent_extra.pc	53	libdata/pkgconfig/libevent_extra.pc
56	%%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc	54	%%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
57	%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc	55	%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc