From 4ef1d5e47bce42cef549a3846ec2c6339628e90c Mon Sep 17 00:00:00 2001 From: ZiyangZhang Date: Tue, 21 Feb 2023 16:55:27 +0800 Subject: [PATCH] remove patch: Revert "Fix checking return value of the evdns_base_resolv_conf_parse()" since transmission now fix its problem Signed-off-by: ZiyangZhang --- ...ing-return-value-of-the-evdns_base_r.patch | 43 ------------------- libevent.spec | 21 +++++---- 2 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch diff --git a/0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch b/0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch deleted file mode 100644 index a9517fc..0000000 --- a/0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7905dba8cf136574b87c972cf1f91a8f95b9df8c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -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 - diff --git a/libevent.spec b/libevent.spec index 8b710f2..8cce687 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,6 +1,6 @@ %global develdocdir %{_docdir}/%{name}-devel -%define anolis_release 2 +%define anolis_release 3 Name: libevent Version: 2.1.12 Release: %{anolis_release}%{?dist} @@ -27,11 +27,6 @@ Patch01: 0001-libevent-nonettests.patch Patch02: 0002-build-do-not-try-install-doxygen-man-pages-if-they-w.patch # Upstream patch: Patch03: 0003-build-add-doxygen-to-all.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 -Patch04: 0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch %description The libevent API provides a mechanism to execute a callback function @@ -65,7 +60,6 @@ This package contains the development documentation for %{name}. %patch01 -p1 -b .nonettests %patch02 -p1 -b .fix-install %patch03 -p1 -b .fix-install-2 -%patch04 -p1 -b .revert-problematic-change pathfix.py -i %{__python3} -pn test/check-dumpevents.py \ event_rpcgen.py @@ -108,10 +102,11 @@ mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample %generate_compatibility_deps %check -# Tests fail due to nameserver not running locally -# [msg] Nameserver 127.0.0.1:38762 has failed: request timed out. -# On some architects this error is ignored on others it is not. -#make check +# On x86_84 and aarch64, tests may fail with newer openssl 3.0. Looks like +# next libevent release could add full compatibility with this new +# major release of openssl. See: +# https://github.com/libevent/libevent/issues/1212 +# make check %ldconfig_scriptlets @@ -151,6 +146,10 @@ mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample %doc %{develdocdir}/ %changelog +* Tue Feb 21 2023 Ziyang Zhang - 2.1.12-3 +- remove patch: Revert "Fix checking return value of the + evdns_base_resolv_conf_parse()" since transmission now fix its problem + * Tue Oct 25 2022 mgb01105731 - 2.1.12-2 - optimise spec file -- Gitee