From 756c39e24d3c10e8edcb28003fc7ac6bf6ce452f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 1 Nov 2020 06:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201101063007669873 - https://github.com/libevent/libevent/commit/8d21ddcf4b5d804565f686ab6577b933a993054f --- ...ddcf4b5d804565f686ab6577b933a993054f.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 8d21ddcf4b5d804565f686ab6577b933a993054f.patch diff --git a/8d21ddcf4b5d804565f686ab6577b933a993054f.patch b/8d21ddcf4b5d804565f686ab6577b933a993054f.patch new file mode 100644 index 0000000..4dd76f6 --- /dev/null +++ b/8d21ddcf4b5d804565f686ab6577b933a993054f.patch @@ -0,0 +1,71 @@ +diff --git a/include/event2/bufferevent_ssl.h b/include/event2/bufferevent_ssl.h +index 355b632d3..8cc357320 100644 +--- a/include/event2/bufferevent_ssl.h ++++ b/include/event2/bufferevent_ssl.h +@@ -78,6 +78,34 @@ enum bufferevent_ssl_state { + */ + #define BUFFEREVENT_SSL_BATCH_WRITE 2 + ++#if defined(EVENT__HAVE_OPENSSL) || defined(EVENT__HAVE_MBEDTLS) ++/** ++ * Get flags of the SSL bufferevent. ++ * ++ * @see BUFFEREVENT_SSL_* ++ * @return flags or SIZE_MAX in case of error (if bufferevent is not SSL). ++ */ ++EVENT2_EXPORT_SYMBOL ++ev_uint64_t bufferevent_ssl_get_flags(struct bufferevent *bev); ++/** Change the flags that are set for an ssl bufferevent by adding more. ++ * ++ * @param bev the ssl bufferevent. ++ * @param flags One or more BUFFEREVENT_SSL_* options ++ * @return old flags success, EV_UINT64_MAX on failure. ++ */ ++EVENT2_EXPORT_SYMBOL ++ev_uint64_t bufferevent_ssl_set_flags(struct bufferevent *bev, ev_uint64_t flags); ++/** Change the flags that are set for an ssl bufferevent by removing some. ++ * ++ * @param bev the bufferevent. ++ * @param flags One or more BUFFEREVENT_SSL_* options ++ * @return old flags success, EV_UINT64_MAX on failure. ++ */ ++EVENT2_EXPORT_SYMBOL ++ev_uint64_t bufferevent_ssl_clear_flags(struct bufferevent *bev, ev_uint64_t flags); ++ ++#endif /* defined(EVENT__HAVE_OPENSSL) || defined(EVENT__HAVE_MBEDTLS) */ ++ + #if defined(EVENT__HAVE_OPENSSL) || defined(EVENT_IN_DOXYGEN_) + /* This is what openssl's SSL objects are underneath. */ + struct ssl_st; +@@ -139,31 +167,6 @@ EVENT2_EXPORT_SYMBOL + void bufferevent_openssl_set_allow_dirty_shutdown(struct bufferevent *bev, + int allow_dirty_shutdown); + +-/** +- * Get flags of the SSL bufferevent. +- * +- * @see BUFFEREVENT_SSL_* +- * @return flags or SIZE_MAX in case of error (if bufferevent is not SSL). +- */ +-EVENT2_EXPORT_SYMBOL +-ev_uint64_t bufferevent_ssl_get_flags(struct bufferevent *bev); +-/** Change the flags that are set for an ssl bufferevent by adding more. +- * +- * @param bev the ssl bufferevent. +- * @param flags One or more BUFFEREVENT_SSL_* options +- * @return old flags success, EV_UINT64_MAX on failure. +- */ +-EVENT2_EXPORT_SYMBOL +-ev_uint64_t bufferevent_ssl_set_flags(struct bufferevent *bev, ev_uint64_t flags); +-/** Change the flags that are set for an ssl bufferevent by removing some. +- * +- * @param bev the bufferevent. +- * @param flags One or more BUFFEREVENT_SSL_* options +- * @return old flags success, EV_UINT64_MAX on failure. +- */ +-EVENT2_EXPORT_SYMBOL +-ev_uint64_t bufferevent_ssl_clear_flags(struct bufferevent *bev, ev_uint64_t flags); +- + /** Return the underlying openssl SSL * object for an SSL bufferevent. */ + EVENT2_EXPORT_SYMBOL + struct ssl_st * -- Gitee From c6a8bf2bae47bd50f9a6fd3995bf94d20d2635bb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 1 Nov 2020 06:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201101063007669873 - update spec file --- libevent.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libevent.spec b/libevent.spec index d03677e..64da79b 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: 8d21ddcf4b5d804565f686ab6577b933a993054f.patch %description Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets, @@ -71,6 +72,9 @@ make check %changelog +* 20201101063007669873 patch-tracking 2.1.12-2 +- append patch file of upstream repository from <8d21ddcf4b5d804565f686ab6577b933a993054f> to <8d21ddcf4b5d804565f686ab6577b933a993054f> + * Thu Jul 30 2020 yang_zhuang_zhuang - 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 - 2.1.11-1 -- Package init +- Package init \ No newline at end of file -- Gitee