udisks2-iscsi.patch

   1 --- udisks-2.9.4/configure.ac.orig      2021-09-29 18:00:31.000000000 +0200
   2 +++ udisks-2.9.4/configure.ac   2022-05-19 06:23:52.571836426 +0200
   3 @@ -342,13 +342,13 @@ if test "x$enable_iscsi" = "xyes" \
   4       -o "x$enable_modules" = "xyes" \
   5       -o "x$enable_available_modules" = "xyes"; then
   6    # libiscsi.h
   7 -  AC_CHECK_HEADER([libiscsi.h],
   8 +  AC_CHECK_HEADER([libopeniscsi.h],
   9                    [AC_DEFINE(HAVE_ISCSI, 1, [Define if libiscsi from iscsi-initiator-utils is available])
  10                     have_iscsi=yes],
  11                    [have_iscsi=no])
  12    if test "x$have_iscsi" = "xyes"; then
  13 -    AC_MSG_CHECKING([whether libiscsi.h defines iscsi_err])
  14 -    AC_TRY_COMPILE([#include <libiscsi.h>],
  15 +    AC_MSG_CHECKING([whether libopeniscsi.h defines iscsi_err])
  16 +    AC_TRY_COMPILE([#include <libopeniscsi.h>],
  17                     [int err = ISCSI_SUCCESS;],
  18                     [AC_MSG_RESULT([yes])
  19                      AC_DEFINE([HAVE_LIBISCSI_ERR], [1], [libiscsi error states])],
  20 @@ -356,12 +356,12 @@ if test "x$enable_iscsi" = "xyes" \
  21    fi
  22
  23    # libiscsi
  24 -  AC_CHECK_LIB([iscsi],
  25 +  AC_CHECK_LIB([openiscsi],
  26                 [libiscsi_init],
  27 -               [ISCSI_LIBS="-liscsi"],
  28 +               [ISCSI_LIBS="-lopeniscsi"],
  29                 [have_iscsi="no"])
  30    if test "x$have_iscsi" = "xyes"; then
  31 -    AC_CHECK_LIB([iscsi],
  32 +    AC_CHECK_LIB([openiscsi],
  33                   [libiscsi_get_session_info_by_id],
  34                   [have_libiscsi_session_info="yes"
  35                    have_libiscsi_session_info_msg=", with iscsi sessions"
  36 --- udisks-2.9.4/modules/iscsi/udisksiscsiutil.c.orig   2021-09-29 18:00:31.000000000 +0200
  37 +++ udisks-2.9.4/modules/iscsi/udisksiscsiutil.c        2022-05-19 06:24:31.734957594 +0200
  38 @@ -20,7 +20,7 @@
  39  #include "config.h"
  40
  41  #include <string.h>
  42 -#include <libiscsi.h>
  43 +#include <libopeniscsi.h>
  44
  45  #include <src/udisksdaemon.h>
  46  #include <src/udisksmodulemanager.h>
  47 --- udisks-2.9.4/modules/iscsi/udiskslinuxiscsisessionobject.c.orig     2021-09-29 18:00:31.000000000 +0200
  48 +++ udisks-2.9.4/modules/iscsi/udiskslinuxiscsisessionobject.c  2022-05-19 06:24:46.198212573 +0200
  49 @@ -19,7 +19,7 @@
  50
  51  #include "config.h"
  52
  53 -#include <libiscsi.h>
  54 +#include <libopeniscsi.h>
  55  #include <src/udisksdaemon.h>
  56  #include <src/udiskslogging.h>
  57  #include <src/udiskslinuxdevice.h>
  58 --- udisks-2.9.4/modules/iscsi/udiskslinuxmanageriscsiinitiator.c.orig  2021-09-29 18:00:31.000000000 +0200
  59 +++ udisks-2.9.4/modules/iscsi/udiskslinuxmanageriscsiinitiator.c       2022-05-19 06:24:57.854816091 +0200
  60 @@ -25,7 +25,7 @@
  61
  62  #include <glib/gi18n-lib.h>
  63
  64 -#include <libiscsi.h>
  65 +#include <libopeniscsi.h>
  66
  67  #include <src/udisksdaemon.h>
  68  #include <src/udisksdaemonutil.h>
  69 --- udisks-2.9.4/modules/iscsi/udiskslinuxmoduleiscsi.c.orig    2021-09-29 18:00:31.000000000 +0200
  70 +++ udisks-2.9.4/modules/iscsi/udiskslinuxmoduleiscsi.c 2022-05-19 06:25:07.794762241 +0200
  71 @@ -20,7 +20,7 @@
  72
  73  #include "config.h"
  74
  75 -#include <libiscsi.h>
  76 +#include <libopeniscsi.h>
  77
  78  #include <src/udisksdaemon.h>
  79  #include <src/udiskslogging.h>