diff --git a/0001-libevent-nonettests.patch b/0001-libevent-nonettests.patch new file mode 100644 index 0000000000000000000000000000000000000000..f62df5bece67bbe4a9256833f08a9f9490b6364d --- /dev/null +++ b/0001-libevent-nonettests.patch @@ -0,0 +1,11 @@ +diff -up libevent-2.0.21-stable/test/regress_main.c.orig libevent-2.0.21-stable/test/regress_main.c +--- libevent-2.0.21-stable/test/regress_main.c.orig 2012-11-02 11:57:00.000000000 -0400 ++++ libevent-2.0.21-stable/test/regress_main.c 2013-08-21 10:16:26.714288000 -0400 +@@ -370,7 +370,6 @@ struct testgroup_t testgroups[] = { + { "util/", util_testcases }, + { "bufferevent/", bufferevent_testcases }, + { "http/", http_testcases }, +- { "dns/", dns_testcases }, + { "evtag/", evtag_testcases }, + { "rpc/", rpc_testcases }, + { "thread/", thread_testcases }, diff --git a/0002-build-do-not-try-install-doxygen-man-pages-if-they-w.patch b/0002-build-do-not-try-install-doxygen-man-pages-if-they-w.patch new file mode 100644 index 0000000000000000000000000000000000000000..602899d184504e822e375a9998b6710ae34dcf82 --- /dev/null +++ b/0002-build-do-not-try-install-doxygen-man-pages-if-they-w.patch @@ -0,0 +1,43 @@ +From 7e6c5fb46ae9d0f135cdcdb4f8d0376cf25320fd Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin +Date: Thu, 6 Aug 2020 10:24:55 +0300 +Subject: [PATCH] build: do not try install doxygen man pages if they were not + requested + +Fixes: #1075 +--- + doxygen.am | 2 ++ + m4/ax_prog_doxygen.m4 | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/doxygen.am b/doxygen.am +index 916d7c40..53da8d24 100644 +--- a/doxygen.am ++++ b/doxygen.am +@@ -17,9 +17,11 @@ if ENABLE_DOXYGEN + clean-local: + -rm -rf $(DX_CLEANFILES) + ++if ENABLE_DOXYGEN_MAN + # integrate doxygen with automake targets + man3_MANS = @DX_DOCDIR@/man/man3/* + $(man3_MANS): doxygen-doc ++endif ENABLE_DOXYGEN_MAN + + # Docs will be installed. It may be one or more docs supported + # by doxygen, but does not include 'man'. +diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 +index e5bdeb59..338e4646 100644 +--- a/m4/ax_prog_doxygen.m4 ++++ b/m4/ax_prog_doxygen.m4 +@@ -574,6 +574,7 @@ DX_INSTALL_DOCS = \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ ++ \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ +-- +2.25.4 + diff --git a/0003-build-add-doxygen-to-all.patch b/0003-build-add-doxygen-to-all.patch new file mode 100644 index 0000000000000000000000000000000000000000..46b7285971db33fd1477a7877eed24266c7faee5 --- /dev/null +++ b/0003-build-add-doxygen-to-all.patch @@ -0,0 +1,26 @@ +From e3e7bb212ea17aa8a9d5a30163487342e6ebb350 Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin +Date: Tue, 11 Aug 2020 02:12:23 +0300 +Subject: [PATCH] build: add doxygen to all + +Fixes: 7e6c5fb4 ("build: do not try install doxygen man pages if they were not requested") +Fixes: #1075 +Fixes: #886 +--- + doxygen.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/doxygen.am b/doxygen.am +index 53da8d24..1377aacd 100644 +--- a/doxygen.am ++++ b/doxygen.am +@@ -53,5 +53,6 @@ uninstall-local: + rmdir "$(DESTDIR)$(htmldir)/" || true + + doxygen: doxygen-doc ++all: doxygen + + endif ENABLE_DOXYGEN +-- +2.25.4 + 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 new file mode 100644 index 0000000000000000000000000000000000000000..a9517fcb8cf485a788ba714b3343414d9b53c75a --- /dev/null +++ b/0004-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch @@ -0,0 +1,43 @@ +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-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 new file mode 100644 index 0000000000000000000000000000000000000000..2132f95558c9f53c92a09495775d0f703bc25637 --- /dev/null +++ b/libevent.spec @@ -0,0 +1,150 @@ +%global develdocdir %{_docdir}/%{name}-devel + +%define anolis_release 1 +Name: libevent +Version: 2.1.12 +Release: %{anolis_release}%{?dist} +Summary: Abstract asynchronous event notification library + +# arc4random.c, which is used in build, is ISC. The rest is BSD. +License: BSD and ISC +URL: http://libevent.org/ +Source0: https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz + +BuildRequires: make +BuildRequires: gcc +# Needed for ./autogen.sh: +BuildRequires: automake libtool +%if ! 0%{?_module_build} +BuildRequires: doxygen +%endif +BuildRequires: openssl-devel +BuildRequires: python3-devel + +# Disable network tests +Patch01: 0001-libevent-nonettests.patch +# Upstream 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 +when a specific event occurs on a file descriptor or after a timeout +has been reached. libevent is meant to replace the asynchronous event +loop found in event driven network servers. An application just needs +to call event_dispatch() and can then add or remove events dynamically +without having to change the event loop. + +%package devel +Summary: Development files for %{name} +License: BSD +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the header files and libraries for developing +with %{name}. + +%package doc +Summary: Development documentation for %{name} +# The files sample/openssl_hostname_validation.{c,h} and sample/hostcheck.{c,h} +# are MIT. The rest is BSD. +License: BSD and MIT +BuildArch: noarch + +%description doc +This package contains the development documentation for %{name}. + +%prep +%setup -q -n libevent-%{version}-stable +%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 + +%build +# We're patching doxygen.am, so regenerate the autotools stuff to be +# safe +./autogen.sh +%configure \ +%if ! 0%{?_module_build} + --enable-doxygen-doc \ +%endif + --disable-dependency-tracking --disable-static +%make_build all + +%install +%make_install +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{develdocdir} + +# Fix multilib install of devel (bug #477685) +mv $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h \ + $RPM_BUILD_ROOT%{_includedir}/event2/event-config-%{__isa_bits}.h +cat > $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h << EOF +#include + +#if __WORDSIZE == 32 +#include +#elif __WORDSIZE == 64 +#include +#else +#error "Unknown word size" +#endif +EOF + +mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample +(cd sample; \ + install -p -m 644 *.c *.am $RPM_BUILD_ROOT/%{develdocdir}/sample) + +%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 + +%ldconfig_scriptlets + +%files +%license LICENSE +%doc ChangeLog +%{_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}/event.h +%{_includedir}/evdns.h +%{_includedir}/evhttp.h +%{_includedir}/evrpc.h +%{_includedir}/evutil.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.* + +%files doc +%doc %{develdocdir}/ + +%changelog +* Wed Mar 09 2022 DengXiewei - 2.1.12-1 +- Init from upstream 2.1.12