[packages/udisks2] - added iscsi patch (adjust open-iscsi library name for PLD), build iscsi module

[qboosh]

commit a62fa8149ad27c866b210767a169e63a1156c223
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 19 17:52:38 2022 +0200

    - added iscsi patch (adjust open-iscsi library name for PLD), build iscsi module

 udisks2-iscsi.patch | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 udisks2.spec        | 15 ++++++++--
 2 files changed, 91 insertions(+), 3 deletions(-)
---
diff --git a/udisks2.spec b/udisks2.spec
index e151ada..d9f734e 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -1,9 +1,7 @@
-# TODO:
-# - iscsi: libiscsi.h, libiscsi_init in libiscsi
 #
 # Conditional build:
 %bcond_with	elogind		# elogind insead of systemd logind support
-%bcond_with	iscsi		# iSCSI support
+%bcond_without	iscsi		# iSCSI support
 %bcond_without	libstoragemgmt	# libstoragemgmt support
 %bcond_without	vdo		# VDO support (deprecated)
 %bcond_without	apidocs		# do not build and package API docs
@@ -21,6 +19,7 @@ Source0:	https://github.com/storaged-project/udisks/releases/download/udisks-%{v
 # Source0-md5:	576e057d2654894fab58f0393d105b7b
 Patch0:		automake-1.12.patch
 Patch1:		%{name}-housekeeping_interval.patch
+Patch2:		%{name}-iscsi.patch
 URL:		https://www.freedesktop.org/wiki/Software/udisks
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.50
@@ -48,6 +47,7 @@ BuildRequires:	libmount-devel >= 2.30
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel >= 2.31
 BuildRequires:	libxslt-progs
+%{?with_iscsi:BuildRequires:	open-iscsi-devel >= 2.1.4-1}
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.102
 BuildRequires:	rpmbuild(macros) >= 1.752
@@ -173,6 +173,7 @@ Pakiet ten dostarcza bashowe uzupełnianie parametrów dla udisks2
 %setup -q -n udisks-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -248,6 +249,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/umount.udisks2.8*
 %attr(700,root,root) %dir /var/lib/udisks2
 
+%if %{with iscsi}
+%attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_iscsi.so
+%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy
+%endif
+
 %if %{with libstoragemgmt}
 %attr(755,root,root) %{_libdir}/udisks2/modules/libudisks2_lsm.so
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf
@@ -274,6 +280,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/udisks2.pc
 %{_pkgconfigdir}/udisks2-bcache.pc
 %{_pkgconfigdir}/udisks2-btrfs.pc
+%if %{with iscsi}
+%{_pkgconfigdir}/udisks2-iscsi.pc
+%endif
 %if %{with libstoragemgmt}
 %{_pkgconfigdir}/udisks2-lsm.pc
 %endif
diff --git a/udisks2-iscsi.patch b/udisks2-iscsi.patch
new file mode 100644
index 0000000..71c445e
--- /dev/null
+++ b/udisks2-iscsi.patch
@@ -0,0 +1,79 @@
+--- udisks-2.9.4/configure.ac.orig	2021-09-29 18:00:31.000000000 +0200
++++ udisks-2.9.4/configure.ac	2022-05-19 06:23:52.571836426 +0200
+@@ -342,13 +342,13 @@ if test "x$enable_iscsi" = "xyes" \
+      -o "x$enable_modules" = "xyes" \
+      -o "x$enable_available_modules" = "xyes"; then
+   # libiscsi.h
+-  AC_CHECK_HEADER([libiscsi.h],
++  AC_CHECK_HEADER([libopeniscsi.h],
+                   [AC_DEFINE(HAVE_ISCSI, 1, [Define if libiscsi from iscsi-initiator-utils is available])
+                    have_iscsi=yes],
+                   [have_iscsi=no])
+   if test "x$have_iscsi" = "xyes"; then
+-    AC_MSG_CHECKING([whether libiscsi.h defines iscsi_err])
+-    AC_TRY_COMPILE([#include <libiscsi.h>],
++    AC_MSG_CHECKING([whether libopeniscsi.h defines iscsi_err])
++    AC_TRY_COMPILE([#include <libopeniscsi.h>],
+                    [int err = ISCSI_SUCCESS;],
+                    [AC_MSG_RESULT([yes])
+                     AC_DEFINE([HAVE_LIBISCSI_ERR], [1], [libiscsi error states])],
+@@ -356,12 +356,12 @@ if test "x$enable_iscsi" = "xyes" \
+   fi
+ 
+   # libiscsi
+-  AC_CHECK_LIB([iscsi],
++  AC_CHECK_LIB([openiscsi],
+                [libiscsi_init],
+-               [ISCSI_LIBS="-liscsi"],
++               [ISCSI_LIBS="-lopeniscsi"],
+                [have_iscsi="no"])
+   if test "x$have_iscsi" = "xyes"; then
+-    AC_CHECK_LIB([iscsi],
++    AC_CHECK_LIB([openiscsi],
+                  [libiscsi_get_session_info_by_id],
+                  [have_libiscsi_session_info="yes"
+                   have_libiscsi_session_info_msg=", with iscsi sessions"
+--- udisks-2.9.4/modules/iscsi/udisksiscsiutil.c.orig	2021-09-29 18:00:31.000000000 +0200
++++ udisks-2.9.4/modules/iscsi/udisksiscsiutil.c	2022-05-19 06:24:31.734957594 +0200
+@@ -20,7 +20,7 @@
+ #include "config.h"
+ 
+ #include <string.h>
+-#include <libiscsi.h>
++#include <libopeniscsi.h>
+ 
+ #include <src/udisksdaemon.h>
+ #include <src/udisksmodulemanager.h>
+--- udisks-2.9.4/modules/iscsi/udiskslinuxiscsisessionobject.c.orig	2021-09-29 18:00:31.000000000 +0200
++++ udisks-2.9.4/modules/iscsi/udiskslinuxiscsisessionobject.c	2022-05-19 06:24:46.198212573 +0200
+@@ -19,7 +19,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libiscsi.h>
++#include <libopeniscsi.h>
+ #include <src/udisksdaemon.h>
+ #include <src/udiskslogging.h>
+ #include <src/udiskslinuxdevice.h>
+--- udisks-2.9.4/modules/iscsi/udiskslinuxmanageriscsiinitiator.c.orig	2021-09-29 18:00:31.000000000 +0200
++++ udisks-2.9.4/modules/iscsi/udiskslinuxmanageriscsiinitiator.c	2022-05-19 06:24:57.854816091 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include <glib/gi18n-lib.h>
+ 
+-#include <libiscsi.h>
++#include <libopeniscsi.h>
+ 
+ #include <src/udisksdaemon.h>
+ #include <src/udisksdaemonutil.h>
+--- udisks-2.9.4/modules/iscsi/udiskslinuxmoduleiscsi.c.orig	2021-09-29 18:00:31.000000000 +0200
++++ udisks-2.9.4/modules/iscsi/udiskslinuxmoduleiscsi.c	2022-05-19 06:25:07.794762241 +0200
+@@ -20,7 +20,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libiscsi.h>
++#include <libopeniscsi.h>
+ 
+ #include <src/udisksdaemon.h>
+ #include <src/udiskslogging.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/udisks2.git/commitdiff/a62fa8149ad27c866b210767a169e63a1156c223