Skip to content

Commit f2663c8

Browse files
author
John Levon
authored
OS-7324 upgrade ipmitool to version 1.8.18 (TritonDataCenter#36)
OS-8157 ipmitool crashes in ipmi_sdr_get_record() Portions contributed by: Mark Brooks <[email protected]> Reviewed by: Jason King <[email protected]> Approved by: Tim Foster <[email protected]>
1 parent 6a02246 commit f2663c8

8 files changed

+156
-813
lines changed

ipmitool/Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
#
1919
# CDDL HEADER END
2020
#
21-
# Copyright (c) 2012 Joyent Inc., All rights reserved.
21+
# Copyright 2020 Joyent, Inc.
2222
#
2323

24-
VER = ipmitool-1.8.14
24+
VER = ipmitool-1.8.18
2525

2626
include ../Makefile.defs
2727

2828
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
29+
# need INT8_MIN and much other stuff
30+
CPPFLAGS += -D__EXTENSIONS__
2931
CFLAGS += -g
3032

3133
AUTOCONF_ENV += \

ipmitool/Patches/MAX.diff

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
2+
index d63d2c1..03a790f 100644
3+
--- a/lib/ipmi_hpmfwupg.c
4+
+++ b/lib/ipmi_hpmfwupg.c
5+
@@ -1,6 +1,7 @@
6+
/*
7+
* Copyright (c) 2006 Kontron Canada, Inc. All Rights Reserved.
8+
* Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
9+
+ * Copyright 2020 Joyent, Inc.
10+
*
11+
* Redistribution and use in source and binary forms, with or without
12+
* modification, are permitted provided that the following conditions
13+
@@ -48,6 +49,10 @@
14+
# include <config.h>
15+
#endif
16+
17+
+#ifndef MAX
18+
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
19+
+#endif
20+
+
21+
extern int verbose;
22+
23+
VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];

0 commit comments

Comments
 (0)