- updated to 2.1.5

- removed obsolete format patch
- added ibacm patch (fixes build with ibacm support)

diff --git a/dapl-format.patch b/dapl-format.patch
deleted file mode 100644 (file)
index d64dcdd..0000000
--- a/dapl-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dapl-2.0.38/test/dapltest/udapl/udapl_tdep.c.orig  2013-06-07 02:42:48.000000000 +0200
-+++ dapl-2.0.38/test/dapltest/udapl/udapl_tdep.c       2013-08-23 22:07:43.793287069 +0200
-@@ -103,7 +103,7 @@
-       vsprintf(buffer, fmt, args);
-       va_end(args);
- 
--      printf(buffer);
-+      fputs(buffer, stdout);
- }
- 
- DAT_RETURN DT_Tdep_evd_dequeue(DAT_EVD_HANDLE evd_handle, DAT_EVENT * event)

diff --git a/dapl-ibacm.patch b/dapl-ibacm.patch
new file mode 100644 (file)
index 0000000..2e2f26a
--- /dev/null
+++ b/dapl-ibacm.patch
@@ -0,0 +1,21 @@
+--- dapl-2.1.5/dapl/openib_cma/dapl_ib_util.h.orig     2015-05-26 19:23:12.000000000 +0200
++++ dapl-2.1.5/dapl/openib_cma/dapl_ib_util.h  2015-06-16 20:44:38.922577552 +0200
+@@ -107,6 +107,7 @@
+       struct  ibv_context     *ib_ctx;
+       struct  ibv_device      *ib_dev;
+       /* dapls_modify_qp_state */
++      uint16_t                lid;
+       ib_cm_attr_t            ib_cm;  /* dev attr for QP and CM */
+       uint64_t                guid;
+       char                    guid_str[32];
+--- dapl-2.1.5/dapl/openib_common/qp.c.orig    2015-05-26 19:23:15.000000000 +0200
++++ dapl-2.1.5/dapl/openib_common/qp.c 2015-06-16 20:03:11.882681921 +0200
+@@ -575,7 +575,7 @@
+ {
+       struct rdma_addrinfo hint, *res;
+       struct ibv_path_record path;
+-      uint8_t sl = hca_ptr->ib_trans.sl;
++      uint8_t sl = hca_ptr->ib_trans.ib_cm.sl;
+       int ret;
+ 
+       memset(&path, 0, sizeof path);

diff --git a/dapl.spec b/dapl.spec
index 8926cc4d5f380ff63c18aaed2f49a3d2c0d73380..08fcfbb87c92f52e5c007c966e1d2f4021a37859 100644 (file)
--- a/dapl.spec
+++ b/dapl.spec
@@ -2,15 +2,15 @@
 Summary:       Userspace access to RDMA devices using OS-agnostic DAT APIs
 Summary(pl.UTF-8):     Dostęp z przestrzeni użytkownika do urządzeń RDMA poprzez API DAT
 Name:          dapl
-Version:       2.1.3
+Version:       2.1.5
 Release:       1
 License:       CPL v1.0 or BSD or GPL v2
 Group:         Libraries
 Source0:       https://www.openfabrics.org/downloads/dapl/%{name}-%{version}.tar.gz
-# Source0-md5: 04537bdd405b89c562d73bfdd6027c2b
+# Source0-md5: 8a7735bfe24dd7c446aec38db3577728
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-include.patch
-Patch2:                %{name}-format.patch
+Patch2:                %{name}-ibacm.patch
 URL:           http://www.openfabrics.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake