- updated to 2.16.0

- updated c++ patch
- removed obsolete align patch

Changed files:
    openhpi-align.patch -> 1.9
    openhpi-c++.patch -> 1.3
    openhpi.spec -> 1.44

diff --git a/openhpi-align.patch b/openhpi-align.patch
deleted file mode 100644 (file)
index 0d1f9a9..0000000
--- a/openhpi-align.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- openhpi-2.10.1/marshal/marshal.c.orig      2007-11-03 06:47:32.000000000 +0100
-+++ openhpi-2.10.1/marshal/marshal.c   2007-11-03 22:54:30.116125607 +0100
-@@ -342,16 +342,16 @@
- 
-        case eMtUint16:
-        case eMtInt16:
--      /* compile error */
--//        m = (tUint32)*(const tUint16 *)so;
--          m = (tUint32)(*(const tUint16 *)(const void *)so);
-+          {
-+          tUint16 buf;
-+          memcpy(&buf, so, sizeof(tUint16));
-+          m = (tUint32)buf;
-+          }
-           break;
- 
-        case eMtUint32:
-        case eMtInt32:
--      /* compile error */
--//        m = *(const tUint32 *)so;
--          m = *(const tUint32 *)(const void *)so;
-+          memcpy(&m, so, sizeof(tUint32));
-           break;
- 
-        default:
-@@ -390,16 +390,16 @@
- 
-        case eMtUint16:
-        case eMtInt16:
--      /* compile error */
--//        size = (tUint32)*(const tUint16 *)so;
--          size = (tUint32)*(const tUint16 *)(const void *)so;
-+          {
-+          tUint16 buf;
-+          memcpy(&buf, so, sizeof(tUint16));
-+          size = (tUint32)buf;
-+          }
-           break;
- 
-        case eMtUint32:
-        case eMtInt32:
--      /* compile error */
--//        size = *(const tUint32 *)so;
--          size = *(const tUint32 *)(const void *)so;
-+          memcpy(&size, so, sizeof(tUint32));
-           break;
- 
-        default:
-@@ -612,7 +612,7 @@
-               if ( MarshalByteOrder() != byte_order )
-                    v = bswap_16( v );
-               
--              *(tUint16 *)data = v;
-+              memcpy( data, &v, sizeof( tUint16 ) );
-             }            
- 
-             return sizeof( tUint16 );
-@@ -626,7 +626,7 @@
-               if ( MarshalByteOrder() != byte_order )
-                    v = bswap_32( v );
- 
--              *(tUint32 *)data = v;
-+              memcpy( data, &v, sizeof( tUint32 ) );
-             }
- 
-             return sizeof( tUint32 );
-@@ -640,7 +640,7 @@
-               if ( MarshalByteOrder() != byte_order )
-                    v = bswap_64( v );
- 
--              *(tUint64 *)data = v;
-+              memcpy( data, &v, sizeof( tUint64 ) );
-             }
- 
-             return sizeof( tUint64 );
-@@ -654,7 +654,7 @@
-               if ( MarshalByteOrder() != byte_order )
-                    v.m_u32 = bswap_32( v.m_u32 );
- 
--              *(tFloat32 *)data = v.m_f32;
-+              memcpy(data, &(v.m_f32), sizeof( tFloat32 ) );
-             }
- 
-             return sizeof( tFloat32 );
-@@ -668,7 +668,7 @@
-               if ( MarshalByteOrder() != byte_order )
-                    v.m_u64 = bswap_64( v.m_u64 );
- 
--              *(tFloat64 *)data = v.m_f64;
-+              memcpy( data, &(v.m_f64), sizeof( tFloat64 ) );
-             }
- 
-             return sizeof( tFloat64 );

diff --git a/openhpi-c++.patch b/openhpi-c++.patch
index 26e07ceeaab03798a9ea8bbf363447328a8bbe0f..89b6fbf719330f5914fdd7adf855c5b215095823 100644 (file)
--- a/openhpi-c++.patch
+++ b/openhpi-c++.patch
@@ -4921,14 +4921,3 @@
 +      return false;
 +}
 +
---- openhpi-2.14.1/plugins/ipmidirect/ipmi_mc_vendor.cpp.orig  2009-11-23 21:18:08.000000000 +0100
-+++ openhpi-2.14.1/plugins/ipmidirect/ipmi_mc_vendor.cpp       2011-01-15 10:13:51.918365808 +0100
-@@ -931,7 +931,7 @@
-           /* Everything is valid, create the Watchdog RDR */
-           stdlog << "CreateWatchdogs Resource type " << res->EntityPath().GetEntryType(0) << " instance " << res->EntityPath().GetEntryInstance(0) << "\n";
-         
--          cIpmiRdr *wd = new cIpmiWatchdog::cIpmiWatchdog( mc, SAHPI_DEFAULT_WATCHDOG_NUM, 0 );
-+          cIpmiRdr *wd = new cIpmiWatchdog( mc, SAHPI_DEFAULT_WATCHDOG_NUM, 0 );
-         
-           wd->EntityPath() = res->EntityPath();
-         

diff --git a/openhpi.spec b/openhpi.spec
index 55b8a5fd534a9ce00d3f285ab105873c4e46ee55..3cc75b4bca45ce8a0b08f52bfdb48a3701f94dab 100644 (file)
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -2,19 +2,18 @@
 Summary:       Service Availability Forum's Hardware Platform Interface (HPI) implementation
 Summary(pl.UTF-8):     Implementacja HPI (Hardware Platform Interface) Service Availability Forum
 Name:          openhpi
-Version:       2.14.1
+Version:       2.16.0
 Release:       1
 License:       BSD
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
-# Source0-md5: 1533972a05f2ed61f3ae441ecd3df5a9
+# Source0-md5: 86455e5a25dabd8ba0190ebf6efec8c2
 Patch0:                %{name}-types.patch
 Patch1:                %{name}-sh.patch
-Patch2:                %{name}-align.patch
-Patch3:                %{name}-proto.patch
-Patch4:                %{name}-rtas.patch
-Patch5:                %{name}-c++.patch
-Patch6:                %{name}-install.patch
+Patch2:                %{name}-proto.patch
+Patch3:                %{name}-rtas.patch
+Patch4:                %{name}-c++.patch
+Patch5:                %{name}-install.patch
 URL:           http://www.openhpi.org/
 BuildRequires: OpenIPMI-devel >= 1.4.20
 BuildRequires: autoconf >= 2.57
@@ -181,7 +180,6 @@ Wtyczka sysfs dla OpenHPI.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -192,6 +190,7 @@ Wtyczka sysfs dla OpenHPI.
 %configure \
        --enable-cpp_wrappers \
        --enable-daemon \
+       --enable-ipmi \
 %ifarch ppc ppc64
        --enable-rtas \
 %endif
@@ -218,8 +217,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING README README.daemon docs/hld/openhpi-manual
 %attr(755,root,root) %{_bindir}/hpi*
+%attr(755,root,root) %{_bindir}/ohdomainlist
+%attr(755,root,root) %{_bindir}/ohhandler
+%attr(755,root,root) %{_bindir}/ohparam
 %attr(755,root,root) %{_sbindir}/openhpid
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libdyn_simulator.so*
+%{_libdir}/%{name}/libdyn_simulator.la
 %attr(755,root,root) %{_libdir}/%{name}/libilo2_ribcl.so*
 %{_libdir}/%{name}/libilo2_ribcl.la
 %attr(755,root,root) %{_libdir}/%{name}/liboa_soap.so*
@@ -229,18 +233,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/openhpi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openhpi/openhpi.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openhpi/openhpiclient.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openhpi/simulation.data
 %attr(754,root,root) /etc/rc.d/init.d/openhpid
 %dir %{_localstatedir}/lib/%{name}
 %{_mandir}/man1/hpi*.1*
+%{_mandir}/man1/ohdomainlist.1*
+%{_mandir}/man1/ohhandler.1*
+%{_mandir}/man1/ohparam.1*
 %{_mandir}/man7/openhpi.7*
 %{_mandir}/man8/openhpid.8*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libohtcpconnx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libohtcpconnx.so.2
-%attr(755,root,root) %{_libdir}/libohudpconnx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libohudpconnx.so.2
 %attr(755,root,root) %{_libdir}/libopenhpi*.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopenhpi*.so.2
 %attr(755,root,root) %{_libdir}/libosahpi.so.*.*.*
@@ -248,12 +252,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libohtcpconnx.so
-%attr(755,root,root) %{_libdir}/libohudpconnx.so
 %attr(755,root,root) %{_libdir}/libopenhpi*.so
 %attr(755,root,root) %{_libdir}/libosahpi.so
-%{_libdir}/libohtcpconnx.la
-%{_libdir}/libohudpconnx.la
 %{_libdir}/libopenhpi*.la
 %{_libdir}/libosahpi.la
 %dir %{_includedir}/openhpi
@@ -264,8 +264,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libohtcpconnx.a
-%{_libdir}/libohudpconnx.a
 %{_libdir}/libopenhpi*.a
 %{_libdir}/libosahpi.a