- Updated ipmitool to 1.8.7

- Updated OpenIPMI to 2.0.6
- Fixed bug with type conversion in ipmitool (#191091)
- Added python bindings
- Split off perl and python bindings in separate subpackages
- Dropped obsolete patches

.cvsignore

@@ -1,2 +1,2 @@
-ipmitool-1.8.6.tar.gz
+ipmitool-1.8.7.tar.gz
-OpenIPMI-1.4.14.tar.gz
+OpenIPMI-2.0.6.tar.gz

OpenIPMI.spec

@@ -1,8 +1,8 @@
-%define ipmitoolver 1.8.6
+%define ipmitoolver 1.8.7
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
-Version: 1.4.14
+Version: 2.0.6
-Release: 19
+Release: 1
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -10,12 +10,11 @@ Source: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
 Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
 Source3: openipmi.sysconf
 Source4: openipmi.initscript
-Patch1: OpenIPMI-1.4.11-gcc4.patch
+Patch100: ipmitool-1.8.7-peftime.patch
-Patch2: OpenIPMI-1.4.14-oob.patch
-Patch3: OpenIPMI-1.4.14-warnings.patch
 BuildRoot: /var/tmp/%{name}-%{version}-root
 PreReq: chkconfig
-BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel openssl-devel
+BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
+BuildPrereq: openssl-devel python-devel
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
@@ -38,6 +37,20 @@ Summary: OpenIPMI utilities and scripts from ipmitool
 The OpenIPMI-tools package contains the addon utilities and script from the
 ipmitool project.
 
+%package perl
+Group: Development/Libraries
+Summary: OpenIPMI Perl language bindings
+
+%description perl
+The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI.
+
+%package python
+Group: Development/Libraries
+Summary: OpenIPMI Python language bindings
+
+%description python
+The OpenIPMI-perl package contains the Python language bindings for OpenIPMI.
+
 %package devel
 Group: Development/Libraries
 Summary: The development environment for the OpenIPMI project.
@@ -49,9 +62,9 @@ of the OpenIPMI project.
 
 %prep
 %setup -q -a 2
-%patch1 -p1 -b .gcc4
+pushd ipmitool-%{ipmitoolver}
-%patch2 -p1 -b .oob
+%patch100 -p1 -b .peftime
-%patch3 -p1 -b .warnings
+popd
 
 %build
 %configure
@@ -62,7 +75,7 @@ make
 popd
 
 %install
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 pushd ipmitool-%{ipmitoolver}
 %makeinstall
@@ -99,18 +112,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/ipmi
 %config %{_initrddir}/ipmi
-%{_bindir}/ipmi_ui
 %{_bindir}/ipmicmd
 %{_bindir}/ipmilan
 %{_bindir}/ipmish
+%{_bindir}/ipmi_ui
+%{_bindir}/openipmicmd
+%{_bindir}/openipmish
+%{_bindir}/rmcp_ping
+%{_bindir}/solterm
 %{_mandir}/man1/ipmi_ui*
-%{_mandir}/man1/ipmicmd*
+%{_mandir}/man1/openipmicmd*
-%{_mandir}/man1/ipmish*
+%{_mandir}/man1/openipmigui*
+%{_mandir}/man1/openipmish*
+%{_mandir}/man1/rmcp_ping*
+%{_mandir}/man1/solterm*
+%{_mandir}/man7/ipmi_cmdlang*
+%{_mandir}/man7/openipmi_conparms*
 %{_mandir}/man8/ipmilan*
+
+%files perl
 %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/OpenIPMI.pm
 %dir %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI
 %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI/*
 
+%files python
+%{_libdir}/python*/site-packages/*
+
 %files tools
 %defattr(-,root,root)
 %{_datadir}/ipmitool/
@@ -132,6 +159,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Tue May 16 2006 Phil Knirsch <pknirsch@redhat.com> 2.0.6-1
+- Fixed bug with type conversion in ipmitool (#191091)
+- Added python bindings 
+- Split off perl and python bindings in separate subpackages
+- Dropped obsolete patches
+
+* Mon May 15 2006 Phil Knirsch <pknirsch@redhat.com>
+- Updated ipmitool to 1.8.7
+- Updated OpenIPMI to 2.0.6
+
 * Fri Feb 17 2006 Phil Knirsch <pknirsch@redhat.com> 1.4.14-19
 - Added missing PreReq for chkconfig
 

ipmitool-1.8.7-peftime.patch

@@ -0,0 +1,36 @@
+--- ipmitool-1.8.7/lib/ipmi_pef.c.peftime	2006-05-16 11:39:00.000000000 +0200
++++ ipmitool-1.8.7/lib/ipmi_pef.c	2006-05-16 11:39:19.000000000 +0200
+@@ -731,6 +731,7 @@
+ 	struct pef_cfgparm_selector psel;
+ 	char tbuf[40];
+ 	time_t ts;
++	uint32_t timei;
+ 
+ 	memset(&req, 0, sizeof(req));
+ 	req.msg.netfn = IPMI_NETFN_SE;
+@@ -741,11 +742,11 @@
+ 			"Last S/W processed ID");
+ 		return;
+ 	}
++	memcpy(&timei, rsp->data, 4);
+ #if WORDS_BIGENDIAN
+-	ts = (time_t)(rsp->data[0]<<24 + rsp->data[1]<<16 + rsp->data[2]<<8 + rsp->data[3]);
+-#else
+-	ts = (time_t)(*(long *)rsp->data);
++	timei = BSWAP_32(timei);
+ #endif
++	ts = (time_t)timei;
+ 	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", localtime(&ts));
+ 
+ 	ipmi_pef_print_str("Last SEL addition", tbuf);
+--- ipmitool-1.8.7/lib/ipmi_sel.c.peftime	2006-05-16 11:39:06.000000000 +0200
++++ ipmitool-1.8.7/lib/ipmi_sel.c	2006-05-16 11:39:20.000000000 +0200
+@@ -1501,7 +1501,7 @@
+ 	
+ 	memcpy(&timei, rsp->data, 4);
+ #if WORDS_BIGENDIAN
+-	timei = BSWAP_32(time);
++	timei = BSWAP_32(timei);
+ #endif
+ 	time = (time_t)timei;
+ 

sources

@@ -1,2 +1,2 @@
-ee4196ccea99898c31b16099ac905260  ipmitool-1.8.6.tar.gz
+8e581db152c97a8c402f94a13bd7aa67  ipmitool-1.8.7.tar.gz
-06fc4b2c8d758f4f9187f0065188542b  OpenIPMI-1.4.14.tar.gz
+43be79ea0693dbde0420202e721b5232  OpenIPMI-2.0.6.tar.gz