import opensm-3.3.24-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/opensm-3.3.21.tar.gz
+SOURCES/opensm-3.3.24.tar.gz

.opensm.metadata

@@ -1 +1 @@
-4e6bd48c8bb39edec50a078fbd3a1b606be42a47 SOURCES/opensm-3.3.21.tar.gz
+285f447c556b67dc5be1deaaab9294b7a8697317 SOURCES/opensm-3.3.24.tar.gz

SOURCES/opensm-3.3.13-prefix.patch

@@ -1,60 +0,0 @@
-diff --git a/man/opensm.8.in b/man/opensm.8.in
-index df557682058f..283483389d20 100644
---- a/man/opensm.8.in
-+++ b/man/opensm.8.in
-@@ -11,6 +11,7 @@ opensm \- InfiniBand subnet manager and administration (SM/SA)
- [\-g(uid) <GUID in hex>]
- [\-l(mc) <LMC>]
- [\-p(riority) <PRIORITY>]
-+[\-\-subnet_prefix <PREFIX in hex>]
- [\-\-smkey <SM_Key>]
- [\-\-sm_sl <SL number>]
- [\-r(eassign_lids)]
-@@ -136,6 +137,13 @@ This will effect the handover cases, where master
- is chosen by priority and GUID.  Range goes from 0
- (default and lowest priority) to 15 (highest).
- .TP
-+\fB\-\-subnet_prefix\fR <PREFIX in hex>
-+This option specifies the subnet prefix to use
-+on the fabric.  The default prefix is
-+0xfe80000000000000.  OpenMPI in particular requires
-+separate fabrics plugged into different ports to
-+have different prefixes or else it won't run.
-+.TP
- \fB\-\-smkey\fR <SM_Key value>
- This option specifies the SM\'s SM_Key (64 bits).
- This will effect SM authentication.
-diff --git a/opensm/main.c b/opensm/main.c
-index 2d23fe2befef..b4bb3481cf8f 100644
---- a/opensm/main.c
-+++ b/opensm/main.c
-@@ -161,6 +161,9 @@ static void show_usage(void)
- 	       "          This will effect the handover cases, where master\n"
- 	       "          is chosen by priority and GUID.  Range goes\n"
- 	       "          from 0 (lowest priority) to 15 (highest).\n\n");
-+	printf("--subnet_prefix <prefix>\n"
-+	       "          Set the subnet prefix to something other than the\n"
-+	       "          default value of 0xfe80000000000000\n\n");
- 	printf("--smkey, -k <SM_Key>\n"
- 	       "          This option specifies the SM's SM_Key (64 bits).\n"
- 	       "          This will effect SM authentication.\n"
-@@ -665,6 +668,7 @@ int main(int argc, char *argv[])
- 		{"once", 0, NULL, 'o'},
- 		{"reassign_lids", 0, NULL, 'r'},
- 		{"priority", 1, NULL, 'p'},
-+		{"subnet_prefix", 1, NULL, 15},
- 		{"smkey", 1, NULL, 'k'},
- 		{"routing_engine", 1, NULL, 'R'},
- 		{"ucast_cache", 0, NULL, 'A'},
-@@ -1008,6 +1012,11 @@ int main(int argc, char *argv[])
- 			printf(" Priority = %d\n", temp);
- 			break;
- 
-+		case 16:
-+			opt.subnet_prefix = cl_hton64(strtoull(optarg, NULL, 16));
-+			printf(" Subnet_Prefix = <0x%" PRIx64 ">\n", cl_hton64(opt.subnet_prefix));
-+			break;
-+
- 		case 'k':
- 			sm_key = cl_hton64(strtoull(optarg, NULL, 16));
- 			printf(" SM Key <0x%" PRIx64 ">\n", cl_hton64(sm_key));

SOURCES/opensm.service

@@ -3,8 +3,7 @@ Description=Starts the OpenSM InfiniBand fabric Subnet Manager
 Documentation=man:opensm
 DefaultDependencies=false
 Before=network.target remote-fs-pre.target
-Requires=rdma.service
+After=rdma-hw.target
-After=rdma.service
 
 [Service]
 Type=forking

SPECS/opensm.spec

@@ -1,8 +1,8 @@
 %global __remake_config 1
 
 Name:    opensm
-Version: 3.3.21
+Version: 3.3.24
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group:   System Environment/Daemons
 License: GPLv2 or BSD
@@ -15,7 +15,6 @@ Source5: opensm.service
 Source6: opensm.launch
 Source7: opensm.rwtab
 Source8: opensm.partitions
-Patch1:  opensm-3.3.13-prefix.patch
 
 BuildRequires: libibumad-devel, systemd, systemd-units
 BuildRequires: bison, flex, byacc, gcc
@@ -61,13 +60,12 @@ Static version of opensm libraries
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if %{__remake_config}
 ./autogen.sh
 %endif
-%configure --with-opensm-conf-sub-dir=rdma CFLAGS="$CFLAGS -fno-strict-aliasing"
+%configure --with-opensm-conf-sub-dir=rdma
 make %{?_smp_mflags}
 cd opensm
 ./opensm -c ../opensm-%{version}.conf
@@ -127,6 +125,34 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jun 15 2021 Honggang Li <honli@redhat.com> - 3.3.24-1
+- Rebase to latest upstream release 3.3.24
+- Resolves: bz1961961
+
+* Thu Dec 10 2020 Honggang Li <honli@redhat.com> - 3.3.23-4
+- opensm service should after rdma-hw.target
+- Resolves: bz1906252
+
+* Fri Nov 20 2020 Honggang Li <honli@redhat.com> - 3.3.23-3
+- Allow MCMR requests with default subnet prefix
+- Resolves: bz1898872
+
+* Thu Nov 05 2020 Honggang Li <honli@redhat.com> - 3.3.23-2
+- Update opensm service file
+- Resolves: bz1892502
+
+* Wed Apr 15 2020 Honggang Li <honli@redhat.com> - 3.3.23-1
+- Rebase to latest upstream release 3.3.23
+- Resolves: bz1815960
+
+* Thu May 30 2019 Honggang Li <honli@redhat.com> - 3.3.22-2
+- Onboard gating configuration
+- Resolves: bz1682401
+
+* Wed May 15 2019 Honggang Li <honli@redhat.com> - 3.3.22-1
+- Rebase to latest upstream release 3.3.22
+- Resolves: bz1708475
+
 * Fri Jan 11 2019 Honggang Li <honli@redhat.com> - 3.3.21-2
 - Restore the 'subnet_prefix' option
 - Resolves: bz1664575