git: b50261e21f39 - main - libevent: Import libevent 2.1.12
Date: Wed, 15 Nov 2023 01:15:04 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=b50261e21f39a6c7249a49e7b60aa878c98512a8
commit b50261e21f39a6c7249a49e7b60aa878c98512a8
Merge: fa08011a521c 5223d1d95fdd
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-11-14 23:04:28 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-11-15 01:13:02 +0000
libevent: Import libevent 2.1.12
MFC after: 2 weeks
Merge commit '5223d1d95fddcef6f9a36e264a5800bd907ade8b' into main
contrib/libevent/CMakeLists.txt | 1575 +++++++++
contrib/libevent/ChangeLog | 313 ++
contrib/libevent/ChangeLog-1.4 | 2 +-
contrib/libevent/ChangeLog-2.0 | 2 +-
contrib/libevent/Doxyfile | 46 +-
contrib/libevent/Makefile.am | 67 +-
contrib/libevent/Makefile.in | 1486 ++++++---
contrib/libevent/README.md | 487 +++
contrib/libevent/WIN32-Code/getopt.c | 149 +
contrib/libevent/WIN32-Code/getopt.h | 33 +
contrib/libevent/WIN32-Code/getopt_long.c | 234 ++
.../WIN32-Code/nmake/event2/event-config.h | 26 +-
contrib/libevent/aclocal.m4 | 193 +-
contrib/libevent/arc4random.c | 40 +-
contrib/libevent/buffer.c | 50 +-
contrib/libevent/buffer_iocp.c | 1 +
contrib/libevent/bufferevent-internal.h | 36 +
contrib/libevent/bufferevent.c | 115 +-
contrib/libevent/bufferevent_async.c | 66 +-
contrib/libevent/bufferevent_filter.c | 10 +-
contrib/libevent/bufferevent_openssl.c | 75 +-
contrib/libevent/bufferevent_pair.c | 4 +-
contrib/libevent/bufferevent_ratelim.c | 9 +-
contrib/libevent/bufferevent_sock.c | 74 +-
contrib/libevent/{ => build-aux}/compile | 17 +-
contrib/libevent/{ => build-aux}/config.guess | 970 +++---
contrib/libevent/build-aux/config.sub | 1793 +++++++++++
contrib/libevent/{ => build-aux}/depcomp | 10 +-
contrib/libevent/{ => build-aux}/install-sh | 60 +-
contrib/libevent/{ => build-aux}/ltmain.sh | 766 +++--
contrib/libevent/{ => build-aux}/missing | 16 +-
contrib/libevent/{ => build-aux}/test-driver | 10 +-
contrib/libevent/cmake/AddCompilerFlags.cmake | 13 +
contrib/libevent/cmake/AddEventLibrary.cmake | 193 ++
contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 +
contrib/libevent/cmake/CheckConstExists.cmake | 25 +
contrib/libevent/cmake/CheckFileOffsetBits.c | 14 +
contrib/libevent/cmake/CheckFileOffsetBits.cmake | 43 +
contrib/libevent/cmake/CheckFunctionKeywords.cmake | 14 +
.../libevent/cmake/CheckPrototypeDefinition.c.in | 29 +
.../libevent/cmake/CheckPrototypeDefinition.cmake | 82 +
contrib/libevent/cmake/CheckWorkingKqueue.cmake | 52 +
contrib/libevent/cmake/CodeCoverage.cmake | 165 +
contrib/libevent/cmake/Copyright.txt | 57 +
contrib/libevent/cmake/LibeventConfig.cmake.in | 183 ++
.../libevent/cmake/LibeventConfigVersion.cmake.in | 11 +
contrib/libevent/cmake/Macros.cmake | 36 +
contrib/libevent/cmake/Uninstall.cmake.in | 23 +
contrib/libevent/cmake/UseDoxygen.cmake | 111 +
contrib/libevent/cmake/VersionViaGit.cmake | 66 +
contrib/libevent/config.h.in | 63 +-
contrib/libevent/config.sub | 1807 -----------
contrib/libevent/configure | 3390 +++++++++++++++++---
contrib/libevent/configure.ac | 328 +-
contrib/libevent/defer-internal.h | 3 +
contrib/libevent/doxygen.am | 55 +
contrib/libevent/epoll.c | 15 +-
contrib/libevent/epolltable-internal.h | 2 +-
contrib/libevent/evbuffer-internal.h | 2 +-
contrib/libevent/evconfig-private.h.cmake | 40 +
contrib/libevent/evconfig-private.h.in | 7 +
contrib/libevent/evdns.c | 144 +-
contrib/libevent/event-config.h.cmake | 513 +++
contrib/libevent/event-internal.h | 13 +-
contrib/libevent/event.c | 392 ++-
contrib/libevent/event_iocp.c | 2 +-
contrib/libevent/event_rpcgen.py | 2057 ++++++------
contrib/libevent/event_tagging.c | 4 +
contrib/libevent/evmap.c | 43 +-
contrib/libevent/evrpc.c | 6 +-
contrib/libevent/evthread-internal.h | 16 +-
contrib/libevent/evthread.c | 2 +-
contrib/libevent/evutil.c | 144 +-
contrib/libevent/evutil_rand.c | 6 +-
contrib/libevent/evutil_time.c | 65 +-
contrib/libevent/http-internal.h | 9 +-
contrib/libevent/http.c | 254 +-
contrib/libevent/include/event2/buffer.h | 3 +-
contrib/libevent/include/event2/buffer_compat.h | 3 +-
contrib/libevent/include/event2/bufferevent.h | 11 +-
.../libevent/include/event2/bufferevent_compat.h | 4 +
contrib/libevent/include/event2/dns.h | 46 +-
contrib/libevent/include/event2/dns_compat.h | 24 +-
contrib/libevent/include/event2/event.h | 77 +-
contrib/libevent/include/event2/http.h | 13 +-
contrib/libevent/include/event2/http_compat.h | 6 +-
contrib/libevent/include/event2/listener.h | 12 +
contrib/libevent/include/event2/rpc.h | 48 +-
contrib/libevent/include/event2/rpc_struct.h | 14 +
contrib/libevent/include/event2/util.h | 34 +-
contrib/libevent/include/event2/visibility.h | 31 +-
contrib/libevent/include/include.am | 7 +-
contrib/libevent/iocp-internal.h | 14 +
contrib/libevent/kqueue.c | 17 +-
contrib/libevent/listener.c | 29 +-
contrib/libevent/log-internal.h | 25 +-
contrib/libevent/log.c | 11 +-
contrib/libevent/m4/ax_check_funcs_ex.m4 | 22 +
contrib/libevent/m4/ax_prog_doxygen.m4 | 600 ++++
contrib/libevent/m4/libevent_openssl.m4 | 9 +
contrib/libevent/m4/libtool.m4 | 102 +-
contrib/libevent/m4/ltoptions.m4 | 2 +-
contrib/libevent/m4/ltsugar.m4 | 2 +-
contrib/libevent/m4/ltversion.m4 | 12 +-
contrib/libevent/m4/lt~obsolete.m4 | 2 +-
contrib/libevent/make-event-config.sed | 10 +-
contrib/libevent/minheap-internal.h | 6 +-
contrib/libevent/mm-internal.h | 5 +
contrib/libevent/openssl-compat.h | 16 +-
contrib/libevent/poll.c | 25 +-
contrib/libevent/sample/dns-example.c | 17 +-
contrib/libevent/sample/event-read-fifo.c | 4 +-
contrib/libevent/sample/hello-world.c | 3 +-
contrib/libevent/sample/http-connect.c | 86 +-
contrib/libevent/sample/http-server.c | 292 +-
contrib/libevent/sample/https-client.c | 88 +-
contrib/libevent/sample/include.am | 11 +-
contrib/libevent/sample/le-proxy.c | 16 +-
.../libevent/sample/openssl_hostname_validation.c | 3 +-
contrib/libevent/sample/signal-test.c | 25 +-
contrib/libevent/sample/time-test.c | 7 +-
contrib/libevent/select.c | 2 +-
contrib/libevent/signal.c | 2 +
contrib/libevent/strlcpy-internal.h | 2 +
contrib/libevent/test/bench.c | 60 +-
contrib/libevent/test/bench_cascade.c | 8 +-
contrib/libevent/test/bench_http.c | 3 +
contrib/libevent/test/bench_httpclient.c | 4 +-
contrib/libevent/test/check-dumpevents.py | 10 +-
contrib/libevent/test/include.am | 43 +-
contrib/libevent/test/print-winsock-errors.c | 86 +
contrib/libevent/test/regress.c | 332 +-
contrib/libevent/test/regress.gen.c | 105 +-
contrib/libevent/test/regress.gen.h | 11 +-
contrib/libevent/test/regress.h | 7 +-
contrib/libevent/test/regress_buffer.c | 369 ++-
contrib/libevent/test/regress_bufferevent.c | 156 +-
contrib/libevent/test/regress_dns.c | 522 ++-
contrib/libevent/test/regress_et.c | 146 +-
contrib/libevent/test/regress_finalize.c | 48 +
contrib/libevent/test/regress_http.c | 479 ++-
contrib/libevent/test/regress_listener.c | 100 +-
contrib/libevent/test/regress_main.c | 68 +-
contrib/libevent/test/regress_rpc.c | 49 +-
contrib/libevent/test/regress_ssl.c | 404 ++-
contrib/libevent/test/regress_testutils.c | 2 +-
contrib/libevent/test/regress_thread.c | 8 +-
contrib/libevent/test/regress_thread.h | 34 +-
contrib/libevent/test/regress_util.c | 196 +-
contrib/libevent/test/rpcgen_wrapper.sh | 11 +-
contrib/libevent/test/test-changelist.c | 4 +-
contrib/libevent/test/test-closed.c | 1 +
contrib/libevent/test/test-eof.c | 4 +-
contrib/libevent/test/test-fdleak.c | 15 +-
contrib/libevent/test/test-init.c | 2 +-
contrib/libevent/test/test-ratelim.c | 87 +-
contrib/libevent/test/test-time.c | 25 +-
contrib/libevent/test/test-weof.c | 4 +-
contrib/libevent/test/test.sh | 4 +-
contrib/libevent/test/tinytest.c | 169 +-
contrib/libevent/test/tinytest.h | 5 +-
contrib/libevent/test/tinytest_macros.h | 12 +-
contrib/libevent/time-internal.h | 3 +
contrib/libevent/util-internal.h | 72 +-
contrib/libevent/win32select.c | 3 +-
165 files changed, 18349 insertions(+), 6378 deletions(-)
diff --cc contrib/libevent/CMakeLists.txt
index 000000000000,676727f16563..676727f16563
mode 000000,100644..100644
--- a/contrib/libevent/CMakeLists.txt
+++ b/contrib/libevent/CMakeLists.txt
diff --cc contrib/libevent/README.md
index 000000000000,000000000000..1247e220f50e
new file mode 100644
--- /dev/null
+++ b/contrib/libevent/README.md
@@@ -1,0 -1,0 +1,487 @@@
++<p align="center">
++ <img src="https://strcpy.net/libevent3.png" alt="libevent logo"/>
++</p>
++
++
++
++[](https://ci.appveyor.com/project/libevent/libevent)
++[](https://travis-ci.org/libevent/libevent)
++[](https://coveralls.io/github/libevent/libevent)
++[](https://gitter.im/libevent/libevent?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
++
++
++
++# 0. BUILDING AND INSTALLATION (Briefly)
++
++## Autoconf
++
++ $ ./configure
++ $ make
++ $ make verify # (optional)
++ $ sudo make install
++
++## CMake (General)
++
++
++The following Libevent specific CMake variables are as follows (the values being
++the default).
++
++```
++# Type of the library to build (SHARED or STATIC)
++# Default is: SHARED for MSVC, otherwise BOTH
++EVENT__LIBRARY_TYPE:STRING=DEFAULT
++
++# Installation directory for CMake files
++EVENT_INSTALL_CMAKE_DIR:PATH=lib/cmake/libevent
++
++# Enable running gcov to get a test coverage report (only works with
++# GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well.
++EVENT__COVERAGE:BOOL=OFF
++
++# Defines if Libevent should build without the benchmark executables
++EVENT__DISABLE_BENCHMARK:BOOL=OFF
++
++# Define if Libevent should build without support for a debug mode
++EVENT__DISABLE_DEBUG_MODE:BOOL=OFF
++
++# Define if Libevent should not allow replacing the mm functions
++EVENT__DISABLE_MM_REPLACEMENT:BOOL=OFF
++
++# Define if Libevent should build without support for OpenSSL encryption
++EVENT__DISABLE_OPENSSL:BOOL=OFF
++
++# Disable the regress tests
++EVENT__DISABLE_REGRESS:BOOL=OFF
++
++# Disable sample files
++EVENT__DISABLE_SAMPLES:BOOL=OFF
++
++# If tests should be compiled or not
++EVENT__DISABLE_TESTS:BOOL=OFF
++
++# Define if Libevent should not be compiled with thread support
++EVENT__DISABLE_THREAD_SUPPORT:BOOL=OFF
++
++# Enables verbose debugging
++EVENT__ENABLE_VERBOSE_DEBUG:BOOL=OFF
++
++# When cross compiling, forces running a test program that verifies that Kqueue
++# works with pipes. Note that this requires you to manually run the test program
++# on the the cross compilation target to verify that it works. See CMake
++# documentation for try_run for more details
++EVENT__FORCE_KQUEUE_CHECK:BOOL=OFF
++```
++
++__More variables can be found by running `cmake -LAH <sourcedir_path>`__
++
++
++## CMake (Windows)
++
++Install CMake: <https://www.cmake.org>
++
++
++ $ md build && cd build
++ $ cmake -G "Visual Studio 10" .. # Or whatever generator you want to use cmake --help for a list.
++ $ start libevent.sln
++
++## CMake (Unix)
++
++ $ mkdir build && cd build
++ $ cmake .. # Default to Unix Makefiles.
++ $ make
++ $ make verify # (optional)
++
++
++# 1. BUILDING AND INSTALLATION (In Depth)
++
++## Autoconf
++
++To build Libevent, type
++
++ $ ./configure && make
++
++
++ (If you got Libevent from the git repository, you will
++ first need to run the included "autogen.sh" script in order to
++ generate the configure script.)
++
++You can run the regression tests by running
++
++ $ make verify
++
++Install as root via
++
++ $ make install
++
++Before reporting any problems, please run the regression tests.
++
++To enable low-level tracing, build the library as:
++
++ $ CFLAGS=-DUSE_DEBUG ./configure [...]
++
++Standard configure flags should work. In particular, see:
++
++ --disable-shared Only build static libraries.
++ --prefix Install all files relative to this directory.
++
++
++The configure script also supports the following flags:
++
++ --enable-gcc-warnings Enable extra compiler checking with GCC.
++ --disable-malloc-replacement
++ Don't let applications replace our memory
++ management functions.
++ --disable-openssl Disable support for OpenSSL encryption.
++ --disable-thread-support Don't support multithreaded environments.
++
++## CMake (Windows)
++
++(Note that autoconf is currently the most mature and supported build
++environment for Libevent; the CMake instructions here are new and
++experimental, though they _should_ be solid. We hope that CMake will
++still be supported in future versions of Libevent, and will try to
++make sure that happens.)
++
++First of all install <https://www.cmake.org>.
++
++To build Libevent using Microsoft Visual studio open the "Visual Studio Command prompt" and type:
++
++```
++$ cd <libevent source dir>
++$ mkdir build && cd build
++$ cmake -G "Visual Studio 10" .. # Or whatever generator you want to use cmake --help for a list.
++$ start libevent.sln
++```
++
++In the above, the ".." refers to the dir containing the Libevent source code.
++You can build multiple versions (with different compile time settings) from the same source tree
++by creating other build directories.
++
++It is highly recommended to build "out of source" when using
++CMake instead of "in source" like the normal behaviour of autoconf for this reason.
++
++The "NMake Makefiles" CMake generator can be used to build entirely via the command line.
++
++To get a list of settings available for the project you can type:
++
++```
++$ cmake -LH ..
++```
++
++### GUI
++
++CMake also provides a GUI that lets you specify the source directory and output (binary) directory
++that the build should be placed in.
++
++# 2. USEFUL LINKS:
++
++For the latest released version of Libevent, see the official website at
++<http://libevent.org/> .
++
++There's a pretty good work-in-progress manual up at
++ <http://www.wangafu.net/~nickm/libevent-book/> .
++
++For the latest development versions of Libevent, access our Git repository
++via
++
++```
++$ git clone https://github.com/libevent/libevent.git
++```
++
++You can browse the git repository online at:
++
++<https://github.com/libevent/libevent>
++
++To report bugs, issues, or ask for new features:
++
++__Patches__: https://github.com/libevent/libevent/pulls
++> OK, those are not really _patches_. You fork, modify, and hit the "Create Pull Request" button.
++> You can still submit normal git patches via the mailing list.
++
++__Bugs, Features [RFC], and Issues__: https://github.com/libevent/libevent/issues
++> Or you can do it via the mailing list.
++
++There's also a libevent-users mailing list for talking about Libevent
++use and development:
++
++<http://archives.seul.org/libevent/users/>
++
++# 3. ACKNOWLEDGMENTS
++
++The following people have helped with suggestions, ideas, code or
++fixing bugs:
++
++ * Samy Al Bahra
++ * Antony Antony
++ * Jacob Appelbaum
++ * Arno Bakker
++ * Weston Andros Adamson
++ * William Ahern
++ * Ivan Andropov
++ * Sergey Avseyev
++ * Avi Bab
++ * Joachim Bauch
++ * Andrey Belobrov
++ * Gilad Benjamini
++ * Stas Bekman
++ * Denis Bilenko
++ * Julien Blache
++ * Kevin Bowling
++ * Tomash Brechko
++ * Kelly Brock
++ * Ralph Castain
++ * Adrian Chadd
++ * Lawnstein Chan
++ * Shuo Chen
++ * Ka-Hing Cheung
++ * Andrew Cox
++ * Paul Croome
++ * George Danchev
++ * Andrew Danforth
++ * Ed Day
++ * Christopher Davis
++ * Mike Davis
++ * Frank Denis
++ * Antony Dovgal
++ * Mihai Draghicioiu
++ * Alexander Drozdov
++ * Mark Ellzey
++ * Shie Erlich
++ * Leonid Evdokimov
++ * Juan Pablo Fernandez
++ * Christophe Fillot
++ * Mike Frysinger
++ * Remi Gacogne
++ * Artem Germanov
++ * Alexander von Gernler
++ * Diego Giagio
++ * Artur Grabowski
++ * Diwaker Gupta
++ * Kuldeep Gupta
++ * Sebastian Hahn
++ * Dave Hart
++ * Greg Hazel
++ * Nicholas Heath
++ * Michael Herf
++ * Savg He
++ * Mark Heily
++ * Maxime Henrion
++ * Michael Herf
++ * Greg Hewgill
++ * Andrew Hochhaus
++ * Aaron Hopkins
++ * Tani Hosokawa
++ * Jamie Iles
++ * Xiuqiang Jiang
++ * Claudio Jeker
++ * Evan Jones
++ * Marcin Juszkiewicz
++ * George Kadianakis
++ * Makoto Kato
++ * Phua Keat
++ * Azat Khuzhin
++ * Alexander Klauer
++ * Kevin Ko
++ * Brian Koehmstedt
++ * Marko Kreen
++ * Ondřej Kuzník
++ * Valery Kyholodov
++ * Ross Lagerwall
++ * Scott Lamb
++ * Christopher Layne
++ * Adam Langley
++ * Graham Leggett
++ * Volker Lendecke
++ * Philip Lewis
++ * Zhou Li
++ * David Libenzi
++ * Yan Lin
++ * Moshe Litvin
++ * Simon Liu
++ * Mitchell Livingston
++ * Hagne Mahre
++ * Lubomir Marinov
++ * Abilio Marques
++ * Nicolas Martyanoff
++ * Abel Mathew
++ * Nick Mathewson
++ * James Mansion
++ * Nicholas Marriott
++ * Andrey Matveev
++ * Caitlin Mercer
++ * Dagobert Michelsen
++ * Andrea Montefusco
++ * Mansour Moufid
++ * Mina Naguib
++ * Felix Nawothnig
++ * Trond Norbye
++ * Linus Nordberg
++ * Richard Nyberg
++ * Jon Oberheide
++ * John Ohl
++ * Phil Oleson
++ * Alexey Ozeritsky
++ * Dave Pacheco
++ * Derrick Pallas
++ * Tassilo von Parseval
++ * Catalin Patulea
++ * Patrick Pelletier
++ * Simon Perreault
++ * Dan Petro
++ * Pierre Phaneuf
++ * Amarin Phaosawasdi
++ * Ryan Phillips
++ * Dimitre Piskyulev
++ * Pavel Plesov
++ * Jon Poland
++ * Roman Puls
++ * Nate R
++ * Robert Ransom
++ * Balint Reczey
++ * Bert JW Regeer
++ * Nate Rosenblum
++ * Peter Rosin
++ * Maseeb Abdul Qadir
++ * Wang Qin
++ * Alex S
++ * Gyepi Sam
++ * Hanna Schroeter
++ * Ralf Schmitt
++ * Mike Smellie
++ * Steve Snyder
++ * Nir Soffer
++ * Dug Song
++ * Dongsheng Song
++ * Hannes Sowa
++ * Joakim Soderberg
++ * Joseph Spadavecchia
++ * Kevin Springborn
++ * Harlan Stenn
++ * Andrew Sweeney
++ * Ferenc Szalai
++ * Brodie Thiesfield
++ * Jason Toffaletti
++ * Brian Utterback
++ * Gisle Vanem
++ * Bas Verhoeven
++ * Constantine Verutin
++ * Colin Watt
++ * Zack Weinberg
++ * Jardel Weyrich
++ * Jay R. Wren
++ * Zack Weinberg
++ * Mobai Zhang
++ * Alejo
++ * Alex
++ * Taral
++ * propanbutan
++ * masksqwe
++ * mmadia
++ * yangacer
++ * Andrey Skriabin
++ * basavesh.as
++ * billsegall
++ * Bill Vaughan
++ * Christopher Wiley
++ * David Paschich
++ * Ed Schouten
++ * Eduardo Panisset
++ * Jan Heylen
++ * jer-gentoo
++ * Joakim Söderberg
++ * kirillDanshin
++ * lzmths
++ * Marcus Sundberg
++ * Mark Mentovai
++ * Mattes D
++ * Matyas Dolak
++ * Neeraj Badlani
++ * Nick Mathewson
++ * Rainer Keller
++ * Seungmo Koo
++ * Thomas Bernard
++ * Xiao Bao Clark
++ * zeliard
++ * Zonr Chang
++ * Kurt Roeckx
++ * Seven
++ * Simone Basso
++ * Vlad Shcherban
++ * Tim Hentenaar
++ * Breaker
++ * johnsonlee
++ * Philip Prindeville
++ * Vis Virial
++ * Andreas Gustafsson
++ * Andrey Okoshkin
++ * an-tao
++ * baixiangcpp
++ * Bernard Spil
++ * Bogdan Harjoc
++ * Carlo Marcelo Arenas Belón
++ * David Benjamin
++ * David Disseldorp
++ * Dmitry Alimov
++ * Dominic Chen
++ * dpayne
++ * ejurgensen
++ * Fredrik Strupe
++ * Gonçalo Ribeiro
++ * James Synge
++ * Jan Beich
++ * Jesse Fang
++ * Jiri Luznicky
++ * José Luis Millán
++ * Kiyoshi Aman
++ * Leo Zhang
++ * lightningkay
++ * Luke Dashjr
++ * Marcin Szewczyk
++ * Maximilian Brunner
++ * Maya Rashish
++ * Murat Demirten
++ * Nathan French
++ * Nikolay Edigaryev
++ * Philip Herron
++ * Redfoxmoon
++ * stenn
++ * SuckShit
++ * The Gitter Badger
++ * tim-le
++ * Vincent JARDIN
++ * Xiang Zhang
++ * Xiaozhou Liu
++ * yongqing.jiao
++ * Enji Cooper
++ * linxiaohui
++ * Seong-Joong Kim
++ * Tobias Stoeckmann
++ * Yury Korzhetsky
++ * zhuizhuhaomeng
++ * Pierce Lopez
++ * yuangongji
++ * Keith Smiley
++ * jeremyerb
++ * Fabrice Fontaine
++ * wenyg
++ * Aleksandr-Melnikov
++ * ayuseleznev
++ * chenguolong
++ * Dimo Markov
++ * dota17
++ * fanquake
++ * Jan Kasiak
++ * Kamil Rytarowski
++ * Mario Emmenlauer
++ * Michael Davidsaver
++ * mohuang
++ * Nick Grifka
++ * Nicolas J. Bouliane
++ * Paul Osborne
++ * Philip Homburg
++ * Wataru Ashihara
++ * William A Rowe Jr
++ * yangyongsheng
++
++
++If we have forgotten your name, please contact us.
diff --cc contrib/libevent/WIN32-Code/getopt.c
index 000000000000,0fcba5d91529..0fcba5d91529
mode 000000,100644..100644
--- a/contrib/libevent/WIN32-Code/getopt.c
+++ b/contrib/libevent/WIN32-Code/getopt.c
diff --cc contrib/libevent/WIN32-Code/getopt.h
index 000000000000,796f4550509d..796f4550509d
mode 000000,100644..100644
--- a/contrib/libevent/WIN32-Code/getopt.h
+++ b/contrib/libevent/WIN32-Code/getopt.h
diff --cc contrib/libevent/WIN32-Code/getopt_long.c
index 000000000000,092defbc4bed..092defbc4bed
mode 000000,100644..100644
--- a/contrib/libevent/WIN32-Code/getopt_long.c
+++ b/contrib/libevent/WIN32-Code/getopt_long.c
diff --cc contrib/libevent/build-aux/config.sub
index 000000000000,f02d43ad500c..f02d43ad500c
mode 000000,100755..100755
--- a/contrib/libevent/build-aux/config.sub
+++ b/contrib/libevent/build-aux/config.sub
diff --cc contrib/libevent/build-aux/ltmain.sh
index 0f0a2da3f9dd,48cea9b0e5bd..48cea9b0e5bd
mode 100755,100644..100644
--- a/contrib/libevent/build-aux/ltmain.sh
+++ b/contrib/libevent/build-aux/ltmain.sh
diff --cc contrib/libevent/cmake/AddCompilerFlags.cmake
index 000000000000,9dc21d03adc5..9dc21d03adc5
mode 000000,100644..100644
--- a/contrib/libevent/cmake/AddCompilerFlags.cmake
+++ b/contrib/libevent/cmake/AddCompilerFlags.cmake
diff --cc contrib/libevent/cmake/AddEventLibrary.cmake
index 000000000000,04f5837e9860..04f5837e9860
mode 000000,100644..100644
--- a/contrib/libevent/cmake/AddEventLibrary.cmake
+++ b/contrib/libevent/cmake/AddEventLibrary.cmake
diff --cc contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS
index 000000000000,ab3c4d25d164..ab3c4d25d164
mode 000000,100644..100644
--- a/contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS
+++ b/contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS
diff --cc contrib/libevent/cmake/CheckConstExists.cmake
index 000000000000,de074581df4c..de074581df4c
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckConstExists.cmake
+++ b/contrib/libevent/cmake/CheckConstExists.cmake
diff --cc contrib/libevent/cmake/CheckFileOffsetBits.c
index 000000000000,d948fecf2b4e..d948fecf2b4e
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckFileOffsetBits.c
+++ b/contrib/libevent/cmake/CheckFileOffsetBits.c
diff --cc contrib/libevent/cmake/CheckFileOffsetBits.cmake
index 000000000000,12534401605c..12534401605c
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckFileOffsetBits.cmake
+++ b/contrib/libevent/cmake/CheckFileOffsetBits.cmake
diff --cc contrib/libevent/cmake/CheckFunctionKeywords.cmake
index 000000000000,3d968b8a6b1a..3d968b8a6b1a
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckFunctionKeywords.cmake
+++ b/contrib/libevent/cmake/CheckFunctionKeywords.cmake
diff --cc contrib/libevent/cmake/CheckPrototypeDefinition.c.in
index 000000000000,a97344ac3e10..a97344ac3e10
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckPrototypeDefinition.c.in
+++ b/contrib/libevent/cmake/CheckPrototypeDefinition.c.in
diff --cc contrib/libevent/cmake/CheckPrototypeDefinition.cmake
index 000000000000,940d1ff0ce38..940d1ff0ce38
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckPrototypeDefinition.cmake
+++ b/contrib/libevent/cmake/CheckPrototypeDefinition.cmake
diff --cc contrib/libevent/cmake/CheckWorkingKqueue.cmake
index 000000000000,f22f011b5875..f22f011b5875
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CheckWorkingKqueue.cmake
+++ b/contrib/libevent/cmake/CheckWorkingKqueue.cmake
diff --cc contrib/libevent/cmake/CodeCoverage.cmake
index 000000000000,eba85b3fb77e..eba85b3fb77e
mode 000000,100644..100644
--- a/contrib/libevent/cmake/CodeCoverage.cmake
+++ b/contrib/libevent/cmake/CodeCoverage.cmake
diff --cc contrib/libevent/cmake/Copyright.txt
index 000000000000,813124f02eef..813124f02eef
mode 000000,100644..100644
--- a/contrib/libevent/cmake/Copyright.txt
+++ b/contrib/libevent/cmake/Copyright.txt
diff --cc contrib/libevent/cmake/LibeventConfig.cmake.in
index 000000000000,7b808c324543..7b808c324543
mode 000000,100644..100644
--- a/contrib/libevent/cmake/LibeventConfig.cmake.in
+++ b/contrib/libevent/cmake/LibeventConfig.cmake.in
diff --cc contrib/libevent/cmake/LibeventConfigVersion.cmake.in
index 000000000000,56371a8fee77..56371a8fee77
mode 000000,100644..100644
--- a/contrib/libevent/cmake/LibeventConfigVersion.cmake.in
+++ b/contrib/libevent/cmake/LibeventConfigVersion.cmake.in
diff --cc contrib/libevent/cmake/Macros.cmake
index 000000000000,e480bbfdca8a..e480bbfdca8a
mode 000000,100644..100644
--- a/contrib/libevent/cmake/Macros.cmake
+++ b/contrib/libevent/cmake/Macros.cmake
diff --cc contrib/libevent/cmake/Uninstall.cmake.in
index 000000000000,c6dc09efe109..c6dc09efe109
mode 000000,100644..100644
--- a/contrib/libevent/cmake/Uninstall.cmake.in
+++ b/contrib/libevent/cmake/Uninstall.cmake.in
diff --cc contrib/libevent/cmake/UseDoxygen.cmake
index 000000000000,3b60d5a0f58b..3b60d5a0f58b
mode 000000,100644..100644
--- a/contrib/libevent/cmake/UseDoxygen.cmake
+++ b/contrib/libevent/cmake/UseDoxygen.cmake
diff --cc contrib/libevent/cmake/VersionViaGit.cmake
index 000000000000,24eb6af9b7de..24eb6af9b7de
mode 000000,100644..100644
--- a/contrib/libevent/cmake/VersionViaGit.cmake
+++ b/contrib/libevent/cmake/VersionViaGit.cmake
diff --cc contrib/libevent/doxygen.am
index 000000000000,916d7c4079b2..916d7c4079b2
mode 000000,100644..100644
--- a/contrib/libevent/doxygen.am
+++ b/contrib/libevent/doxygen.am
diff --cc contrib/libevent/evconfig-private.h.cmake
index 000000000000,1adf9c03d1b4..1adf9c03d1b4
mode 000000,100644..100644
--- a/contrib/libevent/evconfig-private.h.cmake
+++ b/contrib/libevent/evconfig-private.h.cmake
diff --cc contrib/libevent/event-config.h.cmake
index 000000000000,fccf0cf05970..fccf0cf05970
mode 000000,100644..100644
--- a/contrib/libevent/event-config.h.cmake
+++ b/contrib/libevent/event-config.h.cmake
diff --cc contrib/libevent/evutil_rand.c
index 24efa69288da,8e9afdaa6753..f56fd9d30d25
--- a/contrib/libevent/evutil_rand.c
+++ b/contrib/libevent/evutil_rand.c
@@@ -195,7 -194,10 +194,8 @@@ evutil_secure_rng_get_bytes(void *buf,
void
evutil_secure_rng_add_bytes(const char *buf, size_t n)
{
- arc4random_addrandom((unsigned char*)buf,
- n>(size_t)INT_MAX ? INT_MAX : (int)n);
}
+ #endif
void
evutil_free_secure_rng_globals_(void)
diff --cc contrib/libevent/m4/ax_check_funcs_ex.m4
index 000000000000,7aaa58b054d5..7aaa58b054d5
mode 000000,100644..100644
--- a/contrib/libevent/m4/ax_check_funcs_ex.m4
+++ b/contrib/libevent/m4/ax_check_funcs_ex.m4
diff --cc contrib/libevent/m4/ax_prog_doxygen.m4
index 000000000000,e5bdeb5992dc..e5bdeb5992dc
mode 000000,100644..100644
--- a/contrib/libevent/m4/ax_prog_doxygen.m4
+++ b/contrib/libevent/m4/ax_prog_doxygen.m4
diff --cc contrib/libevent/test/print-winsock-errors.c
index 000000000000,64d6b0e70e4d..64d6b0e70e4d
mode 000000,100644..100644
--- a/contrib/libevent/test/print-winsock-errors.c
+++ b/contrib/libevent/test/print-winsock-errors.c