diff --git a/build/ipmitool/build.sh b/build/ipmitool/build.sh index 96d67bf35d..2026ff96bd 100755 --- a/build/ipmitool/build.sh +++ b/build/ipmitool/build.sh @@ -28,7 +28,7 @@ . ../../lib/functions.sh PROG=ipmitool -VER=1.8.16 +VER=1.8.18 VERHUMAN=$VER PKG=system/management/ipmitool SUMMARY="IPMI management tool" diff --git a/build/ipmitool/patches/configure.patch b/build/ipmitool/patches/configure.patch index 6f611d6e9c..038fdd0d61 100644 --- a/build/ipmitool/patches/configure.patch +++ b/build/ipmitool/patches/configure.patch @@ -1,21 +1,11 @@ ---- ipmitool-1.8.16-orig/configure.ac Fri Feb 19 16:05:13 2016 -+++ ipmitool-1.8.16/configure.ac Wed Mar 23 14:53:03 2016 -@@ -59,7 +59,7 @@ - xenable_intf_bmc=no - xenable_intf_imb=yes - xenable_intf_open=yes --xenable_intf_usb=yes -+xenable_intf_usb=no - xenable_intf_lipmi=yes - #xenable_intf_serial=yes - xenable_intf_dummy=no -@@ -78,7 +78,8 @@ +--- ipmitool-1.8.18/configure.ac Sat Oct 8 10:08:59 2016 ++++ ipmitool-1.8.18/configure.ac Sun Jul 16 22:39:21 2017 +@@ -78,7 +78,7 @@ # disable the linux-specific interfaces xenable_intf_bmc=yes xenable_intf_imb=no - xenable_intf_open=no + xenable_intf_open=yes -+ xenable_intf_usb=no xenable_intf_lipmi=no xenable_ipmishell=no xenable_all_options=no diff --git a/build/ipmitool/patches/fix-MAX.patch b/build/ipmitool/patches/fix-MAX.patch index 6c6d98c0a1..b52452ff56 100644 --- a/build/ipmitool/patches/fix-MAX.patch +++ b/build/ipmitool/patches/fix-MAX.patch @@ -1,10 +1,10 @@ ---- ipmitool-old/lib/ipmi_hpmfwupg.c Tue Aug 12 19:42:51 2014 -+++ ipmitool/lib/ipmi_hpmfwupg.c Tue Aug 12 19:43:02 2014 -@@ -41,6 +41,7 @@ +--- ipmitool-1.8.18/lib/ipmi_hpmfwupg.c Wed Jun 29 20:01:49 2016 ++++ ipmitool-1.8.18/lib/ipmi_hpmfwupg.c Sun Jul 16 16:02:46 2017 +@@ -46,6 +46,7 @@ #include #include #include +#include + #include #if HAVE_CONFIG_H - # include diff --git a/build/ipmitool/patches/no-POSIX.patch b/build/ipmitool/patches/no-POSIX.patch index 63c20b4faa..cff543b981 100644 --- a/build/ipmitool/patches/no-POSIX.patch +++ b/build/ipmitool/patches/no-POSIX.patch @@ -1,36 +1,69 @@ ---- ipmitool-1.8.16-orig/lib/helper.c Fri Feb 19 16:01:38 2016 -+++ ipmitool-1.8.16/lib/helper.c Wed Mar 23 14:24:07 2016 +--- ipmitool-1.8.18/lib/helper.c Sun Jul 31 08:52:40 2016 ++++ ipmitool-1.8.18/lib/helper.c Sun Jul 16 15:58:33 2017 @@ -29,7 +29,7 @@ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#define _POSIX_SOURCE +/* #define _POSIX_SOURCE */ - - #include - #include ---- ipmitool-1.8.16-orig/src/plugins/open/open.c Fri Feb 19 16:01:38 2016 -+++ ipmitool-1.8.16/src/plugins/open/open.c Wed Mar 23 14:24:44 2016 + #define /* glibc 2.19 and earlier */ _BSD_SOURCE || \ + /* Since glibc 2.20 */_DEFAULT_SOURCE || \ + _XOPEN_SOURCE >= 500 || \ +--- ipmitool-1.8.18/src/plugins/open/open.c Tue May 31 22:26:19 2016 ++++ ipmitool-1.8.18/src/plugins/open/open.c Sun Jul 16 16:04:37 2017 @@ -29,7 +29,7 @@ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ --#define _POSIX_SOURCE -+/* #define _POSIX_SOURCE */ - +-#define _POSIX_C_SOURCE 1 ++/* #define _POSIX_C_SOURCE 1 */ + #include #include ---- ipmitool-1.8.16-orig/src/plugins/ipmi_intf.c Fri Feb 19 16:02:19 2016 -+++ ipmitool-1.8.16/src/plugins/ipmi_intf.c Wed Mar 23 15:17:54 2016 -@@ -29,8 +29,8 @@ +--- ipmitool-1.8.18/src/plugins/ipmi_intf.c Sun Jul 31 08:52:40 2016 ++++ ipmitool-1.8.18/src/plugins/ipmi_intf.c Sun Jul 16 16:07:04 2017 +@@ -29,9 +29,9 @@ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#define _XOPEN_SOURCE 700 --#define _GNU_SOURCE 1 -+/*#define _XOPEN_SOURCE 700 -+#define _GNU_SOURCE 1 */ ++/* #define _XOPEN_SOURCE 700 + #define _GNU_SOURCE 1 +-#define _DARWIN_C_SOURCE 1 ++#define _DARWIN_C_SOURCE 1 */ + + #include + #include +--- ipmitool-1.8.18/lib/ipmi_sol.c Wed Jun 29 20:06:29 2016 ++++ ipmitool-1.8.18/lib/ipmi_sol.c Sun Jul 16 16:33:43 2017 +@@ -29,7 +29,7 @@ + * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, + * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ +-#define _XOPEN_SOURCE ++/* #define _XOPEN_SOURCE */ + #define _BSD_SOURCE || \ + (_XOPEN_SOURCE >= 500 || \ + _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \ +--- ipmitool-1.8.18/lib/ipmi_sunoem.c Mon May 30 20:28:40 2016 ++++ ipmitool-1.8.18/lib/ipmi_sunoem.c Sun Jul 16 16:35:50 2017 +@@ -29,7 +29,7 @@ + * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, + * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ +-#define _XOPEN_SOURCE ++/* #define _XOPEN_SOURCE */ + #include #include +--- ipmitool-1.8.18/lib/ipmi_isol.c Sun Mar 13 11:14:08 2016 ++++ ipmitool-1.8.18/lib/ipmi_isol.c.new Sun Jul 16 16:38:19 2017 +@@ -29,7 +29,7 @@ + * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, + * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ +-#define _XOPEN_SOURCE ++/* #define _XOPEN_SOURCE */ + #include - + #include diff --git a/build/jeos/omnios-userland.p5m b/build/jeos/omnios-userland.p5m index 514fc50ad2..342f39ad46 100644 --- a/build/jeos/omnios-userland.p5m +++ b/build/jeos/omnios-userland.p5m @@ -114,7 +114,7 @@ depend fmri=library/mtsk@0.5.11,5.11-@PVER@ type=incorporate depend fmri=system/library/pcap@1.8.1,5.11-@PVER@ type=incorporate depend fmri=system/management/ec2-api-tools@1.7.5,5.11-@PVER@ type=incorporate depend fmri=system/management/ec2-credential@1.0,5.11-@PVER@ type=incorporate -depend fmri=system/management/ipmitool@1.8.16,5.11-@PVER@ type=incorporate +depend fmri=system/management/ipmitool@1.8.18,5.11-@PVER@ type=incorporate depend fmri=system/management/mdata-client@20170105,5.11-@PVER@ type=incorporate depend fmri=system/management/snmp/net-snmp@5.7,5.11-@PVER@ type=incorporate depend fmri=system/pciutils@3.5,5.11-@PVER@ type=incorporate