From c482a5a8b271942ee7de32844fdb114cbff72917 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 5 Nov 2020 06:30:11 +0800
Subject: [PATCH 1/2] [patch tracking] 20201105063007673689 -
 https://github.com/libevent/libevent/commit/59e31c9667075ae960d59e0f78d8d9c6eb01765f

---
 ...1c9667075ae960d59e0f78d8d9c6eb01765f.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 59e31c9667075ae960d59e0f78d8d9c6eb01765f.patch

diff --git a/59e31c9667075ae960d59e0f78d8d9c6eb01765f.patch b/59e31c9667075ae960d59e0f78d8d9c6eb01765f.patch
new file mode 100644
index 0000000..b30c970
--- /dev/null
+++ b/59e31c9667075ae960d59e0f78d8d9c6eb01765f.patch
@@ -0,0 +1,32 @@
+diff --git a/bufferevent_ssl.c b/bufferevent_ssl.c
+index b34af9af4..a946c162f 100644
+--- a/bufferevent_ssl.c
++++ b/bufferevent_ssl.c
+@@ -739,8 +739,13 @@ be_ssl_handshakeeventcb(evutil_socket_t fd, short what, void *ptr)
+ 	bufferevent_incref_and_lock_(&bev_ssl->bev.bev);
+ 	if (what & EV_TIMEOUT) {
+ 		bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_TIMEOUT, 0);
+-	} else
+-		do_handshake(bev_ssl);/* XXX handle failure */
++	} else {
++		int c = evutil_socket_finished_connecting_(fd);
++		if (c < 0)
++			bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_ERROR, 0);
++		else
++			do_handshake(bev_ssl);/* XXX handle failure */
++	}
+ 	bufferevent_decref_and_unlock_(&bev_ssl->bev.bev);
+ }
+ 
+diff --git a/util-internal.h b/util-internal.h
+index 9010b2e37..dabb6d6ba 100644
+--- a/util-internal.h
++++ b/util-internal.h
+@@ -300,6 +300,7 @@ int evutil_read_file_(const char *filename, char **content_out, size_t *len_out,
+ EVENT2_EXPORT_SYMBOL
+ int evutil_socket_connect_(evutil_socket_t *fd_ptr, const struct sockaddr *sa, int socklen);
+ 
++EVENT2_EXPORT_SYMBOL
+ int evutil_socket_finished_connecting_(evutil_socket_t fd);
+ 
+ #ifdef EVENT__HAVE_AFUNIX_H
-- 
Gitee


From bac2b00f5edf00c33e7ab8bf379d3a25d6381e6a Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 5 Nov 2020 06:30:13 +0800
Subject: [PATCH 2/2] [patch tracking] 20201105063007673689 - update spec file

---
 libevent.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libevent.spec b/libevent.spec
index d03677e..c0a072e 100644
--- a/libevent.spec
+++ b/libevent.spec
@@ -2,7 +2,7 @@
 
 Name:           libevent
 Version:        2.1.12
-Release:        1
+Release:        2
 Summary:        An event notification library
 
 License:        BSD
@@ -13,6 +13,7 @@ BuildRequires: gcc doxygen openssl-devel libevent
 
 Patch0: libevent-nonettests.patch
 Patch1: http-add-callback-to-allow-server-to-decline-and-the.patch
+Patch6000: 59e31c9667075ae960d59e0f78d8d9c6eb01765f.patch
 
 %description
 Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets,
@@ -71,6 +72,9 @@ make check
 
 
 %changelog
+* 20201105063007673689 patch-tracking 2.1.12-2
+- append patch file of upstream repository from <59e31c9667075ae960d59e0f78d8d9c6eb01765f> to <59e31c9667075ae960d59e0f78d8d9c6eb01765f>
+
 * Thu Jul 30 2020 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-1
 - Type:enhancement
 - ID:NA
@@ -90,4 +94,4 @@ make check
 - DESC:add global marco of debug_package
 
 * Tue Aug 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.1.11-1
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee