Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
d2c9b96ca7 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/freeipmi-1.6.14.tar.gz
|
freeipmi-1.6.14.tar.gz
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
From 373d445993d0700d0d3801b08696b56486b3083b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Albert Chu <chu11@llnl.gov>
|
|
||||||
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 <chu11@llnl.gov>
|
|
||||||
+
|
|
||||||
+ * 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 <chu11@llnl.gov>
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
30
c99.patch
Normal file
30
c99.patch
Normal file
@ -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 */
|
@ -1,24 +1,33 @@
|
|||||||
%global _hardened_build 1
|
## START: Set by rpmautospec
|
||||||
# Copyright (c) 2003 FreeIPMI Core Team
|
## (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
|
Name: freeipmi
|
||||||
Version: 1.6.14
|
Version: 1.6.14
|
||||||
Release: 2%{?dist}
|
Release: %autorelease
|
||||||
Summary: IPMI remote console and system management software
|
Summary: IPMI remote console and system management software
|
||||||
License: GPLv3+
|
License: GPL-3.0-or-later
|
||||||
URL: http://www.gnu.org/software/freeipmi/
|
URL: http://www.gnu.org/software/freeipmi/
|
||||||
Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
|
Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
|
||||||
Source1: bmc-watchdog.service
|
Source1: bmc-watchdog.service
|
||||||
Source2: ipmidetectd.service
|
Source2: ipmidetectd.service
|
||||||
Source3: ipmiseld.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
|
BuildRequires: libgcrypt-devel texinfo systemd
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
Requires(post): /sbin/ldconfig
|
BuildRequires: make
|
||||||
|
BuildRequires: automake
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: libtool
|
||||||
|
|
||||||
|
|
||||||
|
Patch0: c99.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The FreeIPMI project provides "Remote-Console" (out-of-band) and
|
The FreeIPMI project provides "Remote-Console" (out-of-band) and
|
||||||
@ -56,15 +65,16 @@ IPMI SEL syslog logging daemon.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
autoreconf -f -v -i
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
|
export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
|
||||||
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
||||||
%{?_enable_debug} --disable-static
|
%{?_enable_debug} --disable-static
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
%make_install
|
||||||
rm -rf %{buildroot}%{_infodir}/dir
|
rm -rf %{buildroot}%{_infodir}/dir
|
||||||
# kludge to get around rpmlint complaining about 0 length semephore file
|
# kludge to get around rpmlint complaining about 0 length semephore file
|
||||||
echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey
|
echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey
|
||||||
@ -79,17 +89,6 @@ install -pm644 %SOURCE1 %SOURCE2 %SOURCE3 %{buildroot}%{_unitdir}/
|
|||||||
# Remove initscripts
|
# Remove initscripts
|
||||||
rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
|
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
|
%post bmc-watchdog
|
||||||
%systemd_post bmc-watchdog.service
|
%systemd_post bmc-watchdog.service
|
||||||
|
|
||||||
@ -357,19 +356,85 @@ fi
|
|||||||
%dir %{_localstatedir}/cache/ipmiseld
|
%dir %{_localstatedir}/cache/ipmiseld
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Feb 21 2024 Pavel Cahyna <pcahyna@redhat.com> - 1.6.14-2
|
## START: Generated by rpmautospec
|
||||||
- Apply upstream patch 41d0d70f
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.6.14-2
|
||||||
ipmi-config: fix incorrect output of IPv6_Dynamic_Address_Source_Type
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
* Tue Feb 20 2024 Pavel Cahyna <pcahyna@redhat.com> - 1.6.14-1
|
* Mon Feb 12 2024 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.6.14-1
|
||||||
- Update to 1.6.14
|
- Update to 1.6.14 (rhbz#2260597)
|
||||||
Fixes segfault when exceeding 1024 file descriptors
|
|
||||||
|
|
||||||
* Mon Jun 28 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.6.8-1
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.11-3
|
||||||
- New upstream release 1.6.8 (#1923042)
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Nov 18 2020 Josef Ridky <jridky@redhat.com> - 1.6.6-1
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.11-2
|
||||||
- New upstream release 1.6.6 (#1861627)
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Oct 21 2023 Philip Kovacs <pkfed@fedoraproject.org> - 1.6.11-1
|
||||||
|
- Update to 1.6.11 (#2213373)
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.10-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.10-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Sep 25 2022 Philip Kovacs <pkfed@fedoraproject.org> - 1.6.10-1
|
||||||
|
- Update to 1.6.10 (#2123007)
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 12 2022 Philip Kovacs <pkfed@fedoraproject.org> - 1.6.9-1
|
||||||
|
- Update to 1.6.9 (#2042620)
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 20 2021 Philip Kovacs <pkfed@fedoraproject.org> - 1.6.8-1
|
||||||
|
- Update to 1.6.8 (#1962444)
|
||||||
|
|
||||||
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.6.7-2
|
||||||
|
- Rebuilt for updated systemd-rpm-macros
|
||||||
|
See https://pagure.io/fesco/issue/2583.
|
||||||
|
|
||||||
|
* Mon Feb 15 2021 Josef Ridky <jridky@redhat.com> - 1.6.7-1
|
||||||
|
- New upstream release 1.6.7 (#1928428)
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Oct 07 2020 Josef Ridky <jridky@redhat.com> - 1.6.6-1
|
||||||
|
- New upstream release 1.6.6 (#1875941)
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 22 2020 Václav Doležal <vdolezal@redhat.com> - 1.6.5-1
|
||||||
|
- New upstream release 1.6.5
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 11 2019 Vaclav Dolezal <vdolezal@redhat.com> - 1.6.4-1
|
||||||
|
- New upstream release 1.6.4
|
||||||
|
|
||||||
|
* Fri Aug 02 2019 Vaclav Dolezal <vdolezal@redhat.com> - 1.6.3-1
|
||||||
|
- New upstream release 1.6.3
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 09 2018 Josef Ridky <jridky@redhat.com> - 1.6.2-1
|
||||||
|
- New upstream release 1.6.2 (#1574750)
|
||||||
|
|
||||||
* Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 1.6.1-1
|
* Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 1.6.1-1
|
||||||
- New upstream release 1.6.1 (#1541578)
|
- New upstream release 1.6.1 (#1541578)
|
||||||
@ -786,3 +851,5 @@ fi
|
|||||||
files for backwards compatibility.
|
files for backwards compatibility.
|
||||||
- More detailed release information can be found in the NEWS file.
|
- More detailed release information can be found in the NEWS file.
|
||||||
|
|
||||||
|
|
||||||
|
## END: Generated by rpmautospec
|
Loading…
Reference in New Issue
Block a user