Hello community, here is the log from the commit of package ipmitool for openSUSE:Factory checked in at 2020-09-30 19:55:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipmitool (Old) and /work/SRC/openSUSE:Factory/.ipmitool.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipmitool" Wed Sep 30 19:55:22 2020 rev:38 rq:838737 version:1.8.18+git20200916.1245aaa387dc Changes: -------- --- /work/SRC/openSUSE:Factory/ipmitool/ipmitool.changes 2020-02-11 22:26:09.247592185 +0100 +++ /work/SRC/openSUSE:Factory/.ipmitool.new.4249/ipmitool.changes 2020-09-30 19:55:34.860848520 +0200 @@ -1,0 +2,32 @@ +Wed Sep 23 07:49:45 UTC 2020 - Klaus Kämpf <[email protected]> + +- clean up patches + rename fwum_enhance_output.patch + to 0001-Enhance-fwum-output.patch + rename fix_file_permissions.patch + to 0002-Fix-file-permissions.patch + rename several_more_compile_fixes.patch + to 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch + rename ipmitool_adjust_suse_paths.patch + to 0004-Adjust-SUSE-paths.patch + rename hpm_x_compatibility_msg_is_debug_only.patch + to 0005-HPM-x-compatibility-message-is-DEBUG-only.patch + rename autotools_define_DOWNLOAD.diff + to 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch + +------------------------------------------------------------------- +Wed Sep 23 07:30:26 UTC 2020 - [email protected] + +- Update to version 1.8.18+git20200916.1245aaa387dc: + * fru: Fix crashes on 6-bit ASCII strings + * Refix 6e037d6bfbbb93b349c8ca331ebde03a837f76bf + * oem: Add product ID for YADRO VEGMAN + * configure.ac: add '--location' for curl to follow location + * configure.ac: replace '-#' by '--progress-bar' with curl + * log: refix 16f937a1: Add missing header changes + * Add version info to debug output + * doc, ci: Fix an error in package name for Windows + * doc: Fix a small typo in INSTALL + * RPM support: updated spec file changelog + +------------------------------------------------------------------- Old: ---- autotools_define_DOWNLOAD.diff fix_file_permissions.patch fwum_enhance_output.patch hpm_x_compatibility_msg_is_debug_only.patch ipmitool-1.8.18+git20200204.7ccea28.tar.xz ipmitool_adjust_suse_paths.patch several_more_compile_fixes.patch New: ---- 0001-Enhance-fwum-output.patch 0002-Fix-file-permissions.patch 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch 0004-Adjust-SUSE-paths.patch 0005-HPM-x-compatibility-message-is-DEBUG-only.patch 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch _servicedata ipmitool-1.8.18+git20200916.1245aaa387dc.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipmitool.spec ++++++ --- /var/tmp/diff_new_pack.lG4QPT/_old 2020-09-30 19:55:35.760849324 +0200 +++ /var/tmp/diff_new_pack.lG4QPT/_new 2020-09-30 19:55:35.764849327 +0200 @@ -17,7 +17,7 @@ Name: ipmitool -Version: 1.8.18+git20200204.7ccea28 +Version: 1.8.18+git20200916.1245aaa387dc Release: 0 Summary: Utility for IPMI Control License: BSD-3-Clause @@ -27,12 +27,12 @@ Source1: ipmievd.service Source2: ipmievd.sysconf Source3: enterprise-numbers -Patch0: fwum_enhance_output.patch -Patch1: fix_file_permissions.patch -Patch2: several_more_compile_fixes.patch -Patch3: ipmitool_adjust_suse_paths.patch -Patch4: hpm_x_compatibility_msg_is_debug_only.patch -Patch5: autotools_define_DOWNLOAD.diff +Patch1: 0001-Enhance-fwum-output.patch +Patch2: 0002-Fix-file-permissions.patch +Patch3: 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch +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 BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: readline-devel ++++++ 0001-Enhance-fwum-output.patch ++++++ >From 9d1b55b396007558288a9807ef269141c6aeac25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:35:23 +0200 Subject: [PATCH 1/6] Enhance fwum output --- lib/ipmi_fwum.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ipmi_fwum.c b/lib/ipmi_fwum.c index b01c5458d974..ba97da3ae266 100644 --- a/lib/ipmi_fwum.c +++ b/lib/ipmi_fwum.c @@ -1098,12 +1098,14 @@ ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo, int compatible = 0; if (boardInfo.iana != firmInfo.iana) { lprintf(LOG_ERR, - "Board IANA does not match firmware IANA."); + "Board IANA [%u] does not match firmware IANA [%u]\n", + boardInfo.iana, firmInfo.iana); compatible = (-1); } if (boardInfo.boardId != firmInfo.boardId) { lprintf(LOG_ERR, - "Board IANA does not match firmware IANA."); + "Board ID [%u] does not match firmware board ID [%u]\n", + boardInfo.boardId, firmInfo.boardId); compatible = (-1); } if (compatible != 0) { @@ -1121,6 +1123,10 @@ printf_kfwum_info(tKFWUM_BoardInfo boardInfo, tKFWUM_InFirmwareInfo firmInfo) printf( "Target IANA number : %u\n", boardInfo.iana); printf( +"FW File Board Id : %u\n",firmInfo.boardId); + printf( +"FW File IANA number : %u\n",firmInfo.iana); + printf( "File Size : %lu bytes\n", firmInfo.fileSize); printf( "Firmware Version : %d.%d%d SDR %d\n", firmInfo.versMajor, -- 2.26.0 ++++++ 0002-Fix-file-permissions.patch ++++++ >From b7f319ded60e89470012c6f9f957a0bcf9ab7d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:35:54 +0200 Subject: [PATCH 2/6] Fix file permissions --- src/ipmievd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ipmievd.c b/src/ipmievd.c index eeaa0c9c3b98..df01cc8bdf0b 100644 --- a/src/ipmievd.c +++ b/src/ipmievd.c @@ -700,6 +700,7 @@ ipmievd_main(struct ipmi_event_intf * eintf, int argc, char ** argv) int i, rc; int daemon = 1; struct sigaction act; + mode_t oldumask; memset(pidfile, 0, 64); sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum); @@ -762,8 +763,9 @@ ipmievd_main(struct ipmi_event_intf * eintf, int argc, char ** argv) ipmi_start_daemon(eintf->intf); - umask(022); + oldumask = umask(022); fp = ipmi_open_file_write(pidfile); + umask(oldumask); if (!fp) { /* Failed to get fp on PID file -> exit. */ log_halt(); -- 2.26.0 ++++++ 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch ++++++ >From e48fa62fe6e9b5fa1f537c2d149078fb0ce218c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:36:46 +0200 Subject: [PATCH 3/6] Cleanup and compiler issues only, no functional change Changes partly very old and not possible to find the original author. Signed-off-by: Thomas Renninger <[email protected]> --- lib/ipmi_ekanalyzer.c | 2 +- lib/ipmi_picmg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c index be6b671ac6aa..73472e74d760 100644 --- a/lib/ipmi_ekanalyzer.c +++ b/lib/ipmi_ekanalyzer.c @@ -4017,7 +4017,7 @@ ipmi_ek_display_clock_config_record(struct ipmi_ek_multi_header *record) (feature & 1) ? "Source" : "Receiver"); printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy); - printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n", + printf("\tFRQ: %-9lu - min: %-9lu - max: %-9lu\n", freq, min_freq, max_freq); } printf("\n"); diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c index 8becc7883922..a7e32f626894 100644 --- a/lib/ipmi_picmg.c +++ b/lib/ipmi_picmg.c @@ -949,7 +949,7 @@ ipmi_picmg_portstate_get(struct ipmi_intf * intf, int32_t interface, } else if (d->type >= 0x06 && d->type <= 0xef) { - printf("Reserved\n"); + printf("Reserved %d\n",d->type); } 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, oemval2str( rsp->data[3], rsp->data[4], picmg_clk_accuracy_vals)); - printf(" - Freq: %ld\n", freq); + printf(" - Freq: %lu\n", freq); } } } -- 2.26.0 ++++++ 0004-Adjust-SUSE-paths.patch ++++++ >From 8ede995f261edd539bd1f1d454dd74941a6f4aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:37:22 +0200 Subject: [PATCH 4/6] Adjust SUSE paths --- contrib/bmc-snmp-proxy | 4 ++++ contrib/bmc-snmp-proxy.service | 4 ++-- contrib/exchange-bmc-os-info.service.redhat | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/bmc-snmp-proxy b/contrib/bmc-snmp-proxy index fcb2ab8256d3..7f0a5a86472e 100644 --- a/contrib/bmc-snmp-proxy +++ b/contrib/bmc-snmp-proxy @@ -14,6 +14,10 @@ # # Assumptions: This script will work only when /etc/snmp/ is writable. # +# Provides: bmc-snmp-proxy +# Required-Start: ipmi snmp +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 ############################################################################# # GLOBALS ############################################################################# diff --git a/contrib/bmc-snmp-proxy.service b/contrib/bmc-snmp-proxy.service index 247137a4fffd..80b7b100c4e2 100644 --- a/contrib/bmc-snmp-proxy.service +++ b/contrib/bmc-snmp-proxy.service @@ -11,8 +11,8 @@ ConditionPathExists=/var/run/bmc-info Type=oneshot RemainAfterExit=yes -ExecStart=/usr/libexec/bmc-snmp-proxy start -ExecStop=/usr/libexec/bmc-snmp-proxy stop +ExecStart=/usr/sbin/bmc-snmp-proxy start +ExecStop=/usr/sbin/bmc-snmp-proxy stop [Install] WantedBy=multi-user.target diff --git a/contrib/exchange-bmc-os-info.service.redhat b/contrib/exchange-bmc-os-info.service.redhat index eb28ffee1f33..34e90fdb19bb 100644 --- a/contrib/exchange-bmc-os-info.service.redhat +++ b/contrib/exchange-bmc-os-info.service.redhat @@ -7,8 +7,8 @@ AssertPathExistsGlob=/dev/ipmi* [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/libexec/exchange-bmc-os-info start -ExecStop=/usr/libexec/exchange-bmc-os-info stop +ExecStart=/usr/sbin/exchange-bmc-os-info start +ExecStop=/usr/sbin/exchange-bmc-os-info stop [Install] WantedBy=multi-user.target -- 2.26.0 ++++++ 0005-HPM-x-compatibility-message-is-DEBUG-only.patch ++++++ >From d682f056d836b7978d67c5f9170a3ebfb103f54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:38:11 +0200 Subject: [PATCH 5/6] HPM x compatibility message is DEBUG only bsc#948540 Signed-off-by: Thomas Renninger <[email protected]> --- lib/hpm2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/hpm2.c b/lib/hpm2.c index 52e5366c7725..c7ae2343c004 100644 --- a/lib/hpm2.c +++ b/lib/hpm2.c @@ -99,7 +99,7 @@ int hpm2_get_capabilities(struct ipmi_intf * intf, lprintf(LOG_DEBUG, "IPM Controller is not HPM.2 compatible"); return rsp->ccode; } else if (rsp->ccode) { - lprintf(LOG_NOTICE, "Get HPM.x Capabilities request failed," + lprintf(LOG_DEBUG, "Get HPM.x Capabilities request failed," " compcode = %x", rsp->ccode); return rsp->ccode; } -- 2.26.0 ++++++ 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch ++++++ >From 44faed961d148ded6e6a75b73a25d85bcbdd843c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 23 Sep 2020 09:44:29 +0200 Subject: [PATCH 6/6] Make IANA PEN download configurable - fix uninitalized DOWNLOAD variable Currently if you do not have wget and curl requirement met, you get this error: [ 93s] configure: WARNING: ** Neither wget nor curl could be found. [ 93s] configure: WARNING: ** IANA PEN database will not be installed by `make install` ! [ 93s] configure: WARNING: ** Download is: [ 93s] configure: WARNING: ... [ 104s] configure: error: conditional "DOWNLOAD" was never defined. [ 104s] Usually this means the macro was only invoked conditionally. [ 104s] error: Bad exit status from /var/tmp/rpm-tmp.TYnvu5 (%build) Internet download is restricted in most build environments. So there must be a knob to enable/disable IANA PEN database download. For security reasons and as a good manner for open source tools, the internet download is by default set to off. This patch initializes all needed variables and also introduces to make the IANA PEN internet download configurable. ./configure then has this additional feature: --enable-iana-download Download IANA PEN database [default=no] Depending on whether it has explicitly been enabled this additional output is shown after build env is successfully set up via ./configure: Download IANA PEN database : yes IANA PEN database URL : http://www.iana.org/assignments/enterprise-numbers The URL is unfortunately hardcoded in the message. I couldn't find a quick way to show the IANA_PEN_URL variable there, so if this is ever changed (it is not configurable right now, but maybe with a follow up patch in the future), it has to be changed in the help string as well. --- Makefile.am | 5 ++--- configure.ac | 39 ++++++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce3267f00bc8..05fa209e90bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,6 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ $(distdir).tar.gz $(distdir).tar.bz2 SUBDIRS = lib src include doc contrib control -IANA_PEN = http://www.iana.org/assignments/enterprise-numbers dist-hook: cp control/ipmitool.spec $(distdir) @@ -53,8 +52,8 @@ if DOWNLOAD enterprise-numbers: @echo Downloading IANA PEN database... - @$(DOWNLOAD) "$(IANA_PEN)" > tmpfile.$$PPID || {\ - echo "FAILED to download the IANA PEN database"; \ + @$(DOWNLOAD) "$(IANA_PEN_URL)" > tmpfile.$$PPID || {\ + echo "FAILED to download the IANA PEN database from $(IANA_PEN_URL)"; \ rm tmpfile.$$PPID; \ false; \ } diff --git a/configure.ac b/configure.ac index b421192daef7..c7a20cad1dc3 100644 --- a/configure.ac +++ b/configure.ac @@ -56,23 +56,34 @@ if test "x$exec_prefix" = "xNONE"; then exec_prefix="$prefix" fi -if test "x$WGET" = "x"; then - if test "x$CURL" = "x"; then - AC_MSG_WARN([** Neither wget nor curl could be found.]) - AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) +xiana_pen_url="http://www.iana.org/assignments/enterprise-numbers"; +AC_SUBST(IANA_PEN_URL, xiana_pen_url) + +AC_ARG_ENABLE([iana-download], + [AC_HELP_STRING([--enable-iana-download], + [Download IANA PEN database [default=no]])], + [xenable_iana_download=$enableval], + [xenable_iana_download=no]) +if test "x$xenable_iana_download" = "xyes"; then + if test "x$WGET" = "x"; then + if test "x$CURL" = "x"; then + AC_MSG_WARN([** Neither wget nor curl could be found.]) + AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) + xenable_iana_download="no" + else + DOWNLOAD="$CURL -#" + fi else - DOWNLOAD="$CURL --location --progress-bar" - AM_CONDITIONAL([DOWNLOAD], [true]) + DOWNLOAD="$WGET -c -nd -O -" fi +fi +if test "x$xenable_iana_download" = "xyes"; then + AM_CONDITIONAL([DOWNLOAD], [true]) + AC_SUBST(DOWNLOAD, $DOWNLOAD) else - DOWNLOAD="$WGET -c -nd -O -" - AM_CONDITIONAL([DOWNLOAD], [true]) + AM_CONDITIONAL([DOWNLOAD], [false]) fi -AC_MSG_WARN([** Download is:]) -AC_MSG_WARN($DOWNLOAD) -AC_SUBST(DOWNLOAD, $DOWNLOAD) - dnl dnl set default option values dnl @@ -773,4 +784,6 @@ AC_MSG_RESULT([Extra tools]) AC_MSG_RESULT([ ipmievd : yes]) AC_MSG_RESULT([ ipmishell : $xenable_ipmishell]) AC_MSG_RESULT([]) - +AC_MSG_RESULT([ Download IANA PEN database : $xenable_iana_download]) +AC_MSG_RESULT([ IANA PEN database URL : $xiana_pen_url]) +AC_MSG_RESULT([]) -- 2.26.0 ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ipmitool/ipmitool.git</param> <param name="changesrevision">1245aaa387dca1cb99408869b2c1b3e2410a1352</param></service></servicedata>++++++ enterprise-numbers ++++++ ++++ 6537 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ipmitool/enterprise-numbers ++++ and /work/SRC/openSUSE:Factory/.ipmitool.new.4249/enterprise-numbers ++++++ ipmitool-1.8.18+git20200204.7ccea28.tar.xz -> ipmitool-1.8.18+git20200916.1245aaa387dc.tar.xz ++++++ ++++ 5990 lines of diff (skipped)
