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

Accepting request 639393 from home:trenn:branches:systemsmanagement

Browse Source 
- Update to latest git HEAD revision of 1.8.18 version
    commit 6f336d04f14b420822902dca7ef595cd49847d21
    Date:   Mon Sep 24 15:41:00 2018 +0200
- Change git repo and URL in spec from sourceforge to github
- Add download of iana pen list via _service
  from www.iana.org which is used to
  create a C include file at build time (lib/ipmi_pen_list.inc.c)
Downloaded file added:
A enterprise-numbers
- Add possiblity to create the include file from an already
  downloaded, local file
A create_pen_list_from_local_file.patch

OBS-URL: https://build.opensuse.org/request/show/639393
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=49
This commit is contained in:
Thomas Renninger 2018-10-01 13:06:42 +00:00 committed by Git OBS Bridge
parent 912086c092
commit 2b18cffcc3
9 changed files with 210456 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_service
View File

@ -1,6 +1,6 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="url">https://git.code.sf.net/p/ipmitool/source</param>
<param name="url">https://github.com/ipmitool/ipmitool.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">ipmitool</param>
@ -11,4 +11,9 @@
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version"/>
<service mode="disabled" name="download_url">
<param name="protocol">http</param>
<param name="host">www.iana.org</param>
<param name="path">assignments/enterprise-numbers/enterprise-numbers</param>
</service>
</services>

24
create_pen_list_from_local_file.patch Normal file
View File

@ -0,0 +1,24 @@
Author: Thomas Renninger <trenn@suse.de>
Create pen list include file from already downloaded iana file
This is needed for build services where you typically cannot download.
Index: ipmitool-1.8.18/lib/create_pen_list
===================================================================
--- ipmitool-1.8.18.orig/lib/create_pen_list 2018-09-25 13:32:46.000000000 +0200
+++ ipmitool-1.8.18/lib/create_pen_list 2018-09-26 09:09:10.543717017 +0200
@@ -71,5 +71,10 @@ parse_pen_list() {
}'
}
-echo "Generating IANA PEN list..."
-curl -# "$PENLIST_URL" | parse_pen_list > "$OUTFILE"
+if [ -r enterprise-numbers ];then
+ echo "Generating IANA PEN list from local file..."
+ cat enterprise-numbers | parse_pen_list > "$OUTFILE"
+else
+ echo "Generating IANA PEN list from iana downloaded file..."
+ curl -# "$PENLIST_URL" | parse_pen_list > "$OUTFILE"
+fi

210382
enterprise-numbers Normal file
View File

File diff suppressed because it is too large Load Diff

12
fix_file_permissions.patch
View File

@ -1,8 +1,8 @@
Index: ipmitool-1.8.18/lib/helper.c
===================================================================
--- ipmitool-1.8.18.orig/lib/helper.c
+++ ipmitool-1.8.18/lib/helper.c
@@ -829,7 +829,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
--- ipmitool-1.8.18.orig/lib/helper.c 2018-09-25 11:36:13.675132165 +0200
+++ ipmitool-1.8.18/lib/helper.c 2018-09-25 11:40:43.283111633 +0200
@@ -867,7 +867,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
#endif
chdir("/");
@ -12,8 +12,8 @@ Index: ipmitool-1.8.18/lib/helper.c
if (fd != intf->fd)
Index: ipmitool-1.8.18/src/ipmievd.c
===================================================================
--- ipmitool-1.8.18.orig/src/ipmievd.c
+++ ipmitool-1.8.18/src/ipmievd.c
--- ipmitool-1.8.18.orig/src/ipmievd.c 2018-09-25 11:36:13.679132402 +0200
+++ ipmitool-1.8.18/src/ipmievd.c 2018-09-25 11:41:12.744857808 +0200
@@ -701,6 +701,7 @@ ipmievd_main(struct ipmi_event_intf * ei
int i, rc;
int daemon = 1;
@ -30,6 +30,6 @@ Index: ipmitool-1.8.18/src/ipmievd.c
+ oldumask = umask(022);
fp = ipmi_open_file_write(pidfile);
+ umask(oldumask);
if (fp == NULL) {
if (!fp) {
/* Failed to get fp on PID file -> exit. */
log_halt();

4
hpm_x_compatibility_msg_is_debug_only.patch
View File

@ -4,8 +4,8 @@ bsc#948540
Index: ipmitool-1.8.18/lib/hpm2.c
===================================================================
--- ipmitool-1.8.18.orig/lib/hpm2.c 2016-10-08 10:17:55.000000000 +0200
+++ ipmitool-1.8.18/lib/hpm2.c 2017-07-05 16:04:42.438268644 +0200
--- 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;

4
ipmitool-1.8.18.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f4c195b963b549fe325f32e17a9b24fb59fbe6fe0688a6d7d69381a1edf4478
size 435312
oid sha256:3b3d15b6af37d4d0c52e980f03405f0cc79439cdb8954aeb0fef7e8f60ece3cb
size 441900

16
ipmitool.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Sep 26 07:49:44 UTC 2018 - trenn@suse.de
- Update to latest git HEAD revision of 1.8.18 version
commit 6f336d04f14b420822902dca7ef595cd49847d21
Date: Mon Sep 24 15:41:00 2018 +0200
- Change git repo and URL in spec from sourceforge to github
- Add download of iana pen list via _service
from www.iana.org which is used to
create a C include file at build time (lib/ipmi_pen_list.inc.c)
Downloaded file added:
A enterprise-numbers
- Add possiblity to create the include file from an already
downloaded, local file
A create_pen_list_from_local_file.patch
-------------------------------------------------------------------
Fri Jul 27 14:50:26 UTC 2018 - jengelh@inai.de

17
ipmitool.spec
View File

@ -22,15 +22,17 @@ Release: 0
Summary: Utility for IPMI Control
License: BSD-3-Clause
Group: System/Management
Url: http://ipmitool.sourceforge.net/
Source: %{name}/%{name}-%{version}.tar.xz
Url: https://github.com/ipmitool/ipmitool
Source: %{name}-%{version}.tar.xz
Source1: ipmievd.service
Source2: ipmievd.sysconf
Patch100: fwum_enhance_output.patch
Patch101: fix_file_permissions.patch
Patch102: several_more_compile_fixes.patch
Patch103: ipmitool_adjust_suse_paths.patch
Patch104: hpm_x_compatibility_msg_is_debug_only.patch
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: create_pen_list_from_local_file.patch
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: readline-devel
@ -68,6 +70,7 @@ of net-snmp to include redirections to BMC based SNMP.
%autopatch -p1
%build
cp %{SOURCE3} lib
autoreconf -fiv
# file-security: enables more security checks on files
%configure \

16
several_more_compile_fixes.patch
View File

@ -6,9 +6,9 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
Index: ipmitool-1.8.18/lib/ipmi_ekanalyzer.c
===================================================================
--- ipmitool-1.8.18.orig/lib/ipmi_ekanalyzer.c 2017-07-05 16:04:30.733605009 +0200
+++ ipmitool-1.8.18/lib/ipmi_ekanalyzer.c 2017-07-05 16:04:33.905784815 +0200
@@ -4010,7 +4010,7 @@ ipmi_ek_display_clock_config_record(stru
--- ipmitool-1.8.18.orig/lib/ipmi_ekanalyzer.c 2018-09-09 13:48:58.000000000 +0200
+++ ipmitool-1.8.18/lib/ipmi_ekanalyzer.c 2018-09-25 11:42:30.901490572 +0200
@@ -4014,7 +4014,7 @@ ipmi_ek_display_clock_config_record(stru
(feature & 1) ? "Source" : "Receiver");
printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n",
family, accuracy);
@ -19,8 +19,8 @@ Index: ipmitool-1.8.18/lib/ipmi_ekanalyzer.c
printf("\n");
Index: ipmitool-1.8.18/lib/ipmi_picmg.c
===================================================================
--- ipmitool-1.8.18.orig/lib/ipmi_picmg.c 2017-07-05 16:04:30.737605232 +0200
+++ ipmitool-1.8.18/lib/ipmi_picmg.c 2017-07-05 16:04:33.905784815 +0200
--- ipmitool-1.8.18.orig/lib/ipmi_picmg.c 2018-09-09 13:48:58.000000000 +0200
+++ ipmitool-1.8.18/lib/ipmi_picmg.c 2018-09-25 11:42:30.905490809 +0200
@@ -850,7 +850,7 @@ ipmi_picmg_portstate_get(struct ipmi_int
}
else if (d->type >= 0x06 && d->type <= 0xef)
@ -41,9 +41,9 @@ Index: ipmitool-1.8.18/lib/ipmi_picmg.c
}
Index: ipmitool-1.8.18/lib/ipmi_sdr.c
===================================================================
--- ipmitool-1.8.18.orig/lib/ipmi_sdr.c 2017-07-05 16:04:30.741605453 +0200
+++ ipmitool-1.8.18/lib/ipmi_sdr.c 2017-07-05 16:04:33.909785056 +0200
@@ -53,6 +53,7 @@
--- ipmitool-1.8.18.orig/lib/ipmi_sdr.c 2018-09-09 13:48:58.000000000 +0200
+++ ipmitool-1.8.18/lib/ipmi_sdr.c 2018-09-25 11:42:30.909491047 +0200
@@ -52,6 +52,7 @@
#include <ipmitool/ipmi_entity.h>
#include <ipmitool/ipmi_constants.h>
#include <ipmitool/ipmi_strings.h>