Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/libevent merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/65d0ba5cc839
branches:  trunk
changeset: 821293:65d0ba5cc839
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 31 23:17:39 2017 +0000

description:
merge conflicts

diffstat:

 external/bsd/libevent/Makefile.inc                          |     4 +-
 external/bsd/libevent/dist/Doxyfile                         |     2 +-
 external/bsd/libevent/dist/README                           |   198 -
 external/bsd/libevent/dist/WIN32-Code/event2/event-config.h |   364 -
 external/bsd/libevent/dist/buffer.c                         |  1279 +-
 external/bsd/libevent/dist/bufferevent-internal.h           |   162 +-
 external/bsd/libevent/dist/bufferevent.c                    |   336 +-
 external/bsd/libevent/dist/bufferevent_ratelim.c            |   301 +-
 external/bsd/libevent/dist/configure.in                     |   806 -
 external/bsd/libevent/dist/evbuffer-internal.h              |   130 +-
 external/bsd/libevent/dist/evdns.c                          |   456 +-
 external/bsd/libevent/dist/evdns.h                          |    46 -
 external/bsd/libevent/dist/event-internal.h                 |   205 +-
 external/bsd/libevent/dist/event.c                          |  2501 +++-
 external/bsd/libevent/dist/event.h                          |    86 -
 external/bsd/libevent/dist/event_tagging.c                  |    31 +-
 external/bsd/libevent/dist/evhttp.h                         |    46 -
 external/bsd/libevent/dist/evmap.c                          |   552 +-
 external/bsd/libevent/dist/evrpc.c                          |    67 +-
 external/bsd/libevent/dist/evrpc.h                          |    46 -
 external/bsd/libevent/dist/evthread-internal.h              |   218 +-
 external/bsd/libevent/dist/evutil.c                         |  1070 +-
 external/bsd/libevent/dist/evutil.h                         |    40 -
 external/bsd/libevent/dist/evutil_rand.c                    |    58 +-
 external/bsd/libevent/dist/ht-internal.h                    |   101 +-
 external/bsd/libevent/dist/http.c                           |  1117 +-
 external/bsd/libevent/dist/include/Makefile.am              |    47 -
 external/bsd/libevent/dist/include/Makefile.in              |   598 -
 external/bsd/libevent/dist/include/event2/rpc.h             |    18 +-
 external/bsd/libevent/dist/include/event2/util.h            |   297 +-
 external/bsd/libevent/dist/log-internal.h                   |    38 +-
 external/bsd/libevent/dist/log.c                            |    71 +-
 external/bsd/libevent/dist/ltmain.sh                        |  5812 ++++++----
 external/bsd/libevent/dist/minheap-internal.h               |    96 +-
 external/bsd/libevent/dist/ratelim-internal.h               |    14 +-
 external/bsd/libevent/dist/sample/Makefile.am               |    29 -
 external/bsd/libevent/dist/sample/Makefile.in               |   580 -
 external/bsd/libevent/dist/sample/event-test.c              |   144 -
 external/bsd/libevent/dist/select.c                         |    31 +-
 external/bsd/libevent/dist/test/Makefile.am                 |   105 -
 external/bsd/libevent/dist/test/Makefile.in                 |  1091 --
 external/bsd/libevent/dist/test/regress.c                   |  1293 ++-
 external/bsd/libevent/dist/test/regress.h                   |    31 +-
 external/bsd/libevent/dist/test/regress_buffer.c            |  1018 +-
 external/bsd/libevent/dist/test/regress_bufferevent.c       |   726 +-
 external/bsd/libevent/dist/test/regress_dns.c               |   453 +-
 external/bsd/libevent/dist/test/regress_et.c                |    25 +-
 external/bsd/libevent/dist/test/regress_http.c              |  1539 ++-
 external/bsd/libevent/dist/test/regress_listener.c          |    60 +-
 external/bsd/libevent/dist/test/regress_main.c              |   104 +-
 external/bsd/libevent/dist/test/regress_rpc.c               |    29 +-
 external/bsd/libevent/dist/test/regress_ssl.c               |   480 +-
 external/bsd/libevent/dist/test/regress_thread.c            |   201 +-
 external/bsd/libevent/dist/test/regress_util.c              |   499 +-
 external/bsd/libevent/dist/test/regress_zlib.c              |    33 +-
 external/bsd/libevent/dist/test/tinytest_macros.h           |   105 +-
 external/bsd/libevent/dist/util-internal.h                  |   266 +-
 external/bsd/libevent/include/config.h                      |   547 +
 external/bsd/libevent/include/evconfig-private.h            |    50 +
 external/bsd/libevent/include/event-config.h                |   263 -
 external/bsd/libevent/include/event2/event-config.h         |   413 +-
 external/bsd/libevent/lib/libevent/Makefile                 |     3 +-
 62 files changed, 16669 insertions(+), 10662 deletions(-)

diffs (truncated from 43397 to 300 lines):

diff -r a8dd0f1c59d2 -r 65d0ba5cc839 external/bsd/libevent/Makefile.inc
--- a/external/bsd/libevent/Makefile.inc        Tue Jan 31 21:25:58 2017 +0000
+++ b/external/bsd/libevent/Makefile.inc        Tue Jan 31 23:17:39 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/04/11 16:59:16 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2017/01/31 23:17:39 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 CPPFLAGS+=     -I${LIBEVENT_DIST}/include
 
 SHLIB_MAJOR=   4
-SHLIB_MINOR=   0
+SHLIB_MINOR=   1
 
 WARNS?=                4
 
diff -r a8dd0f1c59d2 -r 65d0ba5cc839 external/bsd/libevent/dist/Doxyfile
--- a/external/bsd/libevent/dist/Doxyfile       Tue Jan 31 21:25:58 2017 +0000
+++ b/external/bsd/libevent/dist/Doxyfile       Tue Jan 31 23:17:39 2017 +0000
@@ -239,7 +239,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = TAILQ_ENTRY RB_ENTRY _EVENT_DEFINED_TQENTRY _EVENT_IN_DOXYGEN
+PREDEFINED             = TAILQ_ENTRY RB_ENTRY EVENT_DEFINED_TQENTRY_ EVENT_IN_DOXYGEN_
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
diff -r a8dd0f1c59d2 -r 65d0ba5cc839 external/bsd/libevent/dist/README
--- a/external/bsd/libevent/dist/README Tue Jan 31 21:25:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-0. BUILDING AND INSTALLATION (Briefly)
-
-$ ./configure
-$ make
-$ make verify   # (optional)
-$ sudo make install
-
-1. BUILDING AND INSTALLATION (In Depth)
-
-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 the 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.
-
-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 git://levent.git.sourceforge.net/gitroot/levent/libevent"
-
-You can browse the git repository online at
-http://levent.git.sourceforge.net/git/gitweb-index.cgi .
-
-To report bugs, request features, or submit patches to Libevent,
-use the Sourceforge trackers at
-https://sourceforge.net/tracker/?group_id=50884 .
-
-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:
-
-  Arno Bakker
-  Alejo
-  Weston Andros Adamson
-  William Ahern
-  Ivan Andropov
-  Sergey Avseyev
-  Avi Bab
-  Gilad Benjamini
-  Stas Bekman
-  Joachim Bauch
-  Denis Bilenko
-  Julien Blache
-  Kevin Bowling
-  Tomash Brechko
-  Kelly Brock
-  Ralph Castain
-  Adrian Chadd
-  Lawnstein Chan
-  Shuo Chen
-  Ka-Hing Cheung
-  Andrew Cox
-  George Danchev
-  Andrew Danforth
-  Antony Dovgal
-  Ed Day
-  Christopher Davis
-  Mike Davis
-  Mihai Draghicioiu
-  Mark Ellzey
-  Shie Erlich
-  Leonid Evdokimov
-  Juan Pablo Fernandez
-  Christophe Fillot
-  Mike Frysinger
-  Remi Gacogne
-  Alexander von Gernler
-  Artur Grabowski
-  Sebastian Hahn
-  Dave Hart
-  Greg Hazel
-  Michael Herf
-  Savg He
-  Mark Heily
-  Greg Hewgill
-  Andrew Hochhaus
-  Aaron Hopkins
-  Tani Hosokawa
-  Jamie Iles
-  Claudio Jeker
-  Evan Jones
-  George Kadianakis
-  Phua Keat
-  Kevin Ko
-  Brian Koehmstedt
-  Marko Kreen
-  Valery Kyholodov
-  Ross Lagerwall
-  Scott Lamb
-  Christopher Layne
-  Adam Langley
-  Philip Lewis
-  Zhou Li
-  David Libenzi
-  Yan Lin
-  Moshe Litvin
-  Simon Liu
-  Mitchell Livingston
-  Hagne Mahre
-  Lubomir Marinov
-  Abilio Marques
-  Nick Mathewson
-  James Mansion
-  Nicholas Marriott
-  Andrey Matveev
-  Caitlin Mercer
-  Dagobert Michelsen
-  Mansour Moufid
-  Felix Nawothnig
-  Trond Norbye
-  Linus Nordberg
-  Richard Nyberg
-  Jon Oberheide
-  Phil Oleson
-  Dave Pacheco
-  Tassilo von Parseval
-  Catalin Patulea
-  Patrick Pelletier
-  Simon Perreault
-  Pierre Phaneuf
-  Ryan Phillips
-  Dimitre Piskyulev
-  Pavel Plesov
-  Jon Poland
-  Nate R
-  Robert Ransom
-  Bert JW Regeer
-  Peter Rosin
-  Maseeb Abdul Qadir
-  Wang Qin
-  Alex S
-  Hanna Schroeter
-  Ralf Schmitt
-  Mike Smellie
-  Kevin Springborn
-  Harlan Stenn
-  Steve Snyder
-  Dug Song
-  Dongsheng Song
-  Hannes Sowa
-  Ferenc Szalai
-  Brodie Thiesfield
-  Jason Toffaletti
-  Gisle Vanem
-  Bas Verhoeven
-  Constantine Verutin
-  Colin Watt
-  Zack Weinberg
-  Jardel Weyrich
-  Alex
-  Taral
-  propanbutan
-  mmadia
-
-
-If we have forgotten your name, please contact us.
diff -r a8dd0f1c59d2 -r 65d0ba5cc839 external/bsd/libevent/dist/WIN32-Code/event2/event-config.h
--- a/external/bsd/libevent/dist/WIN32-Code/event2/event-config.h       Tue Jan 31 21:25:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-/*     $NetBSD: event-config.h,v 1.1.1.2 2015/01/29 06:38:25 spz Exp $ */
-/* event2/event-config.h
- *
- * This file was generated by autoconf when libevent was built, and post-
- * processed by Libevent so that its macros would have a uniform prefix.
- *
- * DO NOT EDIT THIS FILE.
- *
- * Do not rely on macros in this file existing in later versions.
- */
-#ifndef _EVENT_CONFIG_H_
-#define _EVENT_CONFIG_H_
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if libevent should not allow replacing the mm functions */
-/* #undef _EVENT_DISABLE_MM_REPLACEMENT */
-
-/* Define if libevent should not be compiled with thread support */
-/* #undef _EVENT_DISABLE_THREAD_SUPPORT */
-
-/* Define if clock_gettime is available in libc */
-/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */
-
-/* Define is no secure id variant is available */
-/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */
-#define _EVENT_DNS_USE_FTIME_FOR_ID 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef _EVENT_HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef _EVENT_HAVE_CLOCK_GETTIME */
-
-/* Define if /dev/poll is available */
-/* #undef _EVENT_HAVE_DEVPOLL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef _EVENT_HAVE_DLFCN_H */
-
-/* Define if your system supports the epoll system calls */
-/* #undef _EVENT_HAVE_EPOLL */
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef _EVENT_HAVE_EPOLL_CTL */
-
-/* Define to 1 if you have the `eventfd' function. */
-/* #undef _EVENT_HAVE_EVENTFD */
-
-/* Define if your system supports event ports */
-/* #undef _EVENT_HAVE_EVENT_PORTS */
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef _EVENT_HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define _EVENT_HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define _EVENT_HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#define _EVENT_HAVE_GETNAMEINFO 1
-



Home | Main Index | Thread Index | Old Index