Hello community, here is the log from the commit of package libiscsi for openSUSE:Factory checked in at 2018-07-02 23:27:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libiscsi (Old) and /work/SRC/openSUSE:Factory/.libiscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libiscsi" Mon Jul 2 23:27:52 2018 rev:8 rq:618440 version:1.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libiscsi/libiscsi.changes 2018-03-19 23:31:05.881111113 +0100 +++ /work/SRC/openSUSE:Factory/.libiscsi.new/libiscsi.changes 2018-07-02 23:27:54.233661295 +0200 @@ -1,0 +2,6 @@ +Fri Jun 22 07:57:31 UTC 2018 - [email protected] + +- Fix building of recent rdma (boo#1098749): + * libiscsi-rdma.patch + +------------------------------------------------------------------- New: ---- libiscsi-rdma.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libiscsi.spec ++++++ --- /var/tmp/diff_new_pack.vVyNUk/_old 2018-07-02 23:27:54.993660359 +0200 +++ /var/tmp/diff_new_pack.vVyNUk/_new 2018-07-02 23:27:54.997660354 +0200 @@ -26,6 +26,7 @@ URL: https://github.com/sahlberg/libiscsi Source: https://github.com/sahlberg/libiscsi/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: %{name}-1.18.0-Fix-32bit-build.patch +Patch1: libiscsi-rdma.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bc ++++++ libiscsi-rdma.patch ++++++ >From f1feb218e2823d236569f0ca3cfad07334f2a304 Mon Sep 17 00:00:00 2001 From: Cole Robinson <[email protected]> Date: Mon, 30 Apr 2018 18:11:05 -0400 Subject: [PATCH] iser: Use local container_of definition The code was implicitly dependent on container_of from inifiniband/verbs.h, however that's been removed in rdma-core latest release: https://github.com/linux-rdma/rdma-core/commit/ce0274acffc78ed2861a56bdc34cdd3d60c20e1f Define container_of locally if it's not already defined --- lib/iser.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) Index: libiscsi-1.18.0/lib/iser.c =================================================================== --- libiscsi-1.18.0.orig/lib/iser.c +++ libiscsi-1.18.0/lib/iser.c @@ -32,6 +32,20 @@ #include <semaphore.h> #include <poll.h> + +#ifndef container_of +/** + * container_of - cast a member of a structure out to the containing structure + * @ptr: the pointer to the member. + * @type: the type of the container struct this is embedded in. + * @member: the name of the member within the struct. + * + */ +#define container_of(ptr, type, member) \ + ((type *) ((uint8_t *)(ptr) - offsetof(type, member))) +#endif + + #ifdef __linux static int cq_handle(struct iser_conn *iser_conn);
