From 8c4055cf6ff8f1289dcd3ab0cecd75b1405661e4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:17:55 +0000 Subject: import OpenIPMI-2.0.23-2.el7 --- diff --git a/.OpenIPMI.metadata b/.OpenIPMI.metadata index 52f2280..d1b8c78 100644 --- a/.OpenIPMI.metadata +++ b/.OpenIPMI.metadata @@ -1,2 +1,2 @@ -4c1d141680e1aaf278a588843b7a23360c34058c SOURCES/OpenIPMI-2.0.19.tar.gz +746cd619a704811df7c9944011d4d645f8cc6823 SOURCES/OpenIPMI-2.0.23.tar.gz ade00c8a47a576e677ffc2efefca2d7269f175d6 SOURCES/openipmi.sysconf diff --git a/.gitignore b/.gitignore index fa9a2f9..5acf080 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/OpenIPMI-2.0.19.tar.gz +SOURCES/OpenIPMI-2.0.23.tar.gz SOURCES/openipmi.sysconf diff --git a/SOURCES/OpenIPMI-2.0.19-man.patch b/SOURCES/OpenIPMI-2.0.19-man.patch index 42959d9..da1a2fd 100644 --- a/SOURCES/OpenIPMI-2.0.19-man.patch +++ b/SOURCES/OpenIPMI-2.0.19-man.patch @@ -1,7 +1,63 @@ -diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 ---- ./man/ipmi_cmdlang.7.manscan 2013-06-05 10:21:15.742099865 +0200 -+++ ./man/ipmi_cmdlang.7 2013-06-05 10:40:49.767658999 +0200 -@@ -246,7 +246,7 @@ instance, the command to create a domain +From dfca464e5fe4c9107f08bff7e6e2730a504945b7 Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Thu, 2 Jun 2016 12:47:22 +0200 +Subject: [PATCH] Apply './OpenIPMI-2.0.19-man.patch' + +Signed-off-by: Boris Ranto +--- + lanserv/ipmilan.8 | 13 ++++++++++--- + man/ipmi_cmdlang.7 | 36 ++++++++++++++++++------------------ + man/ipmi_ui.1 | 10 +++++----- + man/openipmi_conparms.7 | 4 ++-- + man/openipmicmd.1 | 6 +++--- + man/openipmigui.1 | 12 ++++++------ + man/openipmish.1 | 12 +++++++++++- + man/rmcp_ping.1 | 2 +- + man/solterm.1 | 6 +++--- + sample/ipmicmd.c | 1 + + sample/rmcp_ping.c | 5 +++++ + sample/solterm.c | 7 ++++++- + ui/basic_ui.c | 25 +++++++++++++++++++++++++ + 13 files changed, 96 insertions(+), 43 deletions(-) + +diff --git a/lanserv/ipmilan.8 b/lanserv/ipmilan.8 +index ff43d5c..9360507 100644 +--- a/lanserv/ipmilan.8 ++++ b/lanserv/ipmilan.8 +@@ -29,18 +29,25 @@ address they came in. + + .SH OPTIONS + .TP +-.BI \-c\ config-file ++\fB\-c\fR file,\ \fB\-\-config\-file\fR file + Set the configuration file to one other than the default of + .I "/etc/ipmi_lan.conf" + .TP +-.B \-n ++\fB\-i\fR device,\ \fB\-\-ipmi-dev\fR device ++Sets the desired device ++.TP ++\fB\-n\fR,\ \fB\-\-daemonize\fR + Stops the daemon from forking and detaching from the controlling + terminal. This is useful for running from init. + .TP +-.B \-d ++\fB\-d\fR,\ \fB\-\-debug\fR + Turns on debugging to standard output. You generally have to use + .B \-n + with this. ++.TP ++\fB\-?\fR,\ \fB\-\-help\fR,\ \fB\-\-usage\fR ++Prints brief usage hints message. ++ + + + .SH CONFIGURATION +diff --git a/man/ipmi_cmdlang.7 b/man/ipmi_cmdlang.7 +index 4d18e76..a6d73b9 100644 +--- a/man/ipmi_cmdlang.7 ++++ b/man/ipmi_cmdlang.7 +@@ -246,7 +246,7 @@ instance, the command to create a domain is The command to list all sensors in a domain named domain1 is .B sensor list domain1. @@ -10,7 +66,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 listed after the command description. In those responses, anything that begins with a .B % -@@ -316,7 +316,7 @@ BMC. For that, notice that the LAN conn +@@ -316,7 +316,7 @@ BMC. For that, notice that the LAN connection has an options extra IP and port for the second IP address. OpenIPMI supports these IP addresses and connection, detecting failures, switching between addresses, and other fault-tolerant things. It does this @@ -127,7 +183,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 on the control type. .TP Response: -@@ -1128,7 +1128,7 @@ multiple lights. The options values (ma +@@ -1128,7 +1128,7 @@ multiple lights. The options values (marked with ) will not be present if local control is set to true. Local control means that the LED takes whatever default function it does on the device @@ -154,7 +210,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 the MC. Note that when you get a pef config, you claim a lock on the MC that must be unlocked. -@@ -1780,7 +1780,7 @@ operational and finished all it SDR, FRU +@@ -1780,7 +1780,7 @@ operational and finished all it SDR, FRU, and bus scans: .fi .RE @@ -163,41 +219,10 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 .RS .nf EVENT -diff -up ./man/ipmilan.8.manscan ./man/ipmilan.8 ---- ./man/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 -+++ ./man/ipmilan.8 2013-06-05 13:36:31.282753184 +0200 -@@ -29,18 +29,25 @@ address they came in. - - .SH OPTIONS - .TP --.BI \-c\ config-file -+\fB\-c\fR file,\ \fB\-\-config\-file\fR file - Set the configuration file to one other than the default of - .I "/etc/ipmi_lan.conf" - .TP --.B \-n -+\fB\-i\fR device,\ \fB\-\-ipmi-dev\fR device -+Sets the desired device -+.TP -+\fB\-n\fR,\ \fB\-\-daemonize\fR - Stops the daemon from forking and detaching from the controlling - terminal. This is useful for running from init. - .TP --.B \-d -+\fB\-d\fR,\ \fB\-\-debug\fR - Turns on debugging to standard output. You generally have to use - .B \-n - with this. -+.TP -+\fB\-?\fR,\ \fB\-\-help\fR,\ \fB\-\-usage\fR -+Prints brief usage hints message. -+ - - - .SH CONFIGURATION -diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 ---- ./man/ipmi_ui.1.manscan 2013-06-04 15:33:32.206892146 +0200 -+++ ./man/ipmi_ui.1 2013-06-05 10:44:52.592882502 +0200 +diff --git a/man/ipmi_ui.1 b/man/ipmi_ui.1 +index 9c5d9b6..011255f 100644 +--- a/man/ipmi_ui.1 ++++ b/man/ipmi_ui.1 @@ -4,7 +4,7 @@ ipmi_ui \- Crude interface to an IPMI system @@ -216,7 +241,7 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 the right window to scroll. Note that you must set your environment \fBTERM\fP variable properly for -@@ -48,7 +48,7 @@ the connections are to the same IPMI dom +@@ -48,7 +48,7 @@ the connections are to the same IPMI domain through different management controllers. Also, each LAN connection may have two IP addresses. These are two different addresses to the same management controller. So you may have a total of 4 IP addresses to an IPMI @@ -225,7 +250,7 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 management controller. .SH OPTIONS -@@ -174,12 +174,12 @@ turns events on or off from the sensor ( +@@ -174,12 +174,12 @@ turns events on or off from the sensor (\fB0\fP or \fB1\fP). turns scanning on or off for the sensor (\fB0\fP or \fB1\fP). .I "assertion-bitmask" specifies the bitmask of thresholds or states @@ -240,9 +265,32 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 deasserted. .SH CONTROLS -diff -up ./man/openipmicmd.1.manscan ./man/openipmicmd.1 ---- ./man/openipmicmd.1.manscan 2013-06-04 13:57:08.825074711 +0200 -+++ ./man/openipmicmd.1 2013-06-05 10:45:54.938921332 +0200 +diff --git a/man/openipmi_conparms.7 b/man/openipmi_conparms.7 +index 587da2a..9dc6404 100644 +--- a/man/openipmi_conparms.7 ++++ b/man/openipmi_conparms.7 +@@ -1,7 +1,7 @@ + .TH openipmi_conparms 7 05/13/03 OpenIPMI "Connection Parameters for OpenIPMI" + + .SH NAME +-openipmi_cmdparms \- Connection parmeters for OpenIPMI ++openipmi_cmdparms \- Connection parameters for OpenIPMI + + .SH SYNOPSIS + +@@ -97,7 +97,7 @@ use. + .TP + .BI \-Rc\ confidentiality\ algorithm + The \fIRMCP+ confidentiality (encryption) algorithm\fP to use. This keeps +-evesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, ++eavesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, + \fBaes_cbc_128\fP, \fBxrc4_128\fP, and \fBxrc_40\fP. The \fBbmcpick\fP option is used by + default, which means the BMC picks the algorithm it wants to use. + +diff --git a/man/openipmicmd.1 b/man/openipmicmd.1 +index 6bd2401..5d206d1 100644 +--- a/man/openipmicmd.1 ++++ b/man/openipmicmd.1 @@ -22,7 +22,7 @@ interfaces. Execute a single command an exit. @@ -252,7 +300,7 @@ diff -up ./man/openipmicmd.1.manscan ./man/openipmicmd.1 The parameters for the connection depend on the connection type. These are all described in openipmi_conparms (7) -@@ -32,7 +32,7 @@ Once up, you can execute commands in the +@@ -32,7 +32,7 @@ Once up, you can execute commands in the user interface. Note that commands and responses are asynchronous, you issue a command and the interface returns immediately. When the response comes back, it will be dumped on your console. That's a little strange looking, but IPMI @@ -270,31 +318,11 @@ diff -up ./man/openipmicmd.1.manscan ./man/openipmicmd.1 .SH AUTHOR .PP -diff -up ./man/openipmi_conparms.7.manscan ./man/openipmi_conparms.7 ---- ./man/openipmi_conparms.7.manscan 2013-06-05 10:46:13.818932142 +0200 -+++ ./man/openipmi_conparms.7 2013-06-05 10:47:48.332980969 +0200 -@@ -1,7 +1,7 @@ - .TH openipmi_conparms 7 05/13/03 OpenIPMI "Connection Parameters for OpenIPMI" - - .SH NAME --openipmi_cmdparms \- Connection parmeters for OpenIPMI -+openipmi_cmdparms \- Connection parameters for OpenIPMI - - .SH SYNOPSIS - -@@ -97,7 +97,7 @@ use. - .TP - .BI \-Rc\ confidentiality\ algorithm - The \fIRMCP+ confidentiality (encryption) algorithm\fP to use. This keeps --evesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, -+eavesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, - \fBaes_cbc_128\fP, \fBxrc4_128\fP, and \fBxrc_40\fP. The \fBbmcpick\fP option is used by - default, which means the BMC picks the algorithm it wants to use. - -diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 ---- ./man/openipmigui.1.manscan 2013-06-05 10:48:43.389006143 +0200 -+++ ./man/openipmigui.1 2013-06-05 10:51:13.372066408 +0200 -@@ -38,7 +38,7 @@ Turn on message debugging, this will dum +diff --git a/man/openipmigui.1 b/man/openipmigui.1 +index 04f880b..0c8c10f 100644 +--- a/man/openipmigui.1 ++++ b/man/openipmigui.1 +@@ -38,7 +38,7 @@ Turn on message debugging, this will dump all messages to debug log output. .TP .B \-\-drawmsg Turn on raw message debugging, this will dump all low-level messages to @@ -312,7 +340,7 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 Management Controllers (MCs) for that domain. Right click drives most of the operations in the tree window. Many -@@ -92,7 +92,7 @@ Color is used in the GUI to denote error +@@ -92,7 +92,7 @@ Color is used in the GUI to denote error status, and shading is used to denote availability. If a sensor has an error, the tree entry for that sensor will change colors. Black means no error, yellow means warning, red means critical, and blue means non-recoverable. These @@ -330,7 +358,7 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 information is beyond the scope of this document, as IPMI controls are very complex. See the IPMI document from OpenIPMI for information about controls. -@@ -214,7 +214,7 @@ channel listing. Note that some user se +@@ -214,7 +214,7 @@ channel listing. Note that some user setting (the name and password) are global to all channels on the MC. Due to the IPMI spec and some unfortunate implementation bugs, some @@ -348,10 +376,11 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 pulls up all the parameters for the LAN and allows them to be set. Right-clicking on an item allows it to be changed. -diff -up ./man/openipmish.1.manscan ./man/openipmish.1 ---- ./man/openipmish.1.manscan 2013-06-05 10:52:26.787092815 +0200 -+++ ./man/openipmish.1 2013-06-05 14:01:12.004559270 +0200 -@@ -26,7 +26,7 @@ Turn on message debugging, this will dum +diff --git a/man/openipmish.1 b/man/openipmish.1 +index 36b1e43..2c902e4 100644 +--- a/man/openipmish.1 ++++ b/man/openipmish.1 +@@ -26,7 +26,7 @@ Turn on message debugging, this will dump all messages to debug log output. .TP .B \-\-drawmsg Turn on raw message debugging, this will dump all low-level messages to @@ -360,7 +389,7 @@ diff -up ./man/openipmish.1.manscan ./man/openipmish.1 protocol messages are also dumped, not just IPMI messages. .TP .B \-\-dmem -@@ -34,11 +34,21 @@ Turn on memory debugging, this will caus +@@ -34,11 +34,21 @@ Turn on memory debugging, this will cause memory allocation and deallocations to be checked. When the program terminates, it will dump all memory that was not properly freed (leaked). .TP @@ -382,9 +411,10 @@ diff -up ./man/openipmish.1.manscan ./man/openipmish.1 .B \-\-snmp Enable the SNMP trap handler. .B openipmish -diff -up ./man/rmcp_ping.1.manscan ./man/rmcp_ping.1 ---- ./man/rmcp_ping.1.manscan 2013-06-05 10:52:59.704104189 +0200 -+++ ./man/rmcp_ping.1 2013-06-05 10:53:09.788107626 +0200 +diff --git a/man/rmcp_ping.1 b/man/rmcp_ping.1 +index d60019a..ce5cab0 100644 +--- a/man/rmcp_ping.1 ++++ b/man/rmcp_ping.1 @@ -38,7 +38,7 @@ starttag. This is zero by default Turns on debugging to standard output. .TP @@ -394,10 +424,11 @@ diff -up ./man/rmcp_ping.1.manscan ./man/rmcp_ping.1 .SH AUTHOR .PP -diff -up ./man/solterm.1.manscan ./man/solterm.1 ---- ./man/solterm.1.manscan 2013-06-05 10:53:46.923120093 +0200 -+++ ./man/solterm.1 2013-06-05 10:55:59.442162744 +0200 -@@ -37,9 +37,9 @@ These are all described in openipmi_conp +diff --git a/man/solterm.1 b/man/solterm.1 +index 1479a1b..ada15d8 100644 +--- a/man/solterm.1 ++++ b/man/solterm.1 +@@ -37,9 +37,9 @@ These are all described in openipmi_conparms (7) .TP .BI \-e\ escape_char The character to use to escape, or exit, the program. Entering this @@ -418,9 +449,10 @@ diff -up ./man/solterm.1.manscan ./man/solterm.1 handshake is released. .TP -diff -up ./sample/ipmicmd.c.manscan ./sample/ipmicmd.c ---- ./sample/ipmicmd.c.manscan 2013-06-05 13:55:04.191611230 +0200 -+++ ./sample/ipmicmd.c 2013-06-05 13:55:10.988610133 +0200 +diff --git a/sample/ipmicmd.c b/sample/ipmicmd.c +index 6cbcdc5..5f5c1ec 100644 +--- a/sample/ipmicmd.c ++++ b/sample/ipmicmd.c @@ -124,6 +124,7 @@ void usage(void) printf("%s [-k ] [-v] \n", progname); printf("Where is one of:"); @@ -429,9 +461,10 @@ diff -up ./sample/ipmicmd.c.manscan ./sample/ipmicmd.c } char * -diff -up ./sample/rmcp_ping.c.manscan ./sample/rmcp_ping.c ---- ./sample/rmcp_ping.c.manscan 2013-06-05 15:17:40.073957820 +0200 -+++ ./sample/rmcp_ping.c 2013-06-05 14:21:05.778697883 +0200 +diff --git a/sample/rmcp_ping.c b/sample/rmcp_ping.c +index 7814792..5778fea 100644 +--- a/sample/rmcp_ping.c ++++ b/sample/rmcp_ping.c @@ -156,6 +156,11 @@ main(int argc, char *argv[]) if (strcmp(argv[i], "--") == 0) { i++; @@ -444,9 +477,10 @@ diff -up ./sample/rmcp_ping.c.manscan ./sample/rmcp_ping.c } else if (strcmp(argv[i], "-p") == 0) { i++; if (i >= argc) { -diff -up ./sample/solterm.c.manscan ./sample/solterm.c ---- ./sample/solterm.c.manscan 2013-06-05 15:17:55.264961190 +0200 -+++ ./sample/solterm.c 2013-06-05 15:15:14.037921308 +0200 +diff --git a/sample/solterm.c b/sample/solterm.c +index 38a3f9d..a3e52de 100644 +--- a/sample/solterm.c ++++ b/sample/solterm.c @@ -743,7 +743,12 @@ int main(int argc, char *argv[]) /* Now we make sure "lan" is the first argument so we get the @@ -461,11 +495,12 @@ diff -up ./sample/solterm.c.manscan ./sample/solterm.c fprintf(stderr, "main: %s only supports lan connections\n", progname); exit(1); -diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c ---- ./ui/basic_ui.c.manscan 2013-06-04 14:08:04.538642560 +0200 -+++ ./ui/basic_ui.c 2013-06-05 11:17:41.394541158 +0200 -@@ -225,6 +225,26 @@ snmp_init(selector_t *sel) - } +diff --git a/ui/basic_ui.c b/ui/basic_ui.c +index 6993eb2..84889cb 100644 +--- a/ui/basic_ui.c ++++ b/ui/basic_ui.c +@@ -306,6 +306,26 @@ snmp_init(os_handler_t *os_hnd) + static void snmp_setup_fds(os_handler_t *os_hnd) { } #endif /* HAVE_UCDSNMP */ +void help(void) @@ -491,7 +526,7 @@ diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c int main(int argc, char *argv[]) { -@@ -249,6 +269,11 @@ main(int argc, char *argv[]) +@@ -327,6 +347,11 @@ main(int argc, char *argv[]) curr_arg++; if (strcmp(arg, "--") == 0) { break; @@ -503,3 +538,6 @@ diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c } else if (strcmp(arg, "-c") == 0) { full_screen = 0; } else if (strcmp(arg, "-dlock") == 0) { +-- +2.7.4 + diff --git a/SPECS/OpenIPMI.spec b/SPECS/OpenIPMI.spec index 02885dd..e042119 100644 --- a/SPECS/OpenIPMI.spec +++ b/SPECS/OpenIPMI.spec @@ -6,8 +6,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI %global once %{_localstatedir}/run/%{name}.first_installation -Version: 2.0.19 -Release: 15%{?dist} +Version: 2.0.23 +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -88,6 +88,7 @@ Requires: %{name}-libs = %{version}-%{release} The OpenIPMI-devel package contains the development libraries and header files of the OpenIPMI project. + %prep %setup -q %patch1 -p1 -b .pthread @@ -144,13 +145,20 @@ fi %posttrans modalias if [ -f "%{once}" ]; then - if /usr/bin/udevadm info --export-db | grep -qie 'acpi:IPI0'; then - /sbin/modprobe ipmi_si || :; + if /usr/bin/udevadm info --export-db | grep -qie 'ipmi_si'; then + /sbin/modprobe ipmi_si || :; + else + sed -i 's/IPMI_SI=yes/# IPMI_SI disabled by OpenIPMI-modalias rpm scriplet\nIPMI_SI=no/' /etc/sysconfig/ipmi + fi + + if /usr/bin/udevadm info --export-db | grep -qie 'ipmi_ssif'; then + /sbin/modprobe ipmi_ssif + fi + /sbin/modprobe ipmi_devintf || :; /sbin/modprobe ipmi_msghandler || :; %{__rm} -f %{once} || :; /usr/bin/udevadm settle - fi fi %post modalias @@ -191,13 +199,13 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/ipmi %{_libexecdir}/openipmi-helper %{_bindir}/ipmicmd -%{_bindir}/ipmilan %{_bindir}/ipmish %{_bindir}/ipmi_ui %{_bindir}/openipmicmd %{_bindir}/openipmish %{_bindir}/rmcp_ping %{_bindir}/solterm +%{_bindir}/openipmi_eventd %{_unitdir}/ipmi.service %{_mandir}/man1/ipmi_ui* %{_mandir}/man1/openipmicmd* @@ -206,9 +214,21 @@ fi %{_mandir}/man1/solterm* %{_mandir}/man1/ipmish* %{_mandir}/man1/ipmicmd* +%{_mandir}/man1/openipmi_eventd* %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* -%{_mandir}/man8/ipmilan* +# lanserv content +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu +%config(noreplace) %{_sysconfdir}/ipmi/lan.conf +%{_bindir}/ipmilan +%{_bindir}/ipmi_sim +%{_bindir}/sdrcomp +%{_libdir}/libIPMIlanserv.so.* +%doc %{_mandir}/man8/ipmilan.8* +%doc %{_mandir}/man1/ipmi_sim.1* +%doc %{_mandir}/man5/ipmi_lan.5* +%doc %{_mandir}/man5/ipmi_sim_cmd.5* %files perl %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm @@ -229,6 +249,13 @@ fi %config(noreplace) %{_prefix}/lib/modprobe.d/OpenIPMI.conf %changelog +* Tue Oct 24 2017 Josef Ridky - 2.0.23-2 +- Related: #1458422 - fix startup failure on aarch64 + +* Thu Oct 05 2017 Josef Ridky - 2.0.23-1 +- Resolves: #1457805 - New upstream release 2.0.23 +- Resolves: #1458422 - fix startup failure + * Thu Jun 02 2016 Boris Ranto - 2.0.19-15 - Fix once macro, /var/run/OpenIPMI/ no longer exists - Resolves: rhbz#1341735