From f38e07886829bb4613d3fa08c06d65b2d18ae584 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 18 Nov 2012 01:36:03 -0500 Subject: [PATCH 1/4] Make ssl version check in unit tests work --- test/regress_ssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regress_ssl.c b/test/regress_ssl.c index 271a962f..1ce5f6aa 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -159,7 +159,7 @@ init_ssl(void) SSL_load_error_strings(); OpenSSL_add_all_algorithms(); if (SSLeay() != OPENSSL_VERSION_NUMBER) { - TT_DECLARE("WARN", ("Version mismatch for openssl: compiled with %lx but running with %lx", OPENSSL_VERSION_NUMBER, SSLeay())); + TT_DECLARE("WARN", ("Version mismatch for openssl: compiled with %lx but running with %lx", (unsigned long)OPENSSL_VERSION_NUMBER, (unsigned long)SSLeay())); } } From 1c5517c97c1331ee2ebb424c9a297536b377c26c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 18 Nov 2012 01:36:33 -0500 Subject: [PATCH 2/4] Changelog for 2.0.21-stable --- ChangeLog | 16 +++++++++++++++- README | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c06ad861..eb6530d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,18 @@ -Changes in version 2.0.21-stable (?? ??? 2012) +Changes in version 2.0.21-stable (18 Nov 2012) +BUGFIXES: + o ssl: Don't discard SSL read event when timeout and read come close together (576b29f) + o ssl: Stop looping in "consider_reading" if reading is suspended. (f719b8a Joachim Bauch) + o ssl: No need to reserve space if reading is suspended. (1acf2eb Joachim Bauch) + o dns: Avoid a memory-leak on OOM in evdns. (73e85dd, f2bff75 George Danchev) + o build: Use python2 rather than python (0eb0109 Ross Lagerwall) + o build: Compile without warnings on mingw64 (94866c2) + o build: Fix compilation on mingw64 with -DUSE_DEBUG (62bd2c4) + o build: Make rpcgen_wrapper.sh work on systems without a "python2" binary (f3009e4) + o iocp: Close IOCP listener socket on free when LEV_OPT_CLOSE_ON_FREE is set (cb853ea Juan Pablo Fernandez) + o core: Avoid crash when event_pending() called with no event_base set on event (e3cccf3) + o misc: remove stray 'x' so print_err will compile when uncommented (ac35650 Patrick Pelletier) + o tests: Fix renegotiation test to work around openssl 1.0.1 bug (c2f3086) + o tests: Warn when openssl version in unit test mismatches compiled version. (ac009f9) Changes in version 2.0.20-stable (23 Aug 2012) diff --git a/README b/README index 9f719ce1..23b769f9 100644 --- a/README +++ b/README @@ -92,7 +92,9 @@ fixing bugs: Shuo Chen Ka-Hing Cheung Andrew Cox + George Danchev Andrew Danforth + Antony Dovgal Ed Day Christopher Davis Mike Davis @@ -100,6 +102,7 @@ fixing bugs: Mark Ellzey Shie Erlich Leonid Evdokimov + Juan Pablo Fernandez Christophe Fillot Mike Frysinger Remi Gacogne @@ -154,6 +157,7 @@ fixing bugs: Dave Pacheco Tassilo von Parseval Catalin Patulea + Patrick Pelletier Simon Perreault Pierre Phaneuf Ryan Phillips From 0ee10fdfee3a9f438e95efb915e4e1a4df2f4bd5 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 18 Nov 2012 01:38:07 -0500 Subject: [PATCH 3/4] Increment version to 2.0.21-stable --- WIN32-Code/event2/event-config.h | 4 ++-- configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index ed11769a..9d085c4b 100644 --- a/WIN32-Code/event2/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -277,7 +277,7 @@ /* #undef _EVENT_HAVE_WORKING_KQUEUE */ /* Numeric representation of the version */ -#define _EVENT_NUMERIC_VERSION 0x02001401 +#define _EVENT_NUMERIC_VERSION 0x02001500 /* Name of package */ #define _EVENT_PACKAGE "libevent" @@ -334,7 +334,7 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define _EVENT_VERSION "2.0.20-stable-dev" +#define _EVENT_VERSION "2.0.21-stable" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/configure.in b/configure.in index 5ecf5f48..18165f32 100644 --- a/configure.in +++ b/configure.in @@ -11,9 +11,9 @@ AC_INIT(event.c) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libevent,2.0.20-stable-dev) +AM_INIT_AUTOMAKE(libevent,2.0.21-stable) AM_CONFIG_HEADER(config.h) -AC_DEFINE(NUMERIC_VERSION, 0x02001401, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then From 64177777165d9684bafbfa946abd126f7ebff11f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 18 Nov 2012 01:39:10 -0500 Subject: [PATCH 4/4] Increment libtool version for 2.0.21 too --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a08e3e18..42879a31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ RELEASE = -release 2.0 # # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # UNLESS YOU REALLY REALLY HAVE TO. -VERSION_INFO = 6:8:1 +VERSION_INFO = 6:9:1 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -61,6 +61,7 @@ VERSION_INFO = 6:8:1 # 2.0.18-stable-- 2.0 6:6:1 (No ABI change) # 2.0.19-stable-- 2.0 6:7:1 (No ABI change) # 2.0.20-stable-- 2.0 6:8:1 (No ABI change) +# 2.0.21-stable-- 2.0 6:9:1 (No ABI change) # # For Libevent 2.1: # 2.1.1-alpha -- 2.1 1:0:0