From 33aa136261eb5df2e440cb8ed81628a3a10d1e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 22 Apr 2020 00:11:56 +0200 Subject: [PATCH 01/24] Rebuild (json-c) --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 459ca14..92c55d3 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -149,6 +149,9 @@ make check %changelog +* Tue Apr 21 2020 Björn Esser - 3.8.0-11 +- Rebuild (json-c) + * Wed Jan 29 2020 Fedora Release Engineering - 3.8.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7f5b3167e223c2ced0a9a569ff2743c82fb0b3ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:43:03 +0000 Subject: [PATCH 02/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 92c55d3..73ef5f5 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -149,6 +149,9 @@ make check %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 3.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Apr 21 2020 Björn Esser - 3.8.0-11 - Rebuild (json-c) From 1b7c880836c4d104f6b95ed6e9833a877cf38e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Thu, 27 Aug 2020 14:33:27 +0200 Subject: [PATCH 03/24] Rebuilt for new net-snmp release --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 73ef5f5..82746ba 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -149,6 +149,9 @@ make check %changelog +* Thu Aug 27 2020 Josef Řídký - 3.8.0-13 +- Rebuilt for new net-snmp release + * Tue Jul 28 2020 Fedora Release Engineering - 3.8.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cefd8ad0b3a19858d445dff120d1053c0f9cd671 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:32:33 +0000 Subject: [PATCH 04/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- openhpi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openhpi.spec b/openhpi.spec index 82746ba..03ed444 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -12,6 +12,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 +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libsysfs-devel BuildRequires: net-snmp-devel From 53a529488f8bb23057c6fa29b05a968a94e47459 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:30:53 +0000 Subject: [PATCH 05/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 03ed444..cd78e8e 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -150,6 +150,9 @@ make check %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.8.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 27 2020 Josef Řídký - 3.8.0-13 - Rebuilt for new net-snmp release From abfc6989c400d47efd3e19afb28a9af52f105511 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 2 Mar 2021 17:21:51 +0100 Subject: [PATCH 06/24] drop BR on sysfs in rhel >=9 --- openhpi.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index cd78e8e..d0bfdbd 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -14,7 +14,9 @@ Patch4: %{name}-3.8.0-ipv6-ipmidirect.patch Patch5: %{name}-3.8.0-link-libopenhpi.patch BuildRequires: make BuildRequires: gcc-c++ +%if 0%{?fedora} || 0%{?rhel} < 9 BuildRequires: libsysfs-devel +%endif BuildRequires: net-snmp-devel BuildRequires: OpenIPMI-devel BuildRequires: glib2-devel @@ -150,6 +152,9 @@ make check %changelog +* Tue Mar 02 2021 Than Ngo - 3.8.0-15 +- drop BR on sysfs in rhel >=9 + * Tue Jan 26 2021 Fedora Release Engineering - 3.8.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ffbd4eefd9e852dbaee01ef93acafe7ab013f63e Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 31 Mar 2021 13:56:03 +0200 Subject: [PATCH 07/24] Add SELinux subpackage Add openhpi-selinux subpackage containing selinux policy for openhpi. This policy module will override the distribution policy. Policy files where extracted from https://github.com/fedora-selinux/selinux-policy See Independent policy project guidelines for more details about shipping custom SELinux policy. https://fedoraproject.org/wiki/SELinux/IndependentPolicy --- openhpi.spec | 79 +++++++++++++++++++++++-- openhpid.fc | 10 ++++ openhpid.if | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++ openhpid.te | 67 ++++++++++++++++++++++ 4 files changed, 309 insertions(+), 6 deletions(-) create mode 100644 openhpid.fc create mode 100644 openhpid.if create mode 100644 openhpid.te diff --git a/openhpi.spec b/openhpi.spec index d0bfdbd..1dd005b 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,11 +1,21 @@ +# 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: 15%{?dist} +Release: 16%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# convert from initscript to systemd unit +# selinux policy for openhpi, Policy files where extracted from +# https://github.com/fedora-selinux/selinux-policy +Source1: openhpid.fc +Source2: openhpid.if +Source3: openhpid.te Patch0: %{name}-3.4.0-systemd.patch Patch1: %{name}-3.6.1-ssl.patch Patch2: %{name}-3.7.0-multilib.patch @@ -33,6 +43,11 @@ BuildRequires: systemd BuildRequires: autoconf automake libtool BuildRequires: libgcrypt-devel BuildRequires: net-snmp +%if 0%{?with_selinux} +# This ensures that the *-selinux package and all it’s dependencies are not pulled +# into containers and other systems that do not use SELinux +Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) +%endif Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -53,14 +68,12 @@ easily. Many plug-ins exist in the OpenHPI source tree to provide access to various types of hardware. This includes, but is not limited to, IPMI based servers, Blade Center, and machines which export data via sysfs. - %package libs Summary: The system libraries for the OpenHPI project %description libs The system libraries for the OpenHPI project. - %package devel Summary: The development environment for the OpenHPI project Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -69,6 +82,19 @@ Requires: glib2-devel %description devel The development libraries and header files for the OpenHPI project. +%if 0%{?with_selinux} +# SELinux subpackage +%package selinux +Summary: openhpi SELinux policy +BuildArch: noarch +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +Custom SELinux policy module +%endif %prep %autosetup -p1 @@ -88,7 +114,6 @@ if [ $UID -eq 0 ]; then find . -name openhpi.conf -execdir chown root:root . \; fi - %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-static --with-systemdsystemunitdir=%{_unitdir} --docdir=%{_docdir}/%{name}-%{version} @@ -99,6 +124,14 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} +%if 0%{?with_selinux} +# SELinux policy (originally from selinux-policy-contrib) +# this policy module will override the production module +mkdir selinux +cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} selinux/ +make -f %{_datadir}/selinux/devel/Makefile %{modulename}.pp +bzip2 -9 %{modulename}.pp +%endif %install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} @@ -110,9 +143,36 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la cp plugins/dynamic_simulator/README $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/README-dynamic_simulator +# install selinux module +install -D -m 0644 %{modulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 + %check make check +%if 0%{?with_selinux} +# SELinux contexts are saved so that only affected files can be +# relabeled after the policy module installation +%pre selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 +%selinux_relabel_post -s %{selinuxtype} + +if [ "$1" -le "1" ]; then # First install + %systemd_postun_with_restart openhpid.service +fi + +%postun selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{modulename} + %selinux_relabel_post -s %{selinuxtype} + %systemd_postun_with_restart openhpid.service +fi + +%posttrans selinux +%selinux_relabel_post -s %{selinuxtype} +%endif %post %systemd_post openhpid.service @@ -123,7 +183,6 @@ make check %postun %systemd_postun_with_restart openhpid.service - %files %license %{_docdir}/%{name}-%{version}/COPYING %doc %{_docdir}/%{name}-%{version}/ChangeLog @@ -150,8 +209,16 @@ make check %{_includedir}/%{name} %{_libdir}/pkgconfig/*.pc +%if 0%{?with_selinux} +%files selinux +%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%endif %changelog +* Wed Mar 31 2021 Than Ngo - 3.8.0-16 +- Add openhpi-selinux subpackage containing selinux policy for openhpi + * Tue Mar 02 2021 Than Ngo - 3.8.0-15 - drop BR on sysfs in rhel >=9 diff --git a/openhpid.fc b/openhpid.fc new file mode 100644 index 0000000..df219e6 --- /dev/null +++ b/openhpid.fc @@ -0,0 +1,10 @@ + +/etc/rc\.d/init\.d/openhpid -- gen_context(system_u:object_r:openhpid_initrc_exec_t,s0) + +/usr/sbin/openhpid -- gen_context(system_u:object_r:openhpid_exec_t,s0) + +/var/lib/openhpi(/.*)? gen_context(system_u:object_r:openhpid_var_lib_t,s0) + +/var/log/dynsim[0-9]*\.log -- gen_context(system_u:object_r:openhpid_log_t,s0) + +/var/run/openhpid\.pid -- gen_context(system_u:object_r:openhpid_var_run_t,s0) diff --git a/openhpid.if b/openhpid.if new file mode 100644 index 0000000..598789a --- /dev/null +++ b/openhpid.if @@ -0,0 +1,159 @@ + +## policy for openhpid + + +######################################## +## +## Transition to openhpid. +## +## +## +## Domain allowed to transition. +## +## +# +interface(`openhpid_domtrans',` + gen_require(` + type openhpid_t, openhpid_exec_t; + ') + + corecmd_search_bin($1) + domtrans_pattern($1, openhpid_exec_t, openhpid_t) +') + + +######################################## +## +## Execute openhpid server in the openhpid domain. +## +## +## +## Domain allowed access. +## +## +# +interface(`openhpid_initrc_domtrans',` + gen_require(` + type openhpid_initrc_exec_t; + ') + + init_labeled_script_domtrans($1, openhpid_initrc_exec_t) +') + + +######################################## +## +## Search openhpid lib directories. +## +## +## +## Domain allowed access. +## +## +# +interface(`openhpid_search_lib',` + gen_require(` + type openhpid_var_lib_t; + ') + + allow $1 openhpid_var_lib_t:dir search_dir_perms; + files_search_var_lib($1) +') + +######################################## +## +## Read openhpid lib files. +## +## +## +## Domain allowed access. +## +## +# +interface(`openhpid_read_lib_files',` + gen_require(` + type openhpid_var_lib_t; + ') + + files_search_var_lib($1) + read_files_pattern($1, openhpid_var_lib_t, openhpid_var_lib_t) +') + +######################################## +## +## Manage openhpid lib files. +## +## +## +## Domain allowed access. +## +## +# +interface(`openhpid_manage_lib_files',` + gen_require(` + type openhpid_var_lib_t; + ') + + files_search_var_lib($1) + manage_files_pattern($1, openhpid_var_lib_t, openhpid_var_lib_t) +') + +######################################## +## +## Manage openhpid lib directories. +## +## +## +## Domain allowed access. +## +## +# +interface(`openhpid_manage_lib_dirs',` + gen_require(` + type openhpid_var_lib_t; + ') + + files_search_var_lib($1) + manage_dirs_pattern($1, openhpid_var_lib_t, openhpid_var_lib_t) +') + + +######################################## +## +## All of the rules required to administrate +## an openhpid environment +## +## +## +## Domain allowed access. +## +## +## +## +## Role allowed access. +## +## +## +# +interface(`openhpid_admin',` + gen_require(` + type openhpid_t; + type openhpid_initrc_exec_t; + type openhpid_var_lib_t; + ') + + allow $1 openhpid_t:process { ptrace signal_perms }; + ps_process_pattern($1, openhpid_t) + + openhpid_initrc_domtrans($1) + domain_system_change_exemption($1) + role_transition $2 openhpid_initrc_exec_t system_r; + allow $2 system_r; + + files_search_var_lib($1) + admin_pattern($1, openhpid_var_lib_t) + + + +') + diff --git a/openhpid.te b/openhpid.te new file mode 100644 index 0000000..a0e0eaf --- /dev/null +++ b/openhpid.te @@ -0,0 +1,67 @@ +policy_module(openhpid, 1.0.0) + +######################################## +# +# Declarations +# + +type openhpid_t; +type openhpid_exec_t; +init_daemon_domain(openhpid_t, openhpid_exec_t) + +type openhpid_initrc_exec_t; +init_script_file(openhpid_initrc_exec_t) + +type openhpid_log_t; +logging_log_file(openhpid_log_t) + +type openhpid_var_lib_t; +files_type(openhpid_var_lib_t) + +type openhpid_var_run_t; +files_pid_file(openhpid_var_run_t) + +######################################## +# +# openhpid local policy +# + +allow openhpid_t self:capability { kill }; +allow openhpid_t self:process signal_perms; + +allow openhpid_t self:fifo_file rw_fifo_file_perms; +allow openhpid_t self:netlink_route_socket r_netlink_socket_perms; +allow openhpid_t self:unix_stream_socket create_stream_socket_perms; +allow openhpid_t self:tcp_socket create_stream_socket_perms; +allow openhpid_t self:udp_socket create_socket_perms; + + +manage_files_pattern(openhpid_t, openhpid_log_t, openhpid_log_t) +logging_log_filetrans(openhpid_t, openhpid_log_t, file) + +manage_dirs_pattern(openhpid_t, openhpid_var_lib_t, openhpid_var_lib_t) +manage_files_pattern(openhpid_t, openhpid_var_lib_t, openhpid_var_lib_t) +files_var_lib_filetrans(openhpid_t, openhpid_var_lib_t, { dir file }) + +manage_files_pattern(openhpid_t, openhpid_var_run_t, openhpid_var_run_t) +files_pid_filetrans(openhpid_t, openhpid_var_run_t, { file }) + +kernel_read_system_state(openhpid_t) + +corenet_tcp_bind_generic_node(openhpid_t) +corenet_tcp_bind_openhpid_port(openhpid_t) +corenet_tcp_connect_http_port(openhpid_t) + +dev_read_urand(openhpid_t) +dev_rw_watchdog(openhpid_t) + +logging_send_syslog_msg(openhpid_t) + +miscfiles_read_generic_certs(openhpid_t) + +sysnet_read_config(openhpid_t) + +optional_policy(` + snmp_manage_var_lib_files(openhpid_t) + snmp_manage_var_lib_dirs(openhpid_t) +') From e189b8018c23ed00b293912559070fcda5c13b55 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Wed, 7 Apr 2021 14:08:02 +0200 Subject: [PATCH 08/24] selinux: remove duplicate selinux_relabel_post * selinux_relabel_post should only be called once per package, in this case in %post/%postun * "moduletype" is unused since the package is not shipping an interface file Signed-off-by: Vit Mojzis --- openhpi.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openhpi.spec b/openhpi.spec index 1dd005b..10be02c 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -1,6 +1,5 @@ # defining macros needed by SELinux %global selinuxtype targeted -%global moduletype contrib %global modulename openhpid %global with_selinux 1 @@ -169,9 +168,6 @@ 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 From 5a662765247d9021160de4f2a72be73fbebef12a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 30 Jun 2021 10:31:22 +0200 Subject: [PATCH 09/24] Port to net-snmp without DES support --- openhpi-snmp-disable-des.patch | 35 ++++++++++++++++++++++++++++++++++ openhpi.spec | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 openhpi-snmp-disable-des.patch diff --git a/openhpi-snmp-disable-des.patch b/openhpi-snmp-disable-des.patch new file mode 100644 index 0000000..8280e86 --- /dev/null +++ b/openhpi-snmp-disable-des.patch @@ -0,0 +1,35 @@ +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 10be02c..af009ee 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -21,6 +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: openhpi-snmp-disable-des.patch BuildRequires: make BuildRequires: gcc-c++ %if 0%{?fedora} || 0%{?rhel} < 9 @@ -212,6 +213,9 @@ fi %endif %changelog +* 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 From d905aef7bb8a6248b708c0730ae8846a2aa734a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 10 Jul 2021 11:56:33 +0200 Subject: [PATCH 10/24] Rebuild for versioned symbols in json-c --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index af009ee..1bf0d20 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 17%{?dist} +Release: 18%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From d9810ff3a5ccec47f22cfed3fec2a5d7556ce9c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:14:38 +0000 Subject: [PATCH 11/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 1bf0d20..d5c8a65 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From 80e1e8c827690a8404495d339a47d118699515de Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:09:47 +0200 Subject: [PATCH 12/24] Rebuilt with OpenSSL 3.0.0 --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index d5c8a65..274010c 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From 78a12b39cfdf4b8eefe454c3d8e68bac40011c5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:22:49 +0000 Subject: [PATCH 13/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 274010c..997286b 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 20%{?dist} +Release: 21%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From 600330e9e54caf06e019b62b05b50db43209458a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:06:36 +0000 Subject: [PATCH 14/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 997286b..6f81715 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 21%{?dist} +Release: 22%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From 9459ce3c19c5cf77e6d07aa6f67ac39912ded6f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:50:18 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 6f81715..c0334b6 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 22%{?dist} +Release: 23%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From c8524762e0f6a1dcba3b8551da30e1ee9493d50d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 18:04:30 +0000 Subject: [PATCH 16/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index c0334b6..c47e1d0 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 23%{?dist} +Release: 24%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -213,6 +213,9 @@ fi %endif %changelog +* 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 From a30cd1a2775c545501f22038c893cca6bf4883b0 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 5 Jan 2024 06:48:40 +0100 Subject: [PATCH 17/24] Fix C compatibility issue Related to: --- openhpi-c99.patch | 17 +++++++++++++++++ openhpi.spec | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 openhpi-c99.patch diff --git a/openhpi-c99.patch b/openhpi-c99.patch new file mode 100644 index 0000000..99a18bb --- /dev/null +++ b/openhpi-c99.patch @@ -0,0 +1,17 @@ +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.spec b/openhpi.spec index c47e1d0..2122509 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 24%{?dist} +Release: 25%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -22,6 +22,7 @@ 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: openhpi-snmp-disable-des.patch +Patch7: openhpi-c99.patch BuildRequires: make BuildRequires: gcc-c++ %if 0%{?fedora} || 0%{?rhel} < 9 @@ -213,6 +214,9 @@ fi %endif %changelog +* 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 From fd9b9340839c51990f3603a337deb3f8413f7ccb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:13:42 +0000 Subject: [PATCH 18/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 2122509..6e02e86 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 25%{?dist} +Release: 26%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -214,6 +214,9 @@ fi %endif %changelog +* 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 From 8fa465101f11ab58ee84111dfba130340443f428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:19:38 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 6e02e86..007cd78 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 26%{?dist} +Release: 27%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -214,6 +214,9 @@ fi %endif %changelog +* 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 From 213a0b11f6afc812bbb03c033fa0f5d4637355c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:52:36 +0000 Subject: [PATCH 20/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 007cd78..461b15f 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 27%{?dist} +Release: 28%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -214,6 +214,9 @@ fi %endif %changelog +* 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 From b6b6c20d31ff3aee8d932c42c821342a13e7bdcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 19 Jul 2024 17:21:44 +0200 Subject: [PATCH 21/24] - fix build without OpenSSL engines --- openhpi-3.8.0-openssl-no-engine.patch | 20 ++++++++++++++++++++ openhpi.spec | 10 +++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 openhpi-3.8.0-openssl-no-engine.patch diff --git a/openhpi-3.8.0-openssl-no-engine.patch b/openhpi-3.8.0-openssl-no-engine.patch new file mode 100644 index 0000000..40d7cdd --- /dev/null +++ b/openhpi-3.8.0-openssl-no-engine.patch @@ -0,0 +1,20 @@ +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.spec b/openhpi.spec index 461b15f..42400ff 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 28%{?dist} +Release: 29%{?dist} License: BSD URL: http://www.openhpi.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -21,8 +21,9 @@ 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: openhpi-snmp-disable-des.patch -Patch7: openhpi-c99.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 @@ -214,6 +215,9 @@ fi %endif %changelog +* 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 From 7453ecab7f0b17af6bb218d10d88bd4aa02cbf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 12:22:19 +0200 Subject: [PATCH 22/24] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- openhpi.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openhpi.spec b/openhpi.spec index 42400ff..e95ef71 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,8 +6,9 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 29%{?dist} -License: BSD +Release: 30%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-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 @@ -215,6 +216,9 @@ fi %endif %changelog +* 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 From c299973d7b63e90b067354fba3ef35b496540238 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:42:11 +0000 Subject: [PATCH 23/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index e95ef71..182796a 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 30%{?dist} +Release: 31%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.openhpi.org @@ -216,6 +216,9 @@ fi %endif %changelog +* 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 From b69317c46559c18a78e208798798b49a43a73b30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:36:14 +0000 Subject: [PATCH 24/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- openhpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openhpi.spec b/openhpi.spec index 182796a..fad680a 100644 --- a/openhpi.spec +++ b/openhpi.spec @@ -6,7 +6,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 3.8.0 -Release: 31%{?dist} +Release: 32%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.openhpi.org @@ -216,6 +216,9 @@ 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