From 933db2d2c34be422304631bbf661796de23b1d2d25d4c6f6fb8e31b891d4d367 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 15 Mar 2018 07:53:59 +0000 Subject: [PATCH] Accepting request 587413 from home:NMoreyChaisemartin:branches:science:HPC - Update to version 10.3.46 - Enabled IPS_PROTO_FLAG_RCVTHREAD flag - Fix GPU Direct Recv threshold default - Resolve PSM2_CUDA runtime issues - Fix bug in code to remove octal base for env vars - Change direct use of HFI_CLASS_PATH and guard possible buffer overruns - Add libpsm2-fix-gcc8-compilation-error.patch to fix compilation with gcc8 (bsc#1084634) OBS-URL: https://build.opensuse.org/request/show/587413 OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=41 --- _service | 4 +-- libpsm2-10.3.37.tar.bz2 | 3 -- libpsm2-10.3.46.tar.bz2 | 3 ++ libpsm2-fix-gcc8-compilation-error.patch | 41 ++++++++++++++++++++++++ libpsm2.changes | 12 +++++++ libpsm2.spec | 6 ++-- 6 files changed, 62 insertions(+), 7 deletions(-) delete mode 100644 libpsm2-10.3.37.tar.bz2 create mode 100644 libpsm2-10.3.46.tar.bz2 create mode 100644 libpsm2-fix-gcc8-compilation-error.patch diff --git a/_service b/_service index c7d1c1b..6fb3928 100644 --- a/_service +++ b/_service @@ -5,11 +5,11 @@ no .git libpsm2 - 10.3.37 + 10.3.46 PSM2_(.*) \1 PSM2_* - 01d12825369bfc8d9d20729b2df828921e77c516 + 5fabd0e699a920e74333f789923fd1c02bb7c629 libpsm2*.tar diff --git a/libpsm2-10.3.37.tar.bz2 b/libpsm2-10.3.37.tar.bz2 deleted file mode 100644 index 176522e..0000000 --- a/libpsm2-10.3.37.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0c20ea38d70c55291be557aa34ef5bc760b85cc043c46c804ea781d8efb7a15 -size 328043 diff --git a/libpsm2-10.3.46.tar.bz2 b/libpsm2-10.3.46.tar.bz2 new file mode 100644 index 0000000..22fb2b9 --- /dev/null +++ b/libpsm2-10.3.46.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05db39309f69c0033c35b1cceba2c48fa725deee69332776d5f008072b23b075 +size 327958 diff --git a/libpsm2-fix-gcc8-compilation-error.patch b/libpsm2-fix-gcc8-compilation-error.patch new file mode 100644 index 0000000..60ba7cf --- /dev/null +++ b/libpsm2-fix-gcc8-compilation-error.patch @@ -0,0 +1,41 @@ +commit e8380f93eddfe5c79f58c7315c9d027fe39230ce +Author: Nicolas Morey-Chaisemartin +Date: Thu Mar 15 08:13:38 2018 +0100 + + libpsm2: fix gcc8 compilation error + + Compiling with gcc 8.0.1 fails with: + /home/abuild/rpmbuild/BUILD/libpsm2-10.3.37/psm_utils.c: In function 'psmi_faultinj_getspec': + /home/abuild/rpmbuild/BUILD/libpsm2-10.3.37/psm_utils.c:985:59: error: '%s' directive output may be truncated writing up to 127 bytes into a region of size between 110 and 237 [-Werror=format-truncation=] + snprintf(fdesc, sizeof(fdesc) - 1, "Fault Injection %s <%s>", + ^~ + fname, fvals_str); + ~~~~~~~~~ + In file included from /usr/include/stdio.h:862, + from /usr/include/malloc.h:24, + from /home/abuild/rpmbuild/BUILD/libpsm2-10.3.37/psm_utils.c:55: + /usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' output between 20 and 274 bytes into a destination of size 255 + return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + __bos (__s), __fmt, __va_arg_pack ()); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cc1: all warnings being treated as errors + make[1]: *** [Makefile:522: /home/abuild/rpmbuild/BUILD/libpsm2-10.3.37/build_release/psm_utils.o] Error 1 + + This increases the target buffer size to remove the error + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git psm_utils.c psm_utils.c +index e5d4fbc2c498..b3371641304e 100644 +--- psm_utils.c ++++ psm_utils.c +@@ -975,7 +975,7 @@ struct psmi_faultinj_spec *psmi_faultinj_getspec(char *spec_name, int num, + union psmi_envvar_val env_fi; + char fvals_str[128]; + char fname[128]; +- char fdesc[256]; ++ char fdesc[280]; + + snprintf(fvals_str, sizeof(fvals_str) - 1, "%d:%d:1", num, + denom); diff --git a/libpsm2.changes b/libpsm2.changes index 57de374..ba3fdae 100644 --- a/libpsm2.changes +++ b/libpsm2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 15 07:18:37 UTC 2018 - nmoreychaisemartin@suse.com + +- Update to version 10.3.46 + - Enabled IPS_PROTO_FLAG_RCVTHREAD flag + - Fix GPU Direct Recv threshold default + - Resolve PSM2_CUDA runtime issues + - Fix bug in code to remove octal base for env vars + - Change direct use of HFI_CLASS_PATH and guard possible buffer overruns +- Add libpsm2-fix-gcc8-compilation-error.patch to fix compilation + with gcc8 (bsc#1084634) + ------------------------------------------------------------------- Fri Dec 8 08:25:14 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/libpsm2.spec b/libpsm2.spec index 81accf5..5755929 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -1,7 +1,7 @@ # # spec file for package libpsm2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define psm_so 2 Name: libpsm2 -Version: 10.3.37 +Version: 10.3.46 Release: 0 Summary: Intel PSM Messaging API libraries License: BSD-2-Clause or GPL-2.0 @@ -32,6 +32,7 @@ Source2: libpsm2-rpmlintrc Patch2: libpsm2-use_RPM_OPT_FLAGS.patch Patch3: libpsm2-use-exported-variable-for-version-and-release.patch Patch4: libpsm2-include-ioctl_h.patch +Patch5: libpsm2-fix-gcc8-compilation-error.patch BuildRequires: libnuma-devel BuildRequires: libuuid-devel BuildRequires: pkg-config @@ -86,6 +87,7 @@ Support for MPIs linked with PSM versions < 2. %patch2 %patch3 %patch4 +%patch5 cp %{S:1} ChangeLog