From c97d75e8e520a817dced6d5c569402315065b8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 18:47:14 +0200 Subject: [PATCH] openipmi: fix collectd assertion --- pkgs/tools/system/openipmi/default.nix | 6 ++++++ .../tools/system/openipmi/fix-collectd-assertion.diff | 11 +++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/tools/system/openipmi/fix-collectd-assertion.diff diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index c462c2457a9b..06df9afa8139 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh"; }; + patches = [ + # fix assertion when used as a library in collectd + # taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/ + ./fix-collectd-assertion.diff + ]; + buildInputs = [ ncurses popt python3 readline ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff new file mode 100644 index 000000000000..af39fcc05677 --- /dev/null +++ b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff @@ -0,0 +1,11 @@ +--- a/unix/posix_thread_os_hnd.c ++++ b/unix/posix_thread_os_hnd.c +@@ -140,8 +140,6 @@ + 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) {