From d2c9b96ca72c35aedd590fd1c03ba2fc2939fd76 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:12:23 +0000 Subject: [PATCH] import RHEL 10 Beta freeipmi-1.6.14-2.el10 --- .gitignore | 2 +- ...incorrect-output-of-IPv6_Dynamic_Add.patch | 41 ------ ...c-watchdog.service => bmc-watchdog.service | 0 c99.patch | 30 ++++ SPECS/freeipmi.spec => freeipmi.spec | 131 +++++++++++++----- ...ipmidetectd.service => ipmidetectd.service | 0 SOURCES/ipmiseld.service => ipmiseld.service | 0 sources | 1 + 8 files changed, 131 insertions(+), 74 deletions(-) delete mode 100644 SOURCES/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch rename SOURCES/bmc-watchdog.service => bmc-watchdog.service (100%) create mode 100644 c99.patch rename SPECS/freeipmi.spec => freeipmi.spec (88%) rename SOURCES/ipmidetectd.service => ipmidetectd.service (100%) rename SOURCES/ipmiseld.service => ipmiseld.service (100%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 3df7658..b47d098 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/freeipmi-1.6.14.tar.gz +freeipmi-1.6.14.tar.gz diff --git a/SOURCES/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch b/SOURCES/0001-ipmi-config-fix-incorrect-output-of-IPv6_Dynamic_Add.patch deleted file mode 100644 index e650d83..0000000 --- a/SOURCES/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/SOURCES/bmc-watchdog.service b/bmc-watchdog.service similarity index 100% rename from SOURCES/bmc-watchdog.service rename to bmc-watchdog.service diff --git a/c99.patch b/c99.patch new file mode 100644 index 0000000..6c5d47b --- /dev/null +++ b/c99.patch @@ -0,0 +1,30 @@ +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/SPECS/freeipmi.spec b/freeipmi.spec similarity index 88% rename from SPECS/freeipmi.spec rename to freeipmi.spec index 9e1029c..8395d5e 100644 --- a/SPECS/freeipmi.spec +++ b/freeipmi.spec @@ -1,24 +1,33 @@ -%global _hardened_build 1 -# Copyright (c) 2003 FreeIPMI Core Team +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec Name: freeipmi Version: 1.6.14 -Release: 2%{?dist} +Release: %autorelease Summary: IPMI remote console and system management software -License: GPLv3+ +License: GPL-3.0-or-later URL: http://www.gnu.org/software/freeipmi/ 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 -Requires(post): /sbin/ldconfig +BuildRequires: make +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool + + +Patch0: c99.patch %description The FreeIPMI project provides "Remote-Console" (out-of-band) and @@ -56,15 +65,16 @@ IPMI SEL syslog logging daemon. %prep %autosetup -p1 +autoreconf -f -v -i %build export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ %{?_enable_debug} --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -rf %{buildroot}%{_infodir}/dir # kludge to get around rpmlint complaining about 0 length semephore file echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey @@ -79,17 +89,6 @@ install -pm644 %SOURCE1 %SOURCE2 %SOURCE3 %{buildroot}%{_unitdir}/ # Remove initscripts rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d -%post -/sbin/install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || : -/sbin/ldconfig - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || : -fi - -%ldconfig_postun - %post bmc-watchdog %systemd_post bmc-watchdog.service @@ -357,19 +356,85 @@ fi %dir %{_localstatedir}/cache/ipmiseld %changelog -* Wed Feb 21 2024 Pavel Cahyna - 1.6.14-2 -- Apply upstream patch 41d0d70f - ipmi-config: fix incorrect output of IPv6_Dynamic_Address_Source_Type +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 1.6.14-2 +- Bump release for June 2024 mass rebuild -* Tue Feb 20 2024 Pavel Cahyna - 1.6.14-1 -- Update to 1.6.14 - Fixes segfault when exceeding 1024 file descriptors +* Mon Feb 12 2024 Fedora Release Monitoring - 1.6.14-1 +- Update to 1.6.14 (rhbz#2260597) -* Mon Jun 28 2021 Pavel Cahyna - 1.6.8-1 -- New upstream release 1.6.8 (#1923042) +* Wed Jan 24 2024 Fedora Release Engineering - 1.6.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Wed Nov 18 2020 Josef Ridky - 1.6.6-1 -- New upstream release 1.6.6 (#1861627) +* Fri Jan 19 2024 Fedora Release Engineering - 1.6.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Oct 21 2023 Philip Kovacs - 1.6.11-1 +- Update to 1.6.11 (#2213373) + +* Wed Jul 19 2023 Fedora Release Engineering - 1.6.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Sep 25 2022 Philip Kovacs - 1.6.10-1 +- Update to 1.6.10 (#2123007) + +* Thu Jul 21 2022 Fedora Release Engineering - 1.6.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 12 2022 Philip Kovacs - 1.6.9-1 +- Update to 1.6.9 (#2042620) + +* Thu Jan 20 2022 Fedora Release Engineering - 1.6.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 20 2021 Philip Kovacs - 1.6.8-1 +- Update to 1.6.8 (#1962444) + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.6.7-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Feb 15 2021 Josef Ridky - 1.6.7-1 +- New upstream release 1.6.7 (#1928428) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Oct 07 2020 Josef Ridky - 1.6.6-1 +- New upstream release 1.6.6 (#1875941) + +* Mon Jul 27 2020 Fedora Release Engineering - 1.6.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Václav Doležal - 1.6.5-1 +- New upstream release 1.6.5 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 11 2019 Vaclav Dolezal - 1.6.4-1 +- New upstream release 1.6.4 + +* Fri Aug 02 2019 Vaclav Dolezal - 1.6.3-1 +- New upstream release 1.6.3 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed May 09 2018 Josef Ridky - 1.6.2-1 +- New upstream release 1.6.2 (#1574750) * Tue Apr 10 2018 Josef Ridky - 1.6.1-1 - New upstream release 1.6.1 (#1541578) @@ -786,3 +851,5 @@ fi files for backwards compatibility. - More detailed release information can be found in the NEWS file. + +## END: Generated by rpmautospec diff --git a/SOURCES/ipmidetectd.service b/ipmidetectd.service similarity index 100% rename from SOURCES/ipmidetectd.service rename to ipmidetectd.service diff --git a/SOURCES/ipmiseld.service b/ipmiseld.service similarity index 100% rename from SOURCES/ipmiseld.service rename to ipmiseld.service diff --git a/sources b/sources new file mode 100644 index 0000000..78e5976 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (freeipmi-1.6.14.tar.gz) = 5dab6430d257776cad1aed39cb2e2536af42c56e3f53774111efc15b0dfc19241eedfbcbfb1f088dd8be38ce694bff9779050daaec9ad0b2d4dad329ce8f3fe3