diff --git a/openhpi-3.8.0-openssl-no-engine.patch b/openhpi-3.8.0-openssl-no-engine.patch deleted file mode 100644 index 40d7cdd..0000000 --- a/openhpi-3.8.0-openssl-no-engine.patch +++ /dev/null @@ -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 - #include - #include --#include - #include - #include - #include -@@ -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(); diff --git a/openhpi-c99.patch b/openhpi-c99.patch deleted file mode 100644 index 99a18bb..0000000 --- a/openhpi-c99.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid an int-conversion C type error and a build failure with GCC 14. - -Submitted upstream: - -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; diff --git a/openhpi-snmp-disable-des.patch b/openhpi-snmp-disable-des.patch deleted file mode 100644 index 8280e86..0000000 --- a/openhpi-snmp-disable-des.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch is required because net-smp is not build with DES support, -so usmDESPrivProtocol is not available. - -diff --git a/plugins/snmp_bc/snmp_bc_session.c b/plugins/snmp_bc/snmp_bc_session.c -index 767cdb1a77ee420e..cb724fcee0668bd5 100644 ---- a/plugins/snmp_bc/snmp_bc_session.c -+++ b/plugins/snmp_bc/snmp_bc_session.c -@@ -239,23 +239,10 @@ void *snmp_bc_open(GHashTable *handler_config, - err("Cannot find \"privacy_passwd\" configuration parameter."); - return NULL; - } -- -- custom_handle->session.securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; -- custom_handle->session.securityPrivProto = usmDESPrivProtocol; -- custom_handle->session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; -- custom_handle->session.securityPrivKeyLen = USM_PRIV_KU_LEN; -- if (generate_Ku(custom_handle->session.securityAuthProto, -- custom_handle->session.securityAuthProtoLen, -- (u_char *) privacy_passwd, strlen(privacy_passwd), -- custom_handle->session.securityPrivKey, -- &(custom_handle->session.securityPrivKeyLen)) != SNMPERR_SUCCESS) { -- snmp_perror("snmp_bc"); -- snmp_log(LOG_ERR, -- "Error generating Ku from private passphrase.\n"); -- err("Unable to establish SNMP authpriv session."); -- return NULL; -- } -- -+ snmp_perror("snmp_bc"); -+ snmp_log(LOG_ERR, "DES authentication is not supported.\n"); -+ err("Unable to establish SNMP authpriv session."); -+ return NULL; - } - - diff --git a/openhpi.spec b/openhpi.spec index fad680a..1dd005b 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,14 +1,14 @@ # defining macros needed by SELinux %global selinuxtype targeted +%global moduletype contrib %global modulename openhpid %global with_selinux 1 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: 16%{?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 +22,6 @@ 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 BuildRequires: make BuildRequires: gcc-c++ %if 0%{?fedora} || 0%{?rhel} < 9 @@ -172,6 +169,9 @@ if [ $1 -eq 0 ]; then %selinux_relabel_post -s %{selinuxtype} %systemd_postun_with_restart openhpid.service fi + +%posttrans selinux +%selinux_relabel_post -s %{selinuxtype} %endif %post @@ -216,54 +216,6 @@ fi %endif %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 3.8.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 3.8.0-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Sep 02 2024 Miroslav Suchý - 3.8.0-30 -- convert license to SPDX - -* Fri Jul 19 2024 Dan Horák - 3.8.0-29 -- fix build without OpenSSL engines - -* Thu Jul 18 2024 Fedora Release Engineering - 3.8.0-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 3.8.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.8.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 05 2024 Florian Weimer - 3.8.0-25 -- Fix C compatibility issue - -* Thu Jul 20 2023 Fedora Release Engineering - 3.8.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 3.8.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 3.8.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 3.8.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 14 2021 Sahana Prasad - 3.8.0-20 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 3.8.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 3.8.0-18 -- Rebuild for versioned symbols in json-c - -* Wed Jun 30 2021 Than Ngo - 3.8.0-17 -- Port to net-snmp without DES support - * Wed Mar 31 2021 Than Ngo - 3.8.0-16 - Add openhpi-selinux subpackage containing selinux policy for openhpi