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

- clean up patches

Browse Source 
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

- 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

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=53
This commit is contained in:
Klaus Kämpf 2020-09-23 07:51:43 +00:00 committed by Git OBS Bridge
parent 331d0a61d2
commit 42f6b48b25
14 changed files with 5067 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fwum_enhance_output.patch → 0001-Enhance-fwum-output.patch
View File

@ -1,8 +1,17 @@
Index: ipmitool-1.8.16/lib/ipmi_fwum.c
===================================================================
--- ipmitool-1.8.16.orig/lib/ipmi_fwum.c 2015-11-22 13:50:54.000000000 +0100
+++ ipmitool-1.8.16/lib/ipmi_fwum.c 2016-02-25 13:25:35.907249893 +0100
@@ -1098,12 +1098,14 @@ ipmi_kfwum_checkfwcompat(tKFWUM_BoardInf
From 9d1b55b396007558288a9807ef269141c6aeac25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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,
@ -19,7 +28,7 @@ Index: ipmitool-1.8.16/lib/ipmi_fwum.c
compatible = (-1);
}
if (compatible != 0) {
@@ -1121,6 +1123,10 @@ printf_kfwum_info(tKFWUM_BoardInfo board
@@ -1121,6 +1123,10 @@ printf_kfwum_info(tKFWUM_BoardInfo boardInfo, tKFWUM_InFirmwareInfo firmInfo)
printf(
"Target IANA number : %u\n", boardInfo.iana);
printf(
@ -30,3 +39,6 @@ Index: ipmitool-1.8.16/lib/ipmi_fwum.c
"File Size : %lu bytes\n", firmInfo.fileSize);
printf(
"Firmware Version : %d.%d%d SDR %d\n", firmInfo.versMajor,
--
2.26.0

35
0002-Fix-file-permissions.patch Normal file
View File

@ -0,0 +1,35 @@
From b7f319ded60e89470012c6f9f957a0bcf9ab7d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

23
several_more_compile_fixes.patch → 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
View File

@ -1,17 +1,21 @@
Cleanup and compiler issues only, no functional change
From e48fa62fe6e9b5fa1f537c2d149078fb0ce218c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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 <trenn@suse.de>
---
lib/ipmi_ekanalyzer.c | 2 +-
lib/ipmi_picmg.c | 4 ++--
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
@@ -4013,7 +4013,7 @@
@@ -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);
@ -20,9 +24,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
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 @@
@@ -949,7 +949,7 @@ ipmi_picmg_portstate_get(struct ipmi_intf * intf, int32_t interface,
}
else if (d->type >= 0x06 && d->type <= 0xef)
{
@ -31,7 +37,7 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
}
else if (d->type >= 0xf0 && d->type <= 0xfe)
{
@@ -1805,7 +1805,7 @@
@@ -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));
@ -40,3 +46,6 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
}
}
}
--
2.26.0

24
ipmitool_adjust_suse_paths.patch → 0004-Adjust-SUSE-paths.patch
View File

@ -1,9 +1,16 @@
From 8ede995f261edd539bd1f1d454dd74941a6f4aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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 ++--
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 @@
@ -17,9 +24,11 @@
#############################################################################
# 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 @@
@@ -11,8 +11,8 @@ ConditionPathExists=/var/run/bmc-info
Type=oneshot
RemainAfterExit=yes
@ -30,9 +39,11 @@
[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 @@
@@ -7,8 +7,8 @@ AssertPathExistsGlob=/dev/ipmi*
[Service]
Type=oneshot
RemainAfterExit=yes
@ -43,3 +54,6 @@
[Install]
WantedBy=multi-user.target
--
2.26.0

28
0005-HPM-x-compatibility-message-is-DEBUG-only.patch Normal file
View File

@ -0,0 +1,28 @@
From d682f056d836b7978d67c5f9170a3ebfb103f54d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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 <trenn@suse.com>
---
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

44
autotools_define_DOWNLOAD.diff → 0006-Make-IANA-PEN-download-configurable-fix-uninitalized.patch
View File

@ -1,17 +1,20 @@
Make IANA PEN download configurable - fix uninitalized DOWNLOAD variable
From 44faed961d148ded6e6a75b73a25d85bcbdd843c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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:
[ 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
@ -35,16 +38,16 @@ 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 | 38 ++++++++++++++++++++++++++------------
2 files changed, 28 insertions(+), 15 deletions(-)
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 @@
@@ -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
@ -52,7 +55,7 @@ it has to be changed in the help string as well.
dist-hook:
cp control/ipmitool.spec $(distdir)
@@ -52,8 +51,8 @@
@@ -53,8 +52,8 @@ if DOWNLOAD
enterprise-numbers:
@echo Downloading IANA PEN database...
@ -63,9 +66,11 @@ it has to be changed in the help string as well.
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 @@
@@ -56,23 +56,34 @@ if test "x$exec_prefix" = "xNONE"; then
exec_prefix="$prefix"
fi
@ -91,17 +96,17 @@ it has to be changed in the help string as well.
+ DOWNLOAD="$CURL -#"
+ fi
else
- DOWNLOAD="$CURL -#"
- DOWNLOAD="$CURL --location --progress-bar"
- AM_CONDITIONAL([DOWNLOAD], [true])
+ DOWNLOAD="$WGET -c -nd -O -"
fi
-else
- DOWNLOAD="$WGET -c -nd -O -"
+fi
+if test "x$xenable_iana_download" = "xyes"; then
AM_CONDITIONAL([DOWNLOAD], [true])
+ AM_CONDITIONAL([DOWNLOAD], [true])
+ AC_SUBST(DOWNLOAD, $DOWNLOAD)
+else
else
- DOWNLOAD="$WGET -c -nd -O -"
- AM_CONDITIONAL([DOWNLOAD], [true])
+ AM_CONDITIONAL([DOWNLOAD], [false])
fi
@ -112,11 +117,14 @@ it has to be changed in the help string as well.
dnl
dnl set default option values
dnl
@@ -776,4 +787,7 @@
@@ -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

4
_servicedata Normal file
View File

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

5226
enterprise-numbers
View File

File diff suppressed because it is too large Load Diff

25
fix_file_permissions.patch
View File

@ -1,25 +0,0 @@
---
src/ipmievd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/src/ipmievd.c
+++ b/src/ipmievd.c
@@ -700,6 +700,7 @@
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 @@
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();

17
hpm_x_compatibility_msg_is_debug_only.patch
View File

@ -1,17 +0,0 @@
Signed-off-by: Thomas Renninger <trenn@suse.com>
bsc#948540
Index: ipmitool-1.8.18/lib/hpm2.c
===================================================================
--- ipmitool-1.8.18.orig/lib/hpm2.c 2018-09-09 13:48:58.000000000 +0200
+++ ipmitool-1.8.18/lib/hpm2.c 2018-09-25 11:42:48.254519175 +0200
@@ -99,7 +99,7 @@ int hpm2_get_capabilities(struct ipmi_in
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;
}

3
ipmitool-1.8.18+git20200204.7ccea28.tar.xz
View File

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

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

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

32
ipmitool.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Sep 23 07:49:45 UTC 2020 - Klaus Kämpf <kkaempf@suse.com>
- 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 - kkaempf@suse.com
- 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
-------------------------------------------------------------------
Tue Feb 11 13:39:26 UTC 2020 - Ismail Dönmez <idonmez@suse.com>

14
ipmitool.spec
View File

@ -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 @@ Source: %{name}-%{version}.tar.xz
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