diff --git a/.freeipmi.metadata b/.freeipmi.metadata
index 5027f35..5066cd6 100644
--- a/.freeipmi.metadata
+++ b/.freeipmi.metadata
@@ -1 +1 @@
-2f0336582b8d8b8c671cc7dbe7b8cfe4d7cd70d4 SOURCES/freeipmi-1.2.9.tar.gz
+f1f486d781f19f06f3d9a59c33acbb0a0c314d87 SOURCES/freeipmi-1.5.7.tar.gz
diff --git a/.gitignore b/.gitignore
index df81f03..ea218dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/freeipmi-1.2.9.tar.gz
+SOURCES/freeipmi-1.5.7.tar.gz
diff --git a/SOURCES/freeipmi-1.2.1-bigendauth.patch b/SOURCES/freeipmi-1.2.1-bigendauth.patch
deleted file mode 100644
index 03db1e8..0000000
--- a/SOURCES/freeipmi-1.2.1-bigendauth.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urpN freeipmi-1.3.2.orig/libfreeipmi/util/ipmi-rmcpplus-util.c freeipmi-1.3.2.fixed/libfreeipmi/util/ipmi-rmcpplus-util.c
---- freeipmi-1.3.2.orig/libfreeipmi/util/ipmi-rmcpplus-util.c 2013-09-11 01:23:16.000000000 +0200
-+++ freeipmi-1.3.2.fixed/libfreeipmi/util/ipmi-rmcpplus-util.c 2013-10-22 17:56:59.439103790 +0200
-@@ -157,15 +157,8 @@ ipmi_calculate_sik (uint8_t authenticati
- priv_byte |= 0x10;
- priv_byte |= (requested_privilege_level & 0xF);
-
-- memcpy (hash_data + hash_data_len,
-- (void *)&priv_byte,
-- sizeof (uint8_t));
-- hash_data_len += sizeof (uint8_t);
--
-- memcpy (hash_data + hash_data_len,
-- (void *)&user_name_len,
-- sizeof (uint8_t));
-- hash_data_len += sizeof (uint8_t);
-+ hash_data[hash_data_len++] = priv_byte;
-+ hash_data[hash_data_len++] = user_name_len;
-
- if (user_name && user_name_len > 0)
- {
-@@ -1257,8 +1250,8 @@ ipmi_rmcpplus_check_rakp_4_integrity_che
-
- rv = memcmp (digest, integrity_check_value, compare_len) ? 0 : 1;
- cleanup:
-- secure_memset (buf, '\0', IPMI_MAX_KEY_DATA_LENGTH);
-- secure_memset (buf, '\0', IPMI_MAX_KEY_EXCHANGE_AUTHENTICATION_CODE_LENGTH);
-+ secure_memset (buf, '\0', sizeof(buf));
-+ secure_memset (digest, '\0', sizeof(digest));
- return (rv);
- }
-
diff --git a/SOURCES/freeipmi-1.5.7-manpage.patch b/SOURCES/freeipmi-1.5.7-manpage.patch
new file mode 100644
index 0000000..5f31d45
--- /dev/null
+++ b/SOURCES/freeipmi-1.5.7-manpage.patch
@@ -0,0 +1,191 @@
+diff -urNp old/man/freeipmi.7.pre.in new/man/freeipmi.7.pre.in
+--- old/man/freeipmi.7.pre.in 2017-08-29 14:01:35.453296600 +0200
++++ new/man/freeipmi.7.pre.in 2017-11-20 08:37:57.192003912 +0100
+@@ -87,20 +87,20 @@ found in each of the tool manpages.
+ The primary tools that most users of FreeIPMI will be interested in
+ for system management are the following:
+ .PP
+-.B Ipmi-sensors
++.B ipmi-sensors
+ .PP
+ A tool to read IPMI sensor readings to aid in system monitoring.
+ .PP
+-.B Ipmi-sel
++.B ipmi-sel
+ .PP
+ A tool to read and manage IPMI System Event Log (SEL) records to aid
+ in system debugging.
+ .PP
+-.B Ipmipower
++.B ipmipower
+ .PP
+ A tool for remote power control.
+ .PP
+-.B Ipmiconsole
++.B ipmiconsole
+ .PP
+ A tool for Serial-over-Lan (SOL) console access.
+ .PP
+@@ -121,7 +121,7 @@ for more information.
+
+ .SH "HPC Support"
+ Much of FreeIPMI was written with HPC support in mind.
+-.B Ipmi-config(8)
++.B ipmi-config(8)
+ comes with file input/output support so that configuration can be
+ copied and verified across nodes in a cluster. Most tools (like
+ .B ipmipower(8)
+@@ -133,7 +133,7 @@ the hosts in parallel. See tool manpage
+ Also see the document
+ \fIfreeipmi-hostrange.txt\fR
+ for detailed usage and explanation.
+-.B Ipmi-sensors(8)
++.B ipmi-sensors(8)
+ and the
+ .B libipmimonitoring(3)
+ library support the ability to interpret sensor readings as well as
+@@ -155,47 +155,47 @@ Or see the document
+ .SH "Project Tools"
+ The following tools are distributed and supported by FreeIPMI.
+ .PP
+-.B Bmc-info
++.B bmc-info
+ .PP
+ A tool to read information about a BMC such as device version numbers,
+ device support, and globally unique IDs (guids).
+ .PP
+-.B Bmc-watchdog
++.B bmc-watchdog
+ .PP
+ A tool/daemon to manage a BMC Watchdog. This tool is typically used
+ for system timeout management and automatic system restarts in the
+ event of a system crash.
+ .PP
+-.B Ipmi-chassis
++.B ipmi-chassis
+ .PP
+ A tool to manage/monitor a chassis, such as chassis power,
+ identification (i.e. LED control), and status.
+ .PP
+-.B Ipmi-fru
++.B ipmi-fru
+ .PP
+ A tool to read field replaceable unit (FRU) information from a
+ motherboard/machine.
+ .PP
+-.B Ipmi-sel
++.B ipmi-sel
+ .PP
+ A tool to read and manage IPMI System Event Log (SEL) records. SEL
+ records store system event information and may be useful for debugging
+ problems.
+ .PP
+-.B Ipmi-sensors
++.B ipmi-sensors
+ .PP
+ A tool to read IPMI sensor readings and sensor data repository (SDR)
+ information.
+ .PP
+-.B Ipmipower
++.B ipmipower
+ .PP
+ A tool for remote power control.
+ .PP
+-.B Ipmiconsole
++.B ipmiconsole
+ .PP
+ A tool for Serial-over-Lan (SOL) console access.
+ .PP
+-.B Ipmi-config
++.B ipmi-config
+ .PP
+ A tool to configure BMC and IPMI information. In can be used to
+ configured usernames, passwords, networking information, security,
+@@ -203,48 +203,48 @@ Serial-over-LAN (SOL), Platform Event Fi
+ power restoration policy, sensor thresholds, sensor events, and many
+ more configuration options.
+ .PP
+-.B Ipmi-raw
++.B ipmi-raw
+ .PP
+ A tool that provides hex input/output of IPMI commands.
+ .PP
+-.B Ipmi-locate
++.B ipmi-locate
+ .PP
+ A tool that can probe for information about the location of a BMC
+ device, such as device addresses.
+ .PP
+-.B Ipmi-pet
++.B ipmi-pet
+ .PP
+ A tool to parse and interpret Platform Event Traps (PET).
+ .PP
+-.B Ipmi-dcmi
++.B ipmi-dcmi
+ .PP
+ A tool to perform Data Center Manageability Interface (DCMI) IPMI
+ extension commands. Supports extensions for asset management and
+ power usage management.
+ .PP
+-.B Bmc-device
++.B bmc-device
+ .PP
+ A tool to perform advanced BMC commands, such as resetting the BMC,
+ configuring ACPI, configuring SDR/SEL time, manually generating
+ events, re-arming sensors, and configuring manufacturer settings.
+ .PP
+-.B Ipmiping
++.B ipmiping
+ .PP
+ An IPMI ping tool for debugging.
+ .PP
+-.B Rmcpping
++.B rmcpping
+ .PP
+ A RMCP ping tool for debugging.
+ .PP
+-.B Ipmi-oem
++.B ipmi-oem
+ .PP
+ An IPMI tool for OEM specific commands.
+ .PP
+-.B Ipmidetect/Ipmidetectd
++.B ipmidetect/ipmidetectd
+ .PP
+ A tool and daemon for IPMI node detection.
+ .PP
+-.B Ipmiseld
++.B ipmiseld
+ .PP
+ A daemon that regularly polls the SEL and stores the events to the
+ local syslog.
+diff -urNp old/man/ipmi-sensors.8.pre.in new/man/ipmi-sensors.8.pre.in
+--- old/man/ipmi-sensors.8.pre.in 2017-08-29 14:01:35.453296600 +0200
++++ new/man/ipmi-sensors.8.pre.in 2017-08-29 14:05:45.726670330 +0200
+@@ -5,14 +5,14 @@ ipmi-sensors \- display IPMI sensor info
+ .B ipmi-sensors
+ [\fIOPTION\fR...]
+ .SH "DESCRIPTION"
+-.B Ipmi-sensors
++.B ipmi-sensors
+ displays current readings of sensors and sensor data repository (SDR)
+ information. The default display outputs each sensor's record id,
+ sensor name, sensor type name, sensor reading (if appropriate), and
+ the current sensor event. More verbose information can be found using
+ the verbose options specified below.
+
+-.B Ipmi-sensors
++.B ipmi-sensors
+ does not inform the user if a problem exists with a particular sensor
+ because sensor readings and events are not analyzed by default. Users
+ may wish to use the \fB\-\-output\-sensor\-state\fR option to output
+@@ -57,7 +57,7 @@ To perform some advanced SDR management,
+ #include <@top_srcdir@/man/manpage-common-misc.man>
+ .SH "IPMI-SENSORS OPTIONS"
+ The following options are specific to
+-.B Ipmi-sensors.
++.B ipmi-sensors.
+ .TP
+ \fB\-v\fR, \fB\-\-verbose\fR
+ Output verbose sensor output. This option will output additional
diff --git a/SPECS/freeipmi.spec b/SPECS/freeipmi.spec
index ff0b24f..b18f0b9 100644
--- a/SPECS/freeipmi.spec
+++ b/SPECS/freeipmi.spec
@@ -2,8 +2,8 @@
# Copyright (c) 2003 FreeIPMI Core Team
Name: freeipmi
-Version: 1.2.9
-Release: 8%{?dist}
+Version: 1.5.7
+Release: 2%{?dist}
Summary: IPMI remote console and system management software
License: GPLv3+
Group: Applications/System
@@ -14,12 +14,13 @@ Source2: ipmidetectd.service
Source3: ipmiseld.service
Source4: os-shutdown-event.service
Source5: os-startup-event.service
-Patch1: freeipmi-1.2.1-bigendauth.patch
-BuildRequires: libgcrypt-devel texinfo systemd-units
-Requires(preun): info systemd-units
-Requires(post): info systemd-units systemd-sysv
-Requires(postun): systemd-units
-Requires: OpenIPMI-modalias
+
+Patch1: freeipmi-1.5.7-manpage.patch
+
+BuildRequires: libgcrypt-devel texinfo systemd
+Requires(preun): info systemd
+Requires(post): info systemd systemd-sysv
+Requires(postun): systemd
%description
The FreeIPMI project provides "Remote-Console" (out-of-band) and
@@ -62,7 +63,7 @@ IPMI SEL syslog logging daemon.
%prep
%setup -q
-%patch1 -p1 -b .bigendauth
+%patch1 -p1 -b .manpage
%build
export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -213,6 +214,7 @@ fi
%{_sbindir}/bmc-config
%{_sbindir}/bmc-info
%{_sbindir}/bmc-device
+%{_sbindir}/ipmi-config
%{_sbindir}/ipmi-fru
%{_sbindir}/ipmi-locate
%{_sbindir}/ipmi-oem
@@ -241,6 +243,8 @@ fi
%{_mandir}/man5/bmc-config.conf.5*
%{_mandir}/man8/bmc-info.8*
%{_mandir}/man8/bmc-device.8*
+%{_mandir}/man8/ipmi-config.8*
+%{_mandir}/man5/ipmi-config.conf.5*
%{_mandir}/man8/ipmi-fru.8*
%{_mandir}/man8/ipmi-locate.8*
%{_mandir}/man8/ipmi-oem.8*
@@ -300,11 +304,15 @@ fi
%dir %{_includedir}/freeipmi/locate
%dir %{_includedir}/freeipmi/payload
%dir %{_includedir}/freeipmi/record-format
+%dir %{_includedir}/freeipmi/record-format/oem
%dir %{_includedir}/freeipmi/sdr
+%dir %{_includedir}/freeipmi/sdr/oem
%dir %{_includedir}/freeipmi/sel
%dir %{_includedir}/freeipmi/sensor-read
%dir %{_includedir}/freeipmi/spec
+%dir %{_includedir}/freeipmi/spec/oem
%dir %{_includedir}/freeipmi/templates
+%dir %{_includedir}/freeipmi/templates/oem
%dir %{_includedir}/freeipmi/util
%{_includedir}/ipmiconsole.h
%{_includedir}/ipmidetect.h
@@ -321,11 +329,15 @@ fi
%{_includedir}/freeipmi/locate/*.h
%{_includedir}/freeipmi/payload/*.h
%{_includedir}/freeipmi/record-format/*.h
+%{_includedir}/freeipmi/record-format/oem/*.h
%{_includedir}/freeipmi/sdr/*.h
+%{_includedir}/freeipmi/sdr/oem/*.h
%{_includedir}/freeipmi/sel/*.h
%{_includedir}/freeipmi/sensor-read/*.h
%{_includedir}/freeipmi/spec/*.h
+%{_includedir}/freeipmi/spec/oem/*.h
%{_includedir}/freeipmi/templates/*.h
+%{_includedir}/freeipmi/templates/oem/*.h
%{_includedir}/freeipmi/util/*.h
%{_mandir}/man3/*
%{_libdir}/pkgconfig/*
@@ -357,6 +369,13 @@ fi
%dir %{_localstatedir}/cache/ipmiseld
%changelog
+* Mon Nov 20 2017 Josef Ridky <jridky@redhat.com> - 1.5.7-2
+- Additional fix of manpage command examples (#1353981)
+
+* Tue Aug 29 2017 Josef Ridky <jridky@redhat.com> - 1.5.7-1
+- Rebase to the latest upstream release 1.5.7 (#1435848)
+- Fix manpage command examples (#1353981) in separate commit
+
* Tue Jun 28 2016 Boris Ranto <branto@redhat.com> - 1.2.9-8
- Package os event systemd services (#1122307)