rpm/ipmitool
SHA256
1
0
Fork 0
forked from pool/ipmitool
Code Pull Requests Activity

Accepting request 905182 from home:trenn:branches:systemsmanagement

Browse Source 
- Update to version 1.8.18+git20210622.11c7605:
  * Fix codefactor-io / CodeFactor warnings
  * Use /run instead of /var/run
  * oem: Update product IDs for YADRO
  * lan: Add processing of get/set specific CCs
  * lan: Refactor pointer style
  * doc: update lanplus doc to reflect default cipher suite change
  * ekanalyzer: Fix internal use area off-by-one bug
  * ekanalyzer frushow: Fix internal area size calc
  * sel: Fix "power supply inactive" flag offset
  * free: Fix implicit function declarations
  * Convert line endings to LF
- Update source file:
M    enterprise-numbers
- Adopt to latest sources:
M    0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
- Remove mainline patches:
D    0007-bsc#1175328-check-for-correct-fd.patch
D    0008-bsc#1181063-dont-parametrize-pidfile-name.patch
D    Use-run-instead-of-var-run.patch
D    lanplus-don-t-retry-pre-session-Get-cipher-suites.patch
- Config file in /etc must not be executable
  /etc/bmc-snmp-proxy

OBS-URL: https://build.opensuse.org/request/show/905182
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=59
This commit is contained in:
Thomas Renninger 2021-07-09 07:37:01 +00:00 committed by Git OBS Bridge
parent c4f2b0bf65
commit 465a7673ba
11 changed files with 5587 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
lib/ipmi_picmg.c | 4 ++-- lib/ipmi_picmg.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c Index: ipmitool-1.8.18+git20210622.11c7605/lib/ipmi_ekanalyzer.c
index be6b671ac6aa..73472e74d760 100644 ===================================================================
--- a/lib/ipmi_ekanalyzer.c --- ipmitool-1.8.18+git20210622.11c7605.orig/lib/ipmi_ekanalyzer.c
+++ b/lib/ipmi_ekanalyzer.c +++ ipmitool-1.8.18+git20210622.11c7605/lib/ipmi_ekanalyzer.c
@@ -4017,7 +4017,7 @@ ipmi_ek_display_clock_config_record(struct ipmi_ek_multi_header *record) @@ -4055,7 +4055,7 @@ ipmi_ek_display_clock_config_record(stru
(feature & 1) ? "Source" : "Receiver"); (feature & 1) ? "Source" : "Receiver");
printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n",
family, accuracy); family, accuracy);
@ -24,11 +24,11 @@ index be6b671ac6aa..73472e74d760 100644
freq, min_freq, max_freq); freq, min_freq, max_freq);
} }
printf("\n"); printf("\n");
diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c Index: ipmitool-1.8.18+git20210622.11c7605/lib/ipmi_picmg.c
index 8becc7883922..a7e32f626894 100644 ===================================================================
--- a/lib/ipmi_picmg.c --- ipmitool-1.8.18+git20210622.11c7605.orig/lib/ipmi_picmg.c
+++ b/lib/ipmi_picmg.c +++ ipmitool-1.8.18+git20210622.11c7605/lib/ipmi_picmg.c
@@ -949,7 +949,7 @@ ipmi_picmg_portstate_get(struct ipmi_intf * intf, int32_t interface, @@ -949,7 +949,7 @@ ipmi_picmg_portstate_get(struct ipmi_int
} }
else if (d->type >= 0x06 && d->type <= 0xef) else if (d->type >= 0x06 && d->type <= 0xef)
{ {
@ -37,7 +37,7 @@ index 8becc7883922..a7e32f626894 100644
} }
else if (d->type >= 0xf0 && d->type <= 0xfe) else if (d->type >= 0xf0 && d->type <= 0xfe)
{ {
@@ -1805,7 +1805,7 @@ ipmi_picmg_clk_get(struct ipmi_intf * intf, uint8_t clk_id, int8_t clk_res, @@ -1805,7 +1805,7 @@ ipmi_picmg_clk_get(struct ipmi_intf * in
oemval2str( rsp->data[3], rsp->data[4], oemval2str( rsp->data[3], rsp->data[4],
picmg_clk_accuracy_vals)); picmg_clk_accuracy_vals));
@ -46,6 +46,3 @@ index 8becc7883922..a7e32f626894 100644
} }
} }
} }
--
2.26.0

13
0007-bsc#1175328-check-for-correct-fd.patch
View File

@ -1,13 +0,0 @@
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/lib/helper.c
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/lib/helper.c
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/lib/helper.c
@@ -935,7 +935,7 @@ ipmi_start_daemon(struct ipmi_intf *intf
exit(1);
}
ret = dup(fd);
- if (ret != STDOUT_FILENO) {
+ if (ret != STDERR_FILENO) {
lprintf(LOG_ERR, "failed to reset stderr: %s (%d)", strerror(errno), errno);
exit(1);
}

39
0008-bsc#1181063-dont-parametrize-pidfile-name.patch
View File

@ -1,39 +0,0 @@
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/src/ipmievd.c
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/src/ipmievd.c
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/src/ipmievd.c
@@ -702,8 +702,8 @@ ipmievd_main(struct ipmi_event_intf * ei
struct sigaction act;
mode_t oldumask;
- memset(pidfile, 0, 64);
- sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum);
+ memset(pidfile, 0, sizeof(pidfile));
+ strncpy(pidfile, DEFAULT_PIDFILE, sizeof(pidfile)-1);
for (i = 0; i < argc; i++) {
if (strcasecmp(argv[i], "help") == 0) {
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/doc/ipmievd.8.in
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/doc/ipmievd.8.in
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/doc/ipmievd.8.in
@@ -174,8 +174,7 @@ Do NOT become a daemon, instead log all
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
-number -- defaults to 0).
+/var/run/ipmievd.pid.
.RE
.TP
@@ -197,8 +196,7 @@ Do NOT become a daemon, instead log all
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
-number -- defaults to 0).
+/var/run/ipmievd.pid.
.TP
\fItimeout\fP=<\fBseconds\fR>
Time between checks for SEL polling method. Default is 10 seconds.

137
Use-run-instead-of-var-run.patch
View File

@ -1,137 +0,0 @@
From: Thomas Renninger <trenn@suse.com>
Subject: Use /run instead of /var/run
References: 1185162
Patch-Mainline:
Git-commit: aa0b3f5d27f63d649aa4f1d540d9b956b1f30283
Git-repo: git@github.com:watologo1/ipmitool.git.git
In FHS 3.0, /var/run is replaced by /run:
https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch05s13.html
Signed-off-by: <trenn@suse.com>
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/bmc-snmp-proxy
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/contrib/bmc-snmp-proxy
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/bmc-snmp-proxy
@@ -31,7 +31,7 @@ TRAPD_BMC_CONF="${SNMPD_BMC_CONF_DIR}/sn
TRAPD_CONF="/etc/snmp/snmptrapd.conf"
LOCKFILE="/var/lock/subsys/bmc-snmp-proxy"
-BMC_INFO="/var/run/bmc-info"
+BMC_INFO="/run/bmc-info"
IPMITOOL=`which ipmitool`
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/bmc-snmp-proxy.service
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/contrib/bmc-snmp-proxy.service
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/bmc-snmp-proxy.service
@@ -5,7 +5,7 @@ After=exchange-bmc-os-info.service
Requires=exchange-bmc-os-info.service
PartOf=exchange-bmc-os-info.service
-ConditionPathExists=/var/run/bmc-info
+ConditionPathExists=/run/bmc-info
[Service]
Type=oneshot
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/exchange-bmc-os-info.init.redhat
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/contrib/exchange-bmc-os-info.init.redhat
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/exchange-bmc-os-info.init.redhat
@@ -12,10 +12,10 @@
# Description: Script to set OS information in the BMC; fetch BMC IP/URL
# and set in the OS for use by other scripts/user.
#
-# BMC IP and URL are made available in /var/run/bmc-info
+# BMC IP and URL are made available in /run/bmc-info
#
# Example to launch BMC web-interface:
-# # . /var/run/bmc-info
+# # . /run/bmc-info
# # xdg-open $BMC_URL
#
# See here for details:
@@ -42,7 +42,7 @@
#############################################################################
CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info
IPMI_TOOL=/usr/bin/ipmitool
-BMC_INFO=/var/run/bmc-info
+BMC_INFO=/run/bmc-info
# BMC Manufacturer ID used in 'oem_set_os_version' and 'oem_get_bmc_url'
DELL="674"
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/ipmievd.init.debian
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/contrib/ipmievd.init.debian
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/contrib/ipmievd.init.debian
@@ -22,7 +22,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbi
DESC="IPMI event daemon"
NAME=ipmievd
DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
# Gracefully exit if the package has been removed.
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/doc/ipmievd.8.in
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/doc/ipmievd.8.in
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/doc/ipmievd.8.in
@@ -174,7 +174,7 @@ Do NOT become a daemon, instead log all
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid.
+/run/ipmievd.pid.
.RE
.TP
@@ -196,7 +196,7 @@ Do NOT become a daemon, instead log all
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid.
+/run/ipmievd.pid.
.TP
\fItimeout\fP=<\fBseconds\fR>
Time between checks for SEL polling method. Default is 10 seconds.
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/lib/helper.c
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/lib/helper.c
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/lib/helper.c
@@ -54,7 +54,7 @@
#ifdef HAVE_PATHS_H
# include <paths.h>
#else
-# define _PATH_VARRUN "/var/run/"
+# define _PATH_RUN "/run/"
#endif
#include <ipmitool/ipmi.h>
Index: ipmitool-1.8.18+git20200916.1245aaa387dc/src/ipmievd.c
===================================================================
--- ipmitool-1.8.18+git20200916.1245aaa387dc.orig/src/ipmievd.c
+++ ipmitool-1.8.18+git20200916.1245aaa387dc/src/ipmievd.c
@@ -54,8 +54,8 @@
# include <paths.h>
#endif
-#ifndef _PATH_VARRUN
-# define _PATH_VARRUN "/var/run/"
+#ifndef _PATH_RUN
+# define _PATH_RUN "/run/"
#endif
#ifdef IPMI_INTF_OPEN
@@ -82,7 +82,7 @@
#include <ipmitool/ipmi_main.h>
#define WARNING_THRESHOLD 80
-#define DEFAULT_PIDFILE _PATH_VARRUN "ipmievd.pid"
+#define DEFAULT_PIDFILE _PATH_RUN "ipmievd.pid"
char pidfile[64];
/* global variables */

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/ipmitool/ipmitool.git</param> <param name="url">https://github.com/ipmitool/ipmitool.git</param>
<param name="changesrevision">1245aaa387dca1cb99408869b2c1b3e2410a1352</param></service></servicedata> <param name="changesrevision">11c7605c0d5423f90f399f5e830d1095089f38a1</param></service></servicedata>

5910
enterprise-numbers
View File

File diff suppressed because it is too large Load Diff

3
ipmitool-1.8.18+git20200916.1245aaa387dc.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f798d236ff6a75dd2be925cb25b7af521d45bcc74d40daf2b5a36b33539e34f3
size 458952

3
ipmitool-1.8.18+git20210622.11c7605.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f729abdf8046fa024d40086b87b9bac63fe333e3234cf480c1856d39bb099c0
size 458740

29
ipmitool.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Jul 08 15:10:12 UTC 2021 - trenn@suse.de
- Update to version 1.8.18+git20210622.11c7605:
* Fix codefactor-io / CodeFactor warnings
* Use /run instead of /var/run
* oem: Update product IDs for YADRO
* lan: Add processing of get/set specific CCs
* lan: Refactor pointer style
* doc: update lanplus doc to reflect default cipher suite change
* ekanalyzer: Fix internal use area off-by-one bug
* ekanalyzer frushow: Fix internal area size calc
* sel: Fix "power supply inactive" flag offset
* free: Fix implicit function declarations
* Convert line endings to LF
- Update source file:
M enterprise-numbers
- Adopt to latest sources:
M 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
- Remove mainline patches:
D 0007-bsc#1175328-check-for-correct-fd.patch
D 0008-bsc#1181063-dont-parametrize-pidfile-name.patch
D Use-run-instead-of-var-run.patch
D lanplus-don-t-retry-pre-session-Get-cipher-suites.patch
- Config file in /etc must not be executable
/etc/bmc-snmp-proxy
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 25 17:59:48 UTC 2021 - Thomas Renninger <trenn@suse.de> Tue May 25 17:59:48 UTC 2021 - Thomas Renninger <trenn@suse.de>

8
ipmitool.spec
View File

@ -17,7 +17,7 @@
Name: ipmitool Name: ipmitool
Version: 1.8.18+git20200916.1245aaa387dc Version: 1.8.18+git20210622.11c7605
Release: 0 Release: 0
Summary: Utility for IPMI Control Summary: Utility for IPMI Control
License: BSD-3-Clause License: BSD-3-Clause
@ -33,10 +33,6 @@ Patch3: 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
Patch4: 0004-Adjust-SUSE-paths.patch Patch4: 0004-Adjust-SUSE-paths.patch
Patch5: 0005-HPM-x-compatibility-message-is-DEBUG-only.patch Patch5: 0005-HPM-x-compatibility-message-is-DEBUG-only.patch
Patch6: 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch Patch6: 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch
Patch7: 0007-bsc#1175328-check-for-correct-fd.patch
Patch8: 0008-bsc#1181063-dont-parametrize-pidfile-name.patch
Patch9: lanplus-don-t-retry-pre-session-Get-cipher-suites.patch
Patch10: Use-run-instead-of-var-run.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: readline-devel BuildRequires: readline-devel
@ -154,7 +150,7 @@ ln -sf service %{buildroot}%{_sbindir}/rcbmc-snmp-proxy
%files bmc-snmp-proxy %files bmc-snmp-proxy
%attr(755,root,root) %{_sbindir}/bmc-snmp-proxy %attr(755,root,root) %{_sbindir}/bmc-snmp-proxy
%{_sbindir}/rcbmc-snmp-proxy %{_sbindir}/rcbmc-snmp-proxy
%config(noreplace) %{_sysconfdir}/bmc-snmp-proxy %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bmc-snmp-proxy
%{_unitdir}/bmc-snmp-proxy.service %{_unitdir}/bmc-snmp-proxy.service
%changelog %changelog

35
lanplus-don-t-retry-pre-session-Get-cipher-suites.patch
View File

@ -1,35 +0,0 @@
From: Václav Doležal <vdolezal@redhat.com>
Subject: lanplus: don't retry pre-session Get cipher suites
References: bsc#1179133
Patch-Mainline:
Git-commit: 0de01deddb0aca475b3929c372ca2448d6858a89
Git-repo: https://github.com/yontalcar/ipmitool.git.git
Some BMCs are ignoring it, causing needless delay.
Addresses: https://github.com/ipmitool/ipmitool/issues/199
Signed-off-by: Václav Doležal <vdolezal@redhat.com>
Signed-off-by: <trenn@suse.com>
diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
index f5aba5e..06b29a0 100644
--- a/src/plugins/lanplus/lanplus.c
+++ b/src/plugins/lanplus/lanplus.c
@@ -3390,9 +3390,13 @@ ipmi_find_best_cipher_suite(struct ipmi_intf *intf)
};
const size_t nr_preferred = ARRAY_SIZE(cipher_order_preferred);
size_t ipref, i;
+ int rc;
+ int retry_old = intf->ssn_params.retry;
- if (ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E,
- suites, &nr_suites) < 0)
+ ipmi_intf_session_set_retry(intf, 1);
+ rc = ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E, suites, &nr_suites);
+ ipmi_intf_session_set_retry(intf, retry_old);
+ if (rc < 0)
{
/* default legacy behavior - fall back to cipher suite 3 */
return IPMI_LANPLUS_CIPHER_SUITE_3;