From 2ae91bcc07e4b5ebba3f27ab210130ce181e9362 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:46:54 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f89723dfaaf3afbc65b36dcec313158412e26fab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:01:59 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6638ecab4670b396a6647980056435e41fd13195 Mon Sep 17 00:00:00 2001 From: Fedora Release Monitoring Date: Sun, 28 Jan 2024 18:41:05 +0000 Subject: [PATCH 03/10] Update to 1.6.14 (rhbz#2260597) --- freeipmi.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freeipmi.spec b/freeipmi.spec index 7798d09..72aea37 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -1,5 +1,5 @@ Name: freeipmi -Version: 1.6.11 +Version: 1.6.14 Release: %autorelease Summary: IPMI remote console and system management software License: GPL-3.0-or-later diff --git a/sources b/sources index b5fea19..78e5976 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freeipmi-1.6.11.tar.gz) = db37bb1ec559f88764ac08491b616d24e49c9a8ba070717e940fea4886d877819064cb00221aac703d0d149dc38e562924e192e992222e18b0e8b548248487a4 +SHA512 (freeipmi-1.6.14.tar.gz) = 5dab6430d257776cad1aed39cb2e2536af42c56e3f53774111efc15b0dfc19241eedfbcbfb1f088dd8be38ce694bff9779050daaec9ad0b2d4dad329ce8f3fe3 From 8edffc28fa46b557e83013c5e739e5fd19ecaba4 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Wed, 21 Feb 2024 20:32:42 +0100 Subject: [PATCH 04/10] ipmi-config: fix incorrect output of IPv6_Dynamic_Address_Source_Type upstream patch 41d0d70f Fixes a new error detected by Coverity --- ...incorrect-output-of-IPv6_Dynamic_Add.patch | 41 +++++++++++++++++++ freeipmi.spec | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch 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 new file mode 100644 index 0000000..e650d83 --- /dev/null +++ b/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch @@ -0,0 +1,41 @@ +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/freeipmi.spec b/freeipmi.spec index 72aea37..f2782f3 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -8,6 +8,10 @@ Source0: http://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 From 51affe435de03b39dc2ff41a158999fff9dd5c79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:37:46 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6bf8779e91870ae3c7f791f43aeb6f414d43838d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:49:13 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e428afedf0213d2f29ce38212434836c443ec2ee Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Fri, 7 Feb 2025 16:06:32 +0100 Subject: [PATCH 07/10] Update to 1.6.15 (fedora#2338311) Drop patches integrated upstream. --- ...incorrect-output-of-IPv6_Dynamic_Add.patch | 41 ------------------- c99.patch | 30 -------------- freeipmi.spec | 8 +--- sources | 2 +- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch delete mode 100644 c99.patch 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/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..b8874b2 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -1,5 +1,5 @@ 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 @@ -8,10 +8,6 @@ Source0: http://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 @@ -21,8 +17,6 @@ BuildRequires: autoconf BuildRequires: libtool -Patch0: c99.patch - %description The FreeIPMI project provides "Remote-Console" (out-of-band) and "System Management Software" (in-band) based on Intelligent 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 From 7b51c85982f17d369bc085048b3718ee9ce66e33 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Fri, 7 Feb 2025 16:36:23 +0100 Subject: [PATCH 08/10] Use https for Source --- freeipmi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freeipmi.spec b/freeipmi.spec index b8874b2..b45d919 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -3,8 +3,8 @@ 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 From 5916be3feb3d7e8f1e79b3ea83e5112e3150aa2f Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 17 Feb 2025 18:34:35 +0100 Subject: [PATCH 09/10] Add patch to fix FTBFS with GCC 15 / C23 ... (fedora#2340176) --- c23.patch | 22 ++++++++++++++++++++++ freeipmi.spec | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 c23.patch 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/freeipmi.spec b/freeipmi.spec index b45d919..797a66a 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -16,6 +16,9 @@ BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool +# 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 From 945cacc066b66483739b71a5fee388800d91c944 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:47:36 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild