[packages/openhpi] - rediff patches, rebuild with openssl 3.0.0, rel 7
baggins
baggins at pld-linux.org
Mon Oct 4 22:37:37 CEST 2021
commit 95c1709af5c6492c088a3104cab0b8155fb1eadb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Oct 4 22:37:16 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 7
openhpi-c++.patch | 71 ++++++++++++++++++++++++++++++---------------------
openhpi-install.patch | 11 ++++----
openhpi-rtas.patch | 9 ++++---
openhpi-types.patch | 11 ++++----
openhpi.spec | 2 +-
5 files changed, 60 insertions(+), 44 deletions(-)
---
diff --git a/openhpi.spec b/openhpi.spec
index a53437c..2605154 100644
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -3,7 +3,7 @@ Summary: Service Availability Forum's Hardware Platform Interface (HPI) implemen
Summary(pl.UTF-8): Implementacja HPI (Hardware Platform Interface) Service Availability Forum
Name: openhpi
Version: 3.8.0
-Release: 6
+Release: 7
License: BSD
Group: Applications/System
Source0: http://downloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
diff --git a/openhpi-c++.patch b/openhpi-c++.patch
index 89b6fbf..17604d1 100644
--- a/openhpi-c++.patch
+++ b/openhpi-c++.patch
@@ -1,15 +1,16 @@
---- openhpi-2.10.1/cpp/Makefile.am.orig 2007-11-03 23:02:21.142967000 +0100
-+++ openhpi-2.10.1/cpp/Makefile.am 2007-11-04 00:08:36.009482630 +0100
-@@ -75,7 +75,7 @@
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/Makefile.am openhpi-3.8.0/cpp/Makefile.am
+--- openhpi-3.8.0.org/cpp/Makefile.am 2021-10-04 22:34:49.863774831 +0200
++++ openhpi-3.8.0/cpp/Makefile.am 2021-10-04 22:34:50.003767356 +0200
+@@ -75,7 +75,7 @@ include_HEADERS = oSaHpiAlarm.hpp \
oSaHpiWatchdogRec.hpp \
oSaHpi.hpp
-pkglib_LTLIBRARIES = libosahpi.la
+lib_LTLIBRARIES = libosahpi.la
- libosahpi_la_LIBADD = -luuid
+ #libosahpi_la_LIBADD = -luuid
libosahpi_la_SOURCES = oSaHpiAlarm.cpp oSaHpiAlarm.hpp \
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ libosahpi_la_SOURCES = oSaHpiAlarm.cpp o
oSaHpiResourceInfo.cpp oSaHpiResourceInfo.hpp \
oSaHpiRptEntry.cpp oSaHpiRptEntry.hpp \
oSaHpiSensorDataFormat.cpp oSaHpiSensorDataFormat.hpp \
@@ -18,8 +19,9 @@
oSaHpiSensorEnableChangeEvent.hpp \
oSaHpiSensorEvent.cpp oSaHpiSensorEvent.hpp \
oSaHpiSensorRange.cpp oSaHpiSensorRange.hpp \
---- openhpi-2.10.1/cpp/oSaHpiSensorEvent.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorEvent.cpp 2007-11-04 00:10:30.376000007 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorEvent.cpp openhpi-3.8.0/cpp/oSaHpiSensorEvent.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorEvent.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorEvent.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,268 @@
+/* -*- linux-c -*-
+ *
@@ -289,8 +291,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiSensorRange.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorRange.cpp 2007-11-04 00:10:30.376000007 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorRange.cpp openhpi-3.8.0/cpp/oSaHpiSensorRange.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorRange.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorRange.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,181 @@
+/* -*- linux-c -*-
+ *
@@ -473,8 +476,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiSensorReading.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorReading.cpp 2007-11-04 00:10:30.380000235 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorReading.cpp openhpi-3.8.0/cpp/oSaHpiSensorReading.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorReading.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorReading.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,181 @@
+/* -*- linux-c -*-
+ *
@@ -657,8 +661,9 @@
+ }
+}
+
---- openhpi-2.10.1/cpp/oSaHpiSensorRec.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorRec.cpp 2007-11-04 00:10:30.380000235 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorRec.cpp openhpi-3.8.0/cpp/oSaHpiSensorRec.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorRec.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorRec.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,238 @@
+/* -*- linux-c -*-
+ *
@@ -898,8 +903,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiSensorThdDefn.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorThdDefn.cpp 2007-11-04 00:10:30.380000235 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorThdDefn.cpp openhpi-3.8.0/cpp/oSaHpiSensorThdDefn.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorThdDefn.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorThdDefn.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,142 @@
+/* -*- linux-c -*-
+ *
@@ -1043,8 +1049,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiSensorThresholds.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiSensorThresholds.cpp 2007-11-04 00:10:30.380000235 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiSensorThresholds.cpp openhpi-3.8.0/cpp/oSaHpiSensorThresholds.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiSensorThresholds.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiSensorThresholds.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,193 @@
+/* -*- linux-c -*-
+ *
@@ -1239,8 +1246,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiTextBuffer.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiTextBuffer.cpp 2007-11-04 00:10:30.380000235 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiTextBuffer.cpp openhpi-3.8.0/cpp/oSaHpiTextBuffer.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiTextBuffer.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiTextBuffer.cpp 2021-10-04 22:34:50.003767356 +0200
@@ -0,0 +1,324 @@
+/* -*- linux-c -*-
+ *
@@ -1566,8 +1574,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiTypesEnums.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiTypesEnums.cpp 2007-11-04 00:10:30.384000463 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiTypesEnums.cpp openhpi-3.8.0/cpp/oSaHpiTypesEnums.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiTypesEnums.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiTypesEnums.cpp 2021-10-04 22:34:50.007100512 +0200
@@ -0,0 +1,2763 @@
+/* -*- linux-c -*-
+ *
@@ -4332,8 +4341,9 @@
+}
+
+
---- openhpi-2.10.1/cpp/oSaHpiUserEvent.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiUserEvent.cpp 2007-11-04 00:10:30.388000690 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiUserEvent.cpp openhpi-3.8.0/cpp/oSaHpiUserEvent.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiUserEvent.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiUserEvent.cpp 2021-10-04 22:34:50.007100512 +0200
@@ -0,0 +1,110 @@
+/* -*- linux-c -*-
+ *
@@ -4445,8 +4455,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiWatchdog.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiWatchdog.cpp 2007-11-04 00:10:30.388000690 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiWatchdog.cpp openhpi-3.8.0/cpp/oSaHpiWatchdog.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiWatchdog.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiWatchdog.cpp 2021-10-04 22:34:50.007100512 +0200
@@ -0,0 +1,208 @@
+/* -*- linux-c -*-
+ *
@@ -4656,8 +4667,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiWatchdogEvent.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiWatchdogEvent.cpp 2007-11-04 00:10:30.388000690 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiWatchdogEvent.cpp openhpi-3.8.0/cpp/oSaHpiWatchdogEvent.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiWatchdogEvent.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiWatchdogEvent.cpp 2021-10-04 22:34:50.007100512 +0200
@@ -0,0 +1,142 @@
+/* -*- linux-c -*-
+ *
@@ -4801,8 +4813,9 @@
+ return false;
+}
+
---- openhpi-2.10.1/cpp/oSaHpiWatchdogRec.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ openhpi-2.10.1/cpp/oSaHpiWatchdogRec.cpp 2007-11-04 00:10:30.388000690 +0100
+diff -urNp -x '*.orig' openhpi-3.8.0.org/cpp/oSaHpiWatchdogRec.cpp openhpi-3.8.0/cpp/oSaHpiWatchdogRec.cpp
+--- openhpi-3.8.0.org/cpp/oSaHpiWatchdogRec.cpp 1970-01-01 01:00:00.000000000 +0100
++++ openhpi-3.8.0/cpp/oSaHpiWatchdogRec.cpp 2021-10-04 22:34:50.007100512 +0200
@@ -0,0 +1,117 @@
+/* -*- linux-c -*-
+ *
diff --git a/openhpi-install.patch b/openhpi-install.patch
index 6d8ff54..edf03a9 100644
--- a/openhpi-install.patch
+++ b/openhpi-install.patch
@@ -1,8 +1,9 @@
---- openhpi-2.14.1/openhpid/Makefile.am.orig 2009-11-23 21:19:38.000000000 +0100
-+++ openhpi-2.14.1/openhpid/Makefile.am 2011-01-15 11:00:55.598363293 +0100
-@@ -55,9 +55,10 @@
- $(top_builddir)/marshal/libopenhpimarshal.la \
- $(top_builddir)/utils/libopenhpiutils.la
+diff -urNp -x '*.orig' openhpi-3.8.0.org/openhpid/Makefile.am openhpi-3.8.0/openhpid/Makefile.am
+--- openhpi-3.8.0.org/openhpid/Makefile.am 2021-10-04 22:34:50.237088323 +0200
++++ openhpi-3.8.0/openhpid/Makefile.am 2021-10-04 22:34:50.380414060 +0200
+@@ -82,9 +82,10 @@ openhpid_LDADD += -lstdc++
+ endif
+
+initddir=$(sysconfdir)/rc.d/init.d
install-data-local:
diff --git a/openhpi-rtas.patch b/openhpi-rtas.patch
index 96da39a..c9d3fa0 100644
--- a/openhpi-rtas.patch
+++ b/openhpi-rtas.patch
@@ -1,7 +1,8 @@
---- openhpi-2.10.1/acinclude.m4.orig 2007-11-03 23:02:20.362923000 +0100
-+++ openhpi-2.10.1/acinclude.m4 2007-11-03 23:54:07.760003912 +0100
-@@ -202,12 +202,8 @@
- int main (void) { rtas_activate_firmware(); }
+diff -urNp -x '*.orig' openhpi-3.8.0.org/acinclude.m4 openhpi-3.8.0/acinclude.m4
+--- openhpi-3.8.0.org/acinclude.m4 2021-10-04 22:34:49.490461436 +0200
++++ openhpi-3.8.0/acinclude.m4 2021-10-04 22:34:49.630453960 +0200
+@@ -236,12 +236,8 @@ AC_DEFUN([OH_CHECK_RTAS],
+ rtas_activate_firmware();
],
[
- if test -f "/usr/bin/lsvpd"; then
diff --git a/openhpi-types.patch b/openhpi-types.patch
index e10b311..47f6fe5 100644
--- a/openhpi-types.patch
+++ b/openhpi-types.patch
@@ -1,6 +1,7 @@
---- openhpi-0.7.0/plugins/ipmidirect/ipmi.cpp.orig 2004-02-04 03:15:11.000000000 +0000
-+++ openhpi-0.7.0/plugins/ipmidirect/ipmi.cpp 2004-02-22 13:36:05.000000000 +0000
-@@ -908,7 +908,8 @@
+diff -urNp -x '*.orig' openhpi-3.8.0.org/plugins/ipmidirect/ipmi.cpp openhpi-3.8.0/plugins/ipmidirect/ipmi.cpp
+--- openhpi-3.8.0.org/plugins/ipmidirect/ipmi.cpp 2018-03-08 19:10:50.000000000 +0100
++++ openhpi-3.8.0/plugins/ipmidirect/ipmi.cpp 2021-10-04 22:34:50.760393922 +0200
+@@ -1950,7 +1950,8 @@ cIpmi::AllocConnection( GHashTable *hand
}
memcpy( &lan_addr, ent->h_addr_list[0], ent->h_length );
@@ -8,5 +9,5 @@
+ unsigned int a;
+ memcpy(&a, ent->h_addr_list[0], sizeof(a));
- IpmiLog( "Using host at %d.%d.%d.%d.\n",
- a & 0xff, (a >> 8 ) & 0xff,
+ stdlog << "Using host at "
+ << (int)(a & 0xff) << "."
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openhpi.git/commitdiff/95c1709af5c6492c088a3104cab0b8155fb1eadb
More information about the pld-cvs-commit
mailing list