[pkgsrc/trunk]: pkgsrc/devel libevent: updated to 2.1.11

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d8665ccee29
branches:  trunk
changeset: 339994:6d8665ccee29
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Sep 20 11:36:27 2019 +0000

description:
libevent: updated to 2.1.11

Changes in version 2.1.11-stable

 This release contains one ABI breakage fix (that had been introduced in
 2.1.10, and strictly speaking this release breaks ABI again to make it
 compatible with 2.1.9 and less, please take a look at 18104973 for more
 details). Apart from that it contains some bug fixes, that grouped below.

 And even though the return value for evbuffer_setcb() had been changed it
 should ABI compatible (anyway that function is in -compat.h header).

 There is also one patch that introduce new functionality, this is 546a366c,
 to tune SO_RCVBUF/SO_SNDBUF in evdns, but one can count it as a bug-fix on
 the application level, since before you cannot tune this settings and hence
 you could stumble on problems.

 ABI breakage:
  o Protect min_heap_push_ against integer overflow.
  o Revert "Protect min_heap_push_ against integer overflow."

 functionality:
  o evdns: add new options -- so-rcvbuf/so-sndbuf

 build:
  o Change autoconf version to 2.62 and automake version to 1.11.2
  o cmake: install shared library only if it was requested
  o Missing <winerror.h> on win7/MinGW(MINGW32_NT-6.1)/MSYS
  o cmake: set library names to be the same as with autotools
  o Enable _GNU_SOURCE for Android
  o Enable kqueue for APPLE targets
  o autotools: do not install bufferevent_ssl.h under --disable-openssl
  o cmake: link against shell32.lib/advapi32.lib
  o Add README.md into dist archive
  o cmake: add missing autotools targets (doxygen, uninstall, event_rpcgen.py)
  o m4/libevent_openssl.m4: fix detection of openssl
  o Fix detection of the __has_attribute() for apple clang [ci skip]

 lib:
  o buffer: fix possible NULL dereference in evbuffer_setcb() on ENOMEM
  o Warn if forked from the event loop during event_reinit()
  o evutil: set the have_checked_interfaces in evutil_check_interfaces()

 samples:
  o https-client: correction error checking


Changes in version 2.1.10-stable

 This release contains mostly fixes (some evbuffer oddity, AF_UNIX handling in
 http server, some UB fixes and others) but also some new functionality
 (without ABI breakage as usual) and now dist archive can be used for building
 on windows (getopt had been added into it).

 Above you will find changelog for this particular release (but with some
 trivial fixes pruned out from it - to make it a little bit more informative).

 To view full changelog please use git:
   git log --format='  o %s (%h %aN)' release-2.1.9-beta...release-2.1.10-stable

 dist:
  o Add getopt into dist archive

 functionality:
  o evdns: add DNS_OPTION_NAMESERVERS_NO_DEFAULT/EVDNS_BASE_NAMESERVERS_NO_DEFAULT

  o Add support for EV_TIMEOUT to event_base_active_by_fd

 fixes:
  o Merge branch 'evbuffer-fixes-806-v2'
  o Merge branch 'issue-807-accept4-getnameinfo-AF_UNIX'
    Azat Khuzhin)
  o kqueue: Avoid undefined behaviour. (e70e18e9 Tobias Stoeckmann)
  o Prevent integer overflow in kq_build_changes_list.
  o evdns: fix lock/unlock mismatch in evdns_close_server_port()
  o Merge remote-tracking branch 'official/pr/804' -- Enforce limit of NSIG
    signals
  o Protect min_heap_push_ against integer overflow.
  o le-proxy: initiate use of the Winsock DLL
  o Fix leaks in error path of the bufferevent_init_common_() (bb0f8fe7 Azat Khuzhin)
  o buffer: make evbuffer_prepend() of zero-length array no-op
  o Merge branch 'evbuffer-empty-chain-handling'
  o Don't loose top error in SSL
  o Remove needless check for arc4_seeded_ok
  o Merge pull request 769 from sungjungk/fix-return-handling

 build:
  o Define `_GNU_SOURCE` properly/consistently per autoconf
  o signal: guard __cdecl definition with #ifdef
  o Link test/regress with event_core/event_extra over event

 tests:
  o Use kill() over raise() for raising the signal (fixes osx 10.14 with
    kqueue)
  o tinytest: implement per-test timeout (via alarm() under !win32 only)


Changes in version 2.1.9-beta

 This changelog will differs from other releases in the next few clauses:
 - contains only highlighted changes (so now it will not contains a lot of
   patches that fixes some stuff in regression tests, typos, leaks fixes in
   samples and so forth)
 - no authors (since merge commits breaks them anyway, but AUTHORS sections in
   README will be kept up to date)
 - group name trimmed from commit subjects trimmed
 - it's been 2 years since the previoius release, so it is pretty huge

 And I think that this is more useful, so from now on it will always has the
 same look (until there will too many objections of course).

 To view full changelog please use git:
   git log --format='  o %s (%h %aN)' release-2.1.8-stable...release-2.1.9-beta


 dist archive:
  o Add cmake rules into dist archive
  o Add missing print-winsock-errors.c into dist archive
  o Include openssl-compat.h into dist archive

 core:
  o Merge branch 'check-O_NONBLOCK-in-debug'
  o Merge branch 'event-ET-636-v2'
  o Fix visibility issues under (mostly on win32)

  o Define __EXT_POSIX2 for QNX
  o Cleanup __func__ detection
  o Add convenience macros for user-triggered events
  o Notify event base if there are no more events, so it can exit without delay
  o Fix base unlocking in event_del() if event_base_set() runned in another thread
  o If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER
  o Fix race in access to ev_res from event loop with event_active()
  o Return from event_del() after the last event callback termination

 http:
  o Merge branch 'http-EVHTTP_CON_READ_ON_WRITE_ERROR-fixes-v2'
  o Preserve socket error from listen across closesocket cleanup
  o fix connection retries when there more then one request for connection
  o improve error path for bufferevent_{setfd,enable,disable}()
  o Fix conceivable UAF of the bufferevent in evhttp_connection_free()
  o Merge branch 'http-request-line-parsing'
  o Fix evhttp_connection_get_addr() fox incomming http connections
  o fix leaks in evhttp_uriencode()
  o CONNECT method only takes an authority
  o Allow bodies for GET/DELETE/OPTIONS/CONNECT
  o Do not crash when evhttp_send_reply_start() is called after a timeout.
  o Fix crashing http server when callback do not reply in place
  o fix handling of close_notify (ssl) in http with openssl bufferevents

 evrpc:
  o use *_new_with_arg() to match function prototype
  o avoid NULL dereference on request is not EVHTTP_REQ_POST

 regression tests:
  o Merge branch 'TT_RETRIABLE'

 bufferevent:
  o Merge branch 'iocp-fixes'
  o Merge branch 'be-wm-overrun-v2'
  o bufferevent_socket_connect{,_hostname}() missing event callback and use ret code
  o don't fail be_null_filter if bytes are copied
  o Call underlying bev ctrl GET_FD on filtered bufferevents

 bufferevent_openssl/openssl:
  o Merge branch 'ssl_bufferevent_wm_filter-fix'
  o be_openssl: avoid leaking of SSL structure
  o Fix build with LibreSSL 2.7
  o Add missing includes into openssl-compat.h
  o Explicitly call SSL_clear when reseting the fd.
  o Unbreak build with LibreSSL after openssl 1.1 support added

 samples:
  o Merge branch 'sample-http-server'
  o sample/https-client: use host SSL certificate store by default

 listener:
  o ipv6only socket bind support
  o Merge branch 'listener-immediate-close'
  o Merge branch 'evconnlistener-do-not-close-client-fd'

 evdns:
  o evdns: handle NULL filename explicitly
  o Merge branch 'evdns_getaddrinfo-race-fix'
  o Generating evdns_base_config_windows_nameservers docs on all platforms

 utils:
  o Merge branch 'evutil_found_ifaddr-dev'
  o Avoid possible SEGVs in select() (in unit tests)
  o Port `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3.

 buffer:
  o Fix assert() condition in evbuffer_drain() for IOCP
  o fix incorrect unlock of the buffer mutex (for deferred callbacks)
  o Fix wrong assert in evbuffer_drain()

 cmake:
  o fix checking of devpoll backend (like in autotools, by devpoll.h existence)
  o support static runtime (MSVC)
  o do not build both (SHARED and STATIC) for MSVC/win32
  o introduce EVENT__LIBRARY_TYPE option
  o ensure windows dll's are installed as well as lib files
  o Fix generation of LibeventConfig.cmake for the installation tree
  o fix pkgconfig generation (copy-paste typo)
  o Merge branch 'cmake-missing-bits'
  o Fix detection of timerfd_create() in CMake.
  o Merge branch 'cmake-configure-fixes-v2'
  o Do not add epoll_sub (syscall wrappers) for epoll in cmake
  o Fix RPATH for APPLE

 autotools:
  o include win32 specific headers for socklen_t detection on win32/mingw
  o Ignore evconfig-private.h for autotools
  o config.h can't be prefixed unconditionally
  o Merge branch 'pull-628'
  o Provide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS}
  o confirm openssl is working before using
  o pass $(OPENSSL_INCS) for samples (FTBFS macOS)
  o Add configure check for midipix
  o Fix tests with detached builds

 build:
  o Fix arc4random_addrandom() detecting and fallback (regression)
  o Merge branch 'win32-fixes'
  o Merge branch 'fix-openssl-linking'
  o Merge branch 'fix-struct-linger'

 CI:
  o travis-ci/appveyor now uses fast_finish+allow_failures

  o Merge branch 'travis-ci-osx-fixes'
  o Merge branch 'win64-fixes'

diffstat:

 devel/libevent/Makefile                            |  10 +---------
 devel/libevent/Makefile.common                     |   9 ++++-----
 devel/libevent/distinfo                            |  15 ++++++---------
 devel/libevent/patches/patch-evutil__rand.c        |  18 ------------------
 devel/libevent/patches/patch-http.c                |  18 ------------------
 devel/libevent/patches/patch-signal.c              |   8 ++++----
 devel/libevent/patches/patch-test_bench__cascade.c |  14 --------------
 devel/py-libevent-rpcgen/Makefile                  |   5 ++---
 8 files changed, 17 insertions(+), 80 deletions(-)

diffs (176 lines):

diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/Makefile
--- a/devel/libevent/Makefile   Fri Sep 20 11:31:17 2019 +0000
+++ b/devel/libevent/Makefile   Fri Sep 20 11:36:27 2019 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2017/09/26 17:57:36 gson Exp $
+# $NetBSD: Makefile,v 1.54 2019/09/20 11:36:27 adam Exp $
 
 .include "../../devel/libevent/Makefile.common"
 
-PKGREVISION=   1
-
 PKGNAME=       ${DISTNAME:S/-stable//}
 COMMENT=       Asynchronous event notification library
 
@@ -22,12 +20,6 @@
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 CPPFLAGS.QNX+=         -D__EXT_POSIX2
 
-CFLAGS+=-g -O0
-INSTALL_UNSTRIPPED=yes
-
-# XXX helps build, but needs more testing
-#CFLAGS.Interix+=      -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
-
 .include "../../mk/bsd.prefs.mk"
 
 # Explicitly disable epoll on illumos, provided for Linux compat only.
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/Makefile.common
--- a/devel/libevent/Makefile.common    Fri Sep 20 11:31:17 2019 +0000
+++ b/devel/libevent/Makefile.common    Fri Sep 20 11:36:27 2019 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile.common,v 1.3 2017/02/15 17:34:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2019/09/20 11:36:27 adam Exp $
 #
 # used by devel/libevent/Makefile
 # used by devel/py-libevent-rpcgen/Makefile
 
-DISTNAME=      libevent-2.1.8-stable
+DISTNAME=      libevent-2.1.11-stable
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libevent/}
+GITHUB_PROJECT=        libevent
+GITHUB_RELEASE=        release-${PKGVERSION_NOREV}-stable
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://libevent.org/
 LICENSE=       modified-bsd
 
-GITHUB_PROJECT=        libevent
-GITHUB_RELEASE=        release-${PKGVERSION_NOREV}-stable
-
 DISTINFO_FILE= ${.CURDIR}/../../devel/libevent/distinfo
 PATCHDIR=      ${.CURDIR}/../../devel/libevent/patches
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/distinfo
--- a/devel/libevent/distinfo   Fri Sep 20 11:31:17 2019 +0000
+++ b/devel/libevent/distinfo   Fri Sep 20 11:36:27 2019 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.37 2017/09/26 17:57:36 gson Exp $
+$NetBSD: distinfo,v 1.38 2019/09/20 11:36:27 adam Exp $
 
-SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec
-RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797
-SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes
+SHA1 (libevent-2.1.11-stable.tar.gz) = a76bba0a281da9384d4be5b40f3907c07e21428c
+RMD160 (libevent-2.1.11-stable.tar.gz) = 632ef3bb568a510812110575cbf32876899fcc73
+SHA512 (libevent-2.1.11-stable.tar.gz) = 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
+Size (libevent-2.1.11-stable.tar.gz) = 1082234 bytes
 SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219
-SHA1 (patch-evutil__rand.c) = 2b51e719d25181e03b5afb7df0bf443f1d62a8f1
-SHA1 (patch-http.c) = f878714bf4d894d0026580bbed2a93927543eae8
-SHA1 (patch-signal.c) = 1058566e7a6e0ffb709fbd2a3440cac86e188657
-SHA1 (patch-test_bench__cascade.c) = 58bd32fe0cddc468fda57386283b5298b28ef93e
+SHA1 (patch-signal.c) = 868f5f217afd030407a6c8be2d3fbecd58dc7999
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/patches/patch-evutil__rand.c
--- a/devel/libevent/patches/patch-evutil__rand.c       Fri Sep 20 11:31:17 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-evutil__rand.c,v 1.4 2017/09/22 02:58:50 maya Exp $
-
-Native illumos arc4random(3C) imported the latest OpenBSD API which
-does not have arc4random_addrandom().
-
---- evutil_rand.c.orig 2016-10-04 19:55:31.000000000 +0000
-+++ evutil_rand.c
-@@ -195,8 +195,10 @@ evutil_secure_rng_get_bytes(void *buf, s
- void
- evutil_secure_rng_add_bytes(const char *buf, size_t n)
- {
-+#if !(defined(EVENT__HAVE_ARC4RANDOM) && defined(__sun))
-       arc4random_addrandom((unsigned char*)buf,
-           n>(size_t)INT_MAX ? INT_MAX : (int)n);
-+#endif
- }
- 
- void
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/patches/patch-http.c
--- a/devel/libevent/patches/patch-http.c       Fri Sep 20 11:31:17 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-http.c,v 1.1 2017/09/26 17:57:36 gson Exp $
-
-Do not crash when evhttp_send_reply_start() is called after
-a timeout.  Fixes https://github.com/libevent/libevent/issues/509.
-
---- http.c.orig        2016-12-18 21:56:34.000000000 +0000
-+++ http.c
-@@ -2820,6 +2820,10 @@ evhttp_send_reply_start(struct evhttp_re
-     const char *reason)
- {
-       evhttp_response_code_(req, code, reason);
-+
-+      if (req->evcon == NULL)
-+              return;
-+
-       if (evhttp_find_header(req->output_headers, "Content-Length") == NULL &&
-           REQ_VERSION_ATLEAST(req, 1, 1) &&
-           evhttp_response_needs_body(req)) {
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/patches/patch-signal.c
--- a/devel/libevent/patches/patch-signal.c     Fri Sep 20 11:31:17 2019 +0000
+++ b/devel/libevent/patches/patch-signal.c     Fri Sep 20 11:36:27 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-signal.c,v 1.1 2017/09/23 03:24:55 maya Exp $
+$NetBSD: patch-signal.c,v 1.2 2019/09/20 11:36:28 adam Exp $
 
 Provide a fallback definition of SA_RESTART for QNX 6.5
 
---- signal.c.orig      2016-10-04 19:55:31.000000000 +0000
+--- signal.c.orig      2019-07-31 18:28:32.000000000 +0000
 +++ signal.c
-@@ -88,6 +88,10 @@
- #define __cdecl
+@@ -90,6 +90,10 @@
+ #endif
  #endif
  
 +#ifndef SA_RESTART /* Absent in QNX 6.5 */
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/libevent/patches/patch-test_bench__cascade.c
--- a/devel/libevent/patches/patch-test_bench__cascade.c        Fri Sep 20 11:31:17 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-test_bench__cascade.c,v 1.1 2017/09/22 02:58:50 maya Exp $
-
-Remove redundant include (absent in QNX 6.5)
-
---- test/bench_cascade.c.orig  2016-10-04 19:55:31.000000000 +0000
-+++ test/bench_cascade.c
-@@ -48,7 +48,6 @@
- #include <unistd.h>
- #endif
- #include <errno.h>
--#include <getopt.h>
- #include <event.h>
- #include <evutil.h>
- 
diff -r 030b7f7394b6 -r 6d8665ccee29 devel/py-libevent-rpcgen/Makefile
--- a/devel/py-libevent-rpcgen/Makefile Fri Sep 20 11:31:17 2019 +0000
+++ b/devel/py-libevent-rpcgen/Makefile Fri Sep 20 11:36:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/02/15 17:34:37 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/20 11:36:28 adam Exp $
 
 .include "../../devel/libevent/Makefile.common"
 
@@ -8,10 +8,9 @@
 NO_BUILD=              yes
 INSTALLATION_DIRS+=    bin
 
+PYTHON_SELF_CONFLICT=  yes
 REPLACE_PYTHON=                event_rpcgen.py
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 do-configure:
 
 do-install: