Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ipmitool for openSUSE:Factory checked in at 2021-02-04 20:22:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipmitool (Old) and /work/SRC/openSUSE:Factory/.ipmitool.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipmitool" Thu Feb 4 20:22:49 2021 rev:39 rq:868921 version:1.8.18+git20200916.1245aaa387dc Changes: -------- --- /work/SRC/openSUSE:Factory/ipmitool/ipmitool.changes 2020-09-30 19:55:34.860848520 +0200 +++ /work/SRC/openSUSE:Factory/.ipmitool.new.28504/ipmitool.changes 2021-02-04 20:23:37.442785141 +0100 @@ -1,0 +2,22 @@ +Wed Feb 3 11:08:48 UTC 2021 - Thomas Renninger <[email protected]> + +- Fixes (bsc#1179133) lanplus: hanging on getting cipher suites for 10 seconds +A lanplus-don-t-retry-pre-session-Get-cipher-suites.patch + +------------------------------------------------------------------- +Thu Jan 28 13:53:14 UTC 2021 - Josef M??llers <[email protected]> + +- Do not append the device number to the PIDFILE pathname + as this will confuse systemd. + [bsc#1181063, 0008-bsc#1181063-dont-parametrize-pidfile-name.patch] + +------------------------------------------------------------------- +Thu Jan 28 09:10:47 UTC 2021 - Josef M??llers <[email protected]> + +- When really starting the daemon, in lib/helper.c::ipmi_start_daemon() + stdin/stdout/stderr are redirected to /dev/null and this is checked + but the check for stderr tests for STDOUT_FILENO. This is, most + likely, a copy-paste error. + [bsc#1175328, 0007-bsc#1175328-check-for-correct-fd.patch] + +------------------------------------------------------------------- New: ---- 0007-bsc#1175328-check-for-correct-fd.patch 0008-bsc#1181063-dont-parametrize-pidfile-name.patch lanplus-don-t-retry-pre-session-Get-cipher-suites.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipmitool.spec ++++++ --- /var/tmp/diff_new_pack.7jJPCb/_old 2021-02-04 20:23:38.214786316 +0100 +++ /var/tmp/diff_new_pack.7jJPCb/_new 2021-02-04 20:23:38.218786322 +0100 @@ -33,6 +33,9 @@ Patch4: 0004-Adjust-SUSE-paths.patch Patch5: 0005-HPM-x-compatibility-message-is-DEBUG-only.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 BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: readline-devel ++++++ 0007-bsc#1175328-check-for-correct-fd.patch ++++++ 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); } ++++++ 0008-bsc#1181063-dont-parametrize-pidfile-name.patch ++++++ 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. ++++++ lanplus-don-t-retry-pre-session-Get-cipher-suites.patch ++++++ From: V??clav Dole??al <[email protected]> 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 <[email protected]> Signed-off-by: <[email protected]> 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;
