!35 backport contrib: Fix corner case libipmimonitoring-sensors output

From: @liyy9 Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li
!28 backport Fix manpage SDR English typo
2023-12-29 03:29:16 +00:00 · 2023-12-25 07:40:18 +00:00 · 2023-12-22 03:09:44 +08:00 · 2023-12-21 23:36:08 +08:00 · 2020-11-10 15:31:06 +08:00 · 2020-11-10 14:51:49 +08:00
6 changed files with 122 additions and 147 deletions
--- a/0001-Fix-manpage-SDR-English-typo.patch
+++ b/0001-Fix-manpage-SDR-English-typo.patch
@ -0,0 +1,26 @@
+From 2d386e4fcba3bd17af6694626e3105fadb65d85f Mon Sep 17 00:00:00 2001
+From: Albert Chu <chu11@llnl.gov>
+Date: Tue, 31 Jul 2018 15:59:08 -0700
+Subject: [PATCH] Fix manpage SDR English typo
+
+---
+ man/manpage-common-workaround-sdr-text.man | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/manpage-common-workaround-sdr-text.man b/man/manpage-common-workaround-sdr-text.man
+index 147b37e7a..80b583ead 100644
+--- a/man/manpage-common-workaround-sdr-text.man
+++ b/man/manpage-common-workaround-sdr-text.man
+@@ -2,6 +2,6 @@
+ \fIassumemaxsdrrecordcount\fR - This workaround will inform SDR
+ reading to stop reading after a known maximum numer of SDR records
+ have been read.  This will work around systems that have
+-mis-implemented SDR reading functions that.  Those hitting this issue
+-may see "SDR record count invalid" errors.  Issue observed on
+-unspecified Inspur motherboard.
+mis-implemented SDR reading functions.  Those hitting this issue may
+see "SDR record count invalid" errors.  Issue observed on unspecified
+Inspur motherboard.
+-- 
+2.33.0
+
--- a/0002-contrib-Fix-corner-case-libipmimonitoring-sensors-ou.patch
+++ b/0002-contrib-Fix-corner-case-libipmimonitoring-sensors-ou.patch
@ -0,0 +1,44 @@
+From 0423bf4e64c89426584960d324f94921ed5336c3 Mon Sep 17 00:00:00 2001
+From: Albert Chu <chu11@llnl.gov>
+Date: Wed, 12 Dec 2018 13:44:46 -0800
+Subject: [PATCH] contrib: Fix corner case libipmimonitoring-sensors output
+
+---
+ contrib/libipmimonitoring/ipmimonitoring-sensors.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/contrib/libipmimonitoring/ipmimonitoring-sensors.c b/contrib/libipmimonitoring/ipmimonitoring-sensors.c
+index 55001debc..7cf5db58b 100644
+--- a/contrib/libipmimonitoring/ipmimonitoring-sensors.c
+++ b/contrib/libipmimonitoring/ipmimonitoring-sensors.c
+@@ -441,13 +441,10 @@ _ipmimonitoring (struct ipmi_monitoring_ipmi_config *ipmi_config)
+           goto cleanup;
+         }
+ 
+-      if (!(sensor_bitmask_strings = ipmi_monitoring_sensor_read_sensor_bitmask_strings (ctx)))
+-        {
+-          fprintf (stderr,
+-                   "ipmi_monitoring_sensor_read_sensor_bitmask_strings: %s\n",
+-                   ipmi_monitoring_ctx_errormsg (ctx));
+-          goto cleanup;
+-        }
+      /* it's ok for this to be NULL, i.e. sensor_bitmask ==
+       * IPMI_MONITORING_SENSOR_BITMASK_TYPE_UNKNOWN
+       */
+      sensor_bitmask_strings = ipmi_monitoring_sensor_read_sensor_bitmask_strings (ctx);
+ 
+       if ((sensor_reading_type = ipmi_monitoring_sensor_read_sensor_reading_type (ctx)) < 0)
+         {
+@@ -541,7 +538,8 @@ _ipmimonitoring (struct ipmi_monitoring_ipmi_config *ipmi_config)
+       else
+         printf (", N/A");
+ 
+-      if (sensor_bitmask_type != IPMI_MONITORING_SENSOR_BITMASK_TYPE_UNKNOWN)
+      if (sensor_bitmask_type != IPMI_MONITORING_SENSOR_BITMASK_TYPE_UNKNOWN
+          && sensor_bitmask_strings)
+         {
+           unsigned int i = 0;
+ 
+-- 
+2.33.0
+
--- a/bmc-watchdog.service
+++ b/bmc-watchdog.service
@ -0,0 +1,12 @@
+[Unit]
+Description=BMC Watchdog Timer Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/bmc-watchdog.pid
+EnvironmentFile=-/etc/sysconfig/bmc-watchdog
+ExecStart=/usr/sbin/bmc-watchdog $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
--- a/freeipmi.spec
+++ b/freeipmi.spec
@ -1,283 +1,156 @@
 Name:             freeipmi
-
 Version:          1.6.2
-
-Release:          3
-
+Release:          7
 Summary:          IPMI remote console and system management software
-
 License:          GPLv3+
-
 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

+Patch0001:        0001-Fix-manpage-SDR-English-typo.patch
+Patch0002:        0002-contrib-Fix-corner-case-libipmimonitoring-sensors-ou.patch
+
 BuildRequires:    libgcrypt-devel texinfo systemd
-
 %{?systemd_requires}
-
-
-
+Requires:         %{name}-help = %{version}-%{release}
 Requires(post):   ldconfig
-
 Provides:         %{name}-bmc-watchdog = %{version}-%{release} %{name}-ipmidetectd = %{version}-%{release} %{name}-ipmiseld = %{version}-%{release}
-
 Obsoletes:        %{name}-bmc-watchdog < %{version}-%{release} %{name}-ipmidetectd < %{version}-%{release} %{name}-ipmiseld < %{version}-%{release}

-
-
 %description
-
 The package provides "Remote-Console" and
-
 "System Management software" based on intelligent
-
 platform management interface specification.

-
-
 %package          devel
-
 Summary:          Development package for Freeipmi
-
 Requires:         %{name} = %{version}-%{release}

-
-
 %description      devel
-
 Development package for Freeipmi. This package includes the Freeipmi
-
 header files and libraries.

-
-
 %package          help
-
 Summary:          help for freeipmi
-
 Requires:         %{name} = %{version}-%{release}

-
-
 %description help
-
 The help package contains manual pages and other related files for freeipmi.

-
+%if %{?_with_debug:1}%{!?_with_debug:0}
+  %global _enable_debug --enable-debug --enable-trace --enable-syslog
+%endif

 %prep
-
 %autosetup -n %{name}-%{version} -p1

-
-
 %build
-
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
-
-%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} --disable-static
-
+%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} %{?_enable_debug} --disable-static
 %make_build

-
-
 %install
-
 %make_install
-
 echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey

-
-
 %delete_la

-
-
 install -m755 -d %{buildroot}%{_unitdir}
-
 install -pm644 %SOURCE1 %SOURCE2 %SOURCE3 %{buildroot}%{_unitdir}
-
 rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d

 %preun
-
 if [ $1 = 0 ]; then
-
    install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
-
 fi
-
 %systemd_preun bmc-watchdog.service
-
 %systemd_preun ipmiseld.service
-
 %systemd_preun ipmidetectd.service

-
-
-
-
 %post
-
 install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
-
 %systemd_post bmc-watchdog.service
-
 %systemd_post ipmiseld.service
-
 %systemd_post ipmidetectd.service
-
 /sbin/ldconfig

-
-
 %postun
-
 /sbin/ldconfig
-
 %systemd_postun_with_restart bmc-watchdog.service
-
 %systemd_postun_with_restart ipmiseld.service
-
 %systemd_postun_with_restart ipmidetectd.service

-
-
-systemd-sysv-convert --save bmc-watchdog >/dev/null 2>&1 ||:
-
-chkconfig --del bmc-watchdog >/dev/null 2>&1 || :
-
-systemctl try-restart bmc-watchdog.service >/dev/null 2>&1 || :
-
-systemd-sysv-convert --save ipmidetectd >/dev/null 2>&1 ||:
-
-chkconfig --del ipmidetectd >/dev/null 2>&1 || :
-
-systemctl try-restart ipmidetectd.service >/dev/null 2>&1 || :
-
-
-
 %files
-
 %dir %{_sysconfdir}/freeipmi/
-
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/*.conf
-
 %{_libdir}/libipmiconsole*so.*
-
 %doc %{_datadir}/doc/%{name}/AUTHORS
-
 %doc %{_datadir}/doc/%{name}/COPYING
-
 %doc %{_datadir}/doc/%{name}/ChangeLog
-
 %doc %{_datadir}/doc/%{name}/ChangeLog.0
-
 %doc %{_datadir}/doc/%{name}/INSTALL
-
 %doc %{_datadir}/doc/%{name}/NEWS
-
 %doc %{_datadir}/doc/%{name}/README
-
 %doc %{_datadir}/doc/%{name}/README.argp
-
 %doc %{_datadir}/doc/%{name}/README.build
-
 %doc %{_datadir}/doc/%{name}/README.openipmi
-
 %doc %{_datadir}/doc/%{name}/TODO
-
 %doc %{_datadir}/doc/%{name}/COPYING.*
-
 %{_libdir}/libfreeipmi*so.*
-
 %{_libdir}/libipmidetect*so.*
-
 %{_libdir}/libipmimonitoring.so.*
-
 %{_localstatedir}/lib/*
-
 %{_sbindir}/*
-
 %config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog
-
 %{_unitdir}/bmc-watchdog.service
-
 %{_unitdir}/ipmidetectd.service
-
 %{_unitdir}/ipmiseld.service
-
 %dir %{_localstatedir}/cache/ipmimonitoringsdrcache
-
 %dir %{_localstatedir}/cache/ipmiseld

 %files devel
-
 %dir %{_datadir}/doc/%{name}/contrib/libipmimonitoring
-
 %doc %{_datadir}/doc/%{name}/contrib/libipmimonitoring/*
-
 %{_libdir}/libipmiconsole.so
-
 %{_libdir}/libfreeipmi.so
-
 %{_libdir}/libipmidetect.so
-
 %{_libdir}/libipmimonitoring.so
-
 %dir %{_includedir}/freeipmi
-
 %{_includedir}/*
-
 %{_libdir}/pkgconfig/*

-
-
 %files help
-
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.*
-
 %doc %{_datadir}/doc/%{name}/freeipmi-*
-
 %dir %{_datadir}/doc/%{name}
-
 %dir %{_datadir}/doc/%{name}/contrib
-
 %dir %{_datadir}/doc/%{name}/contrib/ganglia
-
 %doc %{_datadir}/doc/%{name}/contrib/ganglia/*
-
 %dir %{_datadir}/doc/%{name}/contrib/nagios
-
 %doc %{_datadir}/doc/%{name}/contrib/nagios/*
-
 %dir %{_datadir}/doc/%{name}/contrib/pet
-
 %doc %{_datadir}/doc/%{name}/contrib/pet/*
-
 %doc %{_infodir}/*
-
 %{_mandir}/man8/*
-
 %{_mandir}/man5/*
-
 %{_mandir}/man7/*
-
 %{_mandir}/man3/*
-
 %exclude %{_infodir}/dir

-
-
 %changelog
+* Thu Dec 28 2023 liyuanyuan <liyuanyuan@xfusion.com> - 1.6.2-7
+- contrib: Fix corner case libipmimonitoring-sensors output
+
+* Fri Dec 22 2023 liyuanyuan <liyuanyuan@xfusion.com> - 1.6.2-6
+- Fix manpage SDR English typo
+
+* Mon Nov 09 2020 huanghaitao <huanghaitao8@huawei.com> - 1.6.2-5
+- Make help package requires by freeipmi
+
+* Sat Nov 30 2019 wangye<wangye54@huawei.com> - 1.6.2-4
+- Package init

 * Thu Nov 21 2019 wangye<wangye54@huawei.com> - 1.6.2-3
-
 - Package init
--- a/ipmidetectd.service
+++ b/ipmidetectd.service
@ -0,0 +1,10 @@
+[Unit]
+Description=IPMI Node Detection Monitoring Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ipmidetectd 
+
+[Install]
+WantedBy=multi-user.target
--- a/ipmiseld.service
+++ b/ipmiseld.service
@ -0,0 +1,10 @@
+[Unit]
+Description=IPMI SEL syslog logging daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ipmiseld 
+
+[Install]
+WantedBy=multi-user.target
Author	SHA1	Message	Date
openeuler-ci-bot	7d50961f4b	!35 backport contrib: Fix corner case libipmimonitoring-sensors output From: @liyy9 Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li	2023-12-29 03:29:16 +00:00
openeuler-ci-bot	620ee1c6af	!28 backport Fix manpage SDR English typo From: @liyy9 Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li	2023-12-25 07:40:18 +00:00
liyuan	86e201de22	backport contrib: Fix corner case libipmimonitoring-sensors output	2023-12-22 03:09:44 +08:00
liyuan	3f534a2abf	backport Fix manpage SDR English typo	2023-12-21 23:36:08 +08:00
openeuler-ci-bot	b82dff780a	!6 Make help package be required From: @hht8 Reviewed-by: @small_leek Signed-off-by: @small_leek	2020-11-10 15:31:06 +08:00
hht8	7522de37b6	Make help package be required	2020-11-10 14:51:49 +08:00
openeuler-ci-bot	5cbd6fd98e	!2 add freeipmi Merge pull request !2 from yeah_wang/apple	2019-12-09 21:40:29 +08:00
yeah_wang	eb3f38b7e1	freeipmi	2019-12-09 21:37:29 +08:00
openeuler-ci-bot	1e4796f18f	!1 add freeipmi Merge pull request !1 from yeah_wang/apple	2019-12-09 15:24:55 +08:00
yeah_wang	c1c9dec990	update freeipmi.spec.	2019-12-09 15:10:28 +08:00