[rpms/libpsm2] rawhide: Update with latest upstream patches

[rpms/libpsm2] rawhide: Update with latest upstream patches

[Michal Schmidt]

            A new commit has been pushed.

            Repo   : rpms/libpsm2
            Branch : rawhide
            Commit : aec1e464350a161bf0010ae13679b097dca9cd36
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2026-06-29T17:52:57+02:00
            Stats  : +208/-4 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/libpsm2/c/aec1e464350a161bf0010ae13679b097dca9cd36?branch=rawhide

            Log:
            Update with latest upstream patches

There were no upstream commits in 2025 and only 2 commits in 2026 so far.
One of them fixes a bug introduced in the previous commit, from May 2024.

---
diff --git a/0001-Fix-strlcat-multiple-definition-build-error.patch b/0001-Fix-strlcat-multiple-definition-build-error.patch
index 9387578..a51657d 100644
--- a/0001-Fix-strlcat-multiple-definition-build-error.patch
+++ b/0001-Fix-strlcat-multiple-definition-build-error.patch
@@ -1,7 +1,7 @@
 From 5ecb57691c24b1b30427df78db42d24ac9297ed2 Mon Sep 17 00:00:00 2001
 From: Brendan Cunningham <bcunningham@cornelisnetworks.com>
 Date: Thu, 31 Oct 2024 16:27:22 -0400
-Subject: [PATCH 1/2] Fix strlcat() multiple-definition build error
+Subject: [PATCH 1/4] Fix strlcat() multiple-definition build error
 
 In ips_proto_dump.c, rename our strlcat() implementation => psmi_strlcat().
 This fixes multiple definition build errors on systems that provide strlcat(),
@@ -112,5 +112,5 @@ index 9abde0020ed4..0ce752030ca2 100644
  	_HFI_ERROR("%s", err_stat_msg);
  }
 -- 
-2.53.0
+2.54.0
 

diff --git a/0002-Fix-unaligned-heap-allocations-of-aligned-structs.patch b/0002-Fix-unaligned-heap-allocations-of-aligned-structs.patch
index 14910e8..222ea8d 100644
--- a/0002-Fix-unaligned-heap-allocations-of-aligned-structs.patch
+++ b/0002-Fix-unaligned-heap-allocations-of-aligned-structs.patch
@@ -1,7 +1,7 @@
 From f6e0969a100e1cf815214e490190be92b11e2bb8 Mon Sep 17 00:00:00 2001
 From: Brendan Cunningham <bcunningham@cornelisnetworks.com>
 Date: Thu, 9 May 2024 20:11:51 -0400
-Subject: [PATCH 2/2] Fix unaligned heap allocations of aligned structs
+Subject: [PATCH 2/4] Fix unaligned heap allocations of aligned structs
 
 gcc can generate instructions that require source or destination
 pointers operands are aligned on boundaries larger than the platform
@@ -149,5 +149,5 @@ index 24556e4a5798..b571c16f8aaa 100644
  			return PSM2_NO_MEMORY;
  		}
 -- 
-2.53.0
+2.54.0
 

diff --git a/0003-Fix-missing-memset-zero-caused-by-unaligned-heap-all.patch b/0003-Fix-missing-memset-zero-caused-by-unaligned-heap-all.patch
new file mode 100644
index 0000000..37f947a
--- /dev/null
+++ b/0003-Fix-missing-memset-zero-caused-by-unaligned-heap-all.patch
@@ -0,0 +1,65 @@
+From 54c51bb43cb4b5068d4b682d61d20cb5907de512 Mon Sep 17 00:00:00 2001
+From: Brendan Cunningham <bcunningham@cornelisnetworks.com>
+Date: Thu, 26 Mar 2026 10:40:58 -0400
+Subject: [PATCH 3/4] Fix missing memset-zero caused by unaligned heap
+ allocation fix
+
+Commit f6e0969a100e ("Fix unaligned heap allocations of aligned structs")
+replaced some psmi_calloc() calls with psmi_memalign().
+
+This introduced a bug; psmi_calloc() zeroes-out the allocated memory
+whereas psmi_memalign() does not. This could cause problems as it is
+probable there is code that assumes the new allocation will be
+all-zeroes but this is not guaranteed to be the case.
+
+Fix this by zeroing out the allocated memory with memset() after
+psmi_memalign() in places where this is needed.
+
+Signed-off-by: Brendan Cunningham <bcunningham@cornelisnetworks.com>
+---
+ psm_hal_gen1/psm_hal_gen1_spio.c | 1 +
+ ptl_ips/ips_tid.c                | 2 ++
+ ptl_ips/ips_tidflow.c            | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/psm_hal_gen1/psm_hal_gen1_spio.c b/psm_hal_gen1/psm_hal_gen1_spio.c
+index 9c63e29e0394..de995c2e7836 100644
+--- a/psm_hal_gen1/psm_hal_gen1_spio.c
++++ b/psm_hal_gen1/psm_hal_gen1_spio.c
+@@ -124,6 +124,7 @@ ips_spio_init(const struct psmi_context *context, struct ptl *ptl,
+ 			return PSM2_NO_MEMORY;
+ 		}
+ 
++		memset((void *)ctrl->spio_ctrl, 0, sizeof(*ctrl->spio_ctrl));
+ 		ctrl->spio_reset_hfi = spio_reset_hfi;
+ 		ctrl->spio_credit_return_update =
+ 				spio_credit_return_update;
+diff --git a/ptl_ips/ips_tid.c b/ptl_ips/ips_tid.c
+index a9c323423905..e2e159b72102 100644
+--- a/ptl_ips/ips_tid.c
++++ b/ptl_ips/ips_tid.c
+@@ -144,6 +144,8 @@ ips_tid_init(const psmi_context_t *context, struct ips_protoexp *protoexp,
+ 		if (tidc->tid_ctrl == NULL) {
+ 			return PSM2_NO_MEMORY;
+ 		}
++
++		memset(tidc->tid_ctrl, 0, sizeof(*tidc->tid_ctrl));
+ 	}
+ 
+ 	/*
+diff --git a/ptl_ips/ips_tidflow.c b/ptl_ips/ips_tidflow.c
+index b571c16f8aaa..6009cc974d0e 100644
+--- a/ptl_ips/ips_tidflow.c
++++ b/ptl_ips/ips_tidflow.c
+@@ -111,6 +111,8 @@ psm2_error_t ips_tf_init(struct ips_protoexp *protoexp,
+ 		if (tfc->tf_ctrl == NULL) {
+ 			return PSM2_NO_MEMORY;
+ 		}
++
++		memset(tfc->tf_ctrl, 0, sizeof(*tfc->tf_ctrl));
+ 	}
+ 
+ 	/*
+-- 
+2.54.0
+

diff --git a/0004-Update-copyright-URL-branding-in-libpsm2-specfile.patch b/0004-Update-copyright-URL-branding-in-libpsm2-specfile.patch
new file mode 100644
index 0000000..3369e2f
--- /dev/null
+++ b/0004-Update-copyright-URL-branding-in-libpsm2-specfile.patch
@@ -0,0 +1,137 @@
+From be99e35465b0de6a37d9c30408256f1dc5b12ea6 Mon Sep 17 00:00:00 2001
+From: Brendan Cunningham <bcunningham@cornelisnetworks.com>
+Date: Wed, 1 Apr 2026 11:01:44 -0400
+Subject: [PATCH 4/4] Update copyright, URL, branding in libpsm2 specfile
+
+Intel to Cornelis.
+
+Signed-off-by: Brendan Cunningham <bcunningham@cornelisnetworks.com>
+---
+ libpsm2.spec.in | 34 ++++++++++++++++++----------------
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/libpsm2.spec.in b/libpsm2.spec.in
+index e9ef766e239b..51f683f0aaea 100644
+--- a/libpsm2.spec.in
++++ b/libpsm2.spec.in
+@@ -4,7 +4,8 @@
+ #
+ #  GPL LICENSE SUMMARY
+ #
+-#  Copyright(c) 2017 Intel Corporation.
++#  Copyright(c) 2017-2020 Intel Corporation.
++#  Copyright (c) 2021-2025, Cornelis Networks
+ #
+ #  This program is free software; you can redistribute it and/or modify
+ #  it under the terms of version 2 of the GNU General Public License as
+@@ -16,11 +17,12 @@
+ #  General Public License for more details.
+ #
+ #  Contact Information:
+-#  Intel Corporation, www.intel.com
++#  Cornelis Networks, www.cornelisnetworks.com
+ #
+ #  BSD LICENSE
+ #
+-#  Copyright(c) 2017 Intel Corporation.
++#  Copyright(c) 2017-2020 Intel Corporation.
++#  Copyright (c) 2021-2025, Cornelis Networks
+ #
+ #  Redistribution and use in source and binary forms, with or without
+ #  modification, are permitted provided that the following conditions
+@@ -32,7 +34,7 @@
+ #      notice, this list of conditions and the following disclaimer in
+ #      the documentation and/or other materials provided with the
+ #      distribution.
+-#    * Neither the name of Intel Corporation nor the names of its
++#    * Neither the name of Cornelis Networks nor the names of its
+ #      contributors may be used to endorse or promote products derived
+ #      from this software without specific prior written permission.
+ #
+@@ -48,21 +50,21 @@
+ #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
+-Summary: Intel PSM2 Libraries
++Summary: Cornelis PSM2 Libraries
+ Name: @RPM_NAME@
+ Version: @VERSION@
+ Release: 1@SPEC_FILE_RELEASE_DIST@
+ License: BSD or GPLv2
+-URL: https://github.com/intel/opa-psm2/
++URL: https://github.com/cornelisnetworks/opa-psm2/
+ 
+ # The tarball can be created by:
+-# git clone https://github.com/intel/opa-psm2
++# git clone https://github.com/cornelisnetworks/opa-psm2
+ # cd opa-psm2
+ # git checkout @DIST_SHA@
+ # make dist
+ Source0: @RPM_NAME@-%{version}.tar.gz
+ 
+-# The OPA product is supported on x86_64 only:
++# The Omni-Path product is supported on x86_64 only:
+ ExclusiveArch: x86_64
+ 
+ BuildRequires: gcc
+@@ -71,7 +73,7 @@ Obsoletes: hfi1-psm < 1.0.0
+ 
+ %if "@RPM_NAME_BASEEXT@"
+ %package -n @RPM_NAME@@RPM_NAME_BASEEXT@
+-Summary: Intel PSM2 Libraries
++Summary: Cornelis PSM2 Libraries
+ %endif
+ Provides: @RPM_NAME@ = %{version}-%{release}
+ Provides: @RPM_NAME@%{_isa} = %{version}-%{release}
+@@ -87,13 +89,13 @@ Requires: numactl-libs
+ %endif
+ 
+ %package -n @RPM_NAME@-devel
+-Summary: Development files for Intel PSM2
++Summary: Development files for Cornelis PSM2
+ Requires: %{name}%{?_isa} = %{version}-%{release}
+ Provides: hfi1-psm-devel
+ Obsoletes: hfi1-psm-devel < 1.0.0
+ 
+ %package -n @RPM_NAME@-compat
+-Summary: Compat library for Intel PSM2
++Summary: Compat library for Cornelis PSM2
+ Requires: %{name}%{?_isa} = %{version}-%{release}
+ %if 0%{?fedora}
+ Requires: systemd-udev
+@@ -107,7 +109,7 @@ Obsoletes: hfi1-psm-compat < 1.0.0
+ %if "@RPM_NAME_BASEEXT@"
+ %description
+ The source code for the PSM2 messaging API, libpsm2.
+-A low-level user-level communications interface for the Intel(R) OPA
++A low-level user-level communications interface for the Cornelis(R) Omni-Path
+ family of products. PSM2 users are enabled with mechanisms
+ necessary to implement higher level communications
+ interfaces in parallel environments.
+@@ -118,19 +120,19 @@ interfaces in parallel environments.
+ # RPM_NAME_BASEEXT defaults to empty contents.
+ %description -n @RPM_NAME@@RPM_NAME_BASEEXT@
+ PSM2 Messaging API, or PSM2 API, is the low-level
+-user-level communications interface for the Intel(R) OPA
++user-level communications interface for the Cornelis(R) Omni-Path
+ family of products. PSM2 users are enabled with mechanisms
+ necessary to implement higher level communications
+ interfaces in parallel environments.
+ 
+ %description -n @RPM_NAME@-devel
+-Intel(R) PSM2, psm2*.h, headers and libpsm2.so files necessary
++Cornelis(R) PSM2, psm2*.h, headers and libpsm2.so files necessary
+ for developing software using libpsm2.
+ 
+ %description -n @RPM_NAME@-compat
+ Support for MPIs linked with PSM versions < 2. This will allow
+-software compiled to use Intel(R) Truescale PSM, libinfinipath, to run
+-with Intel(R) OPA PSM2, libpsm2.
++software compiled to use Cornelis(R) Truescale PSM, libinfinipath, to run
++with Cornelis(R) Omni-Path PSM2, libpsm2.
+ 
+ %prep
+ %setup -q -n @RPM_NAME@-%{version}
+-- 
+2.54.0
+

diff --git a/libpsm2.spec b/libpsm2.spec
index 164839f..9b5c99d 100644
--- a/libpsm2.spec
+++ b/libpsm2.spec
@@ -100,6 +100,8 @@ Support for MPIs linked with PSM versions < 2
 # upstream commits PSM2_12.0.1..master
 0001-Fix-strlcat-multiple-definition-build-error.patch
 0002-Fix-unaligned-heap-allocations-of-aligned-structs.patch
+0003-Fix-missing-memset-zero-caused-by-unaligned-heap-all.patch
+0004-Update-copyright-URL-branding-in-libpsm2-specfile.patch
 
 %prep
 %autosetup -p1 -n opa-psm2-PSM2_%{version}