From dec645c2a948c950c791323fe89fbbec8d4a467a Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 2 Jun 2016 12:45:27 +0200 Subject: [PATCH] New version (0:2.0.22-1) - Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' - Apply './OpenIPMI-2.0.19-man.patch' - Apply 'OpenIPMI-2.0.21-nobundle.patch' Resolves: rhbz#1341876 --- .gitignore | 1 + ...nIPMI-2.0.18-pthread-pkgconfig.patch.patch | 26 ++ ...02-Apply-.-OpenIPMI-2.0.19-man.patch.patch | 256 ++++++++++-------- ...Apply-OpenIPMI-2.0.21-nobundle.patch.patch | 107 ++++---- OpenIPMI-2.0.18-pthread-pkgconfig.patch | 18 -- OpenIPMI.spec | 24 +- sources | 2 +- 7 files changed, 251 insertions(+), 183 deletions(-) create mode 100644 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch rename OpenIPMI-2.0.19-man.patch => 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch (81%) rename OpenIPMI-2.0.21-nobundle.patch => 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch (59%) delete mode 100644 OpenIPMI-2.0.18-pthread-pkgconfig.patch diff --git a/.gitignore b/.gitignore index 423098d..9b1e224 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.19.tar.gz /openipmi-2.0.21.tar.gz /OpenIPMI-2.0.21.tar.gz +/OpenIPMI-2.0.22.tar.gz diff --git a/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch b/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch new file mode 100644 index 0000000..5c92eb9 --- /dev/null +++ b/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch @@ -0,0 +1,26 @@ +From d058bc9be5ef521882e3226a27e81cca8aded5ce Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Thu, 2 Jun 2016 12:46:39 +0200 +Subject: [PATCH] Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' + +Signed-off-by: Boris Ranto +--- + OpenIPMIpthread.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/OpenIPMIpthread.pc.in b/OpenIPMIpthread.pc.in +index 59b52e5..fffa0d0 100644 +--- a/OpenIPMIpthread.pc.in ++++ b/OpenIPMIpthread.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: OpenIPMIpthread + Description: Pthread OS handler for OpenIPMI + Version: @VERSION@ +-Requires: OpenIPMI pthread ++Requires: OpenIPMI + Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread +-Cflags: -I${includedir} ++Cflags: -I${includedir} -pthread +-- +2.7.4 + diff --git a/OpenIPMI-2.0.19-man.patch b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch similarity index 81% rename from OpenIPMI-2.0.19-man.patch rename to 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch index a584da8..51ba9d0 100644 --- a/OpenIPMI-2.0.19-man.patch +++ b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.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 ./lanserv/ipmilan.8.manscan ./lanserv/ipmilan.8 ---- ./lanserv/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 -+++ ./lanserv/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,39 +265,10 @@ 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 -@@ -22,7 +22,7 @@ interfaces. - Execute a single command an exit. - - .TP --.BI -+.BI - 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 - 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 --is ansychronous underneath. Note that the \fB\-k\fP option is synchronous, -+is asynchronous underneath. Note that the \fB\-k\fP option is synchronous, - it will wait for the response or a timeout before returning. - - .TP -@@ -82,7 +82,7 @@ Remove a command registration. - .BR openipmi_conparms (7) - - .SH "KNOWN PROBLEMS" --The asychronous nature of the program can be annoying. -+The asynchronous nature of the program can be annoying. - - .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 +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" @@ -291,10 +287,42 @@ diff -up ./man/openipmi_conparms.7.manscan ./man/openipmi_conparms.7 \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/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. + + .TP +-.BI ++.BI + 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 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 +-is ansychronous underneath. Note that the \fB\-k\fP option is synchronous, ++is asynchronous underneath. Note that the \fB\-k\fP option is synchronous, + it will wait for the response or a timeout before returning. + + .TP +@@ -82,7 +82,7 @@ Remove a command registration. + .BR openipmi_conparms (7) + + .SH "KNOWN PROBLEMS" +-The asychronous nature of the program can be annoying. ++The asynchronous nature of the program can be annoying. + + .SH AUTHOR + .PP +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 9f51273..f9a8a4a 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,10 +495,11 @@ 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 3f0d0a1..de6c600 100644 +--- a/ui/basic_ui.c ++++ b/ui/basic_ui.c +@@ -226,6 +226,26 @@ snmp_init(selector_t *sel) } #endif /* HAVE_UCDSNMP */ @@ -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[]) +@@ -250,6 +270,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/OpenIPMI-2.0.21-nobundle.patch b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch similarity index 59% rename from OpenIPMI-2.0.21-nobundle.patch rename to 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch index 039a2e3..1db6c6c 100644 --- a/OpenIPMI-2.0.21-nobundle.patch +++ b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch @@ -1,39 +1,20 @@ -diff -up ./cmdlang/Makefile.am.nobundle ./cmdlang/Makefile.am ---- ./cmdlang/Makefile.am.nobundle 2013-01-21 18:24:13.000000000 +0100 -+++ ./cmdlang/Makefile.am 2014-08-12 13:35:09.836655867 +0200 -@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 - - AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ $(EDIT_CFLAGS) \ - $(TCL_CFLAGS) - - lib_LTLIBRARIES = libOpenIPMIcmdlang.la -@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la \ - $(top_builddir)/unix/libOpenIPMIposix.la \ -- $(top_builddir)/libedit/libedit.a \ -+ $(EDIT_LIBS) \ - $(TERM_LIBS) \ - $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ - $(TCL_LIB) $(TCL_LIBS) \ -diff -up ./configure.ac.nobundle ./configure.ac ---- ./configure.ac.nobundle 2014-01-28 20:35:02.000000000 +0100 -+++ ./configure.ac 2014-08-12 13:35:09.836655867 +0200 -@@ -930,7 +930,6 @@ AC_OUTPUT(Makefile - swig/perl/Makefile - swig/python/Makefile - swig/python/openipmigui/Makefile -- libedit/Makefile - cmdlang/Makefile - include/Makefile - include/OpenIPMI/Makefile -diff -up ./Makefile.am.nobundle ./Makefile.am ---- ./Makefile.am.nobundle 2012-07-22 00:01:45.000000000 +0200 -+++ ./Makefile.am 2014-08-12 13:35:09.836655867 +0200 +From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Thu, 2 Jun 2016 12:50:03 +0200 +Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch' + +Signed-off-by: Boris Ranto +--- + Makefile.am | 4 ++-- + cmdlang/Makefile.am | 5 +++-- + configure.ac | 1 - + sample/Makefile.am | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b1aacdf..660c693 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,10 +1,10 @@ RPM = rpmbuild RPMFLAGS = -ta @@ -47,10 +28,46 @@ diff -up ./Makefile.am.nobundle ./Makefile.am ui lanserv sample doc man swig EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ -diff -up ./sample/Makefile.am.nobundle ./sample/Makefile.am ---- ./sample/Makefile.am.nobundle 2014-08-12 13:36:19.033804459 +0200 -+++ ./sample/Makefile.am 2014-08-12 13:37:07.478907706 +0200 -@@ -53,8 +53,8 @@ solterm_LDADD = $(POPTLIBS) $(top_buildd +diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am +index e80090d..ae9c65a 100644 +--- a/cmdlang/Makefile.am ++++ b/cmdlang/Makefile.am +@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 + + AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ $(EDIT_CFLAGS) \ + $(TCL_CFLAGS) + + lib_LTLIBRARIES = libOpenIPMIcmdlang.la +@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ + $(top_builddir)/utils/libOpenIPMIutils.la \ + $(top_builddir)/lib/libOpenIPMI.la \ + $(top_builddir)/unix/libOpenIPMIposix.la \ +- $(top_builddir)/libedit/libedit.a \ ++ $(EDIT_LIBS) \ + $(TERM_LIBS) \ + $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ + $(TCL_LIB) $(TCL_LIBS) \ +diff --git a/configure.ac b/configure.ac +index 5103556..ae86ac8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -926,7 +926,6 @@ AC_OUTPUT(Makefile + swig/perl/Makefile + swig/python/Makefile + swig/python/openipmigui/Makefile +- libedit/Makefile + cmdlang/Makefile + include/Makefile + include/OpenIPMI/Makefile +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 06278bd..91d1351 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -59,8 +59,8 @@ solterm_LDADD = $(POPTLIBS) $(top_builddir)/utils/libOpenIPMIutils.la \ rmcp_ping_SOURCES = rmcp_ping.c ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c @@ -61,10 +78,6 @@ diff -up ./sample/Makefile.am.nobundle ./sample/Makefile.am EXTRA_DIST = example_oem.c -@@ -65,4 +65,4 @@ install-data-local: - $(LN_S) openipmicmd $(DESTDIR)$(bindir)/ipmicmd - - uninstall-local: -- rm -f $(DESTDIR)$(bindir)/ipmicmd -\ No newline at end of file -+ rm -f $(DESTDIR)$(bindir)/ipmicmd +-- +2.7.4 + diff --git a/OpenIPMI-2.0.18-pthread-pkgconfig.patch b/OpenIPMI-2.0.18-pthread-pkgconfig.patch deleted file mode 100644 index 9a76208..0000000 --- a/OpenIPMI-2.0.18-pthread-pkgconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -468067 - "pkg-config --libs OpenIPMIpthread" fails - -Fix the pkgconfig file. - -Reported upstream as http://sourceforge.net/tracker/index.php?func=detail&aid=2188750&group_id=36127&atid=416301 - -diff -up OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig OpenIPMI-2.0.18/OpenIPMIpthread.pc.in ---- OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 -+++ OpenIPMI-2.0.18/OpenIPMIpthread.pc.in 2010-05-20 15:48:07.000000000 +0200 -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: OpenIPMIpthread - Description: Pthread OS handler for OpenIPMI - Version: @VERSION@ --Requires: OpenIPMI pthread -+Requires: OpenIPMI - Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread --Cflags: -I${includedir} -+Cflags: -I${includedir} -pthread diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 648b966..9f7e61c 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,8 +4,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.21 -Release: 13%{?dist} +Version: 2.0.22 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -13,6 +13,9 @@ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service +Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch +Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter BuildRequires: desktop-file-utils @@ -30,10 +33,7 @@ Requires(postun): systemd-units Requires(post): systemd-sysv Requires:%{name}-libs = %{version}-%{release} -Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch -Patch2: OpenIPMI-2.0.19-man.patch # switch from libedit bundle to system libedit -Patch3: OpenIPMI-2.0.21-nobundle.patch %description The Open IPMI project aims to develop an open code base to allow access to @@ -87,9 +87,9 @@ This package contains a network IPMI listener. %prep %setup -q -%patch1 -p1 -b .pthread -%patch2 -p1 -b .manscan -%patch3 -p1 -b .nobundle +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 rm -rf ./libedit %build @@ -181,6 +181,7 @@ fi %{_bindir}/openipmish %{_bindir}/rmcp_ping %{_bindir}/solterm +%{_bindir}/openipmi_eventd %{_unitdir}/ipmi.service %{_mandir}/man1/ipmi_ui* %{_mandir}/man1/openipmicmd* @@ -189,6 +190,7 @@ fi %{_mandir}/man1/solterm* %{_mandir}/man1/ipmish* %{_mandir}/man1/ipmicmd* +%{_mandir}/man1/openipmi_eventd* %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* @@ -221,6 +223,12 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jun 02 2016 Boris Ranto - 0:2.0.22-1 +- New version (0:2.0.22-1) +- Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' +- Apply './OpenIPMI-2.0.19-man.patch' +- Apply 'OpenIPMI-2.0.21-nobundle.patch' + * Tue May 17 2016 Jitka Plesnikova - 2.0.21-13 - Perl 5.24 rebuild diff --git a/sources b/sources index 9d0e4a7..dc14ac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc0b42ae40b3f1d0db2a94b75b95fae1 OpenIPMI-2.0.21.tar.gz +9a4e1f6bb073379c494839201ea10aee OpenIPMI-2.0.22.tar.gz