开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:extract_file:libevent.spec Deleted

@@ -1,116 +0,0 @@
-Name:           libevent
-Version:        2.1.12
-Release:        5
-Summary:        An event notification library
-
-License:        BSD
-URL:            http://libevent.org/
-Source0:        https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
-
-BuildRequires: gcc doxygen openssl-devel
-
-Patch0: libevent-nonettests.patch
-Patch1: http-add-callback-to-allow-server-to-decline-and-the.patch
-Patch2: add-testcases-for-event.c-apis.patch
-
-%description
-Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets,
-filters, rate-limiting, SSL, zero-copy file transmission, and IOCP.
-Libevent includes support for several useful protocols, including DNS, HTTP, and a minimal RPC framewor.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the header files and libraries for developing
-with %{name}.
-
-%prep
-%autosetup -n libevent-%{version}-stable -p1
-
-%build
-%configure --disable-dependency-tracking --disable-static
-%make_build
-
-%install
-%make_install
-rm -f %{buildroot}%{_libdir}/*.la
-
-%check
-%make_build check
-
-%ldconfig_scriptlets
-
-%files
-%doc ChangeLog
-%license LICENSE
-%{_libdir}/libevent-2.1.so.*
-%{_libdir}/libevent_core-2.1.so.*
-%{_libdir}/libevent_extra-2.1.so.*
-%{_libdir}/libevent_openssl-2.1.so.*
-%{_libdir}/libevent_pthreads-2.1.so.*
-
-%files devel
-%{_includedir}/*.h
-%dir %{_includedir}/event2
-%{_includedir}/event2/*.h
-%{_libdir}/libevent.so
-%{_libdir}/libevent_core.so
-%{_libdir}/libevent_extra.so
-%{_libdir}/libevent_openssl.so
-%{_libdir}/libevent_pthreads.so
-%{_libdir}/pkgconfig/libevent.pc
-%{_libdir}/pkgconfig/libevent_core.pc
-%{_libdir}/pkgconfig/libevent_extra.pc
-%{_libdir}/pkgconfig/libevent_openssl.pc
-%{_libdir}/pkgconfig/libevent_pthreads.pc
-%{_bindir}/event_rpcgen.*
-
-
-%changelog
-* Tue Nov 23 2021 Hu Bin <hubin571@huawei.com> - 2.1.12-5
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:add testcases for event.c apis
-
-* Wed Apr 21 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-4
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:use make macros to run check
-
-* Mon Mar 29 2021 panxiaohe <panxiaohe@huawei.com> - 2.1.12-3
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:add debuginfo package and make ELF files stripped
-       remove redundant ABI compatibility library
-
-* Thu Mar 18 2021 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-2
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:Optimize compilation time
-
-* Thu Jul 30 2020 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update version to 2.1.12
-
-* Wed Jul 1 2020 Liquor <lirui130@huawei.com> - 2.1.11-3
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix undefined-shift in EVUTIL_IS*_ helpers
-
-* Mon Oct 28 2019 chengquan <chengquan3@huawei.com> - 2.1.11-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add global marco of debug_package
-
-* Tue Aug 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.1.11-1
-- Package init

_service:tar_scm:libevent.spec Added

@@ -0,0 +1,125 @@
+Name:           libevent
+Version:        2.1.12
+Release:        6
+Summary:        An event notification library
+
+License:        BSD
+URL:            http://libevent.org/
+Source0:        https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
+
+BuildRequires: gcc doxygen openssl-devel
+
+Patch0: libevent-nonettests.patch
+Patch1: http-add-callback-to-allow-server-to-decline-and-the.patch
+Patch2: add-testcases-for-event.c-apis.patch
+
+# Temporary downstream change: revert a problematic upstream change
+# until Transmission is fixed. Please drop the patch when the Transmission
+# issue is fixed.
+# https://github.com/transmission/transmission/issues/1437
+Patch3: 0001-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch
+
+%description
+Libevent additionally provides a sophisticated framework for buffered network IO, with support for sockets,
+filters, rate-limiting, SSL, zero-copy file transmission, and IOCP.
+Libevent includes support for several useful protocols, including DNS, HTTP, and a minimal RPC framewor.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and libraries for developing
+with %{name}.
+
+%prep
+%autosetup -n libevent-%{version}-stable -p1
+
+%build
+%configure --disable-dependency-tracking --disable-static
+%make_build
+
+%install
+%make_install
+rm -f %{buildroot}%{_libdir}/*.la
+
+%check
+%make_build check
+
+%ldconfig_scriptlets
+
+%files
+%doc ChangeLog
+%license LICENSE
+%{_libdir}/libevent-2.1.so.*
+%{_libdir}/libevent_core-2.1.so.*
+%{_libdir}/libevent_extra-2.1.so.*
+%{_libdir}/libevent_openssl-2.1.so.*
+%{_libdir}/libevent_pthreads-2.1.so.*
+
+%files devel
+%{_includedir}/*.h
+%dir %{_includedir}/event2
+%{_includedir}/event2/*.h
+%{_libdir}/libevent.so
+%{_libdir}/libevent_core.so
+%{_libdir}/libevent_extra.so
+%{_libdir}/libevent_openssl.so
+%{_libdir}/libevent_pthreads.so
+%{_libdir}/pkgconfig/libevent.pc
+%{_libdir}/pkgconfig/libevent_core.pc
+%{_libdir}/pkgconfig/libevent_extra.pc
+%{_libdir}/pkgconfig/libevent_openssl.pc
+%{_libdir}/pkgconfig/libevent_pthreads.pc
+%{_bindir}/event_rpcgen.*
+
+
+%changelog
+* Fri Jun 24 2022 dillon chen <dillon.chen@gmail.com> - 2.1.12-6
+- add patch3
+
+* Tue Nov 23 2021 Hu Bin <hubin571@huawei.com> - 2.1.12-5
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:add testcases for event.c apis
+
+* Wed Apr 21 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-4
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:use make macros to run check
+
+* Mon Mar 29 2021 panxiaohe <panxiaohe@huawei.com> - 2.1.12-3
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:add debuginfo package and make ELF files stripped
+       remove redundant ABI compatibility library
+
+* Thu Mar 18 2021 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:Optimize compilation time
+
+* Thu Jul 30 2020 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 2.1.12-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update version to 2.1.12
+
+* Wed Jul 1 2020 Liquor <lirui130@huawei.com> - 2.1.11-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix undefined-shift in EVUTIL_IS*_ helpers
+
+* Mon Oct 28 2019 chengquan <chengquan3@huawei.com> - 2.1.11-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add global marco of debug_package
+
+* Tue Aug 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.1.11-1
+- Package init

_service:extract_file:add-testcases-for-event.c-apis.patch Deleted

@@ -1,256 +0,0 @@
-From 1113412e6be9e627e8f4490dc5252051c3d2ddc9 Mon Sep 17 00:00:00 2001
-From: Hubin <h30009454@china.huawei.com>
-Date: Tue, 23 Nov 2021 15:08:15 +0800
-Subject: PATCH add testcases for event.c apis
-
-Signed-off-by: Hubin <hubin57@huawei.com>
----
- test/regress.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 230 insertions(+)
-
-diff --git a/test/regress.c b/test/regress.c
-index 08c30fa..0704b46 100644
---- a/test/regress.c
-+++ b/test/regress.c
-@@ -3475,7 +3475,237 @@ end:
- #endif
- }
- 
-+static void
-+test_event_base_del_virtual_(void *ptr)
-+{
-+	struct basic_test_data *data = ptr;
-+	struct event_base *base = data->base;
-+	struct event ev;
-+	int event_count_active;
-+	int event_count_virtual;
-+	int event_count_added;
-+	int event_count_active_virtual;
-+	int event_count_active_added;
-+	int event_count_virtual_added;
-+	int event_count_active_added_virtual;
-+
-+	struct timeval qsec = {0, 100000};
-+
-+	event_assign(&ev, base, -1, EV_READ, event_selfarg_cb,
-+	    event_self_cbarg());
-+	event_add(&ev, &qsec);
-+	event_base_loop(base, 0);
-+
-+	event_base_add_virtual_(base);
-+	event_count_active = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE);
-+	event_count_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_VIRTUAL);
-+	event_count_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ADDED);
-+	event_count_active_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_VIRTUAL);
-+	event_count_active_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_ADDED);
-+	event_count_virtual_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_VIRTUAL|EVENT_BASE_COUNT_ADDED);
-+	event_count_active_added_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|
-+	EVENT_BASE_COUNT_ADDED|
-+	EVENT_BASE_COUNT_VIRTUAL);
-+	tt_int_op(event_count_active, ==, 0);
-+	tt_int_op(event_count_virtual, ==, 1);
-+	tt_int_op(event_count_added, ==, 0);
-+	tt_int_op(event_count_active_virtual, ==, 1);
-+	tt_int_op(event_count_active_added, ==, 0);
-+	tt_int_op(event_count_virtual_added, ==, 1);
-+	tt_int_op(event_count_active_added_virtual, ==, 1);
-+
-+	event_base_del_virtual_(base);
-+	event_count_active = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE);
-+	event_count_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_VIRTUAL);
-+	event_count_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ADDED);
-+	event_count_active_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_VIRTUAL);
-+	event_count_active_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_ADDED);
-+	event_count_virtual_added = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_VIRTUAL|EVENT_BASE_COUNT_ADDED);
-+	event_count_active_added_virtual = event_base_get_num_events(base,
-+	EVENT_BASE_COUNT_ACTIVE|
-+	EVENT_BASE_COUNT_ADDED|
-+	EVENT_BASE_COUNT_VIRTUAL);
-+	tt_int_op(event_count_active, ==, 0);
-+	tt_int_op(event_count_virtual, ==, 0);
-+	tt_int_op(event_count_added, ==, 0);
-+	tt_int_op(event_count_active_virtual, ==, 0);
-+	tt_int_op(event_count_active_added, ==, 0);
-+	tt_int_op(event_count_virtual_added, ==, 0);
-+	tt_int_op(event_count_active_added_virtual, ==, 0);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_deferred_cb_set_priority_(void *arg)
-+{
-+	struct basic_test_data *data = arg;
-+	struct event_base *base = data->base;
-+	struct event_callback evcb;
-+	event_callback_init_(base, &evcb);
-+	event_deferred_cb_set_priority_(&evcb, 0);
-+	tt_int_op(evcb.evcb_pri, ==, 0);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_callback_init_(void *arg)
-+{
-+	struct basic_test_data *data = arg;
-+	struct event_base *base = data->base;
-+	struct event_callback evcb;
-+
-+	event_callback_init_(base, &evcb);
-+	tt_int_op(evcb.evcb_pri, ==, 0);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_del_block(void *ptr)
-+{
-+	struct basic_test_data *data = ptr;
-+	struct event_base *base = data->base;
-+	struct timeval tv;
-+	struct event ev;
-+	int count = 0;
-+	int res_del = 0;
-+
-+	evutil_timerclear(&tv);
-+	tv.tv_usec = 10000;
-+
-+	event_assign(&ev, base, -1, EV_TIMEOUT|EV_PERSIST,
-+	    timeout_cb, &count);
-+	event_add(&ev, &tv);
-+
-+	res_del = event_del_block(&ev);
-+	tt_int_op(res_del, ==, 0);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_del_noblock(void *ptr) {
-+	struct basic_test_data *data = ptr;
-+	struct event_base *base = data->base;
-+	struct timeval tv;
-+	struct event ev;
-+	int count = 0;
-+	int res_del = 0;
-+
-+	evutil_timerclear(&tv);
-+	tv.tv_usec = 10000;
-+
-+	event_assign(&ev, base, -1, EV_TIMEOUT|EV_PERSIST,
-+	    timeout_cb, &count);
-+	event_add(&ev, &tv);
-+
-+	res_del = event_del_noblock(&ev);
-+	tt_int_op(res_del, ==, 0);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_get_events(void *ptr) {
-+	struct basic_test_data *data = ptr;
-+	struct event *r=NULL, *w=NULL;
-+
-+	r = event_new(data->base, data->pair0, EV_READ, simple_read_cb,
-+	    NULL);
-+	w = event_new(data->base, data->pair1, EV_WRITE, simple_write_cb,
-+	    NULL);
-+
-+	event_add(r, NULL);
-+	event_add(w, NULL);
-+
-+	tt_int_op(event_get_events(r), ==, EV_READ);
-+	tt_int_op(event_get_events(w), ==, EV_WRITE);
-+
-+	event_free(r);
-+	event_free(w);
-+end:
-+	;
-+}
-+
-+static void
-+test_event_config_set_max_dispatch_interval(void)
-+{
-+	struct event_config *cfg = NULL;
-+	struct timeval tv;
-+	int max_dispatch_cbs = 100;
-+	int min_priority = 2;
-+
-+	evutil_timerclear(&tv);
-+	tv.tv_sec = 3;
-+	tv.tv_usec = 0;
-+
-+	cfg = event_config_new();
-+	event_config_set_max_dispatch_interval(cfg, &tv, max_dispatch_cbs, min_priority);

_service:extract_file:http-add-callback-to-allow-server-to-decline-and-the.patch Deleted

@@ -1,255 +0,0 @@
-From 727bcea130eb4beea9b1ea53604b9807f6819a9a Mon Sep 17 00:00:00 2001
-From: John Fremlin <john@fremlin.org>
-Date: Fri, 1 Dec 2017 01:29:32 +0000
-Subject: PATCH 103/319 http: add callback to allow server to decline (and
- thereby close) incoming connections.
-
-This is important, as otherwise clients can easily exhaust the file
-descriptors available on a libevent HTTP server, which can cause
-problems in other code which does not handle EMFILE well: for example,
-see https://github.com/bitcoin/bitcoin/issues/11368
-
-Closes: #578 (patch cherry picked)
----
- http-internal.h       |   2 +
- http.c                |  25 +++++++---
- include/event2/http.h |  18 ++++++++
- test/regress_http.c   | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 163 insertions(+), 7 deletions(-)
-
-diff --git a/http-internal.h b/http-internal.h
-index b7d21ef..9e5b0f9 100644
---- a/http-internal.h
-+++ b/http-internal.h
-@@ -170,6 +170,8 @@ struct evhttp {
- 	void *gencbarg;
- 	struct bufferevent* (*bevcb)(struct event_base *, void *);
- 	void *bevcbarg;
-+	int (*newreqcb)(struct evhttp_request *req, void *);
-+	void *newreqcbarg;
- 
- 	struct event_base *base;
- };
-diff --git a/http.c b/http.c
-index b3087b5..f2e4971 100644
---- a/http.c
-+++ b/http.c
-@@ -3929,6 +3929,14 @@ evhttp_set_bevcb(struct evhttp *http,
- 	http->bevcbarg = cbarg;
- }
- 
-+void
-+evhttp_set_newreqcb(struct evhttp *http,
-+    int (*cb)(struct evhttp_request *, void *), void *cbarg)
-+{
-+	http->newreqcb = cb;
-+	http->newreqcbarg = cbarg;
-+}
-+
- /*
-  * Request related functions
-  */
-@@ -4239,17 +4247,20 @@ evhttp_associate_new_request_with_connection(struct evhttp_connection *evcon)
- 	req->evcon = evcon;	/* the request ends up owning the connection */
- 	req->flags |= EVHTTP_REQ_OWN_CONNECTION;
- 
--	/* We did not present the request to the user user yet, so treat it as
--	 * if the user was done with the request.  This allows us to free the
--	 * request on a persistent connection if the client drops it without
--	 * sending a request.
-+	/* We did not present the request to the user yet, so treat it
-+	 * as if the user was done with the request.  This allows us
-+	 * to free the request on a persistent connection if the
-+	 * client drops it without sending a request.
- 	 */
- 	req->userdone = 1;
--
--	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
--
- 	req->kind = EVHTTP_REQUEST;
- 
-+	if (http->newreqcb && http->newreqcb(req, http->newreqcbarg) == -1) {
-+		evhttp_request_free(req);
-+		return (-1);
-+	}
-+
-+	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
- 
- 	evhttp_start_read_(evcon);
- 
-diff --git a/include/event2/http.h b/include/event2/http.h
-index 2a41303..ed9acf4 100644
---- a/include/event2/http.h
-+++ b/include/event2/http.h
-@@ -298,6 +298,24 @@ EVENT2_EXPORT_SYMBOL
- void evhttp_set_bevcb(struct evhttp *http,
-     struct bufferevent *(*cb)(struct event_base *, void *), void *arg);
- 
-+
-+/**
-+   Set a callback which allows the user to note or throttle incoming requests.
-+
-+   The requests are not populated with HTTP level information. They
-+   are just associated to a connection.
-+
-+   If the callback returns -1, the associated connection is terminated
-+   and the request is closed.
-+
-+   @param http the evhttp server object for which to set the callback
-+   @param cb the callback to invoke for incoming connections
-+   @param arg an context argument for the callback
-+ */
-+EVENT2_EXPORT_SYMBOL
-+void evhttp_set_newreqcb(struct evhttp *http,
-+    int (*cb)(struct evhttp_request*, void *), void *arg);
-+
- /**
-    Adds a virtual host to the http server.
- 
-diff --git a/test/regress_http.c b/test/regress_http.c
-index b761df0..c459910 100644
---- a/test/regress_http.c
-+++ b/test/regress_http.c
-@@ -4604,6 +4604,129 @@ http_request_extra_body_test(void *arg)
- 		evbuffer_free(body);
- }
- 
-+struct http_newreqcb_test_state
-+{
-+	int connections_started;
-+	int connections_noticed;
-+	int connections_throttled;
-+	int connections_good;
-+	int connections_error;
-+	int connections_done;
-+};
-+
-+static void
-+http_newreqcb_test_state_check(struct http_newreqcb_test_state* state)
-+{
-+	tt_int_op(state->connections_started, >=, 0);
-+	tt_int_op(state->connections_started, >=, state->connections_noticed);
-+	tt_int_op(state->connections_throttled, >=, state->connections_error);
-+
-+	tt_int_op(state->connections_done, <=, state->connections_started);
-+	if (state->connections_good + state->connections_error == state->connections_started) {
-+		tt_int_op(state->connections_throttled, ==, state->connections_error);
-+		tt_int_op(state->connections_good + state->connections_error, ==, state->connections_done);
-+		event_base_loopexit(exit_base, NULL);
-+	}
-+
-+	return;
-+end:
-+	tt_fail();
-+	exit(17);
-+}
-+
-+static void
-+http_request_done_newreqcb(struct evhttp_request *req, void *arg)
-+{
-+	struct http_newreqcb_test_state* state = arg;
-+	if (req && evhttp_request_get_response_code(req) == HTTP_OK) {
-+		++state->connections_good;
-+		evhttp_request_set_error_cb(req, NULL);
-+	}
-+	++state->connections_done;
-+
-+	http_newreqcb_test_state_check(state);
-+}
-+
-+static void
-+http_request_error_newreqcb(enum evhttp_request_error err, void *arg)
-+{
-+	struct http_newreqcb_test_state* state = arg;
-+	++state->connections_error;
-+
-+	http_newreqcb_test_state_check(state);
-+}
-+
-+static int
-+http_newreqcb(struct evhttp_request* req, void *arg)
-+{
-+	struct http_newreqcb_test_state* state = arg;
-+	++state->connections_noticed;
-+	http_newreqcb_test_state_check(state);
-+	if (1 == state->connections_noticed % 7) {
-+		state->connections_throttled++;
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+
-+static void
-+http_newreqcb_test(void *arg)
-+{
-+	struct basic_test_data *data = arg;
-+	ev_uint16_t port = 0;
-+	struct evhttp *http = http_setup(&port, data->base, 0);
-+	struct evhttp_connection *evcons100;
-+	struct http_newreqcb_test_state newreqcb_test_state;
-+	unsigned n;
-+
-+	exit_base = data->base;
-+	test_ok = 0;
-+
-+	memset(&newreqcb_test_state, 0, sizeof(newreqcb_test_state));
-+	memset(evcons, 0, sizeof(evcons));
-+
-+	evhttp_set_newreqcb(http, http_newreqcb, &newreqcb_test_state);

_service:extract_file:libevent-nonettests.patch Deleted

_service:tar_scm:0001-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch Added

@@ -0,0 +1,43 @@
+From 7905dba8cf136574b87c972cf1f91a8f95b9df8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
+Date: Tue, 29 Sep 2020 17:37:18 +0200
+Subject: PATCH Revert "Fix checking return value of the
+ evdns_base_resolv_conf_parse()"
+
+This reverts commit fc51bf2c5b686f623c9a2906ddad4042d5c3b39a.
+---
+ evdns.c              | 2 +-
+ sample/dns-example.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/evdns.c b/evdns.c
+index a5b31a3c..4aef28ec 100644
+--- a/evdns.c
++++ b/evdns.c
+@@ -4035,7 +4035,7 @@ evdns_base_new(struct event_base *event_base, int flags)
+ #else
+ 		r = evdns_base_resolv_conf_parse(base, opts, "/etc/resolv.conf");
+ #endif
+-		if (r) {
++		if (r == -1) {
+ 			evdns_base_free_and_unlock(base, 0);
+ 			return NULL;
+ 		}
+diff --git a/sample/dns-example.c b/sample/dns-example.c
+index 2d07c387..21a75de8 100644
+--- a/sample/dns-example.c
++++ b/sample/dns-example.c
+@@ -225,8 +225,8 @@ main(int c, char **v) {
+ 			res = evdns_base_resolv_conf_parse(evdns_base,
+ 			    DNS_OPTION_NAMESERVERS, o.resolv_conf);
+ 
+-		if (res) {
+-			fprintf(stderr, "Couldn't configure nameservers\n");
++		if (res < 0) {
++			fprintf(stderr, "Couldn't configure nameservers");
+ 			return 1;
+ 		}
+ 	}
+-- 
+2.25.4
+

_service:tar_scm:add-testcases-for-event.c-apis.patch Added

@@ -0,0 +1,256 @@
+From 1113412e6be9e627e8f4490dc5252051c3d2ddc9 Mon Sep 17 00:00:00 2001
+From: Hubin <h30009454@china.huawei.com>
+Date: Tue, 23 Nov 2021 15:08:15 +0800
+Subject: PATCH add testcases for event.c apis
+
+Signed-off-by: Hubin <hubin57@huawei.com>
+---
+ test/regress.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 230 insertions(+)
+
+diff --git a/test/regress.c b/test/regress.c
+index 08c30fa..0704b46 100644
+--- a/test/regress.c
++++ b/test/regress.c
+@@ -3475,7 +3475,237 @@ end:
+ #endif
+ }
+ 
++static void
++test_event_base_del_virtual_(void *ptr)
++{
++	struct basic_test_data *data = ptr;
++	struct event_base *base = data->base;
++	struct event ev;
++	int event_count_active;
++	int event_count_virtual;
++	int event_count_added;
++	int event_count_active_virtual;
++	int event_count_active_added;
++	int event_count_virtual_added;
++	int event_count_active_added_virtual;
++
++	struct timeval qsec = {0, 100000};
++
++	event_assign(&ev, base, -1, EV_READ, event_selfarg_cb,
++	    event_self_cbarg());
++	event_add(&ev, &qsec);
++	event_base_loop(base, 0);
++
++	event_base_add_virtual_(base);
++	event_count_active = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE);
++	event_count_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_VIRTUAL);
++	event_count_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ADDED);
++	event_count_active_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_VIRTUAL);
++	event_count_active_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_ADDED);
++	event_count_virtual_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_VIRTUAL|EVENT_BASE_COUNT_ADDED);
++	event_count_active_added_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|
++	EVENT_BASE_COUNT_ADDED|
++	EVENT_BASE_COUNT_VIRTUAL);
++	tt_int_op(event_count_active, ==, 0);
++	tt_int_op(event_count_virtual, ==, 1);
++	tt_int_op(event_count_added, ==, 0);
++	tt_int_op(event_count_active_virtual, ==, 1);
++	tt_int_op(event_count_active_added, ==, 0);
++	tt_int_op(event_count_virtual_added, ==, 1);
++	tt_int_op(event_count_active_added_virtual, ==, 1);
++
++	event_base_del_virtual_(base);
++	event_count_active = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE);
++	event_count_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_VIRTUAL);
++	event_count_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ADDED);
++	event_count_active_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_VIRTUAL);
++	event_count_active_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|EVENT_BASE_COUNT_ADDED);
++	event_count_virtual_added = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_VIRTUAL|EVENT_BASE_COUNT_ADDED);
++	event_count_active_added_virtual = event_base_get_num_events(base,
++	EVENT_BASE_COUNT_ACTIVE|
++	EVENT_BASE_COUNT_ADDED|
++	EVENT_BASE_COUNT_VIRTUAL);
++	tt_int_op(event_count_active, ==, 0);
++	tt_int_op(event_count_virtual, ==, 0);
++	tt_int_op(event_count_added, ==, 0);
++	tt_int_op(event_count_active_virtual, ==, 0);
++	tt_int_op(event_count_active_added, ==, 0);
++	tt_int_op(event_count_virtual_added, ==, 0);
++	tt_int_op(event_count_active_added_virtual, ==, 0);
++end:
++	;
++}
++
++static void
++test_event_deferred_cb_set_priority_(void *arg)
++{
++	struct basic_test_data *data = arg;
++	struct event_base *base = data->base;
++	struct event_callback evcb;
++	event_callback_init_(base, &evcb);
++	event_deferred_cb_set_priority_(&evcb, 0);
++	tt_int_op(evcb.evcb_pri, ==, 0);
++end:
++	;
++}
++
++static void
++test_event_callback_init_(void *arg)
++{
++	struct basic_test_data *data = arg;
++	struct event_base *base = data->base;
++	struct event_callback evcb;
++
++	event_callback_init_(base, &evcb);
++	tt_int_op(evcb.evcb_pri, ==, 0);
++end:
++	;
++}
++
++static void
++test_event_del_block(void *ptr)
++{
++	struct basic_test_data *data = ptr;
++	struct event_base *base = data->base;
++	struct timeval tv;
++	struct event ev;
++	int count = 0;
++	int res_del = 0;
++
++	evutil_timerclear(&tv);
++	tv.tv_usec = 10000;
++
++	event_assign(&ev, base, -1, EV_TIMEOUT|EV_PERSIST,
++	    timeout_cb, &count);
++	event_add(&ev, &tv);
++
++	res_del = event_del_block(&ev);
++	tt_int_op(res_del, ==, 0);
++end:
++	;
++}
++
++static void
++test_event_del_noblock(void *ptr) {
++	struct basic_test_data *data = ptr;
++	struct event_base *base = data->base;
++	struct timeval tv;
++	struct event ev;
++	int count = 0;
++	int res_del = 0;
++
++	evutil_timerclear(&tv);
++	tv.tv_usec = 10000;
++
++	event_assign(&ev, base, -1, EV_TIMEOUT|EV_PERSIST,
++	    timeout_cb, &count);
++	event_add(&ev, &tv);
++
++	res_del = event_del_noblock(&ev);
++	tt_int_op(res_del, ==, 0);
++end:
++	;
++}
++
++static void
++test_event_get_events(void *ptr) {
++	struct basic_test_data *data = ptr;
++	struct event *r=NULL, *w=NULL;
++
++	r = event_new(data->base, data->pair0, EV_READ, simple_read_cb,
++	    NULL);
++	w = event_new(data->base, data->pair1, EV_WRITE, simple_write_cb,
++	    NULL);
++
++	event_add(r, NULL);
++	event_add(w, NULL);
++
++	tt_int_op(event_get_events(r), ==, EV_READ);
++	tt_int_op(event_get_events(w), ==, EV_WRITE);
++
++	event_free(r);
++	event_free(w);
++end:
++	;
++}
++
++static void
++test_event_config_set_max_dispatch_interval(void)
++{
++	struct event_config *cfg = NULL;
++	struct timeval tv;
++	int max_dispatch_cbs = 100;
++	int min_priority = 2;
++
++	evutil_timerclear(&tv);
++	tv.tv_sec = 3;
++	tv.tv_usec = 0;
++
++	cfg = event_config_new();
++	event_config_set_max_dispatch_interval(cfg, &tv, max_dispatch_cbs, min_priority);

_service:tar_scm:http-add-callback-to-allow-server-to-decline-and-the.patch Added

@@ -0,0 +1,255 @@
+From 727bcea130eb4beea9b1ea53604b9807f6819a9a Mon Sep 17 00:00:00 2001
+From: John Fremlin <john@fremlin.org>
+Date: Fri, 1 Dec 2017 01:29:32 +0000
+Subject: PATCH 103/319 http: add callback to allow server to decline (and
+ thereby close) incoming connections.
+
+This is important, as otherwise clients can easily exhaust the file
+descriptors available on a libevent HTTP server, which can cause
+problems in other code which does not handle EMFILE well: for example,
+see https://github.com/bitcoin/bitcoin/issues/11368
+
+Closes: #578 (patch cherry picked)
+---
+ http-internal.h       |   2 +
+ http.c                |  25 +++++++---
+ include/event2/http.h |  18 ++++++++
+ test/regress_http.c   | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 163 insertions(+), 7 deletions(-)
+
+diff --git a/http-internal.h b/http-internal.h
+index b7d21ef..9e5b0f9 100644
+--- a/http-internal.h
++++ b/http-internal.h
+@@ -170,6 +170,8 @@ struct evhttp {
+ 	void *gencbarg;
+ 	struct bufferevent* (*bevcb)(struct event_base *, void *);
+ 	void *bevcbarg;
++	int (*newreqcb)(struct evhttp_request *req, void *);
++	void *newreqcbarg;
+ 
+ 	struct event_base *base;
+ };
+diff --git a/http.c b/http.c
+index b3087b5..f2e4971 100644
+--- a/http.c
++++ b/http.c
+@@ -3929,6 +3929,14 @@ evhttp_set_bevcb(struct evhttp *http,
+ 	http->bevcbarg = cbarg;
+ }
+ 
++void
++evhttp_set_newreqcb(struct evhttp *http,
++    int (*cb)(struct evhttp_request *, void *), void *cbarg)
++{
++	http->newreqcb = cb;
++	http->newreqcbarg = cbarg;
++}
++
+ /*
+  * Request related functions
+  */
+@@ -4239,17 +4247,20 @@ evhttp_associate_new_request_with_connection(struct evhttp_connection *evcon)
+ 	req->evcon = evcon;	/* the request ends up owning the connection */
+ 	req->flags |= EVHTTP_REQ_OWN_CONNECTION;
+ 
+-	/* We did not present the request to the user user yet, so treat it as
+-	 * if the user was done with the request.  This allows us to free the
+-	 * request on a persistent connection if the client drops it without
+-	 * sending a request.
++	/* We did not present the request to the user yet, so treat it
++	 * as if the user was done with the request.  This allows us
++	 * to free the request on a persistent connection if the
++	 * client drops it without sending a request.
+ 	 */
+ 	req->userdone = 1;
+-
+-	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
+-
+ 	req->kind = EVHTTP_REQUEST;
+ 
++	if (http->newreqcb && http->newreqcb(req, http->newreqcbarg) == -1) {
++		evhttp_request_free(req);
++		return (-1);
++	}
++
++	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
+ 
+ 	evhttp_start_read_(evcon);
+ 
+diff --git a/include/event2/http.h b/include/event2/http.h
+index 2a41303..ed9acf4 100644
+--- a/include/event2/http.h
++++ b/include/event2/http.h
+@@ -298,6 +298,24 @@ EVENT2_EXPORT_SYMBOL
+ void evhttp_set_bevcb(struct evhttp *http,
+     struct bufferevent *(*cb)(struct event_base *, void *), void *arg);
+ 
++
++/**
++   Set a callback which allows the user to note or throttle incoming requests.
++
++   The requests are not populated with HTTP level information. They
++   are just associated to a connection.
++
++   If the callback returns -1, the associated connection is terminated
++   and the request is closed.
++
++   @param http the evhttp server object for which to set the callback
++   @param cb the callback to invoke for incoming connections
++   @param arg an context argument for the callback
++ */
++EVENT2_EXPORT_SYMBOL
++void evhttp_set_newreqcb(struct evhttp *http,
++    int (*cb)(struct evhttp_request*, void *), void *arg);
++
+ /**
+    Adds a virtual host to the http server.
+ 
+diff --git a/test/regress_http.c b/test/regress_http.c
+index b761df0..c459910 100644
+--- a/test/regress_http.c
++++ b/test/regress_http.c
+@@ -4604,6 +4604,129 @@ http_request_extra_body_test(void *arg)
+ 		evbuffer_free(body);
+ }
+ 
++struct http_newreqcb_test_state
++{
++	int connections_started;
++	int connections_noticed;
++	int connections_throttled;
++	int connections_good;
++	int connections_error;
++	int connections_done;
++};
++
++static void
++http_newreqcb_test_state_check(struct http_newreqcb_test_state* state)
++{
++	tt_int_op(state->connections_started, >=, 0);
++	tt_int_op(state->connections_started, >=, state->connections_noticed);
++	tt_int_op(state->connections_throttled, >=, state->connections_error);
++
++	tt_int_op(state->connections_done, <=, state->connections_started);
++	if (state->connections_good + state->connections_error == state->connections_started) {
++		tt_int_op(state->connections_throttled, ==, state->connections_error);
++		tt_int_op(state->connections_good + state->connections_error, ==, state->connections_done);
++		event_base_loopexit(exit_base, NULL);
++	}
++
++	return;
++end:
++	tt_fail();
++	exit(17);
++}
++
++static void
++http_request_done_newreqcb(struct evhttp_request *req, void *arg)
++{
++	struct http_newreqcb_test_state* state = arg;
++	if (req && evhttp_request_get_response_code(req) == HTTP_OK) {
++		++state->connections_good;
++		evhttp_request_set_error_cb(req, NULL);
++	}
++	++state->connections_done;
++
++	http_newreqcb_test_state_check(state);
++}
++
++static void
++http_request_error_newreqcb(enum evhttp_request_error err, void *arg)
++{
++	struct http_newreqcb_test_state* state = arg;
++	++state->connections_error;
++
++	http_newreqcb_test_state_check(state);
++}
++
++static int
++http_newreqcb(struct evhttp_request* req, void *arg)
++{
++	struct http_newreqcb_test_state* state = arg;
++	++state->connections_noticed;
++	http_newreqcb_test_state_check(state);
++	if (1 == state->connections_noticed % 7) {
++		state->connections_throttled++;
++		return -1;
++	}
++	return 0;
++}
++
++
++static void
++http_newreqcb_test(void *arg)
++{
++	struct basic_test_data *data = arg;
++	ev_uint16_t port = 0;
++	struct evhttp *http = http_setup(&port, data->base, 0);
++	struct evhttp_connection *evcons100;
++	struct http_newreqcb_test_state newreqcb_test_state;
++	unsigned n;
++
++	exit_base = data->base;
++	test_ok = 0;
++
++	memset(&newreqcb_test_state, 0, sizeof(newreqcb_test_state));
++	memset(evcons, 0, sizeof(evcons));
++
++	evhttp_set_newreqcb(http, http_newreqcb, &newreqcb_test_state);

_service:tar_scm:libevent-nonettests.patch Added

_service Changed

_service:extract_file:libevent-2.1.12-stable.tar.gz Deleted

_service:extract_file:libevent.yaml Deleted

_service:tar_scm:libevent-1637995399.412c8df.tar Deleted

_service:tar_scm:libevent-2.1.12-stable.tar.gz Added

_service:tar_scm:libevent.yaml Added