[rpms/slurm] epel10: Release of 19.05.1

[Philip Kovacs <pkdevel@yahoo.com>]

            A new commit has been pushed.

            Repo   : rpms/slurm
            Branch : epel10
            Commit : 8a8ef77daffa047b01209297185b9363770f0f1b
            Author : Philip Kovacs <pkdevel@yahoo.com>
            Date   : 2019-07-15T15:29:35-04:00
            Stats  : +98/-649 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/slurm/c/8a8ef77daffa047b01209297185b9363770f0f1b?branch=epel10

            Log:
            Release of 19.05.1
Closes security issue (CVE-2019-12838)
Configure for UCX support on supported arches

---
diff --git a/slurm.spec b/slurm.spec
index a3ad352..61db11d 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -1,5 +1,5 @@
 # Upstream tarballs use an additional release number
-%global ups_rel 1
+%global ups_rel 2
 
 %if "%{ups_rel}" == "1"
 %global name_version %{name}-%{version}
@@ -11,8 +11,8 @@
 %undefine _strict_symbol_defs_build
 
 Name:           slurm
-Version:        19.05.0
-Release:        5%{?dist}
+Version:        19.05.1
+Release:        1%{?dist}
 Summary:        Simple Linux Utility for Resource Management
 License:        GPLv2 and BSD
 URL:            https://slurm.schedmd.com/
@@ -25,13 +25,10 @@ Source5:        slurm-setuser.in
 
 # Upstream bug #4449: release-style versioning of libslurmfull
 Patch0:         slurm_libslurmfull_version.patch
-# Upstream bug #7197: fix 19.05.0 testsuite
-Patch1:         slurm_fix_testsuite.patch
 
 # Build-related patches
 Patch10:        slurm_perlapi_rpaths.patch
 Patch11:        slurm_html_doc_path.patch
-Patch12:        slurm_doc_fix.patch
 Patch13:        slurm_without_cray.patch
 Patch14:        slurm_without_pmi.patch
 
@@ -55,7 +52,9 @@ BuildRequires:  python3
 BuildRequires:  systemd
 
 BuildRequires:  hdf5-devel
+BuildRequires:  numactl-devel
 BuildRequires:  pam-devel
+BuildRequires:  rdma-core-devel
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(hwloc)
 BuildRequires:  pkgconfig(libcurl)
@@ -69,12 +68,11 @@ BuildRequires:  pkgconfig(munge)
 BuildRequires:  pkgconfig(ncurses)
 BuildRequires:  pkgconfig(pmix) >= 2.0.0
 BuildRequires:  pkgconfig(zlib)
-BuildRequires:  readline-devel
+BuildRequires:  pkgconfig(readline)
 
-# follow arch exclusions for these devel packages
-%ifnarch s390 s390x %{arm}
-BuildRequires:  rdma-core-devel
-BuildRequires:  numactl-devel
+# follow arch-inclusions for ucx
+%ifarch aarch64 ppc64le x86_64
+BuildRequires:  pkgconfig(ucx)
 %endif
 
 # exclude upstream-deprecated 32-bit architectures
@@ -83,6 +81,9 @@ ExcludeArch:    i686
 
 Requires:       munge
 Requires:       pmix >= 2.0.0
+%ifarch aarch64 ppc64le x86_64
+Requires:       ucx
+%endif
 %{?systemd_requires}
 
 %description
@@ -203,10 +204,8 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm.
 %prep
 %setup -q -n %{name_version}
 %patch0 -p1
-%patch1 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch20 -p1
@@ -233,6 +232,9 @@ automake --no-force
   --prefix=%{_prefix} \
   --sysconfdir=%{_sysconfdir}/%{name} \
   --with-pam_dir=%{_libdir}/security \
+%ifarch aarch64 ppc64le x86_64
+  --with-ucx=%{_prefix} \
+%endif
   --enable-shared \
   --enable-x11 \
   --disable-static \
@@ -677,6 +679,11 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %systemd_postun_with_restart slurmdbd.service
 
 %changelog
+* Mon Jul 15 2019 Philip Kovacs <pkdevel@yahoo.com> - 19.05.1-1
+- Release of 19.05.1
+- Closes security issue (CVE-2019-12838)
+- Configure for UCX support on supported arches
+
 * Tue Jul 2 2019 Philip Kovacs <pkdevel@yahoo.com> - 19.05.0-5
 - Do not install slurm implementation of libpmi/pmi2 libraries
 - in favor of the faster implementation provided by pmix

diff --git a/slurm_doc_fix.patch b/slurm_doc_fix.patch
deleted file mode 100644
index ad7fdcb..0000000
--- a/slurm_doc_fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/doc/man/man5/burst_buffer.conf.5 b/doc/man/man5/burst_buffer.conf.5
-index 90f8e94fc7..efd76aa999 100644
---- a/doc/man/man5/burst_buffer.conf.5
-+++ b/doc/man/man5/burst_buffer.conf.5
-@@ -31,18 +31,18 @@ The configuration parameters available include:
- \fBAllowUsers\fR
- Comma separated list of user names and/or IDs permitted to use burst buffers.
- The options \fBAllowUsers\fR and \fBDenyUsers\fR can not both be specified.
--By default all users are permitted to use burst buffers.
-+By default all users are permitted to use burst buffers.  Possible future
-+future enhancement for generic plugin.
- 
--.\" Possible future enhancement for generic plugin
--.\" .TP
--.\" \fBAltPool\fR
--.\" The AltPool value consists of a comma separated list of alternate pools of
--.\" resources, each of which includes a name separated by a colon and a numeric
--.\" value.
--.\" The numeric value can include a suffix of "k", "m", "g", "t" and "p" which
--.\" multiplies the numeric value by 1,024, 1,048,576, 1,073,741,824 etc.
--.\" The numeric value is a 64-bit value.
--.\" for example, "AltPool=test:20g,small:4g
-+.TP
-+\fBAltPool\fR
-+The AltPool value consists of a comma separated list of alternate pools of
-+resources, each of which includes a name separated by a colon and a numeric
-+value.
-+The numeric value can include a suffix of "k", "m", "g", "t" and "p" which
-+multiplies the numeric value by 1,024, 1,048,576, 1,073,741,824 etc.
-+The numeric value is a 64-bit value.
-+for example, "AltPool=test:20g,small:4g
- 
- .TP
- \fBCreateBuffer\fR
-@@ -206,8 +206,8 @@ By default there is a 5 second timeout for the validation operations.
- AllowUsers=alan,brenda
- .br
- PrivateData=true
--.\" .br
--.\" Gres=nodes:10,other:20
-+.br
-+Gres=nodes:10,other:20
- .br
- #
- .br

diff --git a/slurm_fix_testsuite.patch b/slurm_fix_testsuite.patch
deleted file mode 100644
index 4cf2c80..0000000
--- a/slurm_fix_testsuite.patch
+++ /dev/null
@@ -1,579 +0,0 @@
-commit 7fa8a69d8eda68ac1fa144de7686e47d18161037
-Author: Philip Kovacs <pkdevel@yahoo.com>
-Date:   Fri Jun 7 07:33:01 2019 -0600
-
-    patch for 19.05.0 testsuite `make check` errors
-    
-    bug 7197
-
-diff --git a/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c b/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-index 2f245622e7..ca95f636a8 100644
---- a/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-+++ b/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-@@ -59,7 +59,7 @@ START_TEST(pack_1702_req_null_ptrs)
- 	unpack_req = (job_alloc_info_msg_t *)msg.data;
- 	ck_assert_int_eq(rc, SLURM_SUCCESS);
- 	ck_assert(unpack_req);
--	ck_assert(!unpack_req->req_cluster); /* >= 17.11 */
-+	//ck_assert(!unpack_req->req_cluster); /* >= 17.11 */
- 	ck_assert_uint_eq(unpack_req->job_id, pack_req.job_id);
- 
- 	free_buf(buf);
-@@ -94,7 +94,7 @@ START_TEST(pack_1702_req)
- 	unpack_req = (job_alloc_info_msg_t *)msg.data;
- 	ck_assert_int_eq(rc, SLURM_SUCCESS);
- 	ck_assert(unpack_req);
--	ck_assert(!unpack_req->req_cluster); /* >= 17.11 */
-+	//ck_assert(!unpack_req->req_cluster); /* >= 17.11 */
- 	ck_assert_uint_eq(unpack_req->job_id, pack_req.job_id);
- 
- 	free_buf(buf);
-diff --git a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-index dd10e1b857..d068fef66d 100644
---- a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-+++ b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-@@ -236,9 +236,9 @@ Suite* suite(void)
- 	TCase* tc_core = tcase_create("Pack slurmdb_federation_rec_t");
- 	tcase_add_test(tc_core, invalid_protocol);
- 	tcase_add_test(tc_core, pack_1702_federation_rec);
--	tcase_add_test(tc_core, pack_1702_null_federation_rec);
-+	//tcase_add_test(tc_core, pack_1702_null_federation_rec);
- 	tcase_add_test(tc_core, pack_1702_federation_rec_empty_list);
--	tcase_add_test(tc_core, pack_1702_federation_rec_fail);
-+	//tcase_add_test(tc_core, pack_1702_federation_rec_fail);
- 
- 	tcase_add_test(tc_core, pack_1711_federation_rec);
- 	tcase_add_test(tc_core, pack_1711_null_federation_rec);
-diff --git a/testsuite/slurm_unit/common/xhash-test.c b/testsuite/slurm_unit/common/xhash-test.c
-index 46616aef2b..2fc4d1d373 100644
---- a/testsuite/slurm_unit/common/xhash-test.c
-+++ b/testsuite/slurm_unit/common/xhash-test.c
-@@ -49,12 +49,11 @@ typedef struct hashable_st {
- 	uint32_t idn;
- } hashable_t;
- 
--const char* hashable_identify(void* voiditem)
-+void hashable_identify(void* voiditem, const char** key, uint32_t* key_len)
- {
- 	hashable_t* item = (hashable_t*)voiditem;
--	if (!item->id[0]) snprintf(item->id, 255, "%lu",
--			(unsigned long)item->idn);
--	return item->id;
-+	*key = item->id;
-+	*key_len = strlen(item->id);
- }
- 
- /*****************************************************************************
-@@ -71,7 +70,7 @@ static void setup(void)
- 	g_ht = xhash_init(hashable_identify, NULL);
- 	if (!g_ht) return; /* fatal error, will be detected by test cases */
- 	for (i = 0; i < g_hashableslen; ++i) {
--		g_hashables[i].id[0] = 0;
-+		snprintf(g_hashables[i].id, sizeof(g_hashables[i].id), "%d", i);
- 		g_hashables[i].idn = i;
- 		/* it is an error if xhash_add returns null but it will be
- 		 * detected by test cases */
-@@ -120,7 +119,7 @@ START_TEST(test_add)
- 	fail_unless(xhash_add(ht, a+3) != NULL, "xhash_add failed");
- 	for (i = 0; i < len; ++i) {
- 		snprintf(buffer, sizeof(buffer), "%d", i);
--		fail_unless(xhash_get(ht, buffer) == (a + i),
-+		fail_unless(xhash_get_str(ht, buffer) == (a + i),
- 				"bad hashable item returned");
- 	}
- 	xhash_free(ht);
-@@ -134,14 +133,14 @@ START_TEST(test_find)
- 	int i;
- 
- 	/* test bad match */
--	fail_unless(xhash_get(ht, "bad") == NULL  , "invalid case not null");
--	fail_unless(xhash_get(ht, "-1") == NULL   , "invalid case not null");
--	fail_unless(xhash_get(ht, "10000") == NULL, "invalid case not null");
-+	fail_unless(xhash_get_str(ht, "bad") == NULL  , "invalid case not null");
-+	fail_unless(xhash_get_str(ht, "-1") == NULL   , "invalid case not null");
-+	fail_unless(xhash_get_str(ht, "10000") == NULL, "invalid case not null");
- 
- 	/* test all good indexes */
- 	for (i = 0; i < g_hashableslen; ++i) {
- 		snprintf(buffer, sizeof(buffer), "%d", i);
--		fail_unless(xhash_get(ht, buffer) == (g_hashables + i),
-+		fail_unless(xhash_get_str(ht, buffer) == (g_hashables + i),
- 				"bad hashable item returned");
- 	}
- }
-@@ -156,7 +155,7 @@ static int test_delete_helper()
- 	char buffer[255];
- 	for (i = 0; i < g_hashableslen; ++i) {
- 		snprintf(buffer, sizeof(buffer), "%d", i);
--		if (xhash_get(ht, buffer) != (g_hashables + i)) {
-+		if (xhash_get_str(ht, buffer) != (g_hashables + i)) {
- 			++ret;
- 		}
- 	}
-@@ -170,10 +169,10 @@ START_TEST(test_delete)
- 	char buffer[255];
- 
- 	/* invalid cases */
--	xhash_delete(NULL, "1");
--	fail_unless(xhash_get(ht, "1") != NULL, "invalid case null");
-+	xhash_delete_str(NULL, "1");
-+	fail_unless(xhash_get_str(ht, "1") != NULL, "invalid case null");
- 	/* Deleting non-existent item should do nothing. */
--	xhash_delete(ht, NULL);
-+	xhash_delete(ht, NULL, 0);
- 	fail_unless(xhash_count(ht) == g_hashableslen,
- 			"invalid delete has been done");
- 	result = test_delete_helper();
-@@ -182,17 +181,17 @@ START_TEST(test_delete)
- 			result);
- 
- 	/* test correct deletion */
--	xhash_delete(ht, "10");
--	fail_unless(xhash_get(ht, "10") == NULL, "item not deleted");
-+	xhash_delete_str(ht, "10");
-+	fail_unless(xhash_get_str(ht, "10") == NULL, "item not deleted");
- 	fail_unless(xhash_count(ht) == (g_hashableslen-1), "bad count");
- 	/* left edge */
--	xhash_delete(ht, "0");
--	fail_unless(xhash_get(ht, "0") == NULL, "item not deleted");
-+	xhash_delete_str(ht, "0");
-+	fail_unless(xhash_get_str(ht, "0") == NULL, "item not deleted");
- 	fail_unless(xhash_count(ht) == (g_hashableslen-2), "bad count");
- 	/* right edge */
- 	snprintf(buffer, sizeof(buffer), "%u", (g_hashableslen-2));
--	xhash_delete(ht, buffer);
--	fail_unless(xhash_get(ht, "0") == NULL, "item not deleted");
-+	xhash_delete_str(ht, buffer);
-+	fail_unless(xhash_get_str(ht, "0") == NULL, "item not deleted");
- 	fail_unless(xhash_count(ht) == (g_hashableslen-3), "bad count");
- 
- 	result = test_delete_helper();
-commit b0db3f0fbfdfc9a7820f24c4b30adee696dc863a
-Author: Morris Jette <jette@schedmd.com>
-Date:   Fri Jun 7 07:57:26 2019 -0600
-
-    Modify "make check" to validate v1808 un/pack logic
-    
-    bug 7197
-
-diff --git a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-index d068fef66d..bbeeefc4a7 100644
---- a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-+++ b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-@@ -32,29 +32,26 @@ START_TEST(invalid_protocol)
- }
- END_TEST
- 
--START_TEST(pack_1702_null_federation_rec)
-+START_TEST(pack_1711_null_federation_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
--	slurmdb_federation_rec_t pack_fr = {0};
- 
- 	slurmdb_pack_federation_rec(NULL, SLURM_MIN_PROTOCOL_VERSION, buf);
- 
- 	set_buf_offset(buf, 0);
- 
--	slurmdb_federation_rec_t *unpack_fr;
-+	slurmdb_federation_rec_t *unpack_fr = NULL;
- 	rc = slurmdb_unpack_federation_rec((void **)&unpack_fr, SLURM_MIN_PROTOCOL_VERSION, buf);
--	ck_assert(rc                   == SLURM_SUCCESS);
--	ck_assert(pack_fr.name         == unpack_fr->name);
--	ck_assert(pack_fr.flags        == unpack_fr->flags);
--	ck_assert(pack_fr.cluster_list == unpack_fr->cluster_list);
-+	ck_assert(rc        == SLURM_SUCCESS);
-+	ck_assert(unpack_fr == NULL);
- 
- 	free_buf(buf);
- 	slurmdb_destroy_federation_rec(unpack_fr);
- }
- END_TEST
- 
--START_TEST(pack_1702_federation_rec)
-+START_TEST(pack_1711_federation_rec)
- {
- 	int rc;
- 
-@@ -90,7 +87,7 @@ START_TEST(pack_1702_federation_rec)
- END_TEST
- 
- 
--START_TEST(pack_1702_federation_rec_empty_list)
-+START_TEST(pack_1711_federation_rec_empty_list)
- {
- 	int rc;
- 
-@@ -118,31 +115,7 @@ START_TEST(pack_1702_federation_rec_empty_list)
- END_TEST
- 
- 
--/* This test sets up the buffer so that it fails when unpacking the cluster rec.
-- */
--START_TEST(pack_1702_federation_rec_fail)
--{
--	int rc;
--	char *name = xstrdup("Saint Augustine");
--	Buf buf = init_buf(18*sizeof(uint32_t));
--	packstr(name, buf);
--	pack32(7, buf);
--	pack32(1, buf);
--
--	set_buf_offset(buf, 0);
--
--	slurmdb_federation_rec_t *unpack_fr;
--	rc = slurmdb_unpack_federation_rec((void **)&unpack_fr, SLURM_MIN_PROTOCOL_VERSION, buf);
--	ck_assert_int_eq(rc, SLURM_ERROR);
--
--	free_buf(buf);
--	xfree(name);
--}
--END_TEST
--
--
--/* 17.11 */
--START_TEST(pack_1711_null_federation_rec)
-+START_TEST(pack_1808_null_federation_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -161,7 +134,7 @@ START_TEST(pack_1711_null_federation_rec)
- }
- END_TEST
- 
--START_TEST(pack_1711_federation_rec)
-+START_TEST(pack_1808_federation_rec)
- {
- 	int rc;
- 
-@@ -197,7 +170,7 @@ START_TEST(pack_1711_federation_rec)
- END_TEST
- 
- 
--START_TEST(pack_1711_federation_rec_empty_list)
-+START_TEST(pack_1808_federation_rec_empty_list)
- {
- 	int rc;
- 
-@@ -235,15 +208,14 @@ Suite* suite(void)
- 	Suite* s = suite_create("Pack slurmdb_federation_rec_t");
- 	TCase* tc_core = tcase_create("Pack slurmdb_federation_rec_t");
- 	tcase_add_test(tc_core, invalid_protocol);
--	tcase_add_test(tc_core, pack_1702_federation_rec);
--	//tcase_add_test(tc_core, pack_1702_null_federation_rec);
--	tcase_add_test(tc_core, pack_1702_federation_rec_empty_list);
--	//tcase_add_test(tc_core, pack_1702_federation_rec_fail);
--
- 	tcase_add_test(tc_core, pack_1711_federation_rec);
- 	tcase_add_test(tc_core, pack_1711_null_federation_rec);
- 	tcase_add_test(tc_core, pack_1711_federation_rec_empty_list);
- 
-+	tcase_add_test(tc_core, pack_1808_federation_rec);
-+	tcase_add_test(tc_core, pack_1808_null_federation_rec);
-+	tcase_add_test(tc_core, pack_1808_federation_rec_empty_list);
-+
- 	suite_add_tcase(s, tc_core);
- 	return s;
- }
-commit 8aade6d1a3b25ee43b466f7c5624f5199b7bf0ec
-Author: Morris Jette <jette@schedmd.com>
-Date:   Fri Jun 7 08:14:50 2019 -0600
-
-    Rename some "make check" functions names to be generic
-    
-    bug 7197
-
-diff --git a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-index bbeeefc4a7..6a48164027 100644
---- a/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-+++ b/testsuite/slurm_unit/common/slurmdb_pack/pack_federation_rec-test.c
-@@ -32,7 +32,7 @@ START_TEST(invalid_protocol)
- }
- END_TEST
- 
--START_TEST(pack_1711_null_federation_rec)
-+START_TEST(pack_back2_null_federation_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -51,7 +51,7 @@ START_TEST(pack_1711_null_federation_rec)
- }
- END_TEST
- 
--START_TEST(pack_1711_federation_rec)
-+START_TEST(pack_back2_federation_rec)
- {
- 	int rc;
- 
-@@ -87,7 +87,7 @@ START_TEST(pack_1711_federation_rec)
- END_TEST
- 
- 
--START_TEST(pack_1711_federation_rec_empty_list)
-+START_TEST(pack_back2_federation_rec_empty_list)
- {
- 	int rc;
- 
-@@ -115,7 +115,7 @@ START_TEST(pack_1711_federation_rec_empty_list)
- END_TEST
- 
- 
--START_TEST(pack_1808_null_federation_rec)
-+START_TEST(pack_back1_null_federation_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -134,7 +134,7 @@ START_TEST(pack_1808_null_federation_rec)
- }
- END_TEST
- 
--START_TEST(pack_1808_federation_rec)
-+START_TEST(pack_back1_federation_rec)
- {
- 	int rc;
- 
-@@ -170,7 +170,7 @@ START_TEST(pack_1808_federation_rec)
- END_TEST
- 
- 
--START_TEST(pack_1808_federation_rec_empty_list)
-+START_TEST(pack_back1_federation_rec_empty_list)
- {
- 	int rc;
- 
-@@ -208,13 +208,13 @@ Suite* suite(void)
- 	Suite* s = suite_create("Pack slurmdb_federation_rec_t");
- 	TCase* tc_core = tcase_create("Pack slurmdb_federation_rec_t");
- 	tcase_add_test(tc_core, invalid_protocol);
--	tcase_add_test(tc_core, pack_1711_federation_rec);
--	tcase_add_test(tc_core, pack_1711_null_federation_rec);
--	tcase_add_test(tc_core, pack_1711_federation_rec_empty_list);
-+	tcase_add_test(tc_core, pack_back2_federation_rec);
-+	tcase_add_test(tc_core, pack_back2_null_federation_rec);
-+	tcase_add_test(tc_core, pack_back2_federation_rec_empty_list);
- 
--	tcase_add_test(tc_core, pack_1808_federation_rec);
--	tcase_add_test(tc_core, pack_1808_null_federation_rec);
--	tcase_add_test(tc_core, pack_1808_federation_rec_empty_list);
-+	tcase_add_test(tc_core, pack_back1_federation_rec);
-+	tcase_add_test(tc_core, pack_back1_null_federation_rec);
-+	tcase_add_test(tc_core, pack_back1_federation_rec_empty_list);
- 
- 	suite_add_tcase(s, tc_core);
- 	return s;
-commit 549b1a3e6a8f6a677228209a2520595ffb42f98c
-Author: Morris Jette <jette@schedmd.com>
-Date:   Fri Jun 7 09:50:14 2019 -0600
-
-    Make check tests made more generic
-
-diff --git a/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c b/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-index ca95f636a8..85adb59ed1 100644
---- a/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-+++ b/testsuite/slurm_unit/common/slurm_protocol_pack/pack_job_alloc_info_msg-test.c
-@@ -33,7 +33,7 @@ START_TEST(pack_null_req)
- END_TEST
- #endif
- 
--START_TEST(pack_1702_req_null_ptrs)
-+START_TEST(pack_back2_req_null_ptrs)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -59,7 +59,7 @@ START_TEST(pack_1702_req_null_ptrs)
- 	unpack_req = (job_alloc_info_msg_t *)msg.data;
- 	ck_assert_int_eq(rc, SLURM_SUCCESS);
- 	ck_assert(unpack_req);
--	//ck_assert(!unpack_req->req_cluster); /* >= 17.11 */
-+	ck_assert(!unpack_req->req_cluster);
- 	ck_assert_uint_eq(unpack_req->job_id, pack_req.job_id);
- 
- 	free_buf(buf);
-@@ -67,7 +67,7 @@ START_TEST(pack_1702_req_null_ptrs)
- }
- END_TEST
- 
--START_TEST(pack_1702_req)
-+START_TEST(pack_back2_req)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -103,7 +103,7 @@ START_TEST(pack_1702_req)
- }
- END_TEST
- 
--START_TEST(pack_1711_req_null_ptrs)
-+START_TEST(pack_back1_req_null_ptrs)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -136,7 +136,7 @@ START_TEST(pack_1711_req_null_ptrs)
- }
- END_TEST
- 
--START_TEST(pack_1711_req)
-+START_TEST(pack_back1_req)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -188,10 +188,10 @@ Suite* suite(SRunner *sr)
-        if (srunner_fork_status(sr) != CK_NOFORK)
-                tcase_add_test_raise_signal(tc_core, pack_null_req, SIGABRT);
- #endif
--	tcase_add_test(tc_core, pack_1702_req_null_ptrs);
--	tcase_add_test(tc_core, pack_1702_req);
--	tcase_add_test(tc_core, pack_1711_req_null_ptrs);
--	tcase_add_test(tc_core, pack_1711_req);
-+	tcase_add_test(tc_core, pack_back2_req_null_ptrs);
-+	tcase_add_test(tc_core, pack_back2_req);
-+	tcase_add_test(tc_core, pack_back1_req_null_ptrs);
-+	tcase_add_test(tc_core, pack_back1_req);
- 	suite_add_tcase(s, tc_core);
- 	return s;
- }
-diff --git a/testsuite/slurm_unit/common/slurmdb_pack/pack_cluster_rec-test.c b/testsuite/slurm_unit/common/slurmdb_pack/pack_cluster_rec-test.c
-index c58149b48f..b2c6042888 100644
---- a/testsuite/slurm_unit/common/slurmdb_pack/pack_cluster_rec-test.c
-+++ b/testsuite/slurm_unit/common/slurmdb_pack/pack_cluster_rec-test.c
-@@ -20,7 +20,7 @@ START_TEST(invalid_protocol)
- }
- END_TEST
- 
--START_TEST(pack_1702_null_rec)
-+START_TEST(pack_back2_null_rec)
- {
- 	int rc;
- 	slurmdb_cluster_rec_t pack_rec;
-@@ -64,7 +64,7 @@ START_TEST(pack_1702_null_rec)
- }
- END_TEST
- 
--START_TEST(pack_1702_rec)
-+START_TEST(pack_back2_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -85,6 +85,9 @@ START_TEST(pack_1702_rec)
- 	pack_rec.name             = xstrdup("name");
- 	pack_rec.nodes            = xstrdup("nodes");
- 	pack_rec.plugin_id_select = 8;
-+	pack_rec.fed.feature_list = list_create(slurm_destroy_char);
-+	slurm_addto_mode_char_list(pack_rec.fed.feature_list, "a,b,c", 0);
-+	ck_assert_int_eq(list_count(pack_rec.fed.feature_list), 3);
- 
- 	/* will be tested separately. */
- 	pack_rec.root_assoc       = NULL;
-@@ -126,9 +129,14 @@ START_TEST(pack_1702_rec)
- 	ck_assert_str_eq(pack_rec.name, unpack_rec->name);
- 	ck_assert_str_eq(pack_rec.nodes, unpack_rec->nodes);
- 
--	/* 17.11 */
--	ck_assert(pack_rec.fed.feature_list == unpack_rec->fed.feature_list);
--
-+	char *feature;
-+	ck_assert_int_eq(list_count(pack_rec.fed.feature_list), list_count(unpack_rec->fed.feature_list));
-+	ListIterator itr = list_iterator_create(pack_rec.fed.feature_list);
-+	while ((feature = list_next(itr))) {
-+		if (!list_find_first(unpack_rec->fed.feature_list, slurm_find_char_in_list, feature))
-+			ck_abort_msg("Didn't find feature %s in unpacked list",
-+				     feature);
-+	}
- 
- 	FREE_NULL_LIST(pack_rec.accounting_list);
- 	xfree(pack_rec.control_host);
-@@ -140,7 +148,7 @@ START_TEST(pack_1702_rec)
- }
- END_TEST
- 
--START_TEST(pack_1702_rec_null_ptrs)
-+START_TEST(pack_back2_rec_null_ptrs)
- {
- 	Buf buf = init_buf(1024);
- 	slurmdb_cluster_rec_t pack_rec = {0};
-@@ -185,7 +193,6 @@ START_TEST(pack_1702_rec_null_ptrs)
- 	ck_assert(pack_rec.rpc_version      == unpack_rec->rpc_version);
- 	ck_assert(pack_rec.fed.recv         == unpack_rec->fed.recv);
- 	ck_assert(pack_rec.fed.send         == unpack_rec->fed.send);
--	/* 17.11 */
- 	ck_assert(pack_rec.fed.feature_list == unpack_rec->fed.feature_list);
- 
- 	free_buf(buf);
-@@ -193,7 +200,7 @@ START_TEST(pack_1702_rec_null_ptrs)
- }
- END_TEST
- 
--START_TEST(pack_1711_null_rec)
-+START_TEST(pack_back1_null_rec)
- {
- 	int rc;
- 	slurmdb_cluster_rec_t pack_rec;
-@@ -204,7 +211,6 @@ START_TEST(pack_1711_null_rec)
- 	pack_rec.fed.state        = 0;
- 	pack_rec.dimensions       = 1;
- 	pack_rec.plugin_id_select = NO_VAL;
--
- 	slurmdb_pack_cluster_rec(NULL, SLURM_ONE_BACK_PROTOCOL_VERSION, buf);
- 
- 	set_buf_offset(buf, 0);
-@@ -218,7 +224,6 @@ START_TEST(pack_1711_null_rec)
- 	ck_assert(pack_rec.nodes           == unpack_rec->nodes);
- 	ck_assert(pack_rec.fed.recv        == unpack_rec->fed.recv);
- 	ck_assert(pack_rec.fed.send        == unpack_rec->fed.send);
--	/* 17.11 */
- 	ck_assert(pack_rec.fed.feature_list == unpack_rec->fed.feature_list);
- 
- 	/* root_assoc gets unpacked into a empty structure */
-@@ -237,7 +242,7 @@ START_TEST(pack_1711_null_rec)
- }
- END_TEST
- 
--START_TEST(pack_1711_rec)
-+START_TEST(pack_back1_rec)
- {
- 	int rc;
- 	Buf buf = init_buf(1024);
-@@ -302,7 +307,6 @@ START_TEST(pack_1711_rec)
- 	ck_assert_str_eq(pack_rec.name, unpack_rec->name);
- 	ck_assert_str_eq(pack_rec.nodes, unpack_rec->nodes);
- 
--	/* 17.11 */
- 	char *feature;
- 	ck_assert_int_eq(list_count(pack_rec.fed.feature_list), list_count(unpack_rec->fed.feature_list));
- 	ListIterator itr = list_iterator_create(pack_rec.fed.feature_list);
-@@ -322,7 +326,7 @@ START_TEST(pack_1711_rec)
- }
- END_TEST
- 
--START_TEST(pack_1711_rec_null_ptrs)
-+START_TEST(pack_back1_rec_null_ptrs)
- {
- 	Buf buf = init_buf(1024);
- 	slurmdb_cluster_rec_t pack_rec = {0};
-@@ -367,7 +371,6 @@ START_TEST(pack_1711_rec_null_ptrs)
- 	ck_assert(pack_rec.rpc_version      == unpack_rec->rpc_version);
- 	ck_assert(pack_rec.fed.recv         == unpack_rec->fed.recv);
- 	ck_assert(pack_rec.fed.send         == unpack_rec->fed.send);
--	/* 17.11 */
- 	ck_assert(pack_rec.fed.feature_list == unpack_rec->fed.feature_list);
- 
- 	free_buf(buf);
-@@ -385,13 +388,13 @@ Suite* suite(void)
- 	TCase* tc_core = tcase_create("Pack slurmdb_cluster_rec_t");
- 	tcase_add_test(tc_core, invalid_protocol);
- 
--	tcase_add_test(tc_core, pack_1711_null_rec);
--	tcase_add_test(tc_core, pack_1711_rec);
--	tcase_add_test(tc_core, pack_1711_rec_null_ptrs);
-+	tcase_add_test(tc_core, pack_back1_null_rec);
-+	tcase_add_test(tc_core, pack_back1_rec);
-+	tcase_add_test(tc_core, pack_back1_rec_null_ptrs);
- 
--	tcase_add_test(tc_core, pack_1702_null_rec);
--	tcase_add_test(tc_core, pack_1702_rec);
--	tcase_add_test(tc_core, pack_1702_rec_null_ptrs);
-+	tcase_add_test(tc_core, pack_back2_null_rec);
-+	tcase_add_test(tc_core, pack_back2_rec);
-+	tcase_add_test(tc_core, pack_back2_rec_null_ptrs);
- 
- 	suite_add_tcase(s, tc_core);
- 	return s;

diff --git a/slurm_pmix_soname.patch b/slurm_pmix_soname.patch
index 7557569..cb5f88e 100644
--- a/slurm_pmix_soname.patch
+++ b/slurm_pmix_soname.patch
@@ -1,23 +1,89 @@
 diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
-index bbb947616c..65ec00ad73 100644
+index bbb947616c..b284af63f2 100644
 --- a/src/plugins/mpi/pmix/mpi_pmix.c
 +++ b/src/plugins/mpi/pmix/mpi_pmix.c
-@@ -105,10 +105,17 @@ static void *_libpmix_open(void)
+@@ -89,6 +89,8 @@ const uint32_t plugin_version = SLURM_VERSION_NUMBER;
+ 
+ void *libpmix_plug = NULL;
+ 
++static const char *pmix_libraries[] = { "libpmix.so", "libpmix.so.2", "libpmix.so.1" };
++
+ static void _libpmix_close(void *lib_plug)
+ {
+ 	xassert(lib_plug);
+@@ -99,15 +101,20 @@ static void *_libpmix_open(void)
+ {
+ 	void *lib_plug = NULL;
+ 	char *full_path = NULL;
++	size_t sz = 0;
+ 
+ #ifdef PMIXP_V1_LIBPATH
+ 	xstrfmtcat(full_path, "%s/", PMIXP_V1_LIBPATH);
  #elif defined PMIXP_V2_LIBPATH
  	xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH);
  #endif
 -	xstrfmtcat(full_path, "libpmix.so");
-+	xstrfmtcat(full_path, "libpmix.so.2");
- 	lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
- 	xfree(full_path);
- 
-+	if (!lib_plug) {
-+		dlerror();
-+		xstrfmtcat(full_path, "libpmix.so.1");
+-	lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
+-	xfree(full_path);
++
++	while (!lib_plug && (sz < sizeof(pmix_libraries)/sizeof(pmix_libraries[0]))) {
++		xstrfmtcat(full_path, "%s", pmix_libraries[sz]);
 +		lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
 +		xfree(full_path);
++		++sz;
 +	}
-+
+ 
  	if (lib_plug && (HAVE_PMIX_VER != pmixp_lib_get_version())) {
  		PMIXP_ERROR("pmi/pmix: incorrect PMIx library version loaded %d was loaded, required %d version",
- 			    pmixp_lib_get_version(), (int)HAVE_PMIX_VER);
+diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
+index f6c91adc93..650fb7d5ff 100644
+--- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
++++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
+@@ -140,6 +140,8 @@ static struct io_operations _progress_ops = {
+ 	.handle_read = _progress_read
+ };
+ 
++static const char *ucx_libraries[] = { "libucp.so", "libucp.so.0" };
++
+ static void *_ucx_init(int nodeid, pmixp_p2p_data_t direct_hdr);
+ static void _ucx_fini(void *_priv);
+ static int _ucx_connect(void *_priv, void *ep_data, size_t ep_len,
+@@ -161,15 +163,20 @@ static int _load_ucx_lib()
+ 	setenv("UCX_MEM_MALLOC_RELOC", "no", 1);
+ 	setenv("UCX_MEM_EVENTS", "no", 1);
+ 
++	size_t sz = 0;
++
+ #ifdef PMIXP_UCX_LIBPATH
+ 	/* If this Slurm build doesn't allow RPATH's
+ 	 * try to open library by it's full path that
+ 	 * we have from autoconf
+ 	 */
+ 	char *full_path = NULL;
+-	xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH);
+-	_ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
+-	xfree(full_path);
++	while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) {
++		xstrfmtcat(full_path, "%s/%s", PMIXP_UCX_LIBPATH, ucx_libraries[sz]);
++		_ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
++		xfree(full_path);
++		++sz;
++	}
+ 	if (_ucx_lib_handler) {
+ 		/* successful, exit now */
+ 		return SLURM_SUCCESS;
+@@ -178,7 +185,13 @@ static int _load_ucx_lib()
+ 	 * known by dynamic linker.
+ 	 */
+ #endif
+-	_ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL);
++	sz = 0;
++	while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) {
++		xstrfmtcat(full_path, "%s", ucx_libraries[sz]);
++		_ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
++		xfree(full_path);
++		++sz;
++	}
+ 	if (!_ucx_lib_handler) {
+ 		char *err = dlerror();
+ 		PMIXP_ERROR("Cannot open UCX lib: %s", (err) ? err : "unknown");

diff --git a/sources b/sources
index bcddb1a..60733ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (slurm-19.05.0.tar.bz2) = f91efbd8c96c5c25dcf7c3f73f61ab9b5d591a554447e5a7db0346ace2e9a1053bebce5f16e9d15c23d78743319997aaac51f6d5bceda7cfaa4877a6f439cff1
+SHA512 (slurm-19.05.1-2.tar.bz2) = 49d7fc1bbb9d15a9459268a37742e983785d8fbdd19a771c0b07411fc4d9b6378f48614247991efce5b43c21c277a6b4e998b18231d839128fc5cf4a45172f9b