From 7f1e3311302690cd29f76f528dc73692d61bf1a1 Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Mon, 15 Jun 2020 15:34:50 +0800 Subject: [PATCH 1/5] fix devel without node header files --- fix-devel-without-node-header-files.patch | 13 +++++++++++++ open-iscsi.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix-devel-without-node-header-files.patch diff --git a/fix-devel-without-node-header-files.patch b/fix-devel-without-node-header-files.patch new file mode 100644 index 0000000..9630445 --- /dev/null +++ b/fix-devel-without-node-header-files.patch @@ -0,0 +1,13 @@ +diff -Nur open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile +--- open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile 2020-06-15 15:09:30.624567419 +0800 ++++ open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile 2020-06-15 15:11:09.378006613 +0800 +@@ -35,7 +35,8 @@ + HEADERS = libopeniscsiusr/libopeniscsiusr.h \ + libopeniscsiusr/libopeniscsiusr_common.h \ + libopeniscsiusr/libopeniscsiusr_session.h \ +- libopeniscsiusr/libopeniscsiusr_iface.h ++ libopeniscsiusr/libopeniscsiusr_iface.h \ ++ libopeniscsiusr/libopeniscsiusr_node.h + TESTS = tests/test_context tests/test_session tests/test_iface tests/test_node + EXTRA_MAN_FILES = libopeniscsiusr.h.3 + diff --git a/open-iscsi.spec b/open-iscsi.spec index 33b3e77..0ba207f 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.0.876 -Release: 19 +Release: 20 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org @@ -54,6 +54,7 @@ Patch0039: 0039-iscsi-iname-verify-prefix-length-is-at-most-210.patch Patch0040: 0040-iscsi-iname-remove-unneeded-temp-buffer.patch Patch0041: 0041-Fix-issue-where-iscsi-iname-p-core-dumps.patch Patch0042: 0042-modify-iSCSI-shared-memory-permissions-for-logs.patch +Patch0043: fix-devel-without-node-header-files.patch BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config gdb @@ -186,6 +187,9 @@ fi %{_mandir}/man8/* %changelog +* Mon Jun 15 2020 sunguoshuai - 2.0.876-20 +- fix devel without node header files + * Tue May 12 2020 Wu Bo - 2.0.876-19 - iscsi-iname verfiy prefix length is at most 210 characters. iscsi-iname remove unneeded temp buffer. From b1df6246e681388521084a7e93bc61b3727c940f Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Mon, 15 Jun 2020 17:31:58 +0800 Subject: [PATCH 2/5] modify the patch --- ...-Fix-devel-without-node-header-files.patch | 34 +++++++++++++++++++ fix-devel-without-node-header-files.patch | 13 ------- open-iscsi.spec | 2 +- 3 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 0043-Fix-devel-without-node-header-files.patch delete mode 100644 fix-devel-without-node-header-files.patch diff --git a/0043-Fix-devel-without-node-header-files.patch b/0043-Fix-devel-without-node-header-files.patch new file mode 100644 index 0000000..0f3b066 --- /dev/null +++ b/0043-Fix-devel-without-node-header-files.patch @@ -0,0 +1,34 @@ +From f01725cfd9b2214f7c602bd72a5af9578dc9d023 Mon Sep 17 00:00:00 2001 +From: si-gui <245140120@qq.com> +Date: Mon, 15 Jun 2020 17:07:36 +0800 +Subject: [PATCH] Fix devel without node header files + +When user include libopeniscsiusr.h in the c files,we will get an error: +"/usr/include/libopeniscsiusr.h:33:10: fatal error: +libopeniscsiusr_node.h: No such file or directory" + +We find libopeniscsiusr_node.h was forgetton in our +libopeniscsiusr/Makefile, so fix it. Otherwise user can't use open-iscsi +header file for development + +--- + libopeniscsiusr/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index bf7c96c..75f6fb3 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -35,7 +35,8 @@ PKGFILE = libopeniscsiusr.pc + HEADERS = libopeniscsiusr/libopeniscsiusr.h \ + libopeniscsiusr/libopeniscsiusr_common.h \ + libopeniscsiusr/libopeniscsiusr_session.h \ +- libopeniscsiusr/libopeniscsiusr_iface.h ++ libopeniscsiusr/libopeniscsiusr_iface.h \ ++ libopeniscsiusr/libopeniscsiusr_node.h + TESTS = tests/test_context tests/test_session tests/test_iface tests/test_node + EXTRA_MAN_FILES = libopeniscsiusr.h.3 + +-- +2.23.0 + diff --git a/fix-devel-without-node-header-files.patch b/fix-devel-without-node-header-files.patch deleted file mode 100644 index 9630445..0000000 --- a/fix-devel-without-node-header-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile ---- open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile 2020-06-15 15:09:30.624567419 +0800 -+++ open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile 2020-06-15 15:11:09.378006613 +0800 -@@ -35,7 +35,8 @@ - HEADERS = libopeniscsiusr/libopeniscsiusr.h \ - libopeniscsiusr/libopeniscsiusr_common.h \ - libopeniscsiusr/libopeniscsiusr_session.h \ -- libopeniscsiusr/libopeniscsiusr_iface.h -+ libopeniscsiusr/libopeniscsiusr_iface.h \ -+ libopeniscsiusr/libopeniscsiusr_node.h - TESTS = tests/test_context tests/test_session tests/test_iface tests/test_node - EXTRA_MAN_FILES = libopeniscsiusr.h.3 - diff --git a/open-iscsi.spec b/open-iscsi.spec index 0ba207f..ffbc60f 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -54,7 +54,7 @@ Patch0039: 0039-iscsi-iname-verify-prefix-length-is-at-most-210.patch Patch0040: 0040-iscsi-iname-remove-unneeded-temp-buffer.patch Patch0041: 0041-Fix-issue-where-iscsi-iname-p-core-dumps.patch Patch0042: 0042-modify-iSCSI-shared-memory-permissions-for-logs.patch -Patch0043: fix-devel-without-node-header-files.patch +Patch0043: 0043-Fix-devel-without-node-header-files.patch BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config gdb From f4f665a1adb565d6836c2954a16b7b0a85c46afc Mon Sep 17 00:00:00 2001 From: sigui <245140120@qq.com> Date: Mon, 15 Jun 2020 17:48:22 +0800 Subject: [PATCH 3/5] update 0043-Fix-devel-without-node-header-files.patch. --- 0043-Fix-devel-without-node-header-files.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0043-Fix-devel-without-node-header-files.patch b/0043-Fix-devel-without-node-header-files.patch index 0f3b066..036e4bf 100644 --- a/0043-Fix-devel-without-node-header-files.patch +++ b/0043-Fix-devel-without-node-header-files.patch @@ -3,6 +3,8 @@ From: si-gui <245140120@qq.com> Date: Mon, 15 Jun 2020 17:07:36 +0800 Subject: [PATCH] Fix devel without node header files +Signed-off-by: si-gui 245140120@qq.com + When user include libopeniscsiusr.h in the c files,we will get an error: "/usr/include/libopeniscsiusr.h:33:10: fatal error: libopeniscsiusr_node.h: No such file or directory" From 4ffc23b7cf124229a3a4ea192c02c904e7ef3f04 Mon Sep 17 00:00:00 2001 From: sigui <245140120@qq.com> Date: Tue, 16 Jun 2020 09:12:38 +0800 Subject: [PATCH 4/5] update 0043-Fix-devel-without-node-header-files.patch. --- 0043-Fix-devel-without-node-header-files.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0043-Fix-devel-without-node-header-files.patch b/0043-Fix-devel-without-node-header-files.patch index 036e4bf..03b2e4e 100644 --- a/0043-Fix-devel-without-node-header-files.patch +++ b/0043-Fix-devel-without-node-header-files.patch @@ -3,8 +3,6 @@ From: si-gui <245140120@qq.com> Date: Mon, 15 Jun 2020 17:07:36 +0800 Subject: [PATCH] Fix devel without node header files -Signed-off-by: si-gui 245140120@qq.com - When user include libopeniscsiusr.h in the c files,we will get an error: "/usr/include/libopeniscsiusr.h:33:10: fatal error: libopeniscsiusr_node.h: No such file or directory" @@ -13,6 +11,8 @@ We find libopeniscsiusr_node.h was forgetton in our libopeniscsiusr/Makefile, so fix it. Otherwise user can't use open-iscsi header file for development +Signed-off-by: si-gui <245140120@qq.com> + --- libopeniscsiusr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) From 1d72dac25e8eef0016b71f2a7f3eaf5f9325e7f3 Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Tue, 16 Jun 2020 09:29:23 +0800 Subject: [PATCH 5/5] Rename 0043-Fix-devel-without-node-header-files.patch to 0045 --- ...iles.patch => 0045-Fix-devel-without-node-header-files.patch | 0 open-iscsi.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename 0043-Fix-devel-without-node-header-files.patch => 0045-Fix-devel-without-node-header-files.patch (100%) diff --git a/0043-Fix-devel-without-node-header-files.patch b/0045-Fix-devel-without-node-header-files.patch similarity index 100% rename from 0043-Fix-devel-without-node-header-files.patch rename to 0045-Fix-devel-without-node-header-files.patch diff --git a/open-iscsi.spec b/open-iscsi.spec index fd6579f..7a0b011 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.0.876 -Release: 20 +Release: 21 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org