!23 Fix compile error which report sighold is deprecated and systemd error: Unit file isnsd.socket does not exist.
From: @wenchao-hao Reviewed-by: @wubo009 Signed-off-by: @liuzhiqiang26
This commit is contained in:
commit
c39b0bc048
44
0004-libisns-remove-sighold-and-sigrelse.patch
Normal file
44
0004-libisns-remove-sighold-and-sigrelse.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From e7dac76ce61039fefa58985c955afccb60dabe87 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rosen Penev <rosenp@gmail.com>
|
||||||
|
Date: Wed, 29 Apr 2020 15:55:55 -0700
|
||||||
|
Subject: [PATCH] libisns: remove sighold and sigrelse
|
||||||
|
|
||||||
|
The man page says that these are deprecated. Use sugprocmask as a replacement.
|
||||||
|
---
|
||||||
|
include/libisns/util.h | 16 ++++++++++++----
|
||||||
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/libisns/util.h b/include/libisns/util.h
|
||||||
|
index e5ed037..f1b97f0 100644
|
||||||
|
--- a/include/libisns/util.h
|
||||||
|
+++ b/include/libisns/util.h
|
||||||
|
@@ -41,14 +41,22 @@ char * print_size(unsigned long);
|
||||||
|
*/
|
||||||
|
static inline void signals_hold(void)
|
||||||
|
{
|
||||||
|
- sighold(SIGTERM);
|
||||||
|
- sighold(SIGINT);
|
||||||
|
+ sigset_t s;
|
||||||
|
+
|
||||||
|
+ sigemptyset(&s);
|
||||||
|
+ sigaddset(&s, SIGTERM);
|
||||||
|
+ sigaddset(&s, SIGINT);
|
||||||
|
+ sigprocmask(SIG_BLOCK, &s, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void signals_release(void)
|
||||||
|
{
|
||||||
|
- sigrelse(SIGTERM);
|
||||||
|
- sigrelse(SIGINT);
|
||||||
|
+ sigset_t s;
|
||||||
|
+
|
||||||
|
+ sigemptyset(&s);
|
||||||
|
+ sigaddset(&s, SIGTERM);
|
||||||
|
+ sigaddset(&s, SIGINT);
|
||||||
|
+ sigprocmask(SIG_UNBLOCK, &s, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
25
0005-Do-not-install-isnsd.socket-in-isnsd.service.patch
Normal file
25
0005-Do-not-install-isnsd.socket-in-isnsd.service.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 040ee0d91adb8b2f6dd3705e3c193a77b40e69c5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wenchao Hao <haowenchao@huawei.com>
|
||||||
|
Date: Thu, 29 Apr 2021 16:07:59 +0800
|
||||||
|
Subject: [PATCH] Do not install isnsd.socket in isnsd.service
|
||||||
|
|
||||||
|
isnsd.socket is removed from rpm package, so here remove it from isnsd.service
|
||||||
|
to fix systemd error message
|
||||||
|
|
||||||
|
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
|
||||||
|
---
|
||||||
|
isnsd.service | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/isnsd.service b/isnsd.service
|
||||||
|
index 76eac6c..3f5fb21 100644
|
||||||
|
--- a/isnsd.service
|
||||||
|
+++ b/isnsd.service
|
||||||
|
@@ -12,4 +12,3 @@ LimitCORE=infinity
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sysinit.target
|
||||||
|
-Also=isnsd.socket
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: open-isns
|
Name: open-isns
|
||||||
Version: 0.100
|
Version: 0.100
|
||||||
Release: 3
|
Release: 5
|
||||||
Summary: The iSNS server and client programs
|
Summary: The iSNS server and client programs
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://www.github.com/open-iscsi/open-isns
|
URL: https://www.github.com/open-iscsi/open-isns
|
||||||
@ -9,6 +9,8 @@ Source0: https://www.github.com/open-iscsi/open-isns/archive/v%{version}.
|
|||||||
Patch1: 0001-Fix-the-issue-of-ignoring-the-return-value.patch
|
Patch1: 0001-Fix-the-issue-of-ignoring-the-return-value.patch
|
||||||
Patch2: 0002-Fix-compiler-issue-when-not-in-security-mode.patch
|
Patch2: 0002-Fix-compiler-issue-when-not-in-security-mode.patch
|
||||||
Patch3: 0003-Fix-586-compile-issue-and-remove-Werror.patch
|
Patch3: 0003-Fix-586-compile-issue-and-remove-Werror.patch
|
||||||
|
Patch4: 0004-libisns-remove-sighold-and-sigrelse.patch
|
||||||
|
Patch5: 0005-Do-not-install-isnsd.socket-in-isnsd.service.patch
|
||||||
|
|
||||||
BuildRequires: gcc git systemd automake autoconf make
|
BuildRequires: gcc git systemd automake autoconf make
|
||||||
BuildRequires: openssl-devel systemd-devel
|
BuildRequires: openssl-devel systemd-devel
|
||||||
@ -96,6 +98,12 @@ install -p -m 644 isnsd.service %{buildroot}%{_unitdir}/isnsd.service
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 14 2021 Wenchao Hao<haowenchao@huawei.com> - 0.100-5
|
||||||
|
- Do not install isnsd.socket in isnsd.service
|
||||||
|
|
||||||
|
* Fri May 14 2021 Wenchao Hao<haowenchao@huawei.com> - 0.100-4
|
||||||
|
- libisns: remove sighold and sigrelse
|
||||||
|
|
||||||
* Wed Nov 4 2020 lixiaokeng<lixiaokeng@huawei.com> - 0.100-3
|
* Wed Nov 4 2020 lixiaokeng<lixiaokeng@huawei.com> - 0.100-3
|
||||||
- add make tests
|
- add make tests
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user