diff --git a/http-fix-undefined-shift-in-EVUTIL_IS-_-helpers.patch b/http-fix-undefined-shift-in-EVUTIL_IS-_-helpers.patch deleted file mode 100644 index 49e6c013b7e9ea4093e88223e0b64829ce68bdf0..0000000000000000000000000000000000000000 --- a/http-fix-undefined-shift-in-EVUTIL_IS-_-helpers.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 37dbb3508099d49748453166c1ee9ef1603fcf3a Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Thu, 25 Jun 2020 08:45:34 +0300 -Subject: [PATCH] http: fix undefined-shift in EVUTIL_IS*_ helpers - -evutil.c:2559:1: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' - #0 0x4f2be0 in EVUTIL_ISXDIGIT_ libevent/evutil.c:2559:1 - #1 0x4bd689 in regname_ok libevent/http.c:4838:7 - #2 0x4bc16b in parse_authority libevent/http.c:4958:9 - #3 0x4bb8b5 in evhttp_uri_parse_with_flags libevent/http.c:5103:7 - #4 0x4bb762 in evhttp_uri_parse libevent/http.c:5050:9 - #5 0x4b8f41 in evhttp_parse_query_impl libevent/http.c:3505:9 - #6 0x4b8ed7 in evhttp_parse_query libevent/http.c:3569:9 - -Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=23291 -Report: https://oss-fuzz.com/testcase-detail/5670743106125824 ---- - evutil.c | 2 +- - test/regress_util.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/evutil.c b/evutil.c -index eee970a4..93093b0e 100644 ---- a/evutil.c -+++ b/evutil.c -@@ -2550,7 +2550,7 @@ static const unsigned char EVUTIL_TOLOWER_TABLE[256] = { - #define IMPL_CTYPE_FN(name) \ - int EVUTIL_##name##_(char c) { \ - ev_uint8_t u = c; \ -- return !!(EVUTIL_##name##_TABLE[(u >> 5) & 7] & (1 << (u & 31))); \ -+ return !!(EVUTIL_##name##_TABLE[(u >> 5) & 7] & (1U << (u & 31))); \ - } - IMPL_CTYPE_FN(ISALPHA) - IMPL_CTYPE_FN(ISALNUM) -diff --git a/test/regress_util.c b/test/regress_util.c -index 1459387a..f28238c8 100644 ---- a/test/regress_util.c -+++ b/test/regress_util.c -@@ -988,6 +988,16 @@ end: - ; - } - -+static void -+test_EVUTIL_IS_(void *arg) -+{ -+ tt_int_op(EVUTIL_ISDIGIT_('0'), ==, 1); -+ tt_int_op(EVUTIL_ISDIGIT_('a'), ==, 0); -+ tt_int_op(EVUTIL_ISDIGIT_('\xff'), ==, 0); -+end: -+ ; -+} -+ - static void - test_evutil_getaddrinfo(void *arg) - { -@@ -1787,6 +1797,7 @@ struct testcase_t util_testcases[] = { - { "upcast", test_evutil_upcast, 0, NULL, NULL }, - { "integers", test_evutil_integers, 0, NULL, NULL }, - { "rand", test_evutil_rand, TT_FORK, NULL, NULL }, -+ { "EVUTIL_IS_", test_EVUTIL_IS_, 0, NULL, NULL }, - { "getaddrinfo", test_evutil_getaddrinfo, TT_FORK, NULL, NULL }, - { "getaddrinfo_live", test_evutil_getaddrinfo_live, TT_FORK|TT_OFF_BY_DEFAULT, NULL, NULL }, - #ifdef _WIN32 --- -2.23.0 - diff --git a/libevent-2.1.11-stable.tar.gz b/libevent-2.1.11-stable.tar.gz deleted file mode 100644 index 8ca374c8bcc136836a5ce7fe772815a5f1c60838..0000000000000000000000000000000000000000 Binary files a/libevent-2.1.11-stable.tar.gz and /dev/null differ diff --git a/libevent-2.1.12-stable.tar.gz b/libevent-2.1.12-stable.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4fcefff24f84dbda2650ae25085404f3f3382be3 Binary files /dev/null and b/libevent-2.1.12-stable.tar.gz differ diff --git a/libevent.spec b/libevent.spec index d70fd77e13d11675efb94ad7e59f5da04abc1381..245aedd572d1db1587f4abdcf173ef52a56ca352 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} Name: libevent -Version: 2.1.11 -Release: 3 +Version: 2.1.12 +Release: 1 Summary: An event notification library License: BSD @@ -13,7 +13,6 @@ BuildRequires: gcc doxygen openssl-devel libevent Patch0: libevent-nonettests.patch Patch1: http-add-callback-to-allow-server-to-decline-and-the.patch -Patch2: http-fix-undefined-shift-in-EVUTIL_IS-_-helpers.patch %description Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets, @@ -72,6 +71,9 @@ make check %changelog +* Wed Aug 12 2020 Yeqing Peng - 2.1.12-1 +- update to 2.1.12 + * Wed Jul 1 2020 Liquor - 2.1.11-3 - Type:bugfix - ID:NA