Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

4 changed files with 143 additions and 47 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/ledmon-0.97.tar.gz
SOURCES/ledmon-1.1.0.tar.gz

1
.ledmon.metadata Normal file
View File

@ -0,0 +1 @@
c248d42629df31f1e2ded05a660a487a2d5a1a70 SOURCES/ledmon-1.1.0.tar.gz

View File

@ -0,0 +1,32 @@
From 740a352626e2ed5d26389200f38323fde9bd84f1 Mon Sep 17 00:00:00 2001
From: Blazej Kucman <blazej.kucman@intel.com>
Date: Wed, 16 Apr 2025 12:26:38 +0200
Subject: [PATCH] utils: Fix string2ibpi function
string2ibpi does not compare strings correctly, the function uses strncmp,
which in case strings of different lengths, may return incorrect value
if substrings of given max length are identical. In this function whole
strings must be identical.
Fix is to change strncmp to strcmp.
Fixes intel/ledmon#259
Fixes: 94818457f615 ("Add struct for mapping ibpi statuses to strings. (#211)")
Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
---
src/lib/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/utils.c b/src/lib/utils.c
index bad35eb4..2fe0f764 100644
--- a/src/lib/utils.c
+++ b/src/lib/utils.c
@@ -765,7 +765,7 @@ enum led_ibpi_pattern string2ibpi(const char *name)
if (!input_name)
continue;
- if (strncmp(input_name, name, strlen(input_name)) == 0)
+ if (strcmp(input_name, name) == 0)
return ipbi_names[i].ibpi;
}

View File

@ -1,16 +1,22 @@
Summary: Enclosure LED Utilities
Name: ledmon
Version: 0.97
Release: 1%{?dist}
Version: 1.1.0
Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://github.com/intel/ledmon
Source0: https://github.com/intel/ledmon/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: perl-interpreter perl-podlators
BuildRequires: sg3_utils-devel
Patch: 0001-ledmon-1.1.0-utils-fix-string2ibpi-function.patch
BuildRequires: autoconf automake
BuildRequires: autoconf-archive
BuildRequires: gcc make
BuildRequires: libconfig-devel
BuildRequires: libtool
BuildRequires: pciutils-devel
BuildRequires: autoconf, automake
BuildRequires: sg3_utils-devel
# Needed for pkgconfig usage.
BuildRequires: pkgconfig(systemd)
# Needed for the udev dependency.
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
@ -26,18 +32,38 @@ types of system: 2-LED system (Activity LED, Status LED) and 3-LED system
(Activity LED, Locate LED, Fail LED). User must have root privileges to
use this application.
%package libs
Summary: Runtime library files for %{name}
Requires: pciutils-libs
Requires: sg3_utils-libs
%description libs
The %{name}-libs package contains runtime libraries for applications
that use %{name}.
%package devel
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: pciutils-devel
Requires: sg3_utils-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
%autosetup -p1
autoreconf -fiv
%build
# can't use smp_flags because -j4 makes the build fail
#make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
sh autogen.sh
%configure --enable-systemd=yes
make
%configure --enable-systemd=yes --enable-library --disable-static
%make_build
%install
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUILD_ROOT/%{_sbindir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
%make_install SBIN_DIR=$RPM_BUILD_ROOT/%{_sbindir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
# These files are not useful for install
find %{buildroot} -name '*.la' -delete
%post
%systemd_post ledmon.service
@ -55,58 +81,95 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUI
%{_mandir}/*/*
%{_unitdir}/ledmon.service
%files libs
%{_libdir}/*.so.*
%files devel
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Wed Jul 23 2025 Jan Macku <jamacku@redhat.com> - 1.1.0-3
- Bump release (RHEL-95751)
* Mon Jun 09 2025 Jan Macku <jamacku@redhat.com> - 1.1.0-2
- Fix string2ibpi function (RHEL-95751)
* Tue Nov 12 2024 Jan Macku <jamacku@redhat.com> - 1.1.0-1
- update to 1.1.0
* Fri Apr 12 2024 Jan Macku <jamacku@redhat.com> - 1.0.0-1
- update to 1.0.0
- package shared ledmon library by Tony Asleson
* Wed May 17 2023 Jan Macku <jamacku@redhat.com> - 0.97-1
- update to 0.97 (#2159588)
- drop downstream patch - ipmi: avoid error messages on non-dell platforms
- update to 0.97 (#2159926)
- drop ipmi-avoid-error-messages-on-non-dell-platforms.patch
* Tue Nov 29 2022 Jan Macku <jamacku@redhat.com> - 0.96-3
- Decrease log level of IPMI messages (#2148944)
* Mon Nov 28 2022 Jan Macku <jamacku@redhat.com> - 0.96-5
- Decrease log level of IPMI messages (#2148954)
* Mon Jun 27 2022 Jan Macku <jamacku@redhat.com> - 0.96-2
- Use systemd-rpm-macros to handle ledmon.service (#2073331)
* Mon Jun 27 2022 Jan Macku <jamacku@redhat.com> - 0.96-4
- Use systemd-rpm-macros to handle ledmon.service (#2073332)
* Wed Jun 01 2022 Jan Macku <jamacku@redhat.com> - 0.96-3
- Add tests
* Wed Jun 01 2022 Jan Macku <jamacku@redhat.com> - 0.96-2
- Rename gating.yml to gating.yaml
* Wed Jun 01 2022 Jan Macku <jamacku@redhat.com> - 0.96-1
- update to 0.96 (#2041713)
- update to 0.96 (#2042273)
- Add gating.yml
* Mon Jan 18 2021 Jan Macku <jamacku@redhat.com> - 0.95-1
- update to 0.95 (#1841501)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.95-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
* Thu Jan 14 2021 Jan Macku <jamacku@redhat.com> - 0.94-2
- tests: fix test to run on reverse depedency pipeline (#1912591)
* Thu May 27 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.95-5
- Rebuilt for sg3_utils 1.47 (#1955156)
* Mon Feb 17 2020 Jan Synáček <jsynacek@redhat.com> - 0.94-1
- update to 0.94 (#1780521)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.95-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Dec 10 2019 Jan Synáček <jsynacek@redhat.com> - 0.93-1
- update to 0.93 (#1721928)
* Mon Feb 22 2021 Jan Macku <jamacku@redhat.com> - 0.95-3
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Tue Jun 4 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-7
- tests: fix tests (#1681030)
* Tue Feb 02 2021 Jan Macku <jamacku@redhat.com> - 0.95-2
- drop perl dependency
* Tue Jun 4 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-6
- tests: fix tests (#1681030)
* Tue Feb 02 2021 Jan Macku <jamacku@redhat.com> - 0.95-1
- clean up spec based on RHEL 8.4.0 spec
- remove -Werror=format-truncation=1 from configure
- update to 0.95 (#1880599)
* Mon Jun 3 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-5
- tests: skip tests on unsupported devices (#1681030)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon May 27 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-4
- fix the _ledmon_status() function (#1681030)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 20 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-3
- tests: fix segfault when a value is missing from ibpi_str[] (#1681030)
* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 0.92-4
- rebuilt for sg3_utils 1.45 (#1809392)
* Mon May 6 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-2
- tests: add PURPOSE target (#1681030)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Apr 15 2019 Jan Synáček <jsynacek@redhat.com> - 0.92-1
- update to 0.92 (#1661204)
- update to 0.92 (#1699783)
* Fri Feb 15 2019 Jan Synáček <jsynacek@redhat.com> - 0.90-3
- LEDs do not work properly during migration (#1669232)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.90-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Aug 7 2018 Jan Synáček <jsynacek@redhat.com> - 0.90-2
- fix manpage generation (#1612711)
* Tue Aug 7 2018 Jan Synáček <jsynacek@redhat.com> - 0.90-3
- fix manpage generation (#1611428)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.90-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Mar 14 2018 Jan Synáček <jsynacek@redhat.com> - 0.90-1
- update to 0.90 (#1555099)