diff --git a/c23.patch b/c23.patch new file mode 100644 index 0000000..3828d0f --- /dev/null +++ b/c23.patch @@ -0,0 +1,22 @@ +diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c +index 609e7a3b3..20dfad512 100644 +--- a/common/toolcommon/tool-config-file-common.c ++++ b/common/toolcommon/tool-config-file-common.c +@@ -78,14 +78,14 @@ _config_file_bool (conffile_t cf, + void *app_ptr, + int app_data) + { +- int *bool; ++ int *value; + + assert (data); + assert (optionname); + assert (option_ptr); + +- bool = (int *)option_ptr; +- *bool = data->boolval; ++ value = (int *)option_ptr; ++ *value = data->boolval; + return (0); + } + diff --git a/c99.patch b/c99.patch deleted file mode 100644 index 6c5d47b..0000000 --- a/c99.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN freeipmi-1.6.11/ipmi-sensors/ipmi-sensors-oem-intel.c freeipmi-1.6.11.new/ipmi-sensors/ipmi-sensors-oem-intel.c ---- freeipmi-1.6.11/ipmi-sensors/ipmi-sensors-oem-intel.c 2022-08-31 07:17:04.000000000 +0200 -+++ freeipmi-1.6.11.new/ipmi-sensors/ipmi-sensors-oem-intel.c 2023-02-06 16:36:12.866440828 +0100 -@@ -34,6 +34,7 @@ - #include "ipmi-sensors-oem-intel.h" - #include "ipmi-sensors-oem-intel-s5500wb.h" - #include "ipmi-sensors-oem-intel-s2600jf.h" -+#include "ipmi-sensors-oem-intel-s2600wp.h" - #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" - #include "ipmi-sensors-oem-intel-node-manager.h" - -diff -ruN freeipmi-1.6.11/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h freeipmi-1.6.11.new/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h ---- freeipmi-1.6.11/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h 2022-08-31 07:17:05.000000000 +0200 -+++ freeipmi-1.6.11.new/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h 2023-02-06 15:17:56.023720145 +0100 -@@ -39,4 +39,15 @@ - unsigned int *wlen, - struct ipmi_sel_system_event_record_data *system_event_record_data); - -+int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx, -+ struct ipmi_sel_entry *sel_entry, -+ uint8_t sel_record_type, -+ char *buf, -+ unsigned int buflen, -+ unsigned int flags, -+ unsigned int *wlen, -+ struct ipmi_sel_system_event_record_data *system_event_record_data, -+ int *oem_rv); -+ -+ - #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */ diff --git a/freeipmi.spec b/freeipmi.spec index 7798d09..797a66a 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -1,10 +1,10 @@ Name: freeipmi -Version: 1.6.11 +Version: 1.6.15 Release: %autorelease Summary: IPMI remote console and system management software License: GPL-3.0-or-later -URL: http://www.gnu.org/software/freeipmi/ -Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +URL: https://www.gnu.org/software/freeipmi/ +Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source1: bmc-watchdog.service Source2: ipmidetectd.service Source3: ipmiseld.service @@ -16,8 +16,9 @@ BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool - -Patch0: c99.patch +# https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html +# https://github.com/chu11/freeipmi-mirror/commit/ececf09d6128cbff65e9048f19d191e87f111059 +Patch0: c23.patch %description The FreeIPMI project provides "Remote-Console" (out-of-band) and diff --git a/sources b/sources index b5fea19..8a58988 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeipmi-1.6.11.tar.gz) = db37bb1ec559f88764ac08491b616d24e49c9a8ba070717e940fea4886d877819064cb00221aac703d0d149dc38e562924e192e992222e18b0e8b548248487a4 +SHA512 (freeipmi-1.6.15.tar.gz) = 113005f751a22584b657afa27c5659af8cae3b503f7c6358ac98c7f2461165c882b9ccfa8ad1cc4e3041f10de334def9b4faff03f2b83d56e69d891463f8931a