[freeipmi: 2/2] Merge branch 'f17'

[Jan Šafránek]

commit bd574436477ae84688a0795f73acc94f77d82fc1
Merge: 57bdc75 69589a5
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Wed Mar 7 10:09:22 2012 +0100

    Merge branch 'f17'
    
    Conflicts:
    	.gitignore
    	freeipmi.spec
    	sources

 .gitignore    |    1 +
 freeipmi.spec |   22 +++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 83feda5,1e79c8e..00e0f69
--- a/.gitignore
+++ b/.gitignore
@@@ -14,4 -14,4 +14,5 @@@ freeipmi-0.8.8.tar.g
  /freeipmi-1.0.9.tar.gz
  /freeipmi-1.0.10.tar.gz
  /freeipmi-1.1.1.tar.gz
 +/freeipmi-1.1.2.tar.gz
+ /freeipmi-1.1.3.tar.gz
diff --cc freeipmi.spec
index bd990f3,2c9042a..9888261
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@@ -359,48 -359,26 +359,68 @@@ f
  %{_unitdir}/ipmidetectd.service
  
  %changelog
+ * Wed Mar  7 2012 Jan Safranek <jsafrane at redhat.com> - 1.1.3-1
+ - Updated to freeipmi-1.1.3:
+   - Support Supermicro CPU temperature SEL events.
+   - In ipmi-oem, fix corner case with Dell C410x power control
+     calculation.
+   - In all tools, fix error messages to differentiate between invalid
+     and unsupported cipher suite IDs.
+   - In bmc-config, fix a Cipher Suite Privilege configuration
+     corner case in the workaround for an HP DL145 workaround.
+   - In bmc-config, add workaround for Cipher Suite Privilege
+     configuration on Intel S2600JF/Appro 512X.
+   - Various documentation updates.
+   - In libfreeipmi, fix incorrect packet layout for the Get Lan
+     Configuration Parameters RMCPplus Messaging Cipher Suite Entry Support
+     response.
+   - In libipmimonitoring, properly return connection timeout error on
+     connection timeout.
+   - Fix build when using --docdir. 
+   - Various documentation updates.
+ 
 +* Wed Feb  8 2012 Jan Safranek <jsafrane at redhat.com> - 1.1.2-1
 +- Updated to freeipmi-1.1.2:
 +  - In ipmi-oem, support new Dell C410x OEM extensions
 +    slot-power-toggle, slot-power-control, get-port-map, set-port-map.
 +  - Fix daemon setup race condition in ipmidetectd and bmc-watchdog that
 +    can affect systemd.
 +  - In ipmiconsole, support new --serial-keepalive-empty option.
 +  - In bmc-device, support new --rearm-sensor option.
 +  - In ipmi-oem, add additional Dell get-system-info options
 +  - slot-number
 +  - system-revision
 +  - embedded-video-status
 +  - idrac-info
 +  - idrac-ipv4-url
 +  - idrac-gui-webserver-control
 +  - cmc-ipv4-url,
 +  - cmc-ipv6-info
 +  - cmc-ipv6-url
 +  - In ipmi-oem, support Dell 12G mac addresses under get-system-info.   
 +  - In ipmi-sensors, some sensors that reported "Unknown" may now report
 +    "N/A" due to an interpretation change of several IPMI error codes.
 +  - In ipmi-sensors, workaround sensor reading issue on Sun Blade x6250
 +    and Sun Blade 6000M2.
 +  - Fix several freeipmi.conf config file parsing bugs.
 +  - In libipmiconsole, fix serial keepalive timeout calculation bug that
 +    can lead to excessive packets retransmitted.
 +  - In libipmiconsole, support new SERIAL_KEEPALIVE_EMPTY engine flag.
 +  - In libipmiconsole, do not deactivate a SOL payload if it appears the
 +    SOL payload has been stolen, but we did not receive a SOL deactivating
 +    flag.
 +  - In libipmiconsole, fix corner case in which session not closed
 +    cleanly when DEACTIVATE_ONLY flag specified.
 +  - In libipmiconsole, workaround bug in Dell Poweredge M605, M610, and
 +    M915 where instance count of SOL is always returned as 0.
 +  - In libfreeipmi, add functions for re-arm sensor events IPMI payload. 
 +  - In libfreeipmi/sensor-read, under some error conditions return error
 +    of "unavailable" instead of "cannot be obtained" error code.
 +  - In libfreeipmi/sensor-read, add workarounds to handle issues on Sun
 +    Blade x6250 and Sun Blade 6000M2.
 +  - Various documentation updates.
 +  - Redo formattig of include/freeipmi/templates/ documents.
 +
  * Fri Jan  6 2012 Jan Safranek <jsafrane at redhat.com> - 1.1.1-2
  - added systemd unit files (#767611)