diff --git a/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch b/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch deleted file mode 100644 index e650d83..0000000 --- a/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 373d445993d0700d0d3801b08696b56486b3083b Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Wed, 21 Feb 2024 09:37:17 -0800 -Subject: [PATCH] ipmi-config: fix incorrect output of - IPv6_Dynamic_Address_Source_Type - ---- - ChangeLog | 6 ++++++ - ipmi-config/ipmi-config-category-core-lan6-conf-section.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 6ed5c9739..c761c4854 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+2024-02-21 Albert Chu -+ -+ * ipmi-config/ipmi-config-category-core-lan6-conf-section.c -+ (ipv6_dynamic_address_source_type_checkout): Fix incorrect output -+ of IPv6_Dynamic_Address_Source_Type. -+ - 2024-01-27 Albert Chu - - * configure.ac: Remove duplicate inb/outb declaration check. Could -diff --git a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -index 6d5e2943b..0b9db1d2d 100644 ---- a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -+++ b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -@@ -1227,7 +1227,7 @@ ipv6_dynamic_address_source_type_checkout (ipmi_config_state_data_t *state_data, - - if (ipmi_config_section_update_keyvalue_output (state_data, - kv, -- get_dynamic_address_source_type_string (ipv6_data.source)) < 0) -+ get_dynamic_address_source_type_string (ipv6_data.source_type)) < 0) - return (IPMI_CONFIG_ERR_FATAL_ERROR); - - rv = IPMI_CONFIG_ERR_SUCCESS; --- -2.43.0 - 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 f2782f3..797a66a 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -1,17 +1,13 @@ Name: freeipmi -Version: 1.6.14 +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 - -# https://github.com/chu11/freeipmi-mirror/commit/41d0d70f09b4becfceef0517543cbf335c0e927a -Patch1: 0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch - BuildRequires: libgcrypt-devel texinfo systemd %{?systemd_requires} BuildRequires: gcc @@ -20,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 78e5976..8a58988 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeipmi-1.6.14.tar.gz) = 5dab6430d257776cad1aed39cb2e2536af42c56e3f53774111efc15b0dfc19241eedfbcbfb1f088dd8be38ce694bff9779050daaec9ad0b2d4dad329ce8f3fe3 +SHA512 (freeipmi-1.6.15.tar.gz) = 113005f751a22584b657afa27c5659af8cae3b503f7c6358ac98c7f2461165c882b9ccfa8ad1cc4e3041f10de334def9b4faff03f2b83d56e69d891463f8931a