Merge remote-tracking branch 'azat/release-2.1.7-rc-pull'

Finally 2.1 release candidate is out!

* azat/release-2.1.7-rc-pull:
  Bump version to 2.1.7-beta everywhere
  Update changelog for 2.1.7-rc
  README: update AUTHORS

CMakeLists.txt

@@ -73,7 +73,7 @@ set(EVENT_ABI_LIBVERSION
 set(EVENT_PACKAGE_VERSION
  "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}")
 
-set(EVENT_NUMERIC_VERSION 0x02010600)
+set(EVENT_NUMERIC_VERSION 0x02010700)
 
 # only a subset of names can be used, defaults to "beta"
 set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}

ChangeLog

@@ -1,3 +1,46 @@
+Changes in version 2.1.7-rc (2 Novemer 2016)
+
+ Libevent 2.1.7-rc contains openssl 1.1 support, build fixes, CI improvements
+ and plus Vagrantfile for testing under multiple OS'es.
+
+
+ Continious Integration:
+ o Use coveralls.io via travis (9ac000c Azat Khuzhin)
+ o travis-ci: use container-based infrastructure (7e12e96 Azat Khuzhin)
+ o travis-ci/osx: fix compiling/linking openssl libraries (9d2f8d4 Azat Khuzhin)
+ o travis-ci: use gcc-5 (fixes osx|gcc failures) (d7ceae5 Azat Khuzhin)
+ o Testing with vagrant for 6 OS and cmake+autoconf (9585338 Azat Khuzhin)
+ o travis-ci/osx: install lcov (e4e099b Azat Khuzhin)
+
+ Build Improvements/Fixes:
+ o Fix cmake -DEVENT__COVERAGE=ON (40fbffc Azat Khuzhin)
+ o autogen.sh: learn about gmake (9376ac4 Azat Khuzhin)
+ o autogen.sh: remove all autoconf/automake caches, if any (69cce25 Azat Khuzhin)
+ o cmake: fix finding python2, and check that it is really 2 (3453c08 Azat Khuzhin)
+ o cmake: fix CheckFunctionExistsEx/CheckPrototypeDefinition (CMP0054) (43b69b2 Azat Khuzhin)
+ o cmake: cleanup (dc624ad Zonr Chang)
+ o cmake/win32: fix running regress, but fixing finding python2 interpreter (bcb990a Azat Khuzhin)
+ o cmake: use PYTHON_EXECUTABLE to find python2 (a4d044c Azat Khuzhin)
+ o Merge branch 'force-disable-clockgettime' (83c7cdf Azat Khuzhin)
+
+ Code Improvements (core)
+ o use ev_uint16_t instead of unsigned short for port (e983712 Thomas Bernard)
+ o Merge branch 'contrib-guide-v2' (b9c5077 Azat Khuzhin)
+ o poll: Prevent libevent from spinning if POLLNVAL occurs (675974c Tim Hentenaar)
+
+ Testing:
+ o test/regress: cover a polling of invalid fd (cb0df5c Tim Hentenaar)
+
+ Code Improvements (bufferevent_openssl)
+ o Make it build using OpenSSL 1.1.0 (3e9e0a0 Kurt Roeckx)
+ o Don't call BIO_number_{read|written} on NULL BIOs. (6702da1 Adam Langley)
+ o Switch from a 512 to 2048-bit RSA key. (f9803a6 Adam Langley)
+
+ Trivial fixes:
+ o Ignore temporary configure files (8fb08ae Azat Khuzhin)
+ o README.md: fix typo: ar -> are (2361616 Simone Basso)
+ o be: just a simple mistake, reinclude the <errno.h> (7521664 Seven)
+
 Changes in version 2.1.6-beta (4 July 2016)
 
  Libevent 2.1.6-beta contains mostly bug fixes (evbuffers, evthread, evdns,

Makefile.am

@@ -34,7 +34,7 @@ RELEASE = -release 2.1
 #
 # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
 # UNLESS YOU REALLY REALLY HAVE TO.
-VERSION_INFO = 6:0:0
+VERSION_INFO = 6:1:0
 
 # History: RELEASE VERSION_INFO
 # 2.0.1-alpha -- 2.0 1:0:0
@@ -66,6 +66,7 @@ VERSION_INFO = 6:0:0
 # 2.1.4-alpha -- 2.1 4:0:0 (ABI changed slightly)
 # 2.1.5-beta -- 2.1 5:0:0 (ABI changed slightly)
 # 2.1.6-beta -- 2.1 6:0:0 (ABI changed slightly)
+# 2.1.7-beta -- 2.1 6:1:0 (ABI changed slightly)
 
 # ABI version history for this package effectively restarts every time
 # we change RELEASE. Version 1.4.x had RELEASE of 1.4.

README.md

@@ -418,5 +418,10 @@ fixing bugs:
  * Xiao Bao Clark
  * zeliard
  * Zonr Chang
+ * Kurt Roeckx
+ * Seven
+ * Simone Basso
+ * Vlad Shcherban
+ * Tim Hentenaar
 
 If we have forgotten your name, please contact us.

WIN32-Code/nmake/event2/event-config.h

@@ -274,7 +274,7 @@
 /* #undef EVENT__HAVE_WORKING_KQUEUE */
 
 /* Numeric representation of the version */
-#define EVENT__NUMERIC_VERSION 0x02010600
+#define EVENT__NUMERIC_VERSION 0x02010700
 
 /* Name of package */
 #define EVENT__PACKAGE "libevent"
@@ -331,7 +331,7 @@
 #define EVENT__TIME_WITH_SYS_TIME 1
 
 /* Version number of package */
-#define EVENT__VERSION "2.1.6-beta"
+#define EVENT__VERSION "2.1.7-beta"
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */
 #define EVENT____func__ __FUNCTION__

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.1.6.{build}
+version: 2.1.7.{build}
 
 os: Visual Studio 2015
 

cmake/VersionViaGit.cmake

@@ -27,7 +27,7 @@ macro(event_fuzzy_version_from_git)
  # set our defaults.
  set(EVENT_GIT___VERSION_MAJOR 2)
  set(EVENT_GIT___VERSION_MINOR 1)
- set(EVENT_GIT___VERSION_PATCH 6)
+ set(EVENT_GIT___VERSION_PATCH 7)
  set(EVENT_GIT___VERSION_STAGE "beta")
 
  find_package(Git)

configure.ac

@@ -5,7 +5,7 @@ dnl See LICENSE for copying information.
 dnl
 dnl Original version Dug Song <[email protected]>
 
-AC_INIT(libevent,2.1.6-beta)
+AC_INIT(libevent,2.1.7-beta)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(event.c)
 
@@ -25,7 +25,7 @@ AM_INIT_AUTOMAKE(m4_esyscmd([echo foreign 1.9 subdir-objects
 dnl AM_SILENT_RULES req. automake 1.11. [no] defaults V=1
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS(config.h evconfig-private.h:evconfig-private.h.in)
-AC_DEFINE(NUMERIC_VERSION, 0x02010600, [Numeric representation of the version])
+AC_DEFINE(NUMERIC_VERSION, 0x02010700, [Numeric representation of the version])
 
 dnl Initialize prefix.
 if test "$prefix" = "NONE"; then