Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

3 changed files with 3 additions and 70 deletions

View file

@ -1,20 +0,0 @@
diff --git a/ssl/oh_ssl.c b/ssl/oh_ssl.c
index 45748d40..b5499eb2 100644
--- a/ssl/oh_ssl.c
+++ b/ssl/oh_ssl.c
@@ -66,7 +66,6 @@
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/rand.h>
-#include <openssl/engine.h>
#include <unistd.h>
#include <string.h>
#include <sys/select.h>
@@ -363,7 +362,6 @@ void oh_ssl_finit(void)
{
/* TODO: Check whether any other SSL library cleanup should be called */
thread_cleanup();
- ENGINE_cleanup();
CONF_modules_unload(0);
ERR_free_strings();
EVP_cleanup();

View file

@ -1,17 +0,0 @@
Avoid an int-conversion C type error and a build failure with GCC 14.
Submitted upstream: <https://github.com/open-hpi/openhpi/pull/2752>
diff --git a/plugins/ov_rest/ov_rest_re_discover.c b/plugins/ov_rest/ov_rest_re_discover.c
index 5ad542793f628041..7cdd13d8c395f5d6 100644
--- a/plugins/ov_rest/ov_rest_re_discover.c
+++ b/plugins/ov_rest/ov_rest_re_discover.c
@@ -704,7 +704,7 @@ SaErrorT remove_composer(struct oh_handler_state *handler,
byte bayNumber)
{
- SaErrorT rv = NULL;
+ SaErrorT rv = 0;
SaHpiResourceIdT resource_id = 0;
struct oh_event event = {0};
struct ovRestHotswapState *hotswap_state = NULL;

View file

@ -6,9 +6,8 @@
Summary: Hardware Platform Interface library and tools
Name: openhpi
Version: 3.8.0
Release: 32%{?dist}
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
Release: 23%{?dist}
License: BSD
URL: http://www.openhpi.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# selinux policy for openhpi, Policy files where extracted from
@ -22,9 +21,7 @@ Patch2: %{name}-3.7.0-multilib.patch
Patch3: %{name}-3.8.0-manpage-scan.patch
Patch4: %{name}-3.8.0-ipv6-ipmidirect.patch
Patch5: %{name}-3.8.0-link-libopenhpi.patch
Patch6: %{name}-snmp-disable-des.patch
Patch7: %{name}-c99.patch
Patch8: %{name}-3.8.0-openssl-no-engine.patch
Patch6: openhpi-snmp-disable-des.patch
BuildRequires: make
BuildRequires: gcc-c++
%if 0%{?fedora} || 0%{?rhel} < 9
@ -216,33 +213,6 @@ fi
%endif
%changelog
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 3.8.0-30
- convert license to SPDX
* Fri Jul 19 2024 Dan Horák <dan[at]danny.cz> - 3.8.0-29
- fix build without OpenSSL engines
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 3.8.0-25
- Fix C compatibility issue
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild