Hello community, here is the log from the commit of package libpsm2 for openSUSE:Factory checked in at 2017-05-27 13:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpsm2 (Old) and /work/SRC/openSUSE:Factory/.libpsm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpsm2" Sat May 27 13:09:15 2017 rev:3 rq:496853 version:10.2.103 Changes: -------- --- /work/SRC/openSUSE:Factory/libpsm2/libpsm2.changes 2017-04-11 09:46:35.668949651 +0200 +++ /work/SRC/openSUSE:Factory/.libpsm2.new/libpsm2.changes 2017-05-27 13:09:50.667782835 +0200 @@ -1,0 +2,16 @@ +Fri May 19 19:07:37 UTC 2017 - [email protected] + +- Add libpsm2-gcc7.patch: Fix build with gcc 7.x. Patch taken from + upstream git, https://github.com/01org/opa-psm2/commit/52aa214e8. + +------------------------------------------------------------------- +Fri May 19 11:01:20 UTC 2017 - [email protected] + +- libpsm2-2 provides libpsm2 (bsc#1039855) + +------------------------------------------------------------------- +Mon May 15 11:54:57 UTC 2017 - [email protected] + +- Fix package version numbering (bsc#1037661). + +------------------------------------------------------------------- Old: ---- libpsm2-10.3.2.tar.gz New: ---- libpsm2-10.2.103.tar.bz2 libpsm2-gcc7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpsm2.spec ++++++ --- /var/tmp/diff_new_pack.zzeHBW/_old 2017-05-27 13:09:51.263698582 +0200 +++ /var/tmp/diff_new_pack.zzeHBW/_new 2017-05-27 13:09:51.263698582 +0200 @@ -18,17 +18,18 @@ %define psm_so 2 Name: libpsm2 -Version: 10.3.2 +Version: 10.2.103 Release: 0 Summary: Intel PSM Messaging API libraries License: BSD-2-Clause or GPL-2.0 Group: Development/Libraries/C and C++ Url: https://github.com/01org/opa-psm2/ -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 Source1: libpsm2.changelog 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-gcc7.patch BuildRequires: libuuid-devel BuildRequires: pkg-config BuildRequires: udev @@ -50,6 +51,7 @@ Summary: Intel PSM Messaging API library Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: %{name} = %{version} %description -n %{name}-%{psm_so} libpsm2 provides PSM Messaging API, or PSM API, is Intel's low-level @@ -80,6 +82,7 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{S:1} ChangeLog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zzeHBW/_old 2017-05-27 13:09:51.299693492 +0200 +++ /var/tmp/diff_new_pack.zzeHBW/_new 2017-05-27 13:09:51.299693492 +0200 @@ -4,19 +4,13 @@ <param name="url">https://github.com/01org/opa-psm2.git</param> <param name="package-meta">no</param> <param name="exclude">.git</param> -<!-- - To update to a new release, change "revision" to the desired - git commit hash and bump "version" if necessary - - <param name="versionformat">1.1.13+git%cd.%h</param> ---> - <param name="version">10.2.2</param> - <param name="revision">7dec1ba420c56ae4affe9a0b901781423be40925</param> + <param name="filename">libpsm2</param> + <param name="version">10.2.103</param> + <param name="revision">342e1f95d65cb608142aa4e26da545e260e71d5e</param> </service> <service name="recompress" mode="disabled"> - <param name="file">*pacemaker*.tar</param> + <param name="file">libpsm2*.tar</param> <param name="compression">bz2</param> </service> - <service name="set_version" mode="disabled"/> </services> ++++++ libpsm2-10.3.2.tar.gz -> libpsm2-10.2.103.tar.bz2 ++++++ ++++++ libpsm2-gcc7.patch ++++++ >From 52aa214e81aeb5b998f83e7426a25a8697039e8e Mon Sep 17 00:00:00 2001 From: Aravind Gopalakrishnan <[email protected]> Date: Wed, 12 Apr 2017 11:38:55 -0700 Subject: [PATCH] Fix build failures caught by gcc 7.x This fixes build problems reported in Fedora BZ 1423872 . Tested using mock build system against Fedora rawhide and seems to work fine. Signed-off-by: Aravind Gopalakrishnan <[email protected]> --- psm_ep.c | 10 +++++----- ptl_ips/ips_recvhdrq.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/psm_ep.c b/psm_ep.c index 00149a5..2b1ebee 100644 --- a/psm_ep.c +++ b/psm_ep.c @@ -922,7 +922,7 @@ __psm2_ep_open(psm2_uuid_t const unique_job_key, int i, num_rails = 0; char *uname = "HFI_UNIT"; char *pname = "HFI_PORT"; - char uvalue[4], pvalue[4]; + char uvalue[6], pvalue[6]; int devid_enabled[PTL_MAX_INIT]; union psmi_envvar_val devs; @@ -964,8 +964,8 @@ __psm2_ep_open(psm2_uuid_t const unique_job_key, /* If multi-rail is used, set the first ep unit/port */ if (num_rails > 0) { - snprintf(uvalue, 4, "%1d", units[0]); - snprintf(pvalue, 4, "%1d", ports[0]); + snprintf(uvalue, 6, "%1d", units[0]); + snprintf(pvalue, 6, "%1d", ports[0]); setenv(uname, uvalue, 1); setenv(pname, pvalue, 1); } @@ -999,8 +999,8 @@ __psm2_ep_open(psm2_uuid_t const unique_job_key, if (psmi_device_is_enabled(devid_enabled, PTL_DEVID_IPS)) { for (i = 1; i < num_rails; i++) { - snprintf(uvalue, 4, "%1d", units[i]); - snprintf(pvalue, 4, "%1d", ports[i]); + snprintf(uvalue, 6, "%1d", units[i]); + snprintf(pvalue, 6, "%1d", ports[i]); setenv(uname, uvalue, 1); setenv(pname, pvalue, 1); diff --git a/ptl_ips/ips_recvhdrq.c b/ptl_ips/ips_recvhdrq.c index 7bd6557..4b2617f 100644 --- a/ptl_ips/ips_recvhdrq.c +++ b/ptl_ips/ips_recvhdrq.c @@ -825,7 +825,7 @@ psm2_error_t ips_recvhdrq_scan_cca (struct ips_recvhdrq *recvq) &ctrlscb, ctrlscb.cksum, 0); } } - else if_pt (_is_cca_becn_set(rcv_ev.p_hdr) << (IPS_RECV_EVENT_BECN - 1) ) { + else if_pt (0 != (_is_cca_becn_set(rcv_ev.p_hdr) << (IPS_RECV_EVENT_BECN - 1))) { struct ips_epstate_entry *epstaddr = ips_epstate_lookup(recvq->epstate, rcv_ev.p_hdr->connidx);
