From 11093c905cb23c382428933303586a5b07606c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 2 Aug 2021 15:51:32 +0200 Subject: [PATCH] Resolves: #1927022 - fix collectd-ipmi crash --- OpenIPMI-collectd.patch | 12 ++++++++++++ OpenIPMI.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 OpenIPMI-collectd.patch diff --git a/OpenIPMI-collectd.patch b/OpenIPMI-collectd.patch new file mode 100644 index 0000000..0ddfaf8 --- /dev/null +++ b/OpenIPMI-collectd.patch @@ -0,0 +1,12 @@ +diff -urNp a/unix/posix_thread_os_hnd.c b/unix/posix_thread_os_hnd.c +--- a/unix/posix_thread_os_hnd.c 2021-08-02 15:36:49.536860558 +0200 ++++ b/unix/posix_thread_os_hnd.c 2021-08-02 15:38:48.990041616 +0200 +@@ -140,8 +140,6 @@ add_fd(os_handler_t *handler, + fd_data->data_ready = data_ready; + fd_data->handler = handler; + fd_data->freed = freed; +- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); +- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); + rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, + free_fd_data); + if (rv) { diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 40578f6..ecb223a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -14,6 +14,7 @@ Source3: ipmi.service Patch1: 0001-man.patch Patch2: OpenIPMI-ax-python.patch Patch3: OpenIPMI-sysconfig.patch +Patch4: OpenIPMI-collectd.patch BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel @@ -202,6 +203,7 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %changelog * Mon Aug 02 2021 Josef Ridky - 2.0.31-7 - replace distutils and fix FTBFS (#1948437) +- fix collectd-ipmi crash (#1927022) * Wed Jul 21 2021 Fedora Release Engineering - 2.0.31-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild