diff --git a/freeipmi-1.3.2.tar.bz2 b/freeipmi-1.3.2.tar.bz2 deleted file mode 100644 index d79627a..0000000 --- a/freeipmi-1.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10dab2060f18c119835b9263fca31ffb02de4e2819ce9930db02ffa852c5f0c9 -size 2174222 diff --git a/freeipmi-1.3.4.tar.bz2 b/freeipmi-1.3.4.tar.bz2 new file mode 100644 index 0000000..4c78490 --- /dev/null +++ b/freeipmi-1.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba705b340cde38ac60263ac6f91d5c266a0feaa2c936bd55e73eebd8aac8c755 +size 2176024 diff --git a/freeipmi-max-sensor.patch b/freeipmi-max-sensor.patch new file mode 100644 index 0000000..098c435 --- /dev/null +++ b/freeipmi-max-sensor.patch @@ -0,0 +1,36 @@ +2013-12-19 Dave Love + + * ipmi-sensors/ipmi-sensors.c (_calculate_record_ids): Check + record numbr against array length. + + * common/toolcommon/tool-sensor-common.h (MAX_SENSOR_RECORD_IDS): + Increase to 1024. + +--- freeipmi-1.3.4/common/toolcommon/tool-sensor-common.h.orig 2013-04-26 18:01:55.000000000 +0100 ++++ freeipmi-1.3.4/common/toolcommon/tool-sensor-common.h 2013-12-19 11:38:38.061632119 +0000 +@@ -55,7 +55,7 @@ + #define MAX_SENSOR_TYPES 256 + #else /* !0 */ + /* achu: pick more reasonable limits than the theoretical maxes */ +-#define MAX_SENSOR_RECORD_IDS 512 ++#define MAX_SENSOR_RECORD_IDS 1024 + #define MAX_SENSOR_TYPES 64 + #endif /* !0 */ + #endif /* !__CYGWIN__ */ +--- freeipmi-1.3.4/ipmi-sensors/ipmi-sensors.c.orig 2013-05-08 18:09:34.000000000 +0100 ++++ freeipmi-1.3.4/ipmi-sensors/ipmi-sensors.c 2013-12-19 11:38:54.132859006 +0000 +@@ -514,6 +514,13 @@ + } + + output_record_ids[(*output_record_ids_length)] = record_id; ++ if (output_record_ids_length >= MAX_SENSOR_RECORD_IDS) ++ { ++ fprintf (stderr, ++ "Too many sensors; limit is %d\n", ++ MAX_SENSOR_RECORD_IDS - 1); ++ return (-1); ++ } + (*output_record_ids_length)++; + } + } + diff --git a/freeipmi.changes b/freeipmi.changes index 77ff39e..b60faca 100644 --- a/freeipmi.changes +++ b/freeipmi.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu Dec 19 14:01:05 UTC 2013 - kkaempf@suse.com + +- Prevent crash on systems with more than 601 sensors. + Add freeipmi-max-sensor.patch + +------------------------------------------------------------------- +Fri Dec 13 07:31:45 UTC 2013 - kkaempf@suse.com + +- FreeIPMI 1.3.4 - 12/12/13 + ------------------------- + o Support 'solchannelsupport' workraound in ipmiconsole / + IPMICONSOLE_WORKAROUND_SKIP_CHANNEL_PAYLOAD_SUPPORT workaround + flag in libipmiconsole. + o Fix SDR cache workaround for motherboards with invalid SDR record + counts listed. + o Workaround Supermicro bug in bmc-watchdog. + o Fix error checks in sensor decoding functions, leading to + possible problems in ipmi-sensors-config. + o Update documentation with additional workarounds for motherboards. + o Fix various minor bugs. + +------------------------------------------------------------------- +Wed Oct 30 08:38:34 UTC 2013 - kkaempf@suse.com + +- FreeIPMI 1.3.3 + ------------------------- + o Add support for intelnm get-node-manager-alert-destination and + set-node-manager-alert-destination in ipmi-oem. + o Under very verbose mode, ipmi-sel will now record types for OEM + records. This should allow OEM parses outside of FreeIPMI to more + effectively parse OEM specific SEL records. + o Fix big endian portability bugs. + ------------------------------------------------------------------- Sun Oct 27 19:14:16 UTC 2013 - p.drouand@gmail.com diff --git a/freeipmi.spec b/freeipmi.spec index 5f0782d..9bf561c 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -18,7 +18,7 @@ %define name freeipmi -%define version 1.3.2 +%define version 1.3.4 %if %{?_with_debug:1}%{!?_with_debug:0} %define release 1.debug%{?dist} %else @@ -35,6 +35,8 @@ Source0: %{name}-%{version}.tar.bz2 Source1: bmc-watchdog.service Source2: ipmidetectd.service Source3: ipmiseld.service +# PATCH-FIX-UPSTREAM, Prevent crash on systems with more than 601 sensors, kkaempf@suse.de +Patch: freeipmi-max-sensor.patch Summary: FreeIPMI License: GPL-3.0+ Group: System/Management @@ -50,7 +52,8 @@ BuildRequires: fdupes BuildRequires: pkgconfig(systemd) %endif -Obsoletes: freeipmi-ipmimonitoring +Obsoletes: freeipmi-ipmimonitoring < %{version} +Provides: freeipmi-ipmimonitoring = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): info Requires(preun): info @@ -64,7 +67,7 @@ Platform Management Interface specification. %package devel Summary: Development package for FreeIPMI -Group: Development/System +Group: Development/Tools/Other Requires: freeipmi = %{version} %description devel @@ -111,6 +114,7 @@ This service detects and monitors IPMI nodes. %prep %setup -q +%patch -p1 %build %if 0%{?suse_version} >= 1110